diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 9c33e716..4ef4a998 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.4.0
+current_version = 0.0.0
 commit = True
 message = Update version {current_version} -> {new_version} [skip ci]
 
diff --git a/.env.enc b/.env.enc
deleted file mode 100644
index c8faa580..00000000
Binary files a/.env.enc and /dev/null differ
diff --git a/.ghostenv.enc b/.ghostenv.enc
deleted file mode 100644
index 0726b7c3..00000000
Binary files a/.ghostenv.enc and /dev/null differ
diff --git a/.gitignore b/.gitignore
index e321ff94..5cc5d9f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 .DS_Store
-.env
+*.env
 
 # ignore vendor/
 vendor/
diff --git a/.iam_access_groups_env.enc b/.iam_access_groups_env.enc
deleted file mode 100644
index 2c675ea6..00000000
Binary files a/.iam_access_groups_env.enc and /dev/null differ
diff --git a/.travis.yml b/.travis.yml
index e6509b8c..248f0f01 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,28 +18,27 @@ before_install:
 - nvm install 12
 - npm install -g npm@6.x
 
-install:
-- curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b $(go env GOPATH)/bin v1.21.0
-
-before_script:
+before_install:
 - openssl aes-256-cbc -K "$ghost_key" -iv "$ghost_iv" -in .ghostenv.enc -out .ghostenv -d || true
 - openssl aes-256-cbc -K $encrypted_3b05ea0a069c_key -iv $encrypted_3b05ea0a069c_iv -in .iam_access_groups_env.enc -out .iam_access_groups_env -d || true
 
+install:
+- curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b $(go env GOPATH)/bin v1.21.0
+
 script:
-- go test `go list ./... | grep -v Samples`
 - go test `go list ./... | grep -v Samples` -tags=integration
 - golangci-lint run
 
-before_deploy:
-- pip install --user bump2version
-- npm install @semantic-release/changelog
-- npm install @semantic-release/exec
-- npm install @semantic-release/git
-- npm install @semantic-release/github
-
-deploy:
-  - provider: script
-    script: npx semantic-release
-    skip_cleanup: true
-    on:
-      branch: master
+# before_deploy:
+# - pip install --user bump2version
+# - npm install @semantic-release/changelog
+# - npm install @semantic-release/exec
+# - npm install @semantic-release/git
+# - npm install @semantic-release/github
+# 
+# deploy:
+#   - provider: script
+#     script: npx semantic-release
+#     skip_cleanup: true
+#     on:
+#       branch: master
diff --git a/CHANGELOG.md b/CHANGELOG.md
deleted file mode 100644
index f1f03e36..00000000
--- a/CHANGELOG.md
+++ /dev/null
@@ -1,41 +0,0 @@
-# [0.4.0](https://github.ibm.com/ibmcloud/platform-services-go-sdk/compare/v0.3.0...v0.4.0) (2020-03-24)
-
-
-### Features
-
-* **Case Management:** add initial case-mgmt generated service ([a41ac9f](https://github.ibm.com/ibmcloud/platform-services-go-sdk/commit/a41ac9fa7f08f4954ab9acd26bf9b2b4a32ccabe))
-
-# [0.3.0](https://github.ibm.com/ibmcloud/platform-services-go-sdk/compare/v0.2.0...v0.3.0) (2020-03-23)
-
-
-### Features
-
-* **IAM Access Groups:** re-gen service with new API definition ([8177185](https://github.ibm.com/ibmcloud/platform-services-go-sdk/commit/81771855733a2d82874b83ae80ec15b03db2f410))
-
-# [0.2.0](https://github.ibm.com/ibmcloud/platform-services-go-sdk/compare/v0.1.1...v0.2.0) (2020-03-20)
-
-
-### Features
-
-* **IAM Policy Management:** regen service with latest API definition ([3b3c9f2](https://github.ibm.com/ibmcloud/platform-services-go-sdk/commit/3b3c9f20cbfad74ce4aa0f58b64182680f852f40))
-
-## [0.1.1](https://github.ibm.com/ibmcloud/platform-services-go-sdk/compare/v0.1.0...v0.1.1) (2020-03-16)
-
-
-### Bug Fixes
-
-* remove analytics header (no longer needed) ([40803c4](https://github.ibm.com/ibmcloud/platform-services-go-sdk/commit/40803c49d1ca33b95769a800b37dd54c0aabe046))
-
-# [0.1.0](https://github.ibm.com/ibmcloud/platform-services-go-sdk/compare/v0.0.2...v0.1.0) (2020-03-09)
-
-
-### Features
-
-* add sdk analytics header ([#19](https://github.ibm.com/ibmcloud/platform-services-go-sdk/issues/19)) ([da5290c](https://github.ibm.com/ibmcloud/platform-services-go-sdk/commit/da5290cc8b37da6abd5936b8d3a06e9efddce146))
-
-## [0.0.2](https://github.ibm.com/ibmcloud/platform-services-go-sdk/compare/v0.0.1...v0.0.2) (2020-03-09)
-
-
-### Bug Fixes
-
-* **docs:** update CONTRIBUTING.md with commit message requirements ([8872750](https://github.ibm.com/ibmcloud/platform-services-go-sdk/commit/88727506cb9ce6db237336bc8a52c9d2db7e077a))
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 68fe907c..3aa52eeb 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,11 +1,11 @@
 # Questions
-If you are having problems using the APIs or have a question about IBM Cloud services, please ask a question on
-[dW Answers](https://developer.ibm.com/answers/questions/ask/?topics=ibm-cloud)
-or [Stack Overflow](http://stackoverflow.com/questions/ask?tags=ibm-cloud).
+If you are having problems using the APIs or have a question about IBM Cloud services,
+please ask a question at
+[Stack Overflow](http://stackoverflow.com/questions/ask?tags=ibm-cloud).
 
 # Issues
 If you encounter an issue with the project, you are welcome to submit a
-[bug report](https://github.ibm.com/ibmcloud/platform-services-go-sdk/issues).
+[bug report](https://github.com/IBM/platform-services-go-sdk/issues).
 Before that, please search for similar issues. It's possible that someone has already reported the problem.
 
 # General Information
diff --git a/README.md b/README.md
index c3957bcd..064e0d8b 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,11 @@
-# IBM Cloud Platform Services Go SDK Version 0.4.0
-[![Build Status](https://travis.ibm.com/ibmcloud/platform-services-go-sdk.svg?token=eW5FVD71iyte6tTby8gr&branch=master)](https://travis.ibm.com/ibmcloud/platform-services-go-sdk)
+<!--
+[![Build Status](https://travis-ci.com/IBM/platform-services-go-sdk.svg?token=eW5FVD71iyte6tTby8gr&branch=master)](https://travis-ci.com/IBM/platform-services-go-sdk)
+-->
+
+# IBM Cloud Platform Services Go SDK Version 0.0.0
 
-Go client library to interact with various [IBM Cloud Platform Service APIs](https://cloud.ibm.com/apidocs?category=platform_services).
+Go client library to interact with various
+[IBM Cloud Platform Service APIs](https://cloud.ibm.com/apidocs?category=platform_services).
 
 ## Table of Contents
 <!--
@@ -37,33 +41,21 @@ The IBM Cloud Platform Services Go SDK allows developers to programmatically int
 
 Service Name | Package name 
 --- | --- 
-[Case Management](https://cloud.ibm.com/apidocs/case-management) | casemanagementv1
-[Enterprise Billing Units](https://cloud.ibm.com/apidocs/enterprise-apis/billing-unit) | enterprisebillingunitsv1
-[Enterprise Management](https://cloud.ibm.com/apidocs/enterprise-apis/enterprise) | enterprisemanagementv1
-[Enterprise Usage Reports](https://cloud.ibm.com/apidocs/enterprise-apis/resource-usage-reports) | enterpriseusagereportsv1
-[Global Resource Catalog](https://cloud.ibm.com/apidocs/globalcatalog) | globalcatalogv1
 [Global Search](https://cloud.ibm.com/apidocs/search) | globalsearchv2
 [Global Tagging](https://cloud.ibm.com/apidocs/tagging) | globaltaggingv1
 [IAM Access Groups](https://cloud.ibm.com/apidocs/iam-access-groups) | iamaccessgroupsv2
-[IAM Identity Services](https://cloud.ibm.com/apidocs/iam-identity-token-api) | iamidentityservicesv1
-[IAM Policy Management](https://cloud.ibm.com/apidocs/iam-policy-management) | iampolicymanagementv1
-[Open Services Broker](https://cloud.ibm.com/apidocs/resource-controller/ibm-cloud-osb-api) | openservicebrokerv1
-[Resource Controller](https://cloud.ibm.com/apidocs/resource-controller) | resourcecontrollerv2
-[Resource Manager](https://cloud.ibm.com/apidocs/resource-controller/resource-manager) | resourcemanagerv2
-[Usage Metering](https://cloud.ibm.com/apidocs/usage-metering) | usagemeteringv4
-[Usage Reports](https://cloud.ibm.com/apidocs/usage-metering) | usagereportsv1
-[User Management](https://cloud.ibm.com/apidocs/user-management) | usermanagementv1
 
 ## Prerequisites
 
-[ibm-cloud-onboarding]: https://cloud.ibm.com/registration?target=%2Fdeveloper%2Fwatson&
+[ibm-cloud-onboarding]: https://cloud.ibm.com/registration
 
 * An [IBM Cloud][ibm-cloud-onboarding] account.
-* An IAM API key to allow the SDK to access your account. Create one [here](https://cloud.ibm.com/iam/apikeys).
+* An IAM API key to allow the SDK to access your account. Create one
+[here](https://cloud.ibm.com/iam/apikeys).
 * Go version 1.12 or above.
 
 ## Installation
-The current version of this SDK: 0.4.0
+The current version of this SDK: 0.0.0
 
 There are a few different ways to download and install the Platform Services Go SDK project for use by your
 Go application:
@@ -73,7 +65,7 @@ Use this command to download and install the Platform Services Go SDK project to
 use it:
 
 ```
-go get -u github.ibm.com/ibmcloud/platform-services-go-sdk
+go get -u github.com/IBM/platform-services-go-sdk
 ```
 
 #### Go modules  
@@ -82,7 +74,7 @@ Go application, like this:
 
 ```go
 import (
-	"github.ibm.com/ibmcloud/platform-services-go-sdk/resourcecontrollerv2"
+	"github.com/IBM/platform-services-go-sdk/globalsearchv2"
 )
 ```
 
@@ -95,25 +87,26 @@ to your `Gopkg.toml` file.  Here is an example:
 
 ```
 [[constraint]]
-  name = "github.ibm.com/ibmcloud/platform-services-go-sdk/resourcecontrollerv2"
-  version = "0.4.0"
+  name = "github.com/IBM/platform-services-go-sdk/globalsearchv2"
+  version = "0.0.0"
 
 ```
 
 then run `dep ensure`.
 
 ## Using the SDK
-For general SDK usage information, please see [this link](https://github.com/IBM/ibm-cloud-sdk-common/blob/master/README.md)
+For general SDK usage information, please see
+[this link](https://github.com/IBM/ibm-cloud-sdk-common/blob/master/README.md)
 
 ## Questions
 
 If you are having difficulties using this SDK or have a question about the IBM Cloud services,
-please ask a question at [dW Answers](https://developer.ibm.com/answers/questions/ask/?topics=ibm-cloud) or
+please ask a question at
 [Stack Overflow](http://stackoverflow.com/questions/ask?tags=ibm-cloud).
 
 ## Issues
 If you encounter an issue with the project, you are welcome to submit a
-[bug report](https://github.ibm.com/ibmcloud/platform-services-go-sdk/issues).
+[bug report](https://github.com/IBM/platform-services-go-sdk/issues).
 Before that, please search for similar issues. It's possible that someone has already reported the problem.
 
 ## Open source @ IBM
@@ -125,4 +118,4 @@ See [CONTRIBUTING](CONTRIBUTING.md).
 ## License
 
 The IBM Cloud Platform Services Go SDK is released under the Apache 2.0 license.
-The license's full text can be found in [LICENSE](https://github.ibm.com/ibmcloud/platform-services-go-sdk/blob/master/LICENSE).
+The license's full text can be found in [LICENSE](LICENSE).
diff --git a/Samples/README.md b/Samples/README.md
deleted file mode 100644
index 11f82d0e..00000000
--- a/Samples/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sample Code for IBM Cloud Go Platform SDK
-
-This directory contains some sample code that shows how to use some of the Go Platform SDK's features. You can use these files to help get started with the SDK. For example, the Global Tagging V1 sample file has functions that show how to get, attach, detach, and delete tags.
\ No newline at end of file
diff --git a/Samples/global_tagging_sample.go b/Samples/global_tagging_sample.go
deleted file mode 100644
index 5e86548e..00000000
--- a/Samples/global_tagging_sample.go
+++ /dev/null
@@ -1,142 +0,0 @@
-// Sample file to demonstrate how to use the Global Tagging V1 SDK.
-
-package sample
-
-import (
-	"fmt"
-	"log"
-	"os"
-
-	"github.com/joho/godotenv"
-	"github.com/IBM/go-sdk-core/v3/core"
-	"github.ibm.com/ibmcloud/platform-services-go-sdk/globaltaggingv1"
-)
-
-// Create a GlobalTaggingV1 service to be able to call global tagging functions
-var service *globaltaggingv1.GlobalTaggingV1
-var serviceErr error
-
-func init() {
-
-	// Initialization
-
-	// Load environment variables (should be stored in .env file)
-	envVarErr := godotenv.Load("../.env")
-	if envVarErr != nil {
-		log.Fatal("Error loading .env file")
-	}
-
-	// Create the IAM authenticator.
-	authenticator := &core.IamAuthenticator{
-	    ApiKey: os.Getenv("IAMAPIKEY"),
-	}
-
-	service, serviceErr = globaltaggingv1.
-		NewGlobalTaggingV1(&globaltaggingv1.GlobalTaggingV1Options{
-			Authenticator: authenticator,
-		})
-
-	if serviceErr != nil {
-		fmt.Println("Error: " + serviceErr.Error())
-	}
-
-	// Call any of the functions below to use them.
-
-	// getTagsSample()
-	// attachTagsSample()
-	// detachTagsSample()
-	// deleteTagsSample()
-
-}
-
-func GetTagsSample() {
-
-	// List tags in alphabetical ascending ('asc') or descending ('desc') order - default is ascending
-	orderByName := "asc"
-
-	// Create a ListTagsOptions object that serves as the ListTags function parameters.
-	getTagsOptions := globaltaggingv1.ListTagsOptions{
-
-		// Specify whether you would like to retrieve GhoST tags, IMS tags, or both.
-		Providers:   []string{"ghost", "ims"},
-		OrderByName: &orderByName,
-	}
-
-	// Function call to ListTags using the ListTagsOptions struct generated earlier
-	_, detailedResponse, _ := service.ListTags(&getTagsOptions)
-
-	fmt.Println(detailedResponse)
-
-}
-
-func AttachTagsSample() {
-
-	// Set the CRN of the object to be tagged here.
-	crn := "crn-here"
-
-	// The 'resource' is the instance in an IBM account that is to be tagged.
-	resource := globaltaggingv1.Resource{
-		ResourceID: &crn,
-	}
-
-	options := globaltaggingv1.AttachTagOptions{
-		Resources: []globaltaggingv1.Resource{resource},
-
-		// Insert the desired tag names here.
-		TagNames: []string{"sample", "tag-names", "here"},
-	}
-
-	// Call the AttachTag method.
-	_, detailedResponse, _ := service.AttachTag(&options)
-
-	fmt.Println(detailedResponse)
-
-}
-
-func DetachTagsSample() {
-
-	// Set the CRN of the object whose tag(s) are being detached here.
-	crn := "crn-here"
-
-	// The 'resource' is the instance in an IBM account that is to have its tag removed.
-	resource := globaltaggingv1.Resource{
-		ResourceID: &crn,
-	}
-
-	options := globaltaggingv1.DetachTagOptions{
-		Resources: []globaltaggingv1.Resource{resource},
-
-		// Insert the names of the tags to be removed here.
-		TagNames: []string{"sample", "tag-names", "here"},
-	}
-
-	// Call the AttachTag method.
-	_, detailedResponse, _ := service.DetachTag(&options)
-
-	fmt.Println(detailedResponse)
-
-}
-
-func DeleteTagsSample() {
-
-	// Tags can only be deleted if no instance has that tag attached to it
-
-	// The name of the tag to be deleted from an IBM Cloud account.
-	tagName := "d-wade"
-
-	// Necessary to populate the header with Content-Type for a delete request.
-	headers := make(map[string]string)
-	headers["Content-Type"] = "application-json"
-
-	delTagsOptions := globaltaggingv1.DeleteTagOptions{
-		TagName: &tagName,
-		// Tells the SDK where to look (i.e. GhoST, IMS, or both)
-		Providers: []string{"ghost", "ims"},
-		Headers:   headers,
-	}
-
-	_, detailedResponse, _ := service.DeleteTag(&delTagsOptions)
-
-	fmt.Println(detailedResponse)
-
-}
diff --git a/Samples/iam_policy_management_sample.go b/Samples/iam_policy_management_sample.go
deleted file mode 100644
index 7b851459..00000000
--- a/Samples/iam_policy_management_sample.go
+++ /dev/null
@@ -1,240 +0,0 @@
-package sample
-
-import (
-	"fmt"
-	"log"
-	"net/http"
-	"os"
-
-	"github.com/joho/godotenv"
-	"github.com/IBM/go-sdk-core/v3/core"
-	"github.ibm.com/ibmcloud/platform-services-go-sdk/iampolicymanagementv1"
-)
-
-var policyService *iampolicymanagementv1.IamPolicyManagementV1
-var policyServiceErr error
-
-func init() {
-
-	// loading environment variables from file .env
-	err := godotenv.Load("../.env")
-	if err != nil {
-		log.Fatal("Error while loading .env file")
-	}
-
-	// Create the IAM authenticator.
-	authenticator := &core.IamAuthenticator{
-			ApiKey: os.Getenv("IAMAPIKEY"),
-	}
-
-	// create a new service of usage report
-	// APIKEY of an account is needed to access services on that account
-	policyService, policyServiceErr = iampolicymanagementv1.NewIamPolicyManagementV1(&iampolicymanagementv1.IamPolicyManagementV1Options{
-		Authenticator: authenticator,
-	})
-
-	if policyServiceErr == nil {
-		customHeaders := http.Header{}
-		customHeaders.Add("X-Watson-Learning-Opt-Out", "1")
-		customHeaders.Add("X-Watson-Test", "1")
-		policyService.Service.SetDefaultHeaders(customHeaders)
-	}
-
-	// uncomment bellow lines to run functions
-
-	//policyID := createPolicy()
-	//eTag := getPolicy(policyID)
-	// add manager role to the created policy which already has reader role
-	//updatePolicy(eTag, policyID)
-	//listPolicies()
-	//deletePolicy(policyID)
-}
-
-func CreatePolicy() string {
-	// hardcode required parameters for subject, role, and resources
-	typeOfPolicy := "access"
-	accIDKey := "accountId"
-	accountIDValue := "91631433ee674cd9ab0ef150b8e7030f"
-	//	role : reader
-	roleID := "crn:v1:bluemix:public:iam::::serviceRole:Reader"
-	//	parameters for subject
-	//	in this sample, the subject is a Service ID
-	subjectAttributeKey := "iam_id"
-	subjectAttributeValue := "iam-ServiceId-251553c1-8ae0-4144-8d31-04a26c7cede2"
-	//	parameters for resources
-	//  in this sample, the resource is a COS instance
-	resServiceKey := "serviceName"
-	resServiceNameValue := "cloud-object-storage"
-	resInstanceKey := "serviceInstance"
-	resInstanceValue := "bbe0175e-2377-4fba-8231-fd9da8df8502"
-
-	// create a PolicyRole variable for role
-	policyRole := iampolicymanagementv1.PolicyRequestRolesItem{
-		RoleID: &roleID,
-	}
-
-	// create an SubjectAttributes variable for subject
-	mySubject := iampolicymanagementv1.PolicyRequestSubjectsItem{
-		Attributes: []iampolicymanagementv1.PolicyRequestSubjectsItemAttributesItem{
-			iampolicymanagementv1.PolicyRequestSubjectsItemAttributesItem{
-				Name:  &subjectAttributeKey,
-				Value: &subjectAttributeValue,
-			},
-		},
-	}
-
-	// create an ResourceAttributes variable for resources
-	myResource := iampolicymanagementv1.PolicyRequestResourcesItem{
-		Attributes: []iampolicymanagementv1.PolicyRequestResourcesItemAttributesItem{
-			iampolicymanagementv1.PolicyRequestResourcesItemAttributesItem{
-				Name:  &accIDKey,
-				Value: &accountIDValue,
-			},
-			iampolicymanagementv1.PolicyRequestResourcesItemAttributesItem{
-				Name:  &resServiceKey,
-				Value: &resServiceNameValue,
-			},
-			iampolicymanagementv1.PolicyRequestResourcesItemAttributesItem{
-				Name:  &resInstanceKey,
-				Value: &resInstanceValue,
-			},
-		},
-	}
-
-	// create a CreatePolicyOptions variable pointing to above variables
-	// the CreatePolicyOptions variable will be passed into function CreatePolicy
-	createPolicyOptions := &iampolicymanagementv1.CreatePolicyOptions{
-		Type: &typeOfPolicy,
-		Subjects: []iampolicymanagementv1.PolicyRequestSubjectsItem{mySubject},
-		Roles: []iampolicymanagementv1.PolicyRequestRolesItem{policyRole},
-		Resources: []iampolicymanagementv1.PolicyRequestResourcesItem{myResource},
-	}
-
-	// calling function CreatePolicy to make a request for a new policy
-	returnValue, detailedResponse, returnValueErr := policyService.CreatePolicy(createPolicyOptions)
-
-	if returnValueErr != nil {
-		fmt.Println("Error: " + serviceErr.Error())
-	}
-
-	fmt.Println(detailedResponse)
-
-	// return policy_id of the created policy
-	return *returnValue.ID
-}
-
-func GetPolicy(policyID string) string {
-
-	//	create a GetPolicyOptions variable pointing to required parameters
-	//	GetPolicy requires only Policy ID as a parameter
-	getPolicyOptions := policyService.NewGetPolicyOptions(policyID)
-
-	// calling GetPolicy to make a request to get a specific policy
-	_, detailedResponse, returnValueErr := policyService.GetPolicy(getPolicyOptions)
-	if returnValueErr != nil {
-		fmt.Println("Error: " + serviceErr.Error())
-	}
-	// 	get ETag
-	//  eTag is required to update a policy
-	//	we get eTag by making request GetPolicy
-	eTag := detailedResponse.Headers.Get("Etag")
-
-	fmt.Println(detailedResponse)
-
-	// return eTag
-	return eTag
-}
-
-func UpdatePolicy(eTag string, policyID string) {
-
-	//	hardcode required parameters that UpdatePolicy needs to make a request
-	typeOfPolicy := "access"
-	accIDKey := "accountId"
-	accountIDValue := "91631433ee674cd9ab0ef150b8e7030f"
-	//	parameter of roles
-	roleIDWrite := "crn:v1:bluemix:public:iam::::serviceRole:Writer"
-	roleIDManager := "crn:v1:bluemix:public:iam::::serviceRole:Manager"
-	//	parameters of subject
-	subjectAttributeKey := "iam_id"
-	subjectAttributeValue := "iam-ServiceId-251553c1-8ae0-4144-8d31-04a26c7cede2"
-	//	parameters of resource
-	resAttributeKey := "resourceGroupId"
-	resAttributeValue := "96714c6a77b04bd39d042a265428aea4"
-
-	// create a UpdatePolicyOptions variable pointing to above parameters
-	// the UpdatePolicyOptions variable will be passed into function UpdatePolicy
-	updatePolicyOptions := &iampolicymanagementv1.UpdatePolicyOptions{
-		IfMatch: &eTag, 
-		PolicyID: &policyID,
-		Type: &typeOfPolicy,
-		Subjects: []iampolicymanagementv1.PolicyRequestSubjectsItem{
-			iampolicymanagementv1.PolicyRequestSubjectsItem{
-				Attributes: []iampolicymanagementv1.PolicyRequestSubjectsItemAttributesItem{
-					iampolicymanagementv1.PolicyRequestSubjectsItemAttributesItem{
-						Name:  &subjectAttributeKey,
-						Value: &subjectAttributeValue,
-					},
-				},
-			},
-		},
-		Roles: []iampolicymanagementv1.PolicyRequestRolesItem{
-			iampolicymanagementv1.PolicyRequestRolesItem{
-				RoleID: &roleIDWrite,
-			}, 
-			iampolicymanagementv1.PolicyRequestRolesItem{
-				RoleID: &roleIDManager,
-			},
-		},
-		Resources: []iampolicymanagementv1.PolicyRequestResourcesItem{
-			iampolicymanagementv1.PolicyRequestResourcesItem{
-				Attributes: []iampolicymanagementv1.PolicyRequestResourcesItemAttributesItem{
-					iampolicymanagementv1.PolicyRequestResourcesItemAttributesItem{
-						Name:  &accIDKey,
-						Value: &accountIDValue,
-					},
-					iampolicymanagementv1.PolicyRequestResourcesItemAttributesItem{
-						Name:  &resAttributeKey,
-						Value: &resAttributeValue,
-					},
-				},
-			},
-		},
-	}
-
-	//	call function UpdatePolicy to make a request
-	_, detailedResponse, returnValueErr := policyService.UpdatePolicy(updatePolicyOptions)
-	if returnValueErr != nil {
-		fmt.Println("Error: " + serviceErr.Error())
-	}
-
-	fmt.Println(detailedResponse)
-}
-
-func ListPolicies() {
-	// hardcode required parameters that ListPolicies needs to make a request
-	accountID := "91631433ee674cd9ab0ef150b8e7030f"
-	// create an ListPoliciesOptions object, which points to required parameters
-	listPolicyOptions := policyService.NewListPoliciesOptions(accountID)
-
-	// call function ListPolicies
-	_, detailedResponse, returnValueErr := policyService.ListPolicies(listPolicyOptions)
-	if returnValueErr != nil {
-		fmt.Println("Error: " + serviceErr.Error())
-	}
-
-	fmt.Println(detailedResponse)
-}
-
-func DeletePolicy(policyID string) {
-	// create an DeletePolicyOptions variable, which points to required parameters
-	deletePolicyOptions := policyService.NewDeletePolicyOptions(policyID)
-	// call function DeletePolicy
-	returnValue, returnValueErr := policyService.DeletePolicy(deletePolicyOptions)
-	if returnValueErr != nil {
-		fmt.Println("Error: " + serviceErr.Error())
-	}
-	// returnValue has only StatusCode and does not have any body
-
-	statusCode := returnValue.GetStatusCode()
-	fmt.Println(statusCode)
-}
diff --git a/Samples/resource_controller_sample.go b/Samples/resource_controller_sample.go
deleted file mode 100644
index 23091a7a..00000000
--- a/Samples/resource_controller_sample.go
+++ /dev/null
@@ -1,250 +0,0 @@
-package sample
-
-/**
- * Copyright 2019 IBM All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import (
-	"fmt"
-	"log"
-	"net/http"
-	"os"
-
-	"github.com/joho/godotenv"
-	"github.com/IBM/go-sdk-core/v3/core"
-	"github.ibm.com/ibmcloud/platform-services-go-sdk/resourcecontrollerv2"
-)
-
-// Resource Controller Service Instance
-var rcService *resourcecontrollerv2.ResourceControllerV2
-var rcServiceErr error
-
-func init() {
-	err := godotenv.Load("../.env")
-	if err != nil {
-		log.Fatal("Error loading .env file")
-	}
-
-	// Create the IAM authenticator.
-	authenticator := &core.IamAuthenticator{
-	    ApiKey: os.Getenv("IAMAPIKEY"),
-	}
-
-	if err == nil {
-		rcService, rcServiceErr = resourcecontrollerv2.
-			NewResourceControllerV2(&resourcecontrollerv2.ResourceControllerV2Options{
-				Authenticator: authenticator, // Get APIKey from your .env file
-			})
-
-		if rcServiceErr == nil {
-			customHeaders := http.Header{}
-			customHeaders.Add("Content-type", "application/json")
-			rcService.Service.SetDefaultHeaders(customHeaders)
-		}
-	}
-}
-
-/************************************** Resource Instance Operations ****************************/
-
-// listAllResourceInstance - Gets the list of all resource instances
-func ListAllResourceInstance() {
-	listResourceInstancesOptions := rcService.NewListResourceInstancesOptions()
-
-	// Set neccessary parameters
-	listResourceInstancesOptions.SetGuid("")
-
-	listResourceInstancesOptions.SetHeaders(map[string]string{})
-
-	listResourceInstancesOptions.SetName("")
-
-	listResourceInstancesOptions.SetResourceGroupID("")
-
-	listResourceInstancesOptions.SetResourceID("")
-
-	listResourceInstancesOptions.SetResourcePlanID("")
-
-	_, detailedResponse, reqErr := rcService.ListResourceInstances(listResourceInstancesOptions)
-
-	if reqErr == nil {
-		fmt.Println(detailedResponse.String())
-	} else {
-		fmt.Println(reqErr)
-	}
-}
-
-// createNewResourceInstance - Creates a new resource instance
-func CreateNewResourceInstance(name string, target string) {
-	// ex name := "test-integration-cos-instance"
-	// target refers to the depoyment location
-	// ex target := "bluemix-global"
-
-	resourceGroup := os.Getenv("RESOURCE_GROUP")
-	resourcePlanID := os.Getenv("RESOURCE_PLAN_ID")
-
-	rcInstanceOptions := rcService.NewCreateResourceInstanceOptions(name, target, resourceGroup, resourcePlanID)
-	rcInstanceOptions.SetTags([]string{"integration-test"})
-	rcInstanceOptions.SetParameters(map[string]interface{}{})
-	rcInstanceOptions.SetHeaders(map[string]string{"Content-Type": "application/json"})
-
-	_, detailedResponse, reqErr := rcService.CreateResourceInstance(rcInstanceOptions)
-
-	if reqErr == nil {
-		fmt.Println(detailedResponse.String())
-	} else {
-		fmt.Println(reqErr)
-	}
-}
-
-// getResourceInstance - Gets resource instance based on ID
-func GetResourceInstance(resourceID string) {
-
-	getResourceByIDOptions := rcService.NewGetResourceInstanceOptions(resourceID)
-	getResourceByIDOptions.SetHeaders(map[string]string{
-		"Content-Type": "application/json",
-	})
-
-	_, detailedResponse, reqErr := rcService.GetResourceInstance(getResourceByIDOptions)
-
-	if reqErr == nil {
-		fmt.Println(detailedResponse.String())
-	} else {
-		fmt.Println(reqErr)
-	}
-}
-
-// updateResourceInstance - Updates resource instance based on ID
-func UpdateResourceInstance(name string, target string, resourceID string) {
-	// target refers to the depoyment location
-	// ex target := "bluemix-global"
-
-	resourcePlanID := os.Getenv("RESOURCE_PLAN_ID")
-
-	updateResourceInstaceOptions := rcService.NewUpdateResourceInstanceOptions(resourceID)
-	updateResourceInstaceOptions.SetName(name)
-	updateResourceInstaceOptions.SetHeaders(map[string]string{
-		"Content-Type": "application/json",
-	})
-	updateResourceInstaceOptions.SetResourcePlanID(resourcePlanID)
-	updateResourceInstaceOptions.SetParameters(map[string]interface{}{})
-
-	_, detailedResponse, reqErr := rcService.UpdateResourceInstance(updateResourceInstaceOptions)
-
-	if reqErr == nil {
-		fmt.Println(detailedResponse.String())
-	} else {
-		fmt.Println(reqErr)
-	}
-}
-
-// deleteResourceInstance - delete resource instance based on ID
-func DeleteResourceInstance(resourceID string) {
-
-	deleteResourceInstanceOptions := rcService.NewDeleteResourceInstanceOptions(resourceID)
-
-	_, detailedResponse, reqErr := rcService.DeleteResourceInstance(deleteResourceInstanceOptions)
-
-	if reqErr == nil {
-		fmt.Println(detailedResponse.String())
-	} else {
-		fmt.Println(reqErr)
-	}
-}
-
-/************************************** Resource Keys Operations ****************************/
-
-// listAllResourceKeys - Gets all resource keys
-func ListAllResourceKeys() {
-
-	listResourceKeysOptions := rcService.NewListResourceKeysOptions()
-	listResourceKeysOptions.SetGuid("")
-
-	listResourceKeysOptions.SetHeaders(map[string]string{})
-
-	listResourceKeysOptions.SetName("")
-
-	listResourceKeysOptions.SetResourceGroupID("")
-
-	listResourceKeysOptions.SetResourceID("")
-
-	_, detailedResponse, reqErr := rcService.ListResourceKeys(listResourceKeysOptions)
-
-	if reqErr == nil {
-		fmt.Println(detailedResponse.String())
-	} else {
-		fmt.Println(reqErr)
-	}
-}
-
-// createNewResourceKey - Creates a new resource key(credentials) for a resource instance
-func CreateNewResourceKey(resourceInstance *resourcecontrollerv2.ResourceInstance, role string, name string) {
-	// Resource keys can be created for a resource instances, but the resource instances have to exist
-
-	resourceCrn := *resourceInstance.Crn
-	rcKeyOptions := rcService.NewCreateResourceKeyOptions(name, resourceCrn)
-
-	rcKeyOptions.SetRole(role)
-	rcKeyOptions.SetHeaders(map[string]string{"Content-Type": "application/json"})
-
-	_, detailedResponse, reqErr := rcService.CreateResourceKey(rcKeyOptions)
-
-	if reqErr == nil {
-		fmt.Println(detailedResponse.String())
-	} else {
-		fmt.Println(reqErr)
-	}
-}
-
-// getResourceKey - Get resource key by ID
-func GetResourceKey(resourceKeyID string) {
-
-	getRCKeyOptions := rcService.NewGetResourceKeyOptions(resourceKeyID)
-	getRCKeyOptions.SetHeaders(map[string]string{"Content-Type": "application/json"})
-
-	_, detailedResponse, reqErr := rcService.GetResourceKey(getRCKeyOptions)
-
-	if reqErr == nil {
-		fmt.Println(detailedResponse.String())
-	} else {
-		fmt.Println(reqErr)
-	}
-}
-
-// updateResourceKey - update resource key by ID
-func UpdateResourceKey(resourceKeyID string, updateName string) {
-
-	updateRCKeyOptions := rcService.NewUpdateResourceKeyOptions(resourceKeyID, updateName)
-
-	_, detailedResponse, reqErr := rcService.UpdateResourceKey(updateRCKeyOptions)
-
-	if reqErr == nil {
-		fmt.Println(detailedResponse.String())
-	} else {
-		fmt.Println(reqErr)
-	}
-}
-
-// deleteResourceKey - delete resource key by ID
-func DeleteResourceKey(resourceKeyID string) {
-
-	deleteRCKeyOptions := rcService.NewDeleteResourceKeyOptions(resourceKeyID)
-
-	response, reqErr := rcService.DeleteResourceKey(deleteRCKeyOptions)
-
-	if reqErr == nil {
-		fmt.Println(response.String())
-	} else {
-		fmt.Println(reqErr)
-	}
-}
diff --git a/Samples/usage_report_sample.go b/Samples/usage_report_sample.go
deleted file mode 100644
index bd8ba91f..00000000
--- a/Samples/usage_report_sample.go
+++ /dev/null
@@ -1,191 +0,0 @@
-package sample
-
-import (
-	"fmt"
-	"log"
-	"net/http"
-	"os"
-	"testing"
-
-	"github.com/joho/godotenv"
-	"github.com/IBM/go-sdk-core/v3/core"
-	"github.ibm.com/ibmcloud/platform-services-go-sdk/usagereportsv4"
-)
-
-var usageReportService *usagereportsv4.UsageReportsV4
-var usageReportServiceErr error
-
-func init() {
-
-	// loading environment variables from file .env
-	err := godotenv.Load("../.env")
-	if err != nil {
-		log.Fatal("Error while loading .env file")
-	}
-
-	// Create the IAM authenticator.
-	authenticator := &core.IamAuthenticator{
-			ApiKey: os.Getenv("IAMAPIKEY"),
-	}
-
-	// create a new service of usage report
-	// APIKEY of an account is needed to access services on that account
-	usageReportService, usageReportServiceErr = usagereportsv4.NewUsageReportsV4(&usagereportsv4.UsageReportsV4Options{
-		Authenticator: authenticator,
-	})
-
-	if usageReportServiceErr == nil {
-		customHeaders := http.Header{}
-		customHeaders.Add("X-Watson-Learning-Opt-Out", "1")
-		customHeaders.Add("X-Watson-Test", "1")
-		usageReportService.Service.SetDefaultHeaders(customHeaders)
-	}
-
-	// uncomment below lines to run functions
-
-	//getAccountSummary()
-	//getAccountUsage()
-	//getResourceGroupUsage()
-	//getOrganizationUsage()
-	//getAccountInstancesUsage()
-	//getResourceGroupInstancesUsage()
-	//getOrganizationInstancesUsage()
-
-}
-
-func GetAccountSummary() {
-
-	// hardcode variables that are required parameters for GetAccountSummary request
-	accountID := "a5d2a90b46ac45089fa28d0cb74c49af"
-	// billingMonth has format "yyyy-mm"
-	billingMonth := "2019-05"
-
-	// create a GetAccountSummaryOptions struct pointing to above parameters
-	// a GetAccountSummaryOptions object will be passed into function GetAccountSummary
-	getAccountSummaryOptions := usageReportService.NewGetAccountSummaryOptions(accountID, billingMonth)
-
-	// making a request by calling GetAccountSummary function
-	_, detailedResponse, returnValueErr := usageReportService.GetAccountSummary(getAccountSummaryOptions)
-	if returnValueErr != nil {
-		fmt.Println("Error: " + serviceErr.Error())
-	}
-
-	fmt.Println(detailedResponse)
-}
-
-func GetAccountUsage() {
-
-	// hardcode variables that are required parameters for GetAccountUsage request
-	accountID := "a5d2a90b46ac45089fa28d0cb74c49af"
-	// billingMonth has format "yyyy-mm"
-	billingmonth := "2019-05"
-
-	// create a GetAccountUsageOptions variable pointing to above parameters
-	// a GetAccountUsageOptions object will be passed into function GetAccountUsage
-	getAccountUsageOptions := usageReportService.NewGetAccountUsageOptions(accountID, billingmonth)
-
-	// making a request by calling GetAccountUsage function
-	_, detailedResponse, returnValueErr := usageReportService.GetAccountUsage(getAccountUsageOptions)
-	if returnValueErr != nil {
-		fmt.Println("Error: " + serviceErr.Error())
-	}
-
-	fmt.Println(detailedResponse)
-}
-
-func GetResourceGroupUsage() {
-
-	// hardcode variables that are required parameters for GetResourceGroupUsage request
-	accountID := "91631433ee674cd9ab0ef150b8e7030f"
-	resourceGroupID := "96714c6a77b04bd39d042a265428aea4"
-	// billingMonth has format "yyyy-mm"
-	billingmonth := "2019-05"
-
-	// create a GetResourceGroupUsageOptions variable pointing to above parameters
-	// a GetResourceGroupUsageOptions object will be passed into function GetResourceGroupUsage
-	getResourceGroupUsageOptions := usageReportService.NewGetResourceGroupUsageOptions(accountID, resourceGroupID, billingmonth)
-
-	// making a request by calling GetResourceGroupUsage function
-	_, detailedResponse, returnValueErr := usageReportService.GetResourceGroupUsage(getResourceGroupUsageOptions)
-	if returnValueErr != nil {
-		fmt.Println("Error: " + serviceErr.Error())
-	}
-
-	fmt.Println(detailedResponse)
-}
-
-func GetOrganizationUsage() {
-	// hardcode variables that are required parameters for GetOrganizationUsage request
-	accountID := "a5d2a90b46ac45089fa28d0cb74c49af"
-	organizationID := "us-south:c9d7aff6-a1ae-4916-912d-42fbc25e0e1d"
-	// billingMonth has format "yyyy-mm"
-	billingmonth := "2019-05"
-
-	// create a GetOrganizationUsageOptions variable pointing to above parameters
-	// a GetOrganizationUsageOptions object will be passed into function GetOrganizationUsage
-	getOrganizationUsageOptions := usageReportService.NewGetOrganizationUsageOptions(accountID, organizationID, billingmonth)
-
-	// making a request by calling GetOrganizationUsage function
-	_, detailedResponse, returnValueErr := usageReportService.GetOrganizationUsage(getOrganizationUsageOptions)
-	if returnValueErr != nil {
-		fmt.Println("Error: " + serviceErr.Error())
-	}
-
-	fmt.Println(detailedResponse)
-}
-
-func GetAccountInstancesUsage(t *testing.T) {
-	// hardcode variables that are required parameters for GetAccountInstancesUsage request
-	accountID := "a5d2a90b46ac45089fa28d0cb74c49af"
-	// billingMonth has format "yyyy-mm"
-	billingmonth := "2019-05"
-
-	// create a GetOrganizationUsageOptions variable pointing to above parameters
-	// a GetOrganizationUsageOptions object will be passed into function GetOrganizationUsage
-	getAccountInstancesUsageOptions := usageReportService.NewGetAccountInstancesUsageOptions(accountID, billingmonth)
-
-	// making request by calling GetAccountInstancesUsage function
-	_, detailedResponse, returnValueErr := usageReportService.GetAccountInstancesUsage(getAccountInstancesUsageOptions)
-	if returnValueErr != nil {
-		fmt.Println("Error: " + serviceErr.Error())
-	}
-
-	fmt.Println(detailedResponse)
-}
-func GetResourceGroupInstancesUsage(t *testing.T) {
-	// hardcode variables that are required parameters for GetResourceGroupInstancesUsage request
-	accountID := "91631433ee674cd9ab0ef150b8e7030f"
-	resourceGroupID := "96714c6a77b04bd39d042a265428aea4"
-	// billingMonth has format "yyyy-mm"
-	billingmonth := "2019-05"
-
-	// create a GetResourceGroupInstancesUsageOptions variable pointing to above parameters
-	// a GetResourceGroupInstancesUsageOptions object will be passed into function GetResourceGroupInstancesUsage
-	getResourceGroupInstancesUsageOptions := usageReportService.NewGetResourceGroupInstancesUsageOptions(accountID, resourceGroupID, billingmonth)
-	// making request by calling GetResourceGroupInstancesUsage function
-	_, detailedResponse, returnValueErr := usageReportService.GetResourceGroupInstancesUsage(getResourceGroupInstancesUsageOptions)
-	if returnValueErr != nil {
-		fmt.Println("Error: " + serviceErr.Error())
-	}
-
-	fmt.Println(detailedResponse)
-}
-
-func GetOrganizationInstancesUsage(t *testing.T) {
-	// hardcode variables that are required parameters for GetOrganizationInstancesUsage request
-	accountID := "a5d2a90b46ac45089fa28d0cb74c49af"
-	organizationID := "us-south:c9d7aff6-a1ae-4916-912d-42fbc25e0e1d"
-	// billingMonth has format "yyyy-mm"
-	billingmonth := "2019-05"
-
-	// create a GetOrganizationInstancesUsageOptions variable pointing to above parameters
-	// a GetOrganizationInstancesUsageOptions object will be passed into function GetOrganizationInstancesUsage
-	getOrganizationInstancesUsageOptions := usageReportService.NewGetOrganizationInstancesUsageOptions(accountID, organizationID, billingmonth)
-	// making request by calling GetOrganizationInstancesUsage function
-	_, detailedResponse, returnValueErr := usageReportService.GetOrganizationInstancesUsage(getOrganizationInstancesUsageOptions)
-	if returnValueErr != nil {
-		fmt.Println("Error: " + serviceErr.Error())
-	}
-
-	fmt.Println(detailedResponse)
-}
diff --git a/casemanagementv1/case_management_v1.go b/casemanagementv1/case_management_v1.go
deleted file mode 100644
index 9d370dd5..00000000
--- a/casemanagementv1/case_management_v1.go
+++ /dev/null
@@ -1,3625 +0,0 @@
-/**
- * (C) Copyright IBM Corp. 2020.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// Package casemanagementv1 : Operations and models for the CaseManagementV1 service
-package casemanagementv1
-
-import (
-	"fmt"
-	"github.com/IBM/go-sdk-core/v3/core"
-	common "github.ibm.com/ibmcloud/platform-services-go-sdk/common"
-	"io"
-	"strings"
-)
-
-// CaseManagementV1 : No description provided (generated by Openapi Generator
-// https://github.com/openapitools/openapi-generator)
-//
-// Version: 1.0
-type CaseManagementV1 struct {
-	Service *core.BaseService
-}
-
-// DefaultServiceURL is the default URL to make service requests to.
-const DefaultServiceURL = "https://support-center.cloud.ibm.com/"
-
-// DefaultServiceName is the default key used to find external configuration information.
-const DefaultServiceName = "case_management"
-
-// CaseManagementV1Options : Service options
-type CaseManagementV1Options struct {
-	ServiceName   string
-	URL           string
-	Authenticator core.Authenticator
-}
-
-// NewCaseManagementV1UsingExternalConfig : constructs an instance of CaseManagementV1 with passed in options and external configuration.
-func NewCaseManagementV1UsingExternalConfig(options *CaseManagementV1Options) (caseManagement *CaseManagementV1, err error) {
-	if options.ServiceName == "" {
-		options.ServiceName = DefaultServiceName
-	}
-
-	if options.Authenticator == nil {
-		options.Authenticator, err = core.GetAuthenticatorFromEnvironment(options.ServiceName)
-		if err != nil {
-			return
-		}
-	}
-
-	caseManagement, err = NewCaseManagementV1(options)
-	if err != nil {
-		return
-	}
-
-	err = caseManagement.Service.ConfigureService(options.ServiceName)
-	if err != nil {
-		return
-	}
-
-	if options.URL != "" {
-		err = caseManagement.Service.SetServiceURL(options.URL)
-	}
-	return
-}
-
-// NewCaseManagementV1 : constructs an instance of CaseManagementV1 with passed in options.
-func NewCaseManagementV1(options *CaseManagementV1Options) (service *CaseManagementV1, err error) {
-	serviceOptions := &core.ServiceOptions{
-		URL:           DefaultServiceURL,
-		Authenticator: options.Authenticator,
-	}
-
-	baseService, err := core.NewBaseService(serviceOptions)
-	if err != nil {
-		return
-	}
-
-	if options.URL != "" {
-		err = baseService.SetServiceURL(options.URL)
-		if err != nil {
-			return
-		}
-	}
-
-	service = &CaseManagementV1{
-		Service: baseService,
-	}
-
-	return
-}
-
-// SetServiceURL sets the service URL
-func (caseManagement *CaseManagementV1) SetServiceURL(url string) error {
-	return caseManagement.Service.SetServiceURL(url)
-}
-
-// GetCases : Get cases in account
-// Get cases in the account which is specified by the content of the IAM token.
-func (caseManagement *CaseManagementV1) GetCases(getCasesOptions *GetCasesOptions) (result *CaseCollection, response *core.DetailedResponse, err error) {
-	err = core.ValidateStruct(getCasesOptions, "getCasesOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"case-management/v1/cases"}
-	pathParameters := []string{}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(caseManagement.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range getCasesOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("case_management", "V1", "GetCases")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	if getCasesOptions.Offset != nil {
-		builder.AddQuery("offset", fmt.Sprint(*getCasesOptions.Offset))
-	}
-	if getCasesOptions.Limit != nil {
-		builder.AddQuery("limit", fmt.Sprint(*getCasesOptions.Limit))
-	}
-	if getCasesOptions.Search != nil {
-		builder.AddQuery("search", fmt.Sprint(*getCasesOptions.Search))
-	}
-	if getCasesOptions.Sort != nil {
-		builder.AddQuery("sort", fmt.Sprint(*getCasesOptions.Sort))
-	}
-	if getCasesOptions.Status != nil {
-		builder.AddQuery("status", strings.Join(getCasesOptions.Status, ","))
-	}
-	if getCasesOptions.Fields != nil {
-		builder.AddQuery("fields", strings.Join(getCasesOptions.Fields, ","))
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = caseManagement.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalCaseCollection(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// CreateCase : Create a case
-// Create a case in the account.
-func (caseManagement *CaseManagementV1) CreateCase(createCaseOptions *CreateCaseOptions) (result *Case, response *core.DetailedResponse, err error) {
-	err = core.ValidateStruct(createCaseOptions, "createCaseOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"case-management/v1/cases"}
-	pathParameters := []string{}
-
-	builder := core.NewRequestBuilder(core.POST)
-	_, err = builder.ConstructHTTPURL(caseManagement.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range createCaseOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("case_management", "V1", "CreateCase")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-	builder.AddHeader("Content-Type", "application/json")
-
-	body := make(map[string]interface{})
-	if createCaseOptions.Type != nil {
-		body["type"] = createCaseOptions.Type
-	}
-	if createCaseOptions.Subject != nil {
-		body["subject"] = createCaseOptions.Subject
-	}
-	if createCaseOptions.Description != nil {
-		body["description"] = createCaseOptions.Description
-	}
-	if createCaseOptions.Severity != nil {
-		body["severity"] = createCaseOptions.Severity
-	}
-	if createCaseOptions.Eu != nil {
-		body["eu"] = createCaseOptions.Eu
-	}
-	if createCaseOptions.Offering != nil {
-		body["offering"] = createCaseOptions.Offering
-	}
-	if createCaseOptions.Resources != nil {
-		body["resources"] = createCaseOptions.Resources
-	}
-	if createCaseOptions.Watchlist != nil {
-		body["watchlist"] = createCaseOptions.Watchlist
-	}
-	if createCaseOptions.InvoiceNumber != nil {
-		body["invoice_number"] = createCaseOptions.InvoiceNumber
-	}
-	if createCaseOptions.SlaCreditRequest != nil {
-		body["sla_credit_request"] = createCaseOptions.SlaCreditRequest
-	}
-	_, err = builder.SetBodyContentJSON(body)
-	if err != nil {
-		return
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = caseManagement.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalCase(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// GetCase : Get a case in account
-// Get a case in the account that is specified by the case number.
-func (caseManagement *CaseManagementV1) GetCase(getCaseOptions *GetCaseOptions) (result *Case, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(getCaseOptions, "getCaseOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(getCaseOptions, "getCaseOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"case-management/v1/cases"}
-	pathParameters := []string{*getCaseOptions.CaseNumber}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(caseManagement.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range getCaseOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("case_management", "V1", "GetCase")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	if getCaseOptions.Fields != nil {
-		builder.AddQuery("fields", strings.Join(getCaseOptions.Fields, ","))
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = caseManagement.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalCase(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// UpdateCaseStatus : Update case status
-// Mark the case as resolved or unresolved, or accept the provided resolution.
-func (caseManagement *CaseManagementV1) UpdateCaseStatus(updateCaseStatusOptions *UpdateCaseStatusOptions) (result *Case, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(updateCaseStatusOptions, "updateCaseStatusOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(updateCaseStatusOptions, "updateCaseStatusOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"case-management/v1/cases", "status"}
-	pathParameters := []string{*updateCaseStatusOptions.CaseNumber}
-
-	builder := core.NewRequestBuilder(core.PUT)
-	_, err = builder.ConstructHTTPURL(caseManagement.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range updateCaseStatusOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("case_management", "V1", "UpdateCaseStatus")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-	builder.AddHeader("Content-Type", "application/json")
-
-	body := make(map[string]interface{})
-	if updateCaseStatusOptions.Action != nil {
-		body["action"] = updateCaseStatusOptions.Action
-	}
-	if updateCaseStatusOptions.Comment != nil {
-		body["comment"] = updateCaseStatusOptions.Comment
-	}
-	if updateCaseStatusOptions.ResolutionCode != nil {
-		body["resolution_code"] = updateCaseStatusOptions.ResolutionCode
-	}
-	_, err = builder.SetBodyContentJSON(body)
-	if err != nil {
-		return
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = caseManagement.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalCase(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// AddComment : Add comment to case
-// Add a comment to a case.
-func (caseManagement *CaseManagementV1) AddComment(addCommentOptions *AddCommentOptions) (result *Comment, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(addCommentOptions, "addCommentOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(addCommentOptions, "addCommentOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"case-management/v1/cases", "comments"}
-	pathParameters := []string{*addCommentOptions.CaseNumber}
-
-	builder := core.NewRequestBuilder(core.PUT)
-	_, err = builder.ConstructHTTPURL(caseManagement.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range addCommentOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("case_management", "V1", "AddComment")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-	builder.AddHeader("Content-Type", "application/json")
-
-	body := make(map[string]interface{})
-	if addCommentOptions.Comment != nil {
-		body["comment"] = addCommentOptions.Comment
-	}
-	_, err = builder.SetBodyContentJSON(body)
-	if err != nil {
-		return
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = caseManagement.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalComment(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// AddWatchlist : Add users to watchlist of case
-// Add users to the watchlist of case. By adding a user to the watchlist of the case, you are granting them read and
-// write permissions, so the user can view the case, receive updates, and make updates to the case. Note that the user
-// must be in the account to be added to the watchlist.
-func (caseManagement *CaseManagementV1) AddWatchlist(addWatchlistOptions *AddWatchlistOptions) (result *AddWatchlistResults, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(addWatchlistOptions, "addWatchlistOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(addWatchlistOptions, "addWatchlistOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"case-management/v1/cases", "watchlist"}
-	pathParameters := []string{*addWatchlistOptions.CaseNumber}
-
-	builder := core.NewRequestBuilder(core.PUT)
-	_, err = builder.ConstructHTTPURL(caseManagement.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range addWatchlistOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("case_management", "V1", "AddWatchlist")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-	builder.AddHeader("Content-Type", "application/json")
-
-	body := make(map[string]interface{})
-	if addWatchlistOptions.Watchlist != nil {
-		body["watchlist"] = addWatchlistOptions.Watchlist
-	}
-	_, err = builder.SetBodyContentJSON(body)
-	if err != nil {
-		return
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = caseManagement.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalAddWatchlistResults(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// RemoveWatchlist : Remove users from watchlist of case
-// Remove users from the watchlist of a case.
-func (caseManagement *CaseManagementV1) RemoveWatchlist(removeWatchlistOptions *RemoveWatchlistOptions) (result *[]User, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(removeWatchlistOptions, "removeWatchlistOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(removeWatchlistOptions, "removeWatchlistOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"case-management/v1/cases", "watchlist"}
-	pathParameters := []string{*removeWatchlistOptions.CaseNumber}
-
-	builder := core.NewRequestBuilder(core.DELETE)
-	_, err = builder.ConstructHTTPURL(caseManagement.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range removeWatchlistOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("case_management", "V1", "RemoveWatchlist")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-	builder.AddHeader("Content-Type", "application/json")
-
-	body := make(map[string]interface{})
-	if removeWatchlistOptions.Watchlist != nil {
-		body["watchlist"] = removeWatchlistOptions.Watchlist
-	}
-	_, err = builder.SetBodyContentJSON(body)
-	if err != nil {
-		return
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = caseManagement.Service.Request(request, make([]map[string]interface{}, 1))
-	if err == nil {
-		s, ok := response.Result.([]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		slice, e := UnmarshalUserSlice(s)
-		result = &slice
-		err = e
-		response.Result = result
-	}
-
-	return
-}
-
-// AddResource : Add a resource to case
-// Add a resource to case by specifying the Cloud Resource Name (CRN), or id and type if attaching a class iaaS
-// resource.
-func (caseManagement *CaseManagementV1) AddResource(addResourceOptions *AddResourceOptions) (result *Resource, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(addResourceOptions, "addResourceOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(addResourceOptions, "addResourceOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"case-management/v1/cases", "resources"}
-	pathParameters := []string{*addResourceOptions.CaseNumber}
-
-	builder := core.NewRequestBuilder(core.PUT)
-	_, err = builder.ConstructHTTPURL(caseManagement.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range addResourceOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("case_management", "V1", "AddResource")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-	builder.AddHeader("Content-Type", "application/json")
-
-	body := make(map[string]interface{})
-	if addResourceOptions.Crn != nil {
-		body["crn"] = addResourceOptions.Crn
-	}
-	if addResourceOptions.Name != nil {
-		body["name"] = addResourceOptions.Name
-	}
-	if addResourceOptions.Type != nil {
-		body["type"] = addResourceOptions.Type
-	}
-	if addResourceOptions.ID != nil {
-		body["id"] = addResourceOptions.ID
-	}
-	if addResourceOptions.Note != nil {
-		body["note"] = addResourceOptions.Note
-	}
-	_, err = builder.SetBodyContentJSON(body)
-	if err != nil {
-		return
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = caseManagement.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalResource(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// UploadFile : Add attachment(s) to case
-// You can add attachments to a case to provide more information for the support team about the issue that you're
-// experiencing.
-func (caseManagement *CaseManagementV1) UploadFile(uploadFileOptions *UploadFileOptions) (result *Attachment, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(uploadFileOptions, "uploadFileOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(uploadFileOptions, "uploadFileOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"case-management/v1/cases", "attachments"}
-	pathParameters := []string{*uploadFileOptions.CaseNumber}
-
-	builder := core.NewRequestBuilder(core.PUT)
-	_, err = builder.ConstructHTTPURL(caseManagement.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range uploadFileOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("case_management", "V1", "UploadFile")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	builder.AddFormData("file", "filename",
-		core.StringNilMapper(uploadFileOptions.FileContentType), uploadFileOptions.File)
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = caseManagement.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalAttachment(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// DownloadFile : Download an attachment
-// Download an attachment from a case.
-func (caseManagement *CaseManagementV1) DownloadFile(downloadFileOptions *DownloadFileOptions) (result io.ReadCloser, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(downloadFileOptions, "downloadFileOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(downloadFileOptions, "downloadFileOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"case-management/v1/cases", "attachments"}
-	pathParameters := []string{*downloadFileOptions.CaseNumber, *downloadFileOptions.FileID}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(caseManagement.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range downloadFileOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("case_management", "V1", "DownloadFile")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/octet-stream")
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = caseManagement.Service.Request(request, new(io.ReadCloser))
-	if err == nil {
-		var ok bool
-		result, ok = response.Result.(io.ReadCloser)
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-		}
-	}
-
-	return
-}
-
-// DeleteFile : Remove attachment from case
-// Remove an attachment from a case.
-func (caseManagement *CaseManagementV1) DeleteFile(deleteFileOptions *DeleteFileOptions) (result *DeleteFileResponse, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(deleteFileOptions, "deleteFileOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(deleteFileOptions, "deleteFileOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"case-management/v1/cases", "attachments"}
-	pathParameters := []string{*deleteFileOptions.CaseNumber, *deleteFileOptions.FileID}
-
-	builder := core.NewRequestBuilder(core.DELETE)
-	_, err = builder.ConstructHTTPURL(caseManagement.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range deleteFileOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("case_management", "V1", "DeleteFile")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = caseManagement.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalDeleteFileResponse(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// GetEUSupport : Shows how to mark case as EU supported
-// Shows how an account can mark a case as EU supported.
-func (caseManagement *CaseManagementV1) GetEUSupport(getEUSupportOptions *GetEUSupportOptions) (result *EuSupport, response *core.DetailedResponse, err error) {
-	err = core.ValidateStruct(getEUSupportOptions, "getEUSupportOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"case-management/utilities/v1/eu-support"}
-	pathParameters := []string{}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(caseManagement.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range getEUSupportOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("case_management", "V1", "GetEUSupport")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = caseManagement.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalEuSupport(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// GetTechnicalOfferings : Get offerings
-// Get offerings used in technical cases.
-func (caseManagement *CaseManagementV1) GetTechnicalOfferings(getTechnicalOfferingsOptions *GetTechnicalOfferingsOptions) (result *TechnicalOfferingsResponse, response *core.DetailedResponse, err error) {
-	err = core.ValidateStruct(getTechnicalOfferingsOptions, "getTechnicalOfferingsOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"case-management/utilities/v1/offerings/technical"}
-	pathParameters := []string{}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(caseManagement.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range getTechnicalOfferingsOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("case_management", "V1", "GetTechnicalOfferings")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = caseManagement.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalTechnicalOfferingsResponse(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// GetResolutionCodes : Get resolution code values
-// Get the resolution code values used in "Update Status API".
-func (caseManagement *CaseManagementV1) GetResolutionCodes(getResolutionCodesOptions *GetResolutionCodesOptions) (result *ResolutionCodesResponse, response *core.DetailedResponse, err error) {
-	err = core.ValidateStruct(getResolutionCodesOptions, "getResolutionCodesOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"case-management/utilities/v1/constants/resolution-codes"}
-	pathParameters := []string{}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(caseManagement.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range getResolutionCodesOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("case_management", "V1", "GetResolutionCodes")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = caseManagement.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalResolutionCodesResponse(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// GetStatuses : Get status values
-// Get the status values used in case filtering.
-func (caseManagement *CaseManagementV1) GetStatuses(getStatusesOptions *GetStatusesOptions) (result *StatusesResponse, response *core.DetailedResponse, err error) {
-	err = core.ValidateStruct(getStatusesOptions, "getStatusesOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"case-management/utilities/v1/constants/statuses"}
-	pathParameters := []string{}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(caseManagement.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range getStatusesOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("case_management", "V1", "GetStatuses")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = caseManagement.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalStatusesResponse(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// AddCommentOptions : The AddComment options.
-type AddCommentOptions struct {
-	// Unique identifier of a case.
-	CaseNumber *string `json:"case_number" validate:"required"`
-
-	// the comment to be added to the case.
-	Comment *string `json:"comment" validate:"required"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewAddCommentOptions : Instantiate AddCommentOptions
-func (*CaseManagementV1) NewAddCommentOptions(caseNumber string, comment string) *AddCommentOptions {
-	return &AddCommentOptions{
-		CaseNumber: core.StringPtr(caseNumber),
-		Comment: core.StringPtr(comment),
-	}
-}
-
-// SetCaseNumber : Allow user to set CaseNumber
-func (options *AddCommentOptions) SetCaseNumber(caseNumber string) *AddCommentOptions {
-	options.CaseNumber = core.StringPtr(caseNumber)
-	return options
-}
-
-// SetComment : Allow user to set Comment
-func (options *AddCommentOptions) SetComment(comment string) *AddCommentOptions {
-	options.Comment = core.StringPtr(comment)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *AddCommentOptions) SetHeaders(param map[string]string) *AddCommentOptions {
-	options.Headers = param
-	return options
-}
-
-// AddResourceOptions : The AddResource options.
-type AddResourceOptions struct {
-	// Unique identifier of a case.
-	CaseNumber *string `json:"case_number" validate:"required"`
-
-	// Cloud Resource Name of the resource.
-	Crn *string `json:"crn,omitempty"`
-
-	// Name of the resource.
-	Name *string `json:"name,omitempty"`
-
-	// Only used to attach Classic IaaS devices which have no CRN.
-	Type *string `json:"type,omitempty"`
-
-	// Only used to attach Classic IaaS devices which have no CRN. Id of Classic IaaS device.
-	ID *int64 `json:"id,omitempty"`
-
-	// A note about this resource.
-	Note *string `json:"note,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewAddResourceOptions : Instantiate AddResourceOptions
-func (*CaseManagementV1) NewAddResourceOptions(caseNumber string) *AddResourceOptions {
-	return &AddResourceOptions{
-		CaseNumber: core.StringPtr(caseNumber),
-	}
-}
-
-// SetCaseNumber : Allow user to set CaseNumber
-func (options *AddResourceOptions) SetCaseNumber(caseNumber string) *AddResourceOptions {
-	options.CaseNumber = core.StringPtr(caseNumber)
-	return options
-}
-
-// SetCrn : Allow user to set Crn
-func (options *AddResourceOptions) SetCrn(crn string) *AddResourceOptions {
-	options.Crn = core.StringPtr(crn)
-	return options
-}
-
-// SetName : Allow user to set Name
-func (options *AddResourceOptions) SetName(name string) *AddResourceOptions {
-	options.Name = core.StringPtr(name)
-	return options
-}
-
-// SetType : Allow user to set Type
-func (options *AddResourceOptions) SetType(typeVar string) *AddResourceOptions {
-	options.Type = core.StringPtr(typeVar)
-	return options
-}
-
-// SetID : Allow user to set ID
-func (options *AddResourceOptions) SetID(id int64) *AddResourceOptions {
-	options.ID = core.Int64Ptr(id)
-	return options
-}
-
-// SetNote : Allow user to set Note
-func (options *AddResourceOptions) SetNote(note string) *AddResourceOptions {
-	options.Note = core.StringPtr(note)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *AddResourceOptions) SetHeaders(param map[string]string) *AddResourceOptions {
-	options.Headers = param
-	return options
-}
-
-// AddWatchlistOptions : The AddWatchlist options.
-type AddWatchlistOptions struct {
-	// Unique identifier of a case.
-	CaseNumber *string `json:"case_number" validate:"required"`
-
-	// List of users to be added or removed from the watchlist of a case.
-	Watchlist []UserIdAndRealm `json:"watchlist,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewAddWatchlistOptions : Instantiate AddWatchlistOptions
-func (*CaseManagementV1) NewAddWatchlistOptions(caseNumber string) *AddWatchlistOptions {
-	return &AddWatchlistOptions{
-		CaseNumber: core.StringPtr(caseNumber),
-	}
-}
-
-// SetCaseNumber : Allow user to set CaseNumber
-func (options *AddWatchlistOptions) SetCaseNumber(caseNumber string) *AddWatchlistOptions {
-	options.CaseNumber = core.StringPtr(caseNumber)
-	return options
-}
-
-// SetWatchlist : Allow user to set Watchlist
-func (options *AddWatchlistOptions) SetWatchlist(watchlist []UserIdAndRealm) *AddWatchlistOptions {
-	options.Watchlist = watchlist
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *AddWatchlistOptions) SetHeaders(param map[string]string) *AddWatchlistOptions {
-	options.Headers = param
-	return options
-}
-
-// CreateCaseOptions : The CreateCase options.
-type CreateCaseOptions struct {
-	// the case type.
-	Type *string `json:"type,omitempty"`
-
-	// Subject of the case.
-	Subject *string `json:"subject,omitempty"`
-
-	// Detailed description of the issue.
-	Description *string `json:"description,omitempty"`
-
-	// the severity associated with the case (1 - 4).
-	Severity *int64 `json:"severity,omitempty"`
-
-	// Specify if the case should be treated as EU regulated. Only one of the following properties is required. Call EU
-	// support utility endpoint to determine which property must be specified for your account.
-	Eu *EuPayload `json:"eu,omitempty"`
-
-	// The offering of a case to be created.
-	Offering *OfferingPayload `json:"offering,omitempty"`
-
-	// List of resources to attach to case. If attaching Classic IaaS devices use type and id fields if Cloud Resource Name
-	// (CRN) is unavialable. Otherwise pass the resource CRN. The resource list must be consistent with the value selected
-	// for the resource offering.
-	Resources []Resource `json:"resources,omitempty"`
-
-	// User IDs in the watchlist.
-	Watchlist []User `json:"watchlist,omitempty"`
-
-	// Invoice number of "Billing and Invoice" case type.
-	InvoiceNumber *string `json:"invoice_number,omitempty"`
-
-	// Flag to indicate if case is for an Service Level Agreement (SLA) credit request.
-	SlaCreditRequest *bool `json:"sla_credit_request,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// Constants associated with the CreateCaseOptions.Type property.
-// the case type.
-const (
-	CreateCaseOptions_Type_AccountAndAccess = "account_and_access"
-	CreateCaseOptions_Type_BillingAndInvoice = "billing_and_invoice"
-	CreateCaseOptions_Type_Sales = "sales"
-	CreateCaseOptions_Type_Technical = "technical"
-)
-
-// NewCreateCaseOptions : Instantiate CreateCaseOptions
-func (*CaseManagementV1) NewCreateCaseOptions() *CreateCaseOptions {
-	return &CreateCaseOptions{}
-}
-
-// SetType : Allow user to set Type
-func (options *CreateCaseOptions) SetType(typeVar string) *CreateCaseOptions {
-	options.Type = core.StringPtr(typeVar)
-	return options
-}
-
-// SetSubject : Allow user to set Subject
-func (options *CreateCaseOptions) SetSubject(subject string) *CreateCaseOptions {
-	options.Subject = core.StringPtr(subject)
-	return options
-}
-
-// SetDescription : Allow user to set Description
-func (options *CreateCaseOptions) SetDescription(description string) *CreateCaseOptions {
-	options.Description = core.StringPtr(description)
-	return options
-}
-
-// SetSeverity : Allow user to set Severity
-func (options *CreateCaseOptions) SetSeverity(severity int64) *CreateCaseOptions {
-	options.Severity = core.Int64Ptr(severity)
-	return options
-}
-
-// SetEu : Allow user to set Eu
-func (options *CreateCaseOptions) SetEu(eu *EuPayload) *CreateCaseOptions {
-	options.Eu = eu
-	return options
-}
-
-// SetOffering : Allow user to set Offering
-func (options *CreateCaseOptions) SetOffering(offering *OfferingPayload) *CreateCaseOptions {
-	options.Offering = offering
-	return options
-}
-
-// SetResources : Allow user to set Resources
-func (options *CreateCaseOptions) SetResources(resources []Resource) *CreateCaseOptions {
-	options.Resources = resources
-	return options
-}
-
-// SetWatchlist : Allow user to set Watchlist
-func (options *CreateCaseOptions) SetWatchlist(watchlist []User) *CreateCaseOptions {
-	options.Watchlist = watchlist
-	return options
-}
-
-// SetInvoiceNumber : Allow user to set InvoiceNumber
-func (options *CreateCaseOptions) SetInvoiceNumber(invoiceNumber string) *CreateCaseOptions {
-	options.InvoiceNumber = core.StringPtr(invoiceNumber)
-	return options
-}
-
-// SetSlaCreditRequest : Allow user to set SlaCreditRequest
-func (options *CreateCaseOptions) SetSlaCreditRequest(slaCreditRequest bool) *CreateCaseOptions {
-	options.SlaCreditRequest = core.BoolPtr(slaCreditRequest)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *CreateCaseOptions) SetHeaders(param map[string]string) *CreateCaseOptions {
-	options.Headers = param
-	return options
-}
-
-// DeleteFileOptions : The DeleteFile options.
-type DeleteFileOptions struct {
-	// Unique identifier of a case.
-	CaseNumber *string `json:"case_number" validate:"required"`
-
-	// Unique identifier of a file.
-	FileID *string `json:"file_id" validate:"required"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewDeleteFileOptions : Instantiate DeleteFileOptions
-func (*CaseManagementV1) NewDeleteFileOptions(caseNumber string, fileID string) *DeleteFileOptions {
-	return &DeleteFileOptions{
-		CaseNumber: core.StringPtr(caseNumber),
-		FileID: core.StringPtr(fileID),
-	}
-}
-
-// SetCaseNumber : Allow user to set CaseNumber
-func (options *DeleteFileOptions) SetCaseNumber(caseNumber string) *DeleteFileOptions {
-	options.CaseNumber = core.StringPtr(caseNumber)
-	return options
-}
-
-// SetFileID : Allow user to set FileID
-func (options *DeleteFileOptions) SetFileID(fileID string) *DeleteFileOptions {
-	options.FileID = core.StringPtr(fileID)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *DeleteFileOptions) SetHeaders(param map[string]string) *DeleteFileOptions {
-	options.Headers = param
-	return options
-}
-
-// DownloadFileOptions : The DownloadFile options.
-type DownloadFileOptions struct {
-	// Unique identifier of a case.
-	CaseNumber *string `json:"case_number" validate:"required"`
-
-	// Unique identifier of a file.
-	FileID *string `json:"file_id" validate:"required"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewDownloadFileOptions : Instantiate DownloadFileOptions
-func (*CaseManagementV1) NewDownloadFileOptions(caseNumber string, fileID string) *DownloadFileOptions {
-	return &DownloadFileOptions{
-		CaseNumber: core.StringPtr(caseNumber),
-		FileID: core.StringPtr(fileID),
-	}
-}
-
-// SetCaseNumber : Allow user to set CaseNumber
-func (options *DownloadFileOptions) SetCaseNumber(caseNumber string) *DownloadFileOptions {
-	options.CaseNumber = core.StringPtr(caseNumber)
-	return options
-}
-
-// SetFileID : Allow user to set FileID
-func (options *DownloadFileOptions) SetFileID(fileID string) *DownloadFileOptions {
-	options.FileID = core.StringPtr(fileID)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *DownloadFileOptions) SetHeaders(param map[string]string) *DownloadFileOptions {
-	options.Headers = param
-	return options
-}
-
-// GetCaseOptions : The GetCase options.
-type GetCaseOptions struct {
-	// Unique identifier of a case.
-	CaseNumber *string `json:"case_number" validate:"required"`
-
-	// Selected fields of interest instead of the entire case information.
-	Fields []string `json:"fields,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewGetCaseOptions : Instantiate GetCaseOptions
-func (*CaseManagementV1) NewGetCaseOptions(caseNumber string) *GetCaseOptions {
-	return &GetCaseOptions{
-		CaseNumber: core.StringPtr(caseNumber),
-	}
-}
-
-// SetCaseNumber : Allow user to set CaseNumber
-func (options *GetCaseOptions) SetCaseNumber(caseNumber string) *GetCaseOptions {
-	options.CaseNumber = core.StringPtr(caseNumber)
-	return options
-}
-
-// SetFields : Allow user to set Fields
-func (options *GetCaseOptions) SetFields(fields []string) *GetCaseOptions {
-	options.Fields = fields
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *GetCaseOptions) SetHeaders(param map[string]string) *GetCaseOptions {
-	options.Headers = param
-	return options
-}
-
-// GetCasesOptions : The GetCases options.
-type GetCasesOptions struct {
-	// Number of cases should be skipped.
-	Offset *int64 `json:"offset,omitempty"`
-
-	// Number of cases should be returned.
-	Limit *int64 `json:"limit,omitempty"`
-
-	// String that a case might contain.
-	Search *string `json:"search,omitempty"`
-
-	// Sort field and direction. If omitted, default to descending of updated date. Prefix "~" signifies sort in
-	// descending.
-	Sort *string `json:"sort,omitempty"`
-
-	// Case status filter.
-	Status []string `json:"status,omitempty"`
-
-	// Selected fields of interest instead of the entire case information.
-	Fields []string `json:"fields,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// Constants associated with the GetCasesOptions.Status property.
-const (
-	GetCasesOptions_Status_Closed = "closed"
-	GetCasesOptions_Status_InProgress = "in_progress"
-	GetCasesOptions_Status_New = "new"
-	GetCasesOptions_Status_ResolutionProvided = "resolution_provided"
-	GetCasesOptions_Status_Resolved = "resolved"
-	GetCasesOptions_Status_WaitingOnClient = "waiting_on_client"
-)
-
-// Constants associated with the GetCasesOptions.Fields property.
-const (
-	GetCasesOptions_Fields_Attachments = "attachments"
-	GetCasesOptions_Fields_CloseNotes = "close_notes"
-	GetCasesOptions_Fields_Comments = "comments"
-	GetCasesOptions_Fields_Contact = "contact"
-	GetCasesOptions_Fields_ContactType = "contact_type"
-	GetCasesOptions_Fields_CreatedAt = "created_at"
-	GetCasesOptions_Fields_CreatedBy = "created_by"
-	GetCasesOptions_Fields_Description = "description"
-	GetCasesOptions_Fields_Eu = "eu"
-	GetCasesOptions_Fields_InvoiceNumber = "invoice_number"
-	GetCasesOptions_Fields_Number = "number"
-	GetCasesOptions_Fields_Offering = "offering"
-	GetCasesOptions_Fields_Resolution = "resolution"
-	GetCasesOptions_Fields_Resources = "resources"
-	GetCasesOptions_Fields_Severity = "severity"
-	GetCasesOptions_Fields_ShortDescription = "short_description"
-	GetCasesOptions_Fields_Status = "status"
-	GetCasesOptions_Fields_SupportTier = "support_tier"
-	GetCasesOptions_Fields_UpdatedAt = "updated_at"
-	GetCasesOptions_Fields_UpdatedBy = "updated_by"
-	GetCasesOptions_Fields_Watchlist = "watchlist"
-)
-
-// NewGetCasesOptions : Instantiate GetCasesOptions
-func (*CaseManagementV1) NewGetCasesOptions() *GetCasesOptions {
-	return &GetCasesOptions{}
-}
-
-// SetOffset : Allow user to set Offset
-func (options *GetCasesOptions) SetOffset(offset int64) *GetCasesOptions {
-	options.Offset = core.Int64Ptr(offset)
-	return options
-}
-
-// SetLimit : Allow user to set Limit
-func (options *GetCasesOptions) SetLimit(limit int64) *GetCasesOptions {
-	options.Limit = core.Int64Ptr(limit)
-	return options
-}
-
-// SetSearch : Allow user to set Search
-func (options *GetCasesOptions) SetSearch(search string) *GetCasesOptions {
-	options.Search = core.StringPtr(search)
-	return options
-}
-
-// SetSort : Allow user to set Sort
-func (options *GetCasesOptions) SetSort(sort string) *GetCasesOptions {
-	options.Sort = core.StringPtr(sort)
-	return options
-}
-
-// SetStatus : Allow user to set Status
-func (options *GetCasesOptions) SetStatus(status []string) *GetCasesOptions {
-	options.Status = status
-	return options
-}
-
-// SetFields : Allow user to set Fields
-func (options *GetCasesOptions) SetFields(fields []string) *GetCasesOptions {
-	options.Fields = fields
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *GetCasesOptions) SetHeaders(param map[string]string) *GetCasesOptions {
-	options.Headers = param
-	return options
-}
-
-// GetEUSupportOptions : The GetEUSupport options.
-type GetEUSupportOptions struct {
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewGetEUSupportOptions : Instantiate GetEUSupportOptions
-func (*CaseManagementV1) NewGetEUSupportOptions() *GetEUSupportOptions {
-	return &GetEUSupportOptions{}
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *GetEUSupportOptions) SetHeaders(param map[string]string) *GetEUSupportOptions {
-	options.Headers = param
-	return options
-}
-
-// GetResolutionCodesOptions : The GetResolutionCodes options.
-type GetResolutionCodesOptions struct {
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewGetResolutionCodesOptions : Instantiate GetResolutionCodesOptions
-func (*CaseManagementV1) NewGetResolutionCodesOptions() *GetResolutionCodesOptions {
-	return &GetResolutionCodesOptions{}
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *GetResolutionCodesOptions) SetHeaders(param map[string]string) *GetResolutionCodesOptions {
-	options.Headers = param
-	return options
-}
-
-// GetStatusesOptions : The GetStatuses options.
-type GetStatusesOptions struct {
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewGetStatusesOptions : Instantiate GetStatusesOptions
-func (*CaseManagementV1) NewGetStatusesOptions() *GetStatusesOptions {
-	return &GetStatusesOptions{}
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *GetStatusesOptions) SetHeaders(param map[string]string) *GetStatusesOptions {
-	options.Headers = param
-	return options
-}
-
-// GetTechnicalOfferingsOptions : The GetTechnicalOfferings options.
-type GetTechnicalOfferingsOptions struct {
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewGetTechnicalOfferingsOptions : Instantiate GetTechnicalOfferingsOptions
-func (*CaseManagementV1) NewGetTechnicalOfferingsOptions() *GetTechnicalOfferingsOptions {
-	return &GetTechnicalOfferingsOptions{}
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *GetTechnicalOfferingsOptions) SetHeaders(param map[string]string) *GetTechnicalOfferingsOptions {
-	options.Headers = param
-	return options
-}
-
-// OfferingItemType : the offering type.
-type OfferingItemType struct {
-	// the offering type's group.
-	Group *string `json:"group,omitempty"`
-
-	// the offering type's key value.
-	Key *string `json:"key,omitempty"`
-}
-
-// Constants associated with the OfferingItemType.Group property.
-// the offering type's group.
-const (
-	OfferingItemType_Group_Category = "category"
-	OfferingItemType_Group_CrnServiceName = "crn_service_name"
-)
-
-
-// UnmarshalOfferingItemType constructs an instance of OfferingItemType from the specified map.
-func UnmarshalOfferingItemType(m map[string]interface{}) (result *OfferingItemType, err error) {
-	obj := new(OfferingItemType)
-	obj.Group, err = core.UnmarshalString(m, "group")
-	if err != nil {
-		return
-	}
-	obj.Key, err = core.UnmarshalString(m, "key")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalOfferingItemTypeSlice unmarshals a slice of OfferingItemType instances from the specified list of maps.
-func UnmarshalOfferingItemTypeSlice(s []interface{}) (slice []OfferingItemType, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'OfferingItemType'")
-			return
-		}
-		obj, e := UnmarshalOfferingItemType(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalOfferingItemTypeAsProperty unmarshals an instance of OfferingItemType that is stored as a property
-// within the specified map.
-func UnmarshalOfferingItemTypeAsProperty(m map[string]interface{}, propertyName string) (result *OfferingItemType, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'OfferingItemType'", propertyName)
-			return
-		}
-		result, err = UnmarshalOfferingItemType(objMap)
-	}
-	return
-}
-
-// UnmarshalOfferingItemTypeSliceAsProperty unmarshals a slice of OfferingItemType instances that are stored as a property
-// within the specified map.
-func UnmarshalOfferingItemTypeSliceAsProperty(m map[string]interface{}, propertyName string) (slice []OfferingItemType, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'OfferingItemType'", propertyName)
-			return
-		}
-		slice, err = UnmarshalOfferingItemTypeSlice(vSlice)
-	}
-	return
-}
-
-// OfferingPayloadType : Resource offering type.
-type OfferingPayloadType struct {
-	// the offering type's group.
-	Group *string `json:"group,omitempty"`
-
-	// the offering type's key.
-	Key *string `json:"key,omitempty"`
-
-	// the offering type's identifier.
-	ID *string `json:"id,omitempty"`
-
-	// the offering type's kind.
-	Kind *string `json:"kind,omitempty"`
-}
-
-// Constants associated with the OfferingPayloadType.Group property.
-// the offering type's group.
-const (
-	OfferingPayloadType_Group_Category = "category"
-	OfferingPayloadType_Group_CrnServiceName = "crn_service_name"
-)
-
-
-// UnmarshalOfferingPayloadType constructs an instance of OfferingPayloadType from the specified map.
-func UnmarshalOfferingPayloadType(m map[string]interface{}) (result *OfferingPayloadType, err error) {
-	obj := new(OfferingPayloadType)
-	obj.Group, err = core.UnmarshalString(m, "group")
-	if err != nil {
-		return
-	}
-	obj.Key, err = core.UnmarshalString(m, "key")
-	if err != nil {
-		return
-	}
-	obj.ID, err = core.UnmarshalString(m, "id")
-	if err != nil {
-		return
-	}
-	obj.Kind, err = core.UnmarshalString(m, "kind")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalOfferingPayloadTypeSlice unmarshals a slice of OfferingPayloadType instances from the specified list of maps.
-func UnmarshalOfferingPayloadTypeSlice(s []interface{}) (slice []OfferingPayloadType, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'OfferingPayloadType'")
-			return
-		}
-		obj, e := UnmarshalOfferingPayloadType(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalOfferingPayloadTypeAsProperty unmarshals an instance of OfferingPayloadType that is stored as a property
-// within the specified map.
-func UnmarshalOfferingPayloadTypeAsProperty(m map[string]interface{}, propertyName string) (result *OfferingPayloadType, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'OfferingPayloadType'", propertyName)
-			return
-		}
-		result, err = UnmarshalOfferingPayloadType(objMap)
-	}
-	return
-}
-
-// UnmarshalOfferingPayloadTypeSliceAsProperty unmarshals a slice of OfferingPayloadType instances that are stored as a property
-// within the specified map.
-func UnmarshalOfferingPayloadTypeSliceAsProperty(m map[string]interface{}, propertyName string) (slice []OfferingPayloadType, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'OfferingPayloadType'", propertyName)
-			return
-		}
-		slice, err = UnmarshalOfferingPayloadTypeSlice(vSlice)
-	}
-	return
-}
-
-// RemoveWatchlistOptions : The RemoveWatchlist options.
-type RemoveWatchlistOptions struct {
-	// Unique identifier of a case.
-	CaseNumber *string `json:"case_number" validate:"required"`
-
-	// List of users to be added or removed from the watchlist of a case.
-	Watchlist []UserIdAndRealm `json:"watchlist,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewRemoveWatchlistOptions : Instantiate RemoveWatchlistOptions
-func (*CaseManagementV1) NewRemoveWatchlistOptions(caseNumber string) *RemoveWatchlistOptions {
-	return &RemoveWatchlistOptions{
-		CaseNumber: core.StringPtr(caseNumber),
-	}
-}
-
-// SetCaseNumber : Allow user to set CaseNumber
-func (options *RemoveWatchlistOptions) SetCaseNumber(caseNumber string) *RemoveWatchlistOptions {
-	options.CaseNumber = core.StringPtr(caseNumber)
-	return options
-}
-
-// SetWatchlist : Allow user to set Watchlist
-func (options *RemoveWatchlistOptions) SetWatchlist(watchlist []UserIdAndRealm) *RemoveWatchlistOptions {
-	options.Watchlist = watchlist
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *RemoveWatchlistOptions) SetHeaders(param map[string]string) *RemoveWatchlistOptions {
-	options.Headers = param
-	return options
-}
-
-// UpdateCaseStatusOptions : The UpdateCaseStatus options.
-type UpdateCaseStatusOptions struct {
-	// Unique identifier of a case.
-	CaseNumber *string `json:"case_number" validate:"required"`
-
-	// the action to perform on the case.
-	Action *string `json:"action" validate:"required"`
-
-	// a comment to be associated with the updated status.
-	Comment *string `json:"comment,omitempty"`
-
-	// * 1: Client error
-	// * 2: Defect found with Component/Service
-	// * 3: Documentation Error
-	// * 4: Sollution found in forums
-	// * 5: Solution found in public Documentation
-	// * 6: Solution no longer required
-	// * 7: Solution provided by IBM outside of support case
-	// * 8: Solution provided by IBM support engineer.
-	ResolutionCode *int64 `json:"resolution_code,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// Constants associated with the UpdateCaseStatusOptions.Action property.
-// the action to perform on the case.
-const (
-	UpdateCaseStatusOptions_Action_Accept = "accept"
-	UpdateCaseStatusOptions_Action_Resolve = "resolve"
-	UpdateCaseStatusOptions_Action_Unresolve = "unresolve"
-)
-
-// NewUpdateCaseStatusOptions : Instantiate UpdateCaseStatusOptions
-func (*CaseManagementV1) NewUpdateCaseStatusOptions(caseNumber string, action string) *UpdateCaseStatusOptions {
-	return &UpdateCaseStatusOptions{
-		CaseNumber: core.StringPtr(caseNumber),
-		Action: core.StringPtr(action),
-	}
-}
-
-// SetCaseNumber : Allow user to set CaseNumber
-func (options *UpdateCaseStatusOptions) SetCaseNumber(caseNumber string) *UpdateCaseStatusOptions {
-	options.CaseNumber = core.StringPtr(caseNumber)
-	return options
-}
-
-// SetAction : Allow user to set Action
-func (options *UpdateCaseStatusOptions) SetAction(action string) *UpdateCaseStatusOptions {
-	options.Action = core.StringPtr(action)
-	return options
-}
-
-// SetComment : Allow user to set Comment
-func (options *UpdateCaseStatusOptions) SetComment(comment string) *UpdateCaseStatusOptions {
-	options.Comment = core.StringPtr(comment)
-	return options
-}
-
-// SetResolutionCode : Allow user to set ResolutionCode
-func (options *UpdateCaseStatusOptions) SetResolutionCode(resolutionCode int64) *UpdateCaseStatusOptions {
-	options.ResolutionCode = core.Int64Ptr(resolutionCode)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *UpdateCaseStatusOptions) SetHeaders(param map[string]string) *UpdateCaseStatusOptions {
-	options.Headers = param
-	return options
-}
-
-// UploadFileOptions : The UploadFile options.
-type UploadFileOptions struct {
-	// Unique identifier of a case.
-	CaseNumber *string `json:"case_number" validate:"required"`
-
-	// file of supported types, 8MB in size limit.
-	File io.ReadCloser `json:"file" validate:"required"`
-
-	// The content type of file.
-	FileContentType *string `json:"file_content_type,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewUploadFileOptions : Instantiate UploadFileOptions
-func (*CaseManagementV1) NewUploadFileOptions(caseNumber string, file io.ReadCloser) *UploadFileOptions {
-	return &UploadFileOptions{
-		CaseNumber: core.StringPtr(caseNumber),
-		File: file,
-	}
-}
-
-// SetCaseNumber : Allow user to set CaseNumber
-func (options *UploadFileOptions) SetCaseNumber(caseNumber string) *UploadFileOptions {
-	options.CaseNumber = core.StringPtr(caseNumber)
-	return options
-}
-
-// SetFile : Allow user to set File
-func (options *UploadFileOptions) SetFile(file io.ReadCloser) *UploadFileOptions {
-	options.File = file
-	return options
-}
-
-// SetFileContentType : Allow user to set FileContentType
-func (options *UploadFileOptions) SetFileContentType(fileContentType string) *UploadFileOptions {
-	options.FileContentType = core.StringPtr(fileContentType)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *UploadFileOptions) SetHeaders(param map[string]string) *UploadFileOptions {
-	options.Headers = param
-	return options
-}
-
-// AddWatchlistResults : the response returned by the `add_watchlist` operation.
-type AddWatchlistResults struct {
-	// List of successfully added user IDs.
-	Added []User `json:"added,omitempty"`
-
-	// List of failed-to-add user IDs.
-	Failed []User `json:"failed,omitempty"`
-}
-
-
-// UnmarshalAddWatchlistResults constructs an instance of AddWatchlistResults from the specified map.
-func UnmarshalAddWatchlistResults(m map[string]interface{}) (result *AddWatchlistResults, err error) {
-	obj := new(AddWatchlistResults)
-	obj.Added, err = UnmarshalUserSliceAsProperty(m, "added")
-	if err != nil {
-		return
-	}
-	obj.Failed, err = UnmarshalUserSliceAsProperty(m, "failed")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalAddWatchlistResultsSlice unmarshals a slice of AddWatchlistResults instances from the specified list of maps.
-func UnmarshalAddWatchlistResultsSlice(s []interface{}) (slice []AddWatchlistResults, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'AddWatchlistResults'")
-			return
-		}
-		obj, e := UnmarshalAddWatchlistResults(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalAddWatchlistResultsAsProperty unmarshals an instance of AddWatchlistResults that is stored as a property
-// within the specified map.
-func UnmarshalAddWatchlistResultsAsProperty(m map[string]interface{}, propertyName string) (result *AddWatchlistResults, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'AddWatchlistResults'", propertyName)
-			return
-		}
-		result, err = UnmarshalAddWatchlistResults(objMap)
-	}
-	return
-}
-
-// UnmarshalAddWatchlistResultsSliceAsProperty unmarshals a slice of AddWatchlistResults instances that are stored as a property
-// within the specified map.
-func UnmarshalAddWatchlistResultsSliceAsProperty(m map[string]interface{}, propertyName string) (slice []AddWatchlistResults, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'AddWatchlistResults'", propertyName)
-			return
-		}
-		slice, err = UnmarshalAddWatchlistResultsSlice(vSlice)
-	}
-	return
-}
-
-// Attachment : Details of an attachment.
-type Attachment struct {
-	// Unique identifier of the attachment in database.
-	ID *string `json:"id,omitempty"`
-
-	// Name of the attachment.
-	Filename *string `json:"filename,omitempty"`
-
-	// Size of the attachment in bytes.
-	SizeInBytes *int64 `json:"size_in_bytes,omitempty"`
-
-	// Date time of uploading.
-	CreatedAt *string `json:"created_at,omitempty"`
-
-	// URL of the attachment used to download.
-	URL *string `json:"url,omitempty"`
-}
-
-
-// UnmarshalAttachment constructs an instance of Attachment from the specified map.
-func UnmarshalAttachment(m map[string]interface{}) (result *Attachment, err error) {
-	obj := new(Attachment)
-	obj.ID, err = core.UnmarshalString(m, "id")
-	if err != nil {
-		return
-	}
-	obj.Filename, err = core.UnmarshalString(m, "filename")
-	if err != nil {
-		return
-	}
-	obj.SizeInBytes, err = core.UnmarshalInt64(m, "size_in_bytes")
-	if err != nil {
-		return
-	}
-	obj.CreatedAt, err = core.UnmarshalString(m, "created_at")
-	if err != nil {
-		return
-	}
-	obj.URL, err = core.UnmarshalString(m, "url")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalAttachmentSlice unmarshals a slice of Attachment instances from the specified list of maps.
-func UnmarshalAttachmentSlice(s []interface{}) (slice []Attachment, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'Attachment'")
-			return
-		}
-		obj, e := UnmarshalAttachment(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalAttachmentAsProperty unmarshals an instance of Attachment that is stored as a property
-// within the specified map.
-func UnmarshalAttachmentAsProperty(m map[string]interface{}, propertyName string) (result *Attachment, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'Attachment'", propertyName)
-			return
-		}
-		result, err = UnmarshalAttachment(objMap)
-	}
-	return
-}
-
-// UnmarshalAttachmentSliceAsProperty unmarshals a slice of Attachment instances that are stored as a property
-// within the specified map.
-func UnmarshalAttachmentSliceAsProperty(m map[string]interface{}, propertyName string) (slice []Attachment, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'Attachment'", propertyName)
-			return
-		}
-		slice, err = UnmarshalAttachmentSlice(vSlice)
-	}
-	return
-}
-
-// Case : a case object.
-type Case struct {
-	// Number/ID of the case.
-	Number *string `json:"number,omitempty"`
-
-	// A short description of what the case is about.
-	ShortEscription *string `json:"short_escription,omitempty"`
-
-	// A full description of what the case is about.
-	Description *string `json:"description,omitempty"`
-
-	// Date time of case creation in UTC.
-	CreatedAt *string `json:"created_at,omitempty"`
-
-	// Case creator.
-	CreatedBy *User `json:"created_by,omitempty"`
-
-	// Date time of the last update on the case in UTC.
-	UpdatedAt *string `json:"updated_at,omitempty"`
-
-	// Person who makes the most recent update to the case.
-	UpdatedBy *User `json:"updated_by,omitempty"`
-
-	// Name of the console to interact with the contact.
-	ContactType *string `json:"contact_type,omitempty"`
-
-	// Person who reported the case.
-	Contact *User `json:"contact,omitempty"`
-
-	// Status of the case.
-	Status *string `json:"status,omitempty"`
-
-	// The severity of the case.
-	Severity *float64 `json:"severity,omitempty"`
-
-	// Support tier of the account.
-	SupportTier *string `json:"support_tier,omitempty"`
-
-	// Standard reasons of resolving case.
-	Resolution *string `json:"resolution,omitempty"`
-
-	// Notes of case closing.
-	CloseNotes *string `json:"close_notes,omitempty"`
-
-	// Specifies if the case should be treated as EU regulated.
-	Eu *Eu `json:"eu,omitempty"`
-
-	// User IDs in the watchlist.
-	Watchlist []User `json:"watchlist,omitempty"`
-
-	// List of attachments/files of the case.
-	Attachments []Attachment `json:"attachments,omitempty"`
-
-	// A catalog offering associated with a case.
-	Offering *Offering `json:"offering,omitempty"`
-
-	// List of attached resources.
-	Resources []Resource `json:"resources,omitempty"`
-
-	// List of comments/updates sorted in chronological order.
-	Comments []Comment `json:"comments,omitempty"`
-}
-
-// Constants associated with the Case.ContactType property.
-// Name of the console to interact with the contact.
-const (
-	Case_ContactType_CloudSupportCenter = "Cloud Support Center"
-	Case_ContactType_ImsConsole = "IMS Console"
-)
-
-// Constants associated with the Case.SupportTier property.
-// Support tier of the account.
-const (
-	Case_SupportTier_Basic = "Basic"
-	Case_SupportTier_Free = "Free"
-	Case_SupportTier_Premium = "Premium"
-	Case_SupportTier_Standard = "Standard"
-)
-
-
-// UnmarshalCase constructs an instance of Case from the specified map.
-func UnmarshalCase(m map[string]interface{}) (result *Case, err error) {
-	obj := new(Case)
-	obj.Number, err = core.UnmarshalString(m, "number")
-	if err != nil {
-		return
-	}
-	obj.ShortEscription, err = core.UnmarshalString(m, "short_escription")
-	if err != nil {
-		return
-	}
-	obj.Description, err = core.UnmarshalString(m, "description")
-	if err != nil {
-		return
-	}
-	obj.CreatedAt, err = core.UnmarshalString(m, "created_at")
-	if err != nil {
-		return
-	}
-	obj.CreatedBy, err = UnmarshalUserAsProperty(m, "created_by")
-	if err != nil {
-		return
-	}
-	obj.UpdatedAt, err = core.UnmarshalString(m, "updated_at")
-	if err != nil {
-		return
-	}
-	obj.UpdatedBy, err = UnmarshalUserAsProperty(m, "updated_by")
-	if err != nil {
-		return
-	}
-	obj.ContactType, err = core.UnmarshalString(m, "contact_type")
-	if err != nil {
-		return
-	}
-	obj.Contact, err = UnmarshalUserAsProperty(m, "contact")
-	if err != nil {
-		return
-	}
-	obj.Status, err = core.UnmarshalString(m, "status")
-	if err != nil {
-		return
-	}
-	obj.Severity, err = core.UnmarshalFloat64(m, "severity")
-	if err != nil {
-		return
-	}
-	obj.SupportTier, err = core.UnmarshalString(m, "support_tier")
-	if err != nil {
-		return
-	}
-	obj.Resolution, err = core.UnmarshalString(m, "resolution")
-	if err != nil {
-		return
-	}
-	obj.CloseNotes, err = core.UnmarshalString(m, "close_notes")
-	if err != nil {
-		return
-	}
-	obj.Eu, err = UnmarshalEuAsProperty(m, "eu")
-	if err != nil {
-		return
-	}
-	obj.Watchlist, err = UnmarshalUserSliceAsProperty(m, "watchlist")
-	if err != nil {
-		return
-	}
-	obj.Attachments, err = UnmarshalAttachmentSliceAsProperty(m, "attachments")
-	if err != nil {
-		return
-	}
-	obj.Offering, err = UnmarshalOfferingAsProperty(m, "offering")
-	if err != nil {
-		return
-	}
-	obj.Resources, err = UnmarshalResourceSliceAsProperty(m, "resources")
-	if err != nil {
-		return
-	}
-	obj.Comments, err = UnmarshalCommentSliceAsProperty(m, "comments")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalCaseSlice unmarshals a slice of Case instances from the specified list of maps.
-func UnmarshalCaseSlice(s []interface{}) (slice []Case, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'Case'")
-			return
-		}
-		obj, e := UnmarshalCase(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalCaseAsProperty unmarshals an instance of Case that is stored as a property
-// within the specified map.
-func UnmarshalCaseAsProperty(m map[string]interface{}, propertyName string) (result *Case, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'Case'", propertyName)
-			return
-		}
-		result, err = UnmarshalCase(objMap)
-	}
-	return
-}
-
-// UnmarshalCaseSliceAsProperty unmarshals a slice of Case instances that are stored as a property
-// within the specified map.
-func UnmarshalCaseSliceAsProperty(m map[string]interface{}, propertyName string) (slice []Case, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'Case'", propertyName)
-			return
-		}
-		slice, err = UnmarshalCaseSlice(vSlice)
-	}
-	return
-}
-
-// CaseCollection : a collection of cases returned by the `get_cases` operation.
-type CaseCollection struct {
-	// Total number of cases satisfying the query.
-	TotalCount *int64 `json:"total_count,omitempty"`
-
-	// the first page of the case collection.
-	First *PaginationLink `json:"first,omitempty"`
-
-	// the next page of the case collection.
-	Next *PaginationLink `json:"next,omitempty"`
-
-	// the previous page of the case collection.
-	Previous *PaginationLink `json:"previous,omitempty"`
-
-	// the last page of the case collection.
-	Last *PaginationLink `json:"last,omitempty"`
-
-	// the cases returned in the collection.
-	Cases []Case `json:"cases,omitempty"`
-}
-
-
-// UnmarshalCaseCollection constructs an instance of CaseCollection from the specified map.
-func UnmarshalCaseCollection(m map[string]interface{}) (result *CaseCollection, err error) {
-	obj := new(CaseCollection)
-	obj.TotalCount, err = core.UnmarshalInt64(m, "total_count")
-	if err != nil {
-		return
-	}
-	obj.First, err = UnmarshalPaginationLinkAsProperty(m, "first")
-	if err != nil {
-		return
-	}
-	obj.Next, err = UnmarshalPaginationLinkAsProperty(m, "next")
-	if err != nil {
-		return
-	}
-	obj.Previous, err = UnmarshalPaginationLinkAsProperty(m, "previous")
-	if err != nil {
-		return
-	}
-	obj.Last, err = UnmarshalPaginationLinkAsProperty(m, "last")
-	if err != nil {
-		return
-	}
-	obj.Cases, err = UnmarshalCaseSliceAsProperty(m, "cases")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalCaseCollectionSlice unmarshals a slice of CaseCollection instances from the specified list of maps.
-func UnmarshalCaseCollectionSlice(s []interface{}) (slice []CaseCollection, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'CaseCollection'")
-			return
-		}
-		obj, e := UnmarshalCaseCollection(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalCaseCollectionAsProperty unmarshals an instance of CaseCollection that is stored as a property
-// within the specified map.
-func UnmarshalCaseCollectionAsProperty(m map[string]interface{}, propertyName string) (result *CaseCollection, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'CaseCollection'", propertyName)
-			return
-		}
-		result, err = UnmarshalCaseCollection(objMap)
-	}
-	return
-}
-
-// UnmarshalCaseCollectionSliceAsProperty unmarshals a slice of CaseCollection instances that are stored as a property
-// within the specified map.
-func UnmarshalCaseCollectionSliceAsProperty(m map[string]interface{}, propertyName string) (slice []CaseCollection, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'CaseCollection'", propertyName)
-			return
-		}
-		slice, err = UnmarshalCaseCollectionSlice(vSlice)
-	}
-	return
-}
-
-// Comment : A comment or update associated with a case.
-type Comment struct {
-	// The comment.
-	Value *string `json:"value,omitempty"`
-
-	// Timestamp of when comment is added.
-	AddedAt *string `json:"added_at,omitempty"`
-
-	// The person who added the comment.
-	AddedBy *User `json:"added_by,omitempty"`
-}
-
-
-// UnmarshalComment constructs an instance of Comment from the specified map.
-func UnmarshalComment(m map[string]interface{}) (result *Comment, err error) {
-	obj := new(Comment)
-	obj.Value, err = core.UnmarshalString(m, "value")
-	if err != nil {
-		return
-	}
-	obj.AddedAt, err = core.UnmarshalString(m, "added_at")
-	if err != nil {
-		return
-	}
-	obj.AddedBy, err = UnmarshalUserAsProperty(m, "added_by")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalCommentSlice unmarshals a slice of Comment instances from the specified list of maps.
-func UnmarshalCommentSlice(s []interface{}) (slice []Comment, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'Comment'")
-			return
-		}
-		obj, e := UnmarshalComment(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalCommentAsProperty unmarshals an instance of Comment that is stored as a property
-// within the specified map.
-func UnmarshalCommentAsProperty(m map[string]interface{}, propertyName string) (result *Comment, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'Comment'", propertyName)
-			return
-		}
-		result, err = UnmarshalComment(objMap)
-	}
-	return
-}
-
-// UnmarshalCommentSliceAsProperty unmarshals a slice of Comment instances that are stored as a property
-// within the specified map.
-func UnmarshalCommentSliceAsProperty(m map[string]interface{}, propertyName string) (slice []Comment, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'Comment'", propertyName)
-			return
-		}
-		slice, err = UnmarshalCommentSlice(vSlice)
-	}
-	return
-}
-
-// DeleteFileResponse : The response returned by the `delete_file` operation.
-type DeleteFileResponse struct {
-	// List of attachments/files of the case.
-	Attachments []Attachment `json:"attachments,omitempty"`
-}
-
-
-// UnmarshalDeleteFileResponse constructs an instance of DeleteFileResponse from the specified map.
-func UnmarshalDeleteFileResponse(m map[string]interface{}) (result *DeleteFileResponse, err error) {
-	obj := new(DeleteFileResponse)
-	obj.Attachments, err = UnmarshalAttachmentSliceAsProperty(m, "attachments")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalDeleteFileResponseSlice unmarshals a slice of DeleteFileResponse instances from the specified list of maps.
-func UnmarshalDeleteFileResponseSlice(s []interface{}) (slice []DeleteFileResponse, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'DeleteFileResponse'")
-			return
-		}
-		obj, e := UnmarshalDeleteFileResponse(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalDeleteFileResponseAsProperty unmarshals an instance of DeleteFileResponse that is stored as a property
-// within the specified map.
-func UnmarshalDeleteFileResponseAsProperty(m map[string]interface{}, propertyName string) (result *DeleteFileResponse, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'DeleteFileResponse'", propertyName)
-			return
-		}
-		result, err = UnmarshalDeleteFileResponse(objMap)
-	}
-	return
-}
-
-// UnmarshalDeleteFileResponseSliceAsProperty unmarshals a slice of DeleteFileResponse instances that are stored as a property
-// within the specified map.
-func UnmarshalDeleteFileResponseSliceAsProperty(m map[string]interface{}, propertyName string) (slice []DeleteFileResponse, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'DeleteFileResponse'", propertyName)
-			return
-		}
-		slice, err = UnmarshalDeleteFileResponseSlice(vSlice)
-	}
-	return
-}
-
-// Eu : Specifies if the case should be treated as EU regulated.
-type Eu struct {
-	// Identifying whether the case has EU Support.
-	Support *bool `json:"support,omitempty"`
-
-	// Information about the data center.
-	DataCenter *string `json:"data_center,omitempty"`
-}
-
-
-// UnmarshalEu constructs an instance of Eu from the specified map.
-func UnmarshalEu(m map[string]interface{}) (result *Eu, err error) {
-	obj := new(Eu)
-	obj.Support, err = core.UnmarshalBool(m, "support")
-	if err != nil {
-		return
-	}
-	obj.DataCenter, err = core.UnmarshalString(m, "data_center")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalEuSlice unmarshals a slice of Eu instances from the specified list of maps.
-func UnmarshalEuSlice(s []interface{}) (slice []Eu, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'Eu'")
-			return
-		}
-		obj, e := UnmarshalEu(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalEuAsProperty unmarshals an instance of Eu that is stored as a property
-// within the specified map.
-func UnmarshalEuAsProperty(m map[string]interface{}, propertyName string) (result *Eu, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'Eu'", propertyName)
-			return
-		}
-		result, err = UnmarshalEu(objMap)
-	}
-	return
-}
-
-// UnmarshalEuSliceAsProperty unmarshals a slice of Eu instances that are stored as a property
-// within the specified map.
-func UnmarshalEuSliceAsProperty(m map[string]interface{}, propertyName string) (slice []Eu, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'Eu'", propertyName)
-			return
-		}
-		slice, err = UnmarshalEuSlice(vSlice)
-	}
-	return
-}
-
-// EuPayload : Specify if the case should be treated as EU regulated. Only one of the following properties is required. Call EU
-// support utility endpoint to determine which property must be specified for your account.
-type EuPayload struct {
-	// indicates whether the case should be treated as EU regulated.
-	Supported *bool `json:"supported,omitempty"`
-
-	// If EU supported utility endpoint specifies datacenter then pass the datacenter id to mark a case as EU supported.
-	DataCenter *int64 `json:"data_center,omitempty"`
-}
-
-
-// UnmarshalEuPayload constructs an instance of EuPayload from the specified map.
-func UnmarshalEuPayload(m map[string]interface{}) (result *EuPayload, err error) {
-	obj := new(EuPayload)
-	obj.Supported, err = core.UnmarshalBool(m, "supported")
-	if err != nil {
-		return
-	}
-	obj.DataCenter, err = core.UnmarshalInt64(m, "data_center")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalEuPayloadSlice unmarshals a slice of EuPayload instances from the specified list of maps.
-func UnmarshalEuPayloadSlice(s []interface{}) (slice []EuPayload, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'EuPayload'")
-			return
-		}
-		obj, e := UnmarshalEuPayload(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalEuPayloadAsProperty unmarshals an instance of EuPayload that is stored as a property
-// within the specified map.
-func UnmarshalEuPayloadAsProperty(m map[string]interface{}, propertyName string) (result *EuPayload, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'EuPayload'", propertyName)
-			return
-		}
-		result, err = UnmarshalEuPayload(objMap)
-	}
-	return
-}
-
-// UnmarshalEuPayloadSliceAsProperty unmarshals a slice of EuPayload instances that are stored as a property
-// within the specified map.
-func UnmarshalEuPayloadSliceAsProperty(m map[string]interface{}, propertyName string) (slice []EuPayload, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'EuPayload'", propertyName)
-			return
-		}
-		slice, err = UnmarshalEuPayloadSlice(vSlice)
-	}
-	return
-}
-
-// EuSupport : information needed to treat a case as EU regulated.
-type EuSupport struct {
-	// Property which must be specified on eu property of case creation payload.
-	Property *string `json:"property,omitempty"`
-
-	// If the value of property is 'datacenter' then select datacenter by passing its id in `eu.datacenter` field of case
-	// creation payload.
-	Values []interface{} `json:"values,omitempty"`
-}
-
-// Constants associated with the EuSupport.Property property.
-// Property which must be specified on eu property of case creation payload.
-const (
-	EuSupport_Property_DataCenter = "data_center"
-	EuSupport_Property_Supported = "supported"
-)
-
-
-// UnmarshalEuSupport constructs an instance of EuSupport from the specified map.
-func UnmarshalEuSupport(m map[string]interface{}) (result *EuSupport, err error) {
-	obj := new(EuSupport)
-	obj.Property, err = core.UnmarshalString(m, "property")
-	if err != nil {
-		return
-	}
-	obj.Values, err = core.UnmarshalAnySlice(m, "values")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalEuSupportSlice unmarshals a slice of EuSupport instances from the specified list of maps.
-func UnmarshalEuSupportSlice(s []interface{}) (slice []EuSupport, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'EuSupport'")
-			return
-		}
-		obj, e := UnmarshalEuSupport(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalEuSupportAsProperty unmarshals an instance of EuSupport that is stored as a property
-// within the specified map.
-func UnmarshalEuSupportAsProperty(m map[string]interface{}, propertyName string) (result *EuSupport, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'EuSupport'", propertyName)
-			return
-		}
-		result, err = UnmarshalEuSupport(objMap)
-	}
-	return
-}
-
-// UnmarshalEuSupportSliceAsProperty unmarshals a slice of EuSupport instances that are stored as a property
-// within the specified map.
-func UnmarshalEuSupportSliceAsProperty(m map[string]interface{}, propertyName string) (slice []EuSupport, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'EuSupport'", propertyName)
-			return
-		}
-		slice, err = UnmarshalEuSupportSlice(vSlice)
-	}
-	return
-}
-
-// Offering : A catalog offering associated with a case.
-type Offering struct {
-	// id of the catalog offering.
-	ID *string `json:"id,omitempty"`
-
-	// display name of the catalog offering.
-	Value *string `json:"value,omitempty"`
-}
-
-
-// UnmarshalOffering constructs an instance of Offering from the specified map.
-func UnmarshalOffering(m map[string]interface{}) (result *Offering, err error) {
-	obj := new(Offering)
-	obj.ID, err = core.UnmarshalString(m, "id")
-	if err != nil {
-		return
-	}
-	obj.Value, err = core.UnmarshalString(m, "value")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalOfferingSlice unmarshals a slice of Offering instances from the specified list of maps.
-func UnmarshalOfferingSlice(s []interface{}) (slice []Offering, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'Offering'")
-			return
-		}
-		obj, e := UnmarshalOffering(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalOfferingAsProperty unmarshals an instance of Offering that is stored as a property
-// within the specified map.
-func UnmarshalOfferingAsProperty(m map[string]interface{}, propertyName string) (result *Offering, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'Offering'", propertyName)
-			return
-		}
-		result, err = UnmarshalOffering(objMap)
-	}
-	return
-}
-
-// UnmarshalOfferingSliceAsProperty unmarshals a slice of Offering instances that are stored as a property
-// within the specified map.
-func UnmarshalOfferingSliceAsProperty(m map[string]interface{}, propertyName string) (slice []Offering, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'Offering'", propertyName)
-			return
-		}
-		slice, err = UnmarshalOfferingSlice(vSlice)
-	}
-	return
-}
-
-// OfferingItem : an individual offering.
-type OfferingItem struct {
-	// the name of the offering.
-	Name *string `json:"name,omitempty"`
-
-	// the offering type.
-	Type *OfferingItemType `json:"type,omitempty"`
-}
-
-
-// UnmarshalOfferingItem constructs an instance of OfferingItem from the specified map.
-func UnmarshalOfferingItem(m map[string]interface{}) (result *OfferingItem, err error) {
-	obj := new(OfferingItem)
-	obj.Name, err = core.UnmarshalString(m, "name")
-	if err != nil {
-		return
-	}
-	obj.Type, err = UnmarshalOfferingItemTypeAsProperty(m, "type")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalOfferingItemSlice unmarshals a slice of OfferingItem instances from the specified list of maps.
-func UnmarshalOfferingItemSlice(s []interface{}) (slice []OfferingItem, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'OfferingItem'")
-			return
-		}
-		obj, e := UnmarshalOfferingItem(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalOfferingItemAsProperty unmarshals an instance of OfferingItem that is stored as a property
-// within the specified map.
-func UnmarshalOfferingItemAsProperty(m map[string]interface{}, propertyName string) (result *OfferingItem, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'OfferingItem'", propertyName)
-			return
-		}
-		result, err = UnmarshalOfferingItem(objMap)
-	}
-	return
-}
-
-// UnmarshalOfferingItemSliceAsProperty unmarshals a slice of OfferingItem instances that are stored as a property
-// within the specified map.
-func UnmarshalOfferingItemSliceAsProperty(m map[string]interface{}, propertyName string) (slice []OfferingItem, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'OfferingItem'", propertyName)
-			return
-		}
-		slice, err = UnmarshalOfferingItemSlice(vSlice)
-	}
-	return
-}
-
-// OfferingPayload : The offering of a case to be created.
-type OfferingPayload struct {
-	// Resource offering name.
-	Name *string `json:"name" validate:"required"`
-
-	// Resource offering type.
-	Type *OfferingPayloadType `json:"type" validate:"required"`
-}
-
-
-// NewOfferingPayload : Instantiate OfferingPayload (Generic Model Constructor)
-func (*CaseManagementV1) NewOfferingPayload(name string, typeVar *OfferingPayloadType) (model *OfferingPayload, err error) {
-	model = &OfferingPayload{
-		Name: core.StringPtr(name),
-		Type: typeVar,
-	}
-	err = core.ValidateStruct(model, "required parameters")
-	return
-}
-
-// UnmarshalOfferingPayload constructs an instance of OfferingPayload from the specified map.
-func UnmarshalOfferingPayload(m map[string]interface{}) (result *OfferingPayload, err error) {
-	obj := new(OfferingPayload)
-	obj.Name, err = core.UnmarshalString(m, "name")
-	if err != nil {
-		return
-	}
-	obj.Type, err = UnmarshalOfferingPayloadTypeAsProperty(m, "type")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalOfferingPayloadSlice unmarshals a slice of OfferingPayload instances from the specified list of maps.
-func UnmarshalOfferingPayloadSlice(s []interface{}) (slice []OfferingPayload, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'OfferingPayload'")
-			return
-		}
-		obj, e := UnmarshalOfferingPayload(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalOfferingPayloadAsProperty unmarshals an instance of OfferingPayload that is stored as a property
-// within the specified map.
-func UnmarshalOfferingPayloadAsProperty(m map[string]interface{}, propertyName string) (result *OfferingPayload, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'OfferingPayload'", propertyName)
-			return
-		}
-		result, err = UnmarshalOfferingPayload(objMap)
-	}
-	return
-}
-
-// UnmarshalOfferingPayloadSliceAsProperty unmarshals a slice of OfferingPayload instances that are stored as a property
-// within the specified map.
-func UnmarshalOfferingPayloadSliceAsProperty(m map[string]interface{}, propertyName string) (slice []OfferingPayload, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'OfferingPayload'", propertyName)
-			return
-		}
-		slice, err = UnmarshalOfferingPayloadSlice(vSlice)
-	}
-	return
-}
-
-// PaginationLink : a reference to a page of results within a case collection.
-type PaginationLink struct {
-	// the page reference as a URI.
-	Href *string `json:"href,omitempty"`
-}
-
-
-// UnmarshalPaginationLink constructs an instance of PaginationLink from the specified map.
-func UnmarshalPaginationLink(m map[string]interface{}) (result *PaginationLink, err error) {
-	obj := new(PaginationLink)
-	obj.Href, err = core.UnmarshalString(m, "href")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalPaginationLinkSlice unmarshals a slice of PaginationLink instances from the specified list of maps.
-func UnmarshalPaginationLinkSlice(s []interface{}) (slice []PaginationLink, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'PaginationLink'")
-			return
-		}
-		obj, e := UnmarshalPaginationLink(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalPaginationLinkAsProperty unmarshals an instance of PaginationLink that is stored as a property
-// within the specified map.
-func UnmarshalPaginationLinkAsProperty(m map[string]interface{}, propertyName string) (result *PaginationLink, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'PaginationLink'", propertyName)
-			return
-		}
-		result, err = UnmarshalPaginationLink(objMap)
-	}
-	return
-}
-
-// UnmarshalPaginationLinkSliceAsProperty unmarshals a slice of PaginationLink instances that are stored as a property
-// within the specified map.
-func UnmarshalPaginationLinkSliceAsProperty(m map[string]interface{}, propertyName string) (slice []PaginationLink, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'PaginationLink'", propertyName)
-			return
-		}
-		slice, err = UnmarshalPaginationLinkSlice(vSlice)
-	}
-	return
-}
-
-// ResolutionCode : a resolution code.
-type ResolutionCode struct {
-	// the resolution code identifier.
-	ID *float64 `json:"id,omitempty"`
-
-	// the resolution code value.
-	Value *string `json:"value,omitempty"`
-}
-
-
-// UnmarshalResolutionCode constructs an instance of ResolutionCode from the specified map.
-func UnmarshalResolutionCode(m map[string]interface{}) (result *ResolutionCode, err error) {
-	obj := new(ResolutionCode)
-	obj.ID, err = core.UnmarshalFloat64(m, "id")
-	if err != nil {
-		return
-	}
-	obj.Value, err = core.UnmarshalString(m, "value")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalResolutionCodeSlice unmarshals a slice of ResolutionCode instances from the specified list of maps.
-func UnmarshalResolutionCodeSlice(s []interface{}) (slice []ResolutionCode, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'ResolutionCode'")
-			return
-		}
-		obj, e := UnmarshalResolutionCode(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalResolutionCodeAsProperty unmarshals an instance of ResolutionCode that is stored as a property
-// within the specified map.
-func UnmarshalResolutionCodeAsProperty(m map[string]interface{}, propertyName string) (result *ResolutionCode, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'ResolutionCode'", propertyName)
-			return
-		}
-		result, err = UnmarshalResolutionCode(objMap)
-	}
-	return
-}
-
-// UnmarshalResolutionCodeSliceAsProperty unmarshals a slice of ResolutionCode instances that are stored as a property
-// within the specified map.
-func UnmarshalResolutionCodeSliceAsProperty(m map[string]interface{}, propertyName string) (slice []ResolutionCode, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'ResolutionCode'", propertyName)
-			return
-		}
-		slice, err = UnmarshalResolutionCodeSlice(vSlice)
-	}
-	return
-}
-
-// ResolutionCodesResponse : the resolution codes returned by the `get_resolution_codes` operation.
-type ResolutionCodesResponse struct {
-	// the set of supported resolution codes.
-	ResolutionCodes []ResolutionCode `json:"resolution_codes,omitempty"`
-}
-
-
-// UnmarshalResolutionCodesResponse constructs an instance of ResolutionCodesResponse from the specified map.
-func UnmarshalResolutionCodesResponse(m map[string]interface{}) (result *ResolutionCodesResponse, err error) {
-	obj := new(ResolutionCodesResponse)
-	obj.ResolutionCodes, err = UnmarshalResolutionCodeSliceAsProperty(m, "resolution_codes")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalResolutionCodesResponseSlice unmarshals a slice of ResolutionCodesResponse instances from the specified list of maps.
-func UnmarshalResolutionCodesResponseSlice(s []interface{}) (slice []ResolutionCodesResponse, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'ResolutionCodesResponse'")
-			return
-		}
-		obj, e := UnmarshalResolutionCodesResponse(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalResolutionCodesResponseAsProperty unmarshals an instance of ResolutionCodesResponse that is stored as a property
-// within the specified map.
-func UnmarshalResolutionCodesResponseAsProperty(m map[string]interface{}, propertyName string) (result *ResolutionCodesResponse, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'ResolutionCodesResponse'", propertyName)
-			return
-		}
-		result, err = UnmarshalResolutionCodesResponse(objMap)
-	}
-	return
-}
-
-// UnmarshalResolutionCodesResponseSliceAsProperty unmarshals a slice of ResolutionCodesResponse instances that are stored as a property
-// within the specified map.
-func UnmarshalResolutionCodesResponseSliceAsProperty(m map[string]interface{}, propertyName string) (slice []ResolutionCodesResponse, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'ResolutionCodesResponse'", propertyName)
-			return
-		}
-		slice, err = UnmarshalResolutionCodesResponseSlice(vSlice)
-	}
-	return
-}
-
-// Resource : a resource associated with a case.
-type Resource struct {
-	// Cloud Resource Name of the resource.
-	Crn *string `json:"crn,omitempty"`
-
-	// Name of the resource.
-	Name *string `json:"name,omitempty"`
-
-	// Only used to attach Classic IaaS devices which have no CRN.
-	Type *string `json:"type,omitempty"`
-
-	// Only used to attach Classic IaaS devices which have no CRN. Id of Classic IaaS device.
-	ID *int64 `json:"id,omitempty"`
-
-	// A note about this resource.
-	Note *string `json:"note,omitempty"`
-}
-
-
-// UnmarshalResource constructs an instance of Resource from the specified map.
-func UnmarshalResource(m map[string]interface{}) (result *Resource, err error) {
-	obj := new(Resource)
-	obj.Crn, err = core.UnmarshalString(m, "crn")
-	if err != nil {
-		return
-	}
-	obj.Name, err = core.UnmarshalString(m, "name")
-	if err != nil {
-		return
-	}
-	obj.Type, err = core.UnmarshalString(m, "type")
-	if err != nil {
-		return
-	}
-	obj.ID, err = core.UnmarshalInt64(m, "id")
-	if err != nil {
-		return
-	}
-	obj.Note, err = core.UnmarshalString(m, "note")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalResourceSlice unmarshals a slice of Resource instances from the specified list of maps.
-func UnmarshalResourceSlice(s []interface{}) (slice []Resource, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'Resource'")
-			return
-		}
-		obj, e := UnmarshalResource(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalResourceAsProperty unmarshals an instance of Resource that is stored as a property
-// within the specified map.
-func UnmarshalResourceAsProperty(m map[string]interface{}, propertyName string) (result *Resource, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'Resource'", propertyName)
-			return
-		}
-		result, err = UnmarshalResource(objMap)
-	}
-	return
-}
-
-// UnmarshalResourceSliceAsProperty unmarshals a slice of Resource instances that are stored as a property
-// within the specified map.
-func UnmarshalResourceSliceAsProperty(m map[string]interface{}, propertyName string) (slice []Resource, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'Resource'", propertyName)
-			return
-		}
-		slice, err = UnmarshalResourceSlice(vSlice)
-	}
-	return
-}
-
-// Status : A status value used in case filtering.
-type Status struct {
-	// the status identifier.
-	ID *string `json:"id,omitempty"`
-
-	// the status description.
-	Description *string `json:"description,omitempty"`
-}
-
-
-// UnmarshalStatus constructs an instance of Status from the specified map.
-func UnmarshalStatus(m map[string]interface{}) (result *Status, err error) {
-	obj := new(Status)
-	obj.ID, err = core.UnmarshalString(m, "id")
-	if err != nil {
-		return
-	}
-	obj.Description, err = core.UnmarshalString(m, "description")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalStatusSlice unmarshals a slice of Status instances from the specified list of maps.
-func UnmarshalStatusSlice(s []interface{}) (slice []Status, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'Status'")
-			return
-		}
-		obj, e := UnmarshalStatus(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalStatusAsProperty unmarshals an instance of Status that is stored as a property
-// within the specified map.
-func UnmarshalStatusAsProperty(m map[string]interface{}, propertyName string) (result *Status, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'Status'", propertyName)
-			return
-		}
-		result, err = UnmarshalStatus(objMap)
-	}
-	return
-}
-
-// UnmarshalStatusSliceAsProperty unmarshals a slice of Status instances that are stored as a property
-// within the specified map.
-func UnmarshalStatusSliceAsProperty(m map[string]interface{}, propertyName string) (slice []Status, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'Status'", propertyName)
-			return
-		}
-		slice, err = UnmarshalStatusSlice(vSlice)
-	}
-	return
-}
-
-// StatusesResponse : a collection of status values used in case filtering.
-type StatusesResponse struct {
-	// the list of status values used incase filtering.
-	Statuses []Status `json:"statuses,omitempty"`
-}
-
-
-// UnmarshalStatusesResponse constructs an instance of StatusesResponse from the specified map.
-func UnmarshalStatusesResponse(m map[string]interface{}) (result *StatusesResponse, err error) {
-	obj := new(StatusesResponse)
-	obj.Statuses, err = UnmarshalStatusSliceAsProperty(m, "statuses")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalStatusesResponseSlice unmarshals a slice of StatusesResponse instances from the specified list of maps.
-func UnmarshalStatusesResponseSlice(s []interface{}) (slice []StatusesResponse, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'StatusesResponse'")
-			return
-		}
-		obj, e := UnmarshalStatusesResponse(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalStatusesResponseAsProperty unmarshals an instance of StatusesResponse that is stored as a property
-// within the specified map.
-func UnmarshalStatusesResponseAsProperty(m map[string]interface{}, propertyName string) (result *StatusesResponse, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'StatusesResponse'", propertyName)
-			return
-		}
-		result, err = UnmarshalStatusesResponse(objMap)
-	}
-	return
-}
-
-// UnmarshalStatusesResponseSliceAsProperty unmarshals a slice of StatusesResponse instances that are stored as a property
-// within the specified map.
-func UnmarshalStatusesResponseSliceAsProperty(m map[string]interface{}, propertyName string) (slice []StatusesResponse, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'StatusesResponse'", propertyName)
-			return
-		}
-		slice, err = UnmarshalStatusesResponseSlice(vSlice)
-	}
-	return
-}
-
-// TechnicalOfferingsResponse : the response for the `get_technical_offerings` operation.
-type TechnicalOfferingsResponse struct {
-	// a list of offerings.
-	Offerings []OfferingItem `json:"offerings,omitempty"`
-}
-
-
-// UnmarshalTechnicalOfferingsResponse constructs an instance of TechnicalOfferingsResponse from the specified map.
-func UnmarshalTechnicalOfferingsResponse(m map[string]interface{}) (result *TechnicalOfferingsResponse, err error) {
-	obj := new(TechnicalOfferingsResponse)
-	obj.Offerings, err = UnmarshalOfferingItemSliceAsProperty(m, "offerings")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalTechnicalOfferingsResponseSlice unmarshals a slice of TechnicalOfferingsResponse instances from the specified list of maps.
-func UnmarshalTechnicalOfferingsResponseSlice(s []interface{}) (slice []TechnicalOfferingsResponse, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'TechnicalOfferingsResponse'")
-			return
-		}
-		obj, e := UnmarshalTechnicalOfferingsResponse(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalTechnicalOfferingsResponseAsProperty unmarshals an instance of TechnicalOfferingsResponse that is stored as a property
-// within the specified map.
-func UnmarshalTechnicalOfferingsResponseAsProperty(m map[string]interface{}, propertyName string) (result *TechnicalOfferingsResponse, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'TechnicalOfferingsResponse'", propertyName)
-			return
-		}
-		result, err = UnmarshalTechnicalOfferingsResponse(objMap)
-	}
-	return
-}
-
-// UnmarshalTechnicalOfferingsResponseSliceAsProperty unmarshals a slice of TechnicalOfferingsResponse instances that are stored as a property
-// within the specified map.
-func UnmarshalTechnicalOfferingsResponseSliceAsProperty(m map[string]interface{}, propertyName string) (slice []TechnicalOfferingsResponse, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'TechnicalOfferingsResponse'", propertyName)
-			return
-		}
-		slice, err = UnmarshalTechnicalOfferingsResponseSlice(vSlice)
-	}
-	return
-}
-
-// User : information related to a user.
-type User struct {
-	// Full name of the user.
-	Name *string `json:"name,omitempty"`
-
-	// the ID realm.
-	Realm *string `json:"realm,omitempty"`
-
-	// unique user ID in the realm specified by the type.
-	UserID *string `json:"user_id,omitempty"`
-}
-
-// Constants associated with the User.Realm property.
-// the ID realm.
-const (
-	User_Realm_Bss = "BSS"
-	User_Realm_Ibmid = "IBMid"
-	User_Realm_Sl = "SL"
-)
-
-
-// UnmarshalUser constructs an instance of User from the specified map.
-func UnmarshalUser(m map[string]interface{}) (result *User, err error) {
-	obj := new(User)
-	obj.Name, err = core.UnmarshalString(m, "name")
-	if err != nil {
-		return
-	}
-	obj.Realm, err = core.UnmarshalString(m, "realm")
-	if err != nil {
-		return
-	}
-	obj.UserID, err = core.UnmarshalString(m, "user_id")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalUserSlice unmarshals a slice of User instances from the specified list of maps.
-func UnmarshalUserSlice(s []interface{}) (slice []User, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'User'")
-			return
-		}
-		obj, e := UnmarshalUser(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalUserAsProperty unmarshals an instance of User that is stored as a property
-// within the specified map.
-func UnmarshalUserAsProperty(m map[string]interface{}, propertyName string) (result *User, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'User'", propertyName)
-			return
-		}
-		result, err = UnmarshalUser(objMap)
-	}
-	return
-}
-
-// UnmarshalUserSliceAsProperty unmarshals a slice of User instances that are stored as a property
-// within the specified map.
-func UnmarshalUserSliceAsProperty(m map[string]interface{}, propertyName string) (slice []User, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'User'", propertyName)
-			return
-		}
-		slice, err = UnmarshalUserSlice(vSlice)
-	}
-	return
-}
-
-// UserIdAndRealm : information related to a user.
-type UserIdAndRealm struct {
-	// the ID realm.
-	Realm *string `json:"realm" validate:"required"`
-
-	// unique user ID in the realm specified by the type.
-	UserID *string `json:"user_id" validate:"required"`
-}
-
-// Constants associated with the UserIdAndRealm.Realm property.
-// the ID realm.
-const (
-	UserIdAndRealm_Realm_Bss = "BSS"
-	UserIdAndRealm_Realm_Ibmid = "IBMid"
-	UserIdAndRealm_Realm_Sl = "SL"
-)
-
-
-// NewUserIdAndRealm : Instantiate UserIdAndRealm (Generic Model Constructor)
-func (*CaseManagementV1) NewUserIdAndRealm(realm string, userID string) (model *UserIdAndRealm, err error) {
-	model = &UserIdAndRealm{
-		Realm: core.StringPtr(realm),
-		UserID: core.StringPtr(userID),
-	}
-	err = core.ValidateStruct(model, "required parameters")
-	return
-}
-
-// UnmarshalUserIdAndRealm constructs an instance of UserIdAndRealm from the specified map.
-func UnmarshalUserIdAndRealm(m map[string]interface{}) (result *UserIdAndRealm, err error) {
-	obj := new(UserIdAndRealm)
-	obj.Realm, err = core.UnmarshalString(m, "realm")
-	if err != nil {
-		return
-	}
-	obj.UserID, err = core.UnmarshalString(m, "user_id")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalUserIdAndRealmSlice unmarshals a slice of UserIdAndRealm instances from the specified list of maps.
-func UnmarshalUserIdAndRealmSlice(s []interface{}) (slice []UserIdAndRealm, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'UserIdAndRealm'")
-			return
-		}
-		obj, e := UnmarshalUserIdAndRealm(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalUserIdAndRealmAsProperty unmarshals an instance of UserIdAndRealm that is stored as a property
-// within the specified map.
-func UnmarshalUserIdAndRealmAsProperty(m map[string]interface{}, propertyName string) (result *UserIdAndRealm, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'UserIdAndRealm'", propertyName)
-			return
-		}
-		result, err = UnmarshalUserIdAndRealm(objMap)
-	}
-	return
-}
-
-// UnmarshalUserIdAndRealmSliceAsProperty unmarshals a slice of UserIdAndRealm instances that are stored as a property
-// within the specified map.
-func UnmarshalUserIdAndRealmSliceAsProperty(m map[string]interface{}, propertyName string) (slice []UserIdAndRealm, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'UserIdAndRealm'", propertyName)
-			return
-		}
-		slice, err = UnmarshalUserIdAndRealmSlice(vSlice)
-	}
-	return
-}
diff --git a/casemanagementv1/case_management_v1_suite_test.go b/casemanagementv1/case_management_v1_suite_test.go
deleted file mode 100644
index 2e471b74..00000000
--- a/casemanagementv1/case_management_v1_suite_test.go
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * (C) Copyright IBM Corp. 2020.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package casemanagementv1_test
-
-import (
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-	"testing"
-)
-
-func TestCaseManagementV1(t *testing.T) {
-	RegisterFailHandler(Fail)
-	RunSpecs(t, "CaseManagementV1 Suite")
-}
diff --git a/casemanagementv1/case_management_v1_test.go b/casemanagementv1/case_management_v1_test.go
deleted file mode 100644
index cbc0adae..00000000
--- a/casemanagementv1/case_management_v1_test.go
+++ /dev/null
@@ -1,881 +0,0 @@
-/**
- * (C) Copyright IBM Corp. 2020.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package casemanagementv1_test
-
-import (
-	"bytes"
-	"fmt"
-	"github.com/IBM/go-sdk-core/v3/core"
-	"github.com/go-openapi/strfmt"
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-	"github.ibm.com/ibmcloud/platform-services-go-sdk/casemanagementv1"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"net/http/httptest"
-	"time"
-)
-
-var _ = Describe(`CaseManagementV1`, func() {
-	Describe(`GetCases(getCasesOptions *GetCasesOptions)`, func() {
-		bearerToken := "0ui9876453"
-		getCasesPath := "/case-management/v1/cases"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(getCasesPath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				Expect(req.URL.Query()["offset"]).To(Equal([]string{fmt.Sprint(int64(38))}))
-
-				Expect(req.URL.Query()["limit"]).To(Equal([]string{fmt.Sprint(int64(38))}))
-
-				Expect(req.URL.Query()["search"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["sort"]).To(Equal([]string{"number"}))
-
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"total_count": 10, "first": {"href": "Href"}, "next": {"href": "Href"}, "previous": {"href": "Href"}, "last": {"href": "Href"}, "cases": [{"number": "Number", "short_escription": "ShortEscription", "description": "Description", "created_at": "CreatedAt", "created_by": {"name": "Name", "realm": "IBMid", "user_id": "abc@ibm.com"}, "updated_at": "UpdatedAt", "updated_by": {"name": "Name", "realm": "IBMid", "user_id": "abc@ibm.com"}, "contact_type": "Cloud Support Center", "contact": {"name": "Name", "realm": "IBMid", "user_id": "abc@ibm.com"}, "status": "Status", "severity": 8, "support_tier": "Free", "resolution": "Resolution", "close_notes": "CloseNotes", "eu": {"support": false, "data_center": "DataCenter"}, "watchlist": [{"name": "Name", "realm": "IBMid", "user_id": "abc@ibm.com"}], "attachments": [{"id": "ID", "filename": "Filename", "size_in_bytes": 11, "created_at": "CreatedAt", "url": "URL"}], "offering": {"id": "ID", "value": "Value"}, "resources": [{"crn": "Crn", "name": "Name", "type": "Type", "id": 2, "note": "Note"}], "comments": [{"value": "Value", "added_at": "AddedAt", "added_by": {"name": "Name", "realm": "IBMid", "user_id": "abc@ibm.com"}}]}]}`)
-			}))
-			It(`Invoke GetCases successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := casemanagementv1.NewCaseManagementV1(&casemanagementv1.CaseManagementV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.GetCases(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the GetCasesOptions model
-				getCasesOptionsModel := new(casemanagementv1.GetCasesOptions)
-				getCasesOptionsModel.Offset = core.Int64Ptr(int64(38))
-				getCasesOptionsModel.Limit = core.Int64Ptr(int64(38))
-				getCasesOptionsModel.Search = core.StringPtr("testString")
-				getCasesOptionsModel.Sort = core.StringPtr("number")
-				getCasesOptionsModel.Status = []string{"new"}
-				getCasesOptionsModel.Fields = []string{"number"}
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.GetCases(getCasesOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`CreateCase(createCaseOptions *CreateCaseOptions)`, func() {
-		bearerToken := "0ui9876453"
-		createCasePath := "/case-management/v1/cases"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(createCasePath))
-				Expect(req.Method).To(Equal("POST"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"number": "Number", "short_escription": "ShortEscription", "description": "Description", "created_at": "CreatedAt", "created_by": {"name": "Name", "realm": "IBMid", "user_id": "abc@ibm.com"}, "updated_at": "UpdatedAt", "updated_by": {"name": "Name", "realm": "IBMid", "user_id": "abc@ibm.com"}, "contact_type": "Cloud Support Center", "contact": {"name": "Name", "realm": "IBMid", "user_id": "abc@ibm.com"}, "status": "Status", "severity": 8, "support_tier": "Free", "resolution": "Resolution", "close_notes": "CloseNotes", "eu": {"support": false, "data_center": "DataCenter"}, "watchlist": [{"name": "Name", "realm": "IBMid", "user_id": "abc@ibm.com"}], "attachments": [{"id": "ID", "filename": "Filename", "size_in_bytes": 11, "created_at": "CreatedAt", "url": "URL"}], "offering": {"id": "ID", "value": "Value"}, "resources": [{"crn": "Crn", "name": "Name", "type": "Type", "id": 2, "note": "Note"}], "comments": [{"value": "Value", "added_at": "AddedAt", "added_by": {"name": "Name", "realm": "IBMid", "user_id": "abc@ibm.com"}}]}`)
-			}))
-			It(`Invoke CreateCase successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := casemanagementv1.NewCaseManagementV1(&casemanagementv1.CaseManagementV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.CreateCase(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the OfferingPayloadType model
-				offeringPayloadTypeModel := new(casemanagementv1.OfferingPayloadType)
-				offeringPayloadTypeModel.Group = core.StringPtr("crn_service_name")
-				offeringPayloadTypeModel.Key = core.StringPtr("testString")
-				offeringPayloadTypeModel.ID = core.StringPtr("testString")
-				offeringPayloadTypeModel.Kind = core.StringPtr("testString")
-
-				// Construct an instance of the EuPayload model
-				euPayloadModel := new(casemanagementv1.EuPayload)
-				euPayloadModel.Supported = core.BoolPtr(true)
-				euPayloadModel.DataCenter = core.Int64Ptr(int64(38))
-
-				// Construct an instance of the OfferingPayload model
-				offeringPayloadModel := new(casemanagementv1.OfferingPayload)
-				offeringPayloadModel.Name = core.StringPtr("testString")
-				offeringPayloadModel.Type = offeringPayloadTypeModel
-
-				// Construct an instance of the Resource model
-				resourceModel := new(casemanagementv1.Resource)
-				resourceModel.Crn = core.StringPtr("testString")
-				resourceModel.Name = core.StringPtr("testString")
-				resourceModel.Type = core.StringPtr("testString")
-				resourceModel.ID = core.Int64Ptr(int64(38))
-				resourceModel.Note = core.StringPtr("testString")
-
-				// Construct an instance of the User model
-				userModel := new(casemanagementv1.User)
-				userModel.Name = core.StringPtr("testString")
-				userModel.Realm = core.StringPtr("IBMid")
-				userModel.UserID = core.StringPtr("abc@ibm.com")
-
-				// Construct an instance of the CreateCaseOptions model
-				createCaseOptionsModel := new(casemanagementv1.CreateCaseOptions)
-				createCaseOptionsModel.Type = core.StringPtr("technical")
-				createCaseOptionsModel.Subject = core.StringPtr("testString")
-				createCaseOptionsModel.Description = core.StringPtr("testString")
-				createCaseOptionsModel.Severity = core.Int64Ptr(int64(1))
-				createCaseOptionsModel.Eu = euPayloadModel
-				createCaseOptionsModel.Offering = offeringPayloadModel
-				createCaseOptionsModel.Resources = []casemanagementv1.Resource{*resourceModel}
-				createCaseOptionsModel.Watchlist = []casemanagementv1.User{*userModel}
-				createCaseOptionsModel.InvoiceNumber = core.StringPtr("testString")
-				createCaseOptionsModel.SlaCreditRequest = core.BoolPtr(true)
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.CreateCase(createCaseOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`GetCase(getCaseOptions *GetCaseOptions)`, func() {
-		bearerToken := "0ui9876453"
-		getCasePath := "/case-management/v1/cases/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(getCasePath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"number": "Number", "short_escription": "ShortEscription", "description": "Description", "created_at": "CreatedAt", "created_by": {"name": "Name", "realm": "IBMid", "user_id": "abc@ibm.com"}, "updated_at": "UpdatedAt", "updated_by": {"name": "Name", "realm": "IBMid", "user_id": "abc@ibm.com"}, "contact_type": "Cloud Support Center", "contact": {"name": "Name", "realm": "IBMid", "user_id": "abc@ibm.com"}, "status": "Status", "severity": 8, "support_tier": "Free", "resolution": "Resolution", "close_notes": "CloseNotes", "eu": {"support": false, "data_center": "DataCenter"}, "watchlist": [{"name": "Name", "realm": "IBMid", "user_id": "abc@ibm.com"}], "attachments": [{"id": "ID", "filename": "Filename", "size_in_bytes": 11, "created_at": "CreatedAt", "url": "URL"}], "offering": {"id": "ID", "value": "Value"}, "resources": [{"crn": "Crn", "name": "Name", "type": "Type", "id": 2, "note": "Note"}], "comments": [{"value": "Value", "added_at": "AddedAt", "added_by": {"name": "Name", "realm": "IBMid", "user_id": "abc@ibm.com"}}]}`)
-			}))
-			It(`Invoke GetCase successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := casemanagementv1.NewCaseManagementV1(&casemanagementv1.CaseManagementV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.GetCase(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the GetCaseOptions model
-				getCaseOptionsModel := new(casemanagementv1.GetCaseOptions)
-				getCaseOptionsModel.CaseNumber = core.StringPtr("testString")
-				getCaseOptionsModel.Fields = []string{"testString"}
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.GetCase(getCaseOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`UpdateCaseStatus(updateCaseStatusOptions *UpdateCaseStatusOptions)`, func() {
-		bearerToken := "0ui9876453"
-		updateCaseStatusPath := "/case-management/v1/cases/testString/status"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(updateCaseStatusPath))
-				Expect(req.Method).To(Equal("PUT"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"number": "Number", "short_escription": "ShortEscription", "description": "Description", "created_at": "CreatedAt", "created_by": {"name": "Name", "realm": "IBMid", "user_id": "abc@ibm.com"}, "updated_at": "UpdatedAt", "updated_by": {"name": "Name", "realm": "IBMid", "user_id": "abc@ibm.com"}, "contact_type": "Cloud Support Center", "contact": {"name": "Name", "realm": "IBMid", "user_id": "abc@ibm.com"}, "status": "Status", "severity": 8, "support_tier": "Free", "resolution": "Resolution", "close_notes": "CloseNotes", "eu": {"support": false, "data_center": "DataCenter"}, "watchlist": [{"name": "Name", "realm": "IBMid", "user_id": "abc@ibm.com"}], "attachments": [{"id": "ID", "filename": "Filename", "size_in_bytes": 11, "created_at": "CreatedAt", "url": "URL"}], "offering": {"id": "ID", "value": "Value"}, "resources": [{"crn": "Crn", "name": "Name", "type": "Type", "id": 2, "note": "Note"}], "comments": [{"value": "Value", "added_at": "AddedAt", "added_by": {"name": "Name", "realm": "IBMid", "user_id": "abc@ibm.com"}}]}`)
-			}))
-			It(`Invoke UpdateCaseStatus successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := casemanagementv1.NewCaseManagementV1(&casemanagementv1.CaseManagementV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.UpdateCaseStatus(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the UpdateCaseStatusOptions model
-				updateCaseStatusOptionsModel := new(casemanagementv1.UpdateCaseStatusOptions)
-				updateCaseStatusOptionsModel.CaseNumber = core.StringPtr("testString")
-				updateCaseStatusOptionsModel.Action = core.StringPtr("resolve")
-				updateCaseStatusOptionsModel.Comment = core.StringPtr("testString")
-				updateCaseStatusOptionsModel.ResolutionCode = core.Int64Ptr(int64(1))
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.UpdateCaseStatus(updateCaseStatusOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`AddComment(addCommentOptions *AddCommentOptions)`, func() {
-		bearerToken := "0ui9876453"
-		addCommentPath := "/case-management/v1/cases/testString/comments"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(addCommentPath))
-				Expect(req.Method).To(Equal("PUT"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"value": "Value", "added_at": "AddedAt", "added_by": {"name": "Name", "realm": "IBMid", "user_id": "abc@ibm.com"}}`)
-			}))
-			It(`Invoke AddComment successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := casemanagementv1.NewCaseManagementV1(&casemanagementv1.CaseManagementV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.AddComment(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the AddCommentOptions model
-				addCommentOptionsModel := new(casemanagementv1.AddCommentOptions)
-				addCommentOptionsModel.CaseNumber = core.StringPtr("testString")
-				addCommentOptionsModel.Comment = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.AddComment(addCommentOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`AddWatchlist(addWatchlistOptions *AddWatchlistOptions)`, func() {
-		bearerToken := "0ui9876453"
-		addWatchlistPath := "/case-management/v1/cases/testString/watchlist"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(addWatchlistPath))
-				Expect(req.Method).To(Equal("PUT"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"added": [{"name": "Name", "realm": "IBMid", "user_id": "abc@ibm.com"}], "failed": [{"name": "Name", "realm": "IBMid", "user_id": "abc@ibm.com"}]}`)
-			}))
-			It(`Invoke AddWatchlist successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := casemanagementv1.NewCaseManagementV1(&casemanagementv1.CaseManagementV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.AddWatchlist(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the UserIdAndRealm model
-				userIdAndRealmModel := new(casemanagementv1.UserIdAndRealm)
-				userIdAndRealmModel.Realm = core.StringPtr("IBMid")
-				userIdAndRealmModel.UserID = core.StringPtr("testString")
-
-				// Construct an instance of the AddWatchlistOptions model
-				addWatchlistOptionsModel := new(casemanagementv1.AddWatchlistOptions)
-				addWatchlistOptionsModel.CaseNumber = core.StringPtr("testString")
-				addWatchlistOptionsModel.Watchlist = []casemanagementv1.UserIdAndRealm{*userIdAndRealmModel}
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.AddWatchlist(addWatchlistOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`RemoveWatchlist(removeWatchlistOptions *RemoveWatchlistOptions)`, func() {
-		bearerToken := "0ui9876453"
-		removeWatchlistPath := "/case-management/v1/cases/testString/watchlist"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(removeWatchlistPath))
-				Expect(req.Method).To(Equal("DELETE"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `[{}]`)
-			}))
-			It(`Invoke RemoveWatchlist successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := casemanagementv1.NewCaseManagementV1(&casemanagementv1.CaseManagementV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.RemoveWatchlist(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the UserIdAndRealm model
-				userIdAndRealmModel := new(casemanagementv1.UserIdAndRealm)
-				userIdAndRealmModel.Realm = core.StringPtr("IBMid")
-				userIdAndRealmModel.UserID = core.StringPtr("testString")
-
-				// Construct an instance of the RemoveWatchlistOptions model
-				removeWatchlistOptionsModel := new(casemanagementv1.RemoveWatchlistOptions)
-				removeWatchlistOptionsModel.CaseNumber = core.StringPtr("testString")
-				removeWatchlistOptionsModel.Watchlist = []casemanagementv1.UserIdAndRealm{*userIdAndRealmModel}
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.RemoveWatchlist(removeWatchlistOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`AddResource(addResourceOptions *AddResourceOptions)`, func() {
-		bearerToken := "0ui9876453"
-		addResourcePath := "/case-management/v1/cases/testString/resources"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(addResourcePath))
-				Expect(req.Method).To(Equal("PUT"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"crn": "Crn", "name": "Name", "type": "Type", "id": 2, "note": "Note"}`)
-			}))
-			It(`Invoke AddResource successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := casemanagementv1.NewCaseManagementV1(&casemanagementv1.CaseManagementV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.AddResource(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the AddResourceOptions model
-				addResourceOptionsModel := new(casemanagementv1.AddResourceOptions)
-				addResourceOptionsModel.CaseNumber = core.StringPtr("testString")
-				addResourceOptionsModel.Crn = core.StringPtr("testString")
-				addResourceOptionsModel.Name = core.StringPtr("testString")
-				addResourceOptionsModel.Type = core.StringPtr("testString")
-				addResourceOptionsModel.ID = core.Int64Ptr(int64(38))
-				addResourceOptionsModel.Note = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.AddResource(addResourceOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`UploadFile(uploadFileOptions *UploadFileOptions)`, func() {
-		bearerToken := "0ui9876453"
-		uploadFilePath := "/case-management/v1/cases/testString/attachments"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(uploadFilePath))
-				Expect(req.Method).To(Equal("PUT"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"id": "ID", "filename": "Filename", "size_in_bytes": 11, "created_at": "CreatedAt", "url": "URL"}`)
-			}))
-			It(`Invoke UploadFile successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := casemanagementv1.NewCaseManagementV1(&casemanagementv1.CaseManagementV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.UploadFile(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the UploadFileOptions model
-				uploadFileOptionsModel := new(casemanagementv1.UploadFileOptions)
-				uploadFileOptionsModel.CaseNumber = core.StringPtr("testString")
-				uploadFileOptionsModel.File = CreateMockReader("This is a mock file.")
-				uploadFileOptionsModel.FileContentType = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.UploadFile(uploadFileOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`DownloadFile(downloadFileOptions *DownloadFileOptions)`, func() {
-		bearerToken := "0ui9876453"
-		downloadFilePath := "/case-management/v1/cases/testString/attachments/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(downloadFilePath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.Header().Set("Content-type", "application/octet-stream")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `Contents of response byte-stream...`)
-			}))
-			It(`Invoke DownloadFile successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := casemanagementv1.NewCaseManagementV1(&casemanagementv1.CaseManagementV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.DownloadFile(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the DownloadFileOptions model
-				downloadFileOptionsModel := new(casemanagementv1.DownloadFileOptions)
-				downloadFileOptionsModel.CaseNumber = core.StringPtr("testString")
-				downloadFileOptionsModel.FileID = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.DownloadFile(downloadFileOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`DeleteFile(deleteFileOptions *DeleteFileOptions)`, func() {
-		bearerToken := "0ui9876453"
-		deleteFilePath := "/case-management/v1/cases/testString/attachments/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(deleteFilePath))
-				Expect(req.Method).To(Equal("DELETE"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"attachments": [{"id": "ID", "filename": "Filename", "size_in_bytes": 11, "created_at": "CreatedAt", "url": "URL"}]}`)
-			}))
-			It(`Invoke DeleteFile successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := casemanagementv1.NewCaseManagementV1(&casemanagementv1.CaseManagementV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.DeleteFile(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the DeleteFileOptions model
-				deleteFileOptionsModel := new(casemanagementv1.DeleteFileOptions)
-				deleteFileOptionsModel.CaseNumber = core.StringPtr("testString")
-				deleteFileOptionsModel.FileID = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.DeleteFile(deleteFileOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`GetEUSupport(getEUSupportOptions *GetEUSupportOptions)`, func() {
-		bearerToken := "0ui9876453"
-		getEuSupportPath := "/case-management/utilities/v1/eu-support"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(getEuSupportPath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"property": "supported", "values": [{"anyKey": "anyValue"}]}`)
-			}))
-			It(`Invoke GetEUSupport successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := casemanagementv1.NewCaseManagementV1(&casemanagementv1.CaseManagementV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.GetEUSupport(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the GetEUSupportOptions model
-				getEuSupportOptionsModel := new(casemanagementv1.GetEUSupportOptions)
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.GetEUSupport(getEuSupportOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`GetTechnicalOfferings(getTechnicalOfferingsOptions *GetTechnicalOfferingsOptions)`, func() {
-		bearerToken := "0ui9876453"
-		getTechnicalOfferingsPath := "/case-management/utilities/v1/offerings/technical"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(getTechnicalOfferingsPath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"offerings": [{"name": "Name", "type": {"group": "crn_service_name", "key": "Key"}}]}`)
-			}))
-			It(`Invoke GetTechnicalOfferings successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := casemanagementv1.NewCaseManagementV1(&casemanagementv1.CaseManagementV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.GetTechnicalOfferings(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the GetTechnicalOfferingsOptions model
-				getTechnicalOfferingsOptionsModel := new(casemanagementv1.GetTechnicalOfferingsOptions)
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.GetTechnicalOfferings(getTechnicalOfferingsOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`GetResolutionCodes(getResolutionCodesOptions *GetResolutionCodesOptions)`, func() {
-		bearerToken := "0ui9876453"
-		getResolutionCodesPath := "/case-management/utilities/v1/constants/resolution-codes"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(getResolutionCodesPath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"resolution_codes": [{"id": 2, "value": "Value"}]}`)
-			}))
-			It(`Invoke GetResolutionCodes successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := casemanagementv1.NewCaseManagementV1(&casemanagementv1.CaseManagementV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.GetResolutionCodes(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the GetResolutionCodesOptions model
-				getResolutionCodesOptionsModel := new(casemanagementv1.GetResolutionCodesOptions)
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.GetResolutionCodes(getResolutionCodesOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`GetStatuses(getStatusesOptions *GetStatusesOptions)`, func() {
-		bearerToken := "0ui9876453"
-		getStatusesPath := "/case-management/utilities/v1/constants/statuses"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(getStatusesPath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"statuses": [{"id": "ID", "description": "Description"}]}`)
-			}))
-			It(`Invoke GetStatuses successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := casemanagementv1.NewCaseManagementV1(&casemanagementv1.CaseManagementV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.GetStatuses(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the GetStatusesOptions model
-				getStatusesOptionsModel := new(casemanagementv1.GetStatusesOptions)
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.GetStatuses(getStatusesOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`Model constructor tests`, func() {
-		Context(`Using a sample service client instance`, func() {
-			testService, _ := casemanagementv1.NewCaseManagementV1(&casemanagementv1.CaseManagementV1Options{
-				URL:           "http://casemanagementv1modelgenerator.com",
-				Authenticator: &core.NoAuthAuthenticator{},
-			})
-			It(`Invoke NewOfferingPayload successfully`, func() {
-				name := "testString"
-				var typeVar *casemanagementv1.OfferingPayloadType = nil
-				_, err := testService.NewOfferingPayload(name, typeVar)
-				Expect(err).ToNot(BeNil())
-			})
-			It(`Invoke NewUserIdAndRealm successfully`, func() {
-				realm := "IBMid"
-				userID := "testString"
-				model, err := testService.NewUserIdAndRealm(realm, userID)
-				Expect(model).ToNot(BeNil())
-				Expect(err).To(BeNil())
-			})
-		})
-	})
-	Describe(`Utility function tests`, func() {
-		It(`Invoke CreateMockMap() successfully`, func() {
-			mockMap := CreateMockMap()
-			Expect(mockMap).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockByteArray() successfully`, func() {
-			mockByteArray := CreateMockByteArray("This is a test")
-			Expect(mockByteArray).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockUUID() successfully`, func() {
-			mockUUID := CreateMockUUID("9fab83da-98cb-4f18-a7ba-b6f0435c9673")
-			Expect(mockUUID).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockReader() successfully`, func() {
-			mockReader := CreateMockReader("This is a test.")
-			Expect(mockReader).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockDate() successfully`, func() {
-			mockDate := CreateMockDate()
-			Expect(mockDate).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockDateTime() successfully`, func() {
-			mockDateTime := CreateMockDateTime()
-			Expect(mockDateTime).ToNot(BeNil())
-		})
-	})
-})
-
-//
-// Utility functions used by the generated test code
-//
-
-func CreateMockMap() map[string]interface{} {
-	m := make(map[string]interface{})
-	return m
-}
-
-func CreateMockByteArray(mockData string) *[]byte {
-	ba := make([]byte, len(mockData))
-	ba = append(ba, mockData...)
-	return &ba
-}
-
-func CreateMockUUID(mockData string) *strfmt.UUID {
-	uuid := strfmt.UUID(mockData)
-	return &uuid
-}
-
-func CreateMockReader(mockData string) io.ReadCloser {
-	return ioutil.NopCloser(bytes.NewReader([]byte(mockData)))
-}
-
-func CreateMockDate() *strfmt.Date {
-	d := strfmt.Date(time.Now())
-	return &d
-}
-
-func CreateMockDateTime() *strfmt.DateTime {
-	d := strfmt.DateTime(time.Now())
-	return &d
-}
diff --git a/common/headers.go b/common/headers.go
index 40e346dc..44afd10c 100644
--- a/common/headers.go
+++ b/common/headers.go
@@ -1,5 +1,5 @@
 /**
- * (C) Copyright IBM Corp. 2019.
+ * (C) Copyright IBM Corp. 2020.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/common/headers_test.go b/common/headers_test.go
index 305e90b7..7043b858 100644
--- a/common/headers_test.go
+++ b/common/headers_test.go
@@ -1,5 +1,5 @@
 /**
- * (C) Copyright IBM Corp. 2019.
+ * (C) Copyright IBM Corp. 2020.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/common/version.go b/common/version.go
index fc688588..f843f162 100644
--- a/common/version.go
+++ b/common/version.go
@@ -1,5 +1,5 @@
 /**
- * (C) Copyright IBM Corp. 2019.
+ * (C) Copyright IBM Corp. 2020.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,4 +17,4 @@
 package common
 
 // Version of the SDK
-const Version = "0.4.0"
+const Version = "0.0.0"
diff --git a/enterprisebillingunitsv1/enterprise_billing_units_v1.go b/enterprisebillingunitsv1/enterprise_billing_units_v1.go
deleted file mode 100644
index 3bdab21e..00000000
--- a/enterprisebillingunitsv1/enterprise_billing_units_v1.go
+++ /dev/null
@@ -1,1188 +0,0 @@
-/**
- * (C) Copyright IBM Corp. 2020.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// Package enterprisebillingunitsv1 : Operations and models for the EnterpriseBillingUnitsV1 service
-package enterprisebillingunitsv1
-
-import (
-	"fmt"
-	"github.com/IBM/go-sdk-core/v3/core"
-	common "github.ibm.com/ibmcloud/platform-services-go-sdk/common"
-)
-
-// EnterpriseBillingUnitsV1 : Billing units for IBM Cloud enterprises
-//
-// Version: 1.0.0
-type EnterpriseBillingUnitsV1 struct {
-	Service *core.BaseService
-}
-
-// DefaultServiceURL is the default URL to make service requests to.
-const DefaultServiceURL = "https://billing.cloud.ibm.com"
-
-// DefaultServiceName is the default key used to find external configuration information.
-const DefaultServiceName = "enterprise_billing_units"
-
-// EnterpriseBillingUnitsV1Options : Service options
-type EnterpriseBillingUnitsV1Options struct {
-	ServiceName   string
-	URL           string
-	Authenticator core.Authenticator
-}
-
-// NewEnterpriseBillingUnitsV1UsingExternalConfig : constructs an instance of EnterpriseBillingUnitsV1 with passed in options and external configuration.
-func NewEnterpriseBillingUnitsV1UsingExternalConfig(options *EnterpriseBillingUnitsV1Options) (enterpriseBillingUnits *EnterpriseBillingUnitsV1, err error) {
-	if options.ServiceName == "" {
-		options.ServiceName = DefaultServiceName
-	}
-
-	if options.Authenticator == nil {
-		options.Authenticator, err = core.GetAuthenticatorFromEnvironment(options.ServiceName)
-		if err != nil {
-			return
-		}
-	}
-
-	enterpriseBillingUnits, err = NewEnterpriseBillingUnitsV1(options)
-	if err != nil {
-		return
-	}
-
-	err = enterpriseBillingUnits.Service.ConfigureService(options.ServiceName)
-	if err != nil {
-		return
-	}
-
-	if options.URL != "" {
-		err = enterpriseBillingUnits.Service.SetServiceURL(options.URL)
-	}
-	return
-}
-
-// NewEnterpriseBillingUnitsV1 : constructs an instance of EnterpriseBillingUnitsV1 with passed in options.
-func NewEnterpriseBillingUnitsV1(options *EnterpriseBillingUnitsV1Options) (service *EnterpriseBillingUnitsV1, err error) {
-	serviceOptions := &core.ServiceOptions{
-		URL:           DefaultServiceURL,
-		Authenticator: options.Authenticator,
-	}
-
-	baseService, err := core.NewBaseService(serviceOptions)
-	if err != nil {
-		return
-	}
-
-	if options.URL != "" {
-		err = baseService.SetServiceURL(options.URL)
-		if err != nil {
-			return
-		}
-	}
-
-	service = &EnterpriseBillingUnitsV1{
-		Service: baseService,
-	}
-
-	return
-}
-
-// SetServiceURL sets the service URL
-func (enterpriseBillingUnits *EnterpriseBillingUnitsV1) SetServiceURL(url string) error {
-	return enterpriseBillingUnits.Service.SetServiceURL(url)
-}
-
-// GetBillingOptionByQuery : Get billing options by query
-// Return matching billing options if any exist. Show subscriptions and promotional offers that are available to a
-// billing unit.
-func (enterpriseBillingUnits *EnterpriseBillingUnitsV1) GetBillingOptionByQuery(getBillingOptionByQueryOptions *GetBillingOptionByQueryOptions) (result *BillingOption, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(getBillingOptionByQueryOptions, "getBillingOptionByQueryOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(getBillingOptionByQueryOptions, "getBillingOptionByQueryOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v1/billing-options"}
-	pathParameters := []string{}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(enterpriseBillingUnits.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range getBillingOptionByQueryOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("enterprise_billing_units", "V1", "GetBillingOptionByQuery")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	builder.AddQuery("billing_unit_id", fmt.Sprint(*getBillingOptionByQueryOptions.BillingUnitID))
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = enterpriseBillingUnits.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalBillingOption(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// GetBillingUnitByID : Get billing unit by ID
-// Return the billing unit information if it exists.
-func (enterpriseBillingUnits *EnterpriseBillingUnitsV1) GetBillingUnitByID(getBillingUnitByIdOptions *GetBillingUnitByIdOptions) (result *BillingUnit, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(getBillingUnitByIdOptions, "getBillingUnitByIdOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(getBillingUnitByIdOptions, "getBillingUnitByIdOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v1/billing-units"}
-	pathParameters := []string{*getBillingUnitByIdOptions.BillingUnitID}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(enterpriseBillingUnits.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range getBillingUnitByIdOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("enterprise_billing_units", "V1", "GetBillingUnitByID")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = enterpriseBillingUnits.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalBillingUnit(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// GetBillingUnitByQuery : Get billing unit by query
-// Return matching billing unit information if any exists. Omits internal properties and enterprise account ID from the
-// billing unit.
-func (enterpriseBillingUnits *EnterpriseBillingUnitsV1) GetBillingUnitByQuery(getBillingUnitByQueryOptions *GetBillingUnitByQueryOptions) (result *ResponseBillingUnitsByQuery, response *core.DetailedResponse, err error) {
-	err = core.ValidateStruct(getBillingUnitByQueryOptions, "getBillingUnitByQueryOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v1/billing-units"}
-	pathParameters := []string{}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(enterpriseBillingUnits.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range getBillingUnitByQueryOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("enterprise_billing_units", "V1", "GetBillingUnitByQuery")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	if getBillingUnitByQueryOptions.AccountID != nil {
-		builder.AddQuery("account_id", fmt.Sprint(*getBillingUnitByQueryOptions.AccountID))
-	}
-	if getBillingUnitByQueryOptions.EnterpriseID != nil {
-		builder.AddQuery("enterprise_id", fmt.Sprint(*getBillingUnitByQueryOptions.EnterpriseID))
-	}
-	if getBillingUnitByQueryOptions.AccountGroupID != nil {
-		builder.AddQuery("account_group_id", fmt.Sprint(*getBillingUnitByQueryOptions.AccountGroupID))
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = enterpriseBillingUnits.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalResponseBillingUnitsByQuery(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// GetCreditPools : Get credit pools
-// Get credit pools for a billing unit. Credit pools can be either platform or support credit pools. The platform credit
-// pool contains credit from platform subscriptions and promotional offers. The support credit pool contains credit from
-// support subscriptions.
-func (enterpriseBillingUnits *EnterpriseBillingUnitsV1) GetCreditPools(getCreditPoolsOptions *GetCreditPoolsOptions) (result *ResponseCreditPoolsByQuery, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(getCreditPoolsOptions, "getCreditPoolsOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(getCreditPoolsOptions, "getCreditPoolsOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v1/credit-pools"}
-	pathParameters := []string{}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(enterpriseBillingUnits.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range getCreditPoolsOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("enterprise_billing_units", "V1", "GetCreditPools")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	builder.AddQuery("billing_unit_id", fmt.Sprint(*getCreditPoolsOptions.BillingUnitID))
-	if getCreditPoolsOptions.Date != nil {
-		builder.AddQuery("date", fmt.Sprint(*getCreditPoolsOptions.Date))
-	}
-	if getCreditPoolsOptions.Type != nil {
-		builder.AddQuery("type", fmt.Sprint(*getCreditPoolsOptions.Type))
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = enterpriseBillingUnits.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalResponseCreditPoolsByQuery(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// BillingOption : A container for all the plans in the resource.
-type BillingOption struct {
-	// The ID of the billing option.
-	ID *string `json:"id,omitempty"`
-
-	// The ID of the billing unit that's associated with the billing option.
-	BillingUnitID *string `json:"billing_unit_id,omitempty"`
-
-	// The start date of billing option.
-	StartDate *string `json:"start_date,omitempty"`
-
-	// The end date of billing option.
-	EndDate *string `json:"end_date,omitempty"`
-
-	// The state of the billing option. The valid values include `ACTIVE, `SUSPENDED`, and `CANCELED`.
-	State *string `json:"state,omitempty"`
-
-	// The type of billing option. The valid values are `SUBSCRIPTION` and `OFFER`.
-	Type *string `json:"type,omitempty"`
-
-	// The category of the billing option. The valid values are `PLATFORM`, `SERVICE`, and `SUPPORT`.
-	Category *string `json:"category,omitempty"`
-
-	// The payment method for support.
-	PaymentInstrument interface{} `json:"payment_instrument,omitempty"`
-
-	// The duration of the billing options in months.
-	DurationInMonths *float64 `json:"duration_in_months,omitempty"`
-
-	// The line item ID for support.
-	LineItemID *float64 `json:"line_item_id,omitempty"`
-
-	// The support billing system.
-	BillingSystem interface{} `json:"billing_system,omitempty"`
-
-	// The renewal code for support. This code denotes whether the subscription automatically renews, is assessed monthly,
-	// and so on.
-	RenewalModeCode *string `json:"renewal_mode_code,omitempty"`
-
-	// The date when the billing option was updated.
-	UpdatedAt *string `json:"updated_at,omitempty"`
-}
-
-
-// UnmarshalBillingOption constructs an instance of BillingOption from the specified map.
-func UnmarshalBillingOption(m map[string]interface{}) (result *BillingOption, err error) {
-	obj := new(BillingOption)
-	obj.ID, err = core.UnmarshalString(m, "id")
-	if err != nil {
-		return
-	}
-	obj.BillingUnitID, err = core.UnmarshalString(m, "billing_unit_id")
-	if err != nil {
-		return
-	}
-	obj.StartDate, err = core.UnmarshalString(m, "start_date")
-	if err != nil {
-		return
-	}
-	obj.EndDate, err = core.UnmarshalString(m, "end_date")
-	if err != nil {
-		return
-	}
-	obj.State, err = core.UnmarshalString(m, "state")
-	if err != nil {
-		return
-	}
-	obj.Type, err = core.UnmarshalString(m, "type")
-	if err != nil {
-		return
-	}
-	obj.Category, err = core.UnmarshalString(m, "category")
-	if err != nil {
-		return
-	}
-	obj.PaymentInstrument, err = core.UnmarshalAny(m, "payment_instrument")
-	if err != nil {
-		return
-	}
-	obj.DurationInMonths, err = core.UnmarshalFloat64(m, "duration_in_months")
-	if err != nil {
-		return
-	}
-	obj.LineItemID, err = core.UnmarshalFloat64(m, "line_item_id")
-	if err != nil {
-		return
-	}
-	obj.BillingSystem, err = core.UnmarshalAny(m, "billing_system")
-	if err != nil {
-		return
-	}
-	obj.RenewalModeCode, err = core.UnmarshalString(m, "renewal_mode_code")
-	if err != nil {
-		return
-	}
-	obj.UpdatedAt, err = core.UnmarshalString(m, "updated_at")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalBillingOptionSlice unmarshals a slice of BillingOption instances from the specified list of maps.
-func UnmarshalBillingOptionSlice(s []interface{}) (slice []BillingOption, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'BillingOption'")
-			return
-		}
-		obj, e := UnmarshalBillingOption(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalBillingOptionAsProperty unmarshals an instance of BillingOption that is stored as a property
-// within the specified map.
-func UnmarshalBillingOptionAsProperty(m map[string]interface{}, propertyName string) (result *BillingOption, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'BillingOption'", propertyName)
-			return
-		}
-		result, err = UnmarshalBillingOption(objMap)
-	}
-	return
-}
-
-// UnmarshalBillingOptionSliceAsProperty unmarshals a slice of BillingOption instances that are stored as a property
-// within the specified map.
-func UnmarshalBillingOptionSliceAsProperty(m map[string]interface{}, propertyName string) (slice []BillingOption, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'BillingOption'", propertyName)
-			return
-		}
-		slice, err = UnmarshalBillingOptionSlice(vSlice)
-	}
-	return
-}
-
-// BillingUnit : Aggregated usage and charges for all the plans in the account.
-type BillingUnit struct {
-	// The ID of the billing unit, which is a globally unique identifier (GUID).
-	ID *string `json:"id,omitempty"`
-
-	// The Cloud Resource Name (CRN) of the billing unit, scoped to the enterprise account ID.
-	Crn *string `json:"crn,omitempty"`
-
-	// The name of the billing unit.
-	Name *string `json:"name,omitempty"`
-
-	// The ID of the enterprise to which the billing unit is associated.
-	EnterpriseID *string `json:"enterprise_id,omitempty"`
-
-	// The currency code for the billing unit.
-	CurrencyCode *string `json:"currency_code,omitempty"`
-
-	// The country code for the billing unit.
-	CountryCode *string `json:"country_code,omitempty"`
-
-	// A flag that indicates whether this billing unit is the primary billing mechanism for the enterprise.
-	Master *bool `json:"master,omitempty"`
-
-	// The creation date of the billing unit.
-	CreatedAt *string `json:"created_at,omitempty"`
-}
-
-
-// UnmarshalBillingUnit constructs an instance of BillingUnit from the specified map.
-func UnmarshalBillingUnit(m map[string]interface{}) (result *BillingUnit, err error) {
-	obj := new(BillingUnit)
-	obj.ID, err = core.UnmarshalString(m, "id")
-	if err != nil {
-		return
-	}
-	obj.Crn, err = core.UnmarshalString(m, "crn")
-	if err != nil {
-		return
-	}
-	obj.Name, err = core.UnmarshalString(m, "name")
-	if err != nil {
-		return
-	}
-	obj.EnterpriseID, err = core.UnmarshalString(m, "enterprise_id")
-	if err != nil {
-		return
-	}
-	obj.CurrencyCode, err = core.UnmarshalString(m, "currency_code")
-	if err != nil {
-		return
-	}
-	obj.CountryCode, err = core.UnmarshalString(m, "country_code")
-	if err != nil {
-		return
-	}
-	obj.Master, err = core.UnmarshalBool(m, "master")
-	if err != nil {
-		return
-	}
-	obj.CreatedAt, err = core.UnmarshalString(m, "created_at")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalBillingUnitSlice unmarshals a slice of BillingUnit instances from the specified list of maps.
-func UnmarshalBillingUnitSlice(s []interface{}) (slice []BillingUnit, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'BillingUnit'")
-			return
-		}
-		obj, e := UnmarshalBillingUnit(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalBillingUnitAsProperty unmarshals an instance of BillingUnit that is stored as a property
-// within the specified map.
-func UnmarshalBillingUnitAsProperty(m map[string]interface{}, propertyName string) (result *BillingUnit, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'BillingUnit'", propertyName)
-			return
-		}
-		result, err = UnmarshalBillingUnit(objMap)
-	}
-	return
-}
-
-// UnmarshalBillingUnitSliceAsProperty unmarshals a slice of BillingUnit instances that are stored as a property
-// within the specified map.
-func UnmarshalBillingUnitSliceAsProperty(m map[string]interface{}, propertyName string) (slice []BillingUnit, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'BillingUnit'", propertyName)
-			return
-		}
-		slice, err = UnmarshalBillingUnitSlice(vSlice)
-	}
-	return
-}
-
-// CreditPoolOverage : Overage that was generated on the credit pool.
-type CreditPoolOverage struct {
-	// The number of credits used as overage.
-	Cost *float64 `json:"cost,omitempty"`
-
-	// A list of resources that generated overage.
-	Resources []interface{} `json:"resources,omitempty"`
-}
-
-
-// UnmarshalCreditPoolOverage constructs an instance of CreditPoolOverage from the specified map.
-func UnmarshalCreditPoolOverage(m map[string]interface{}) (result *CreditPoolOverage, err error) {
-	obj := new(CreditPoolOverage)
-	obj.Cost, err = core.UnmarshalFloat64(m, "cost")
-	if err != nil {
-		return
-	}
-	obj.Resources, err = core.UnmarshalAnySlice(m, "resources")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalCreditPoolOverageSlice unmarshals a slice of CreditPoolOverage instances from the specified list of maps.
-func UnmarshalCreditPoolOverageSlice(s []interface{}) (slice []CreditPoolOverage, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'CreditPoolOverage'")
-			return
-		}
-		obj, e := UnmarshalCreditPoolOverage(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalCreditPoolOverageAsProperty unmarshals an instance of CreditPoolOverage that is stored as a property
-// within the specified map.
-func UnmarshalCreditPoolOverageAsProperty(m map[string]interface{}, propertyName string) (result *CreditPoolOverage, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'CreditPoolOverage'", propertyName)
-			return
-		}
-		result, err = UnmarshalCreditPoolOverage(objMap)
-	}
-	return
-}
-
-// UnmarshalCreditPoolOverageSliceAsProperty unmarshals a slice of CreditPoolOverage instances that are stored as a property
-// within the specified map.
-func UnmarshalCreditPoolOverageSliceAsProperty(m map[string]interface{}, propertyName string) (slice []CreditPoolOverage, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'CreditPoolOverage'", propertyName)
-			return
-		}
-		slice, err = UnmarshalCreditPoolOverageSlice(vSlice)
-	}
-	return
-}
-
-// CreditPool : The credit pool for a billing unit.
-type CreditPool struct {
-	// The type of credit, either `PLATFORM` or `SUPPORT`.
-	Type *string `json:"type,omitempty"`
-
-	// The currency code of the associated billing unit.
-	CurrencyCode *string `json:"currency_code,omitempty"`
-
-	// The ID of the billing unit that's associated with the credit pool. This value is a globally unique identifier
-	// (GUID).
-	BillingUnitID *string `json:"billing_unit_id,omitempty"`
-
-	// A list of active subscription terms available within a credit pool.
-	TermCredits []TermCredits `json:"term_credits,omitempty"`
-
-	// Overage that was generated on the credit pool.
-	Overage *CreditPoolOverage `json:"overage,omitempty"`
-}
-
-
-// UnmarshalCreditPool constructs an instance of CreditPool from the specified map.
-func UnmarshalCreditPool(m map[string]interface{}) (result *CreditPool, err error) {
-	obj := new(CreditPool)
-	obj.Type, err = core.UnmarshalString(m, "type")
-	if err != nil {
-		return
-	}
-	obj.CurrencyCode, err = core.UnmarshalString(m, "currency_code")
-	if err != nil {
-		return
-	}
-	obj.BillingUnitID, err = core.UnmarshalString(m, "billing_unit_id")
-	if err != nil {
-		return
-	}
-	obj.TermCredits, err = UnmarshalTermCreditsSliceAsProperty(m, "term_credits")
-	if err != nil {
-		return
-	}
-	obj.Overage, err = UnmarshalCreditPoolOverageAsProperty(m, "overage")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalCreditPoolSlice unmarshals a slice of CreditPool instances from the specified list of maps.
-func UnmarshalCreditPoolSlice(s []interface{}) (slice []CreditPool, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'CreditPool'")
-			return
-		}
-		obj, e := UnmarshalCreditPool(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalCreditPoolAsProperty unmarshals an instance of CreditPool that is stored as a property
-// within the specified map.
-func UnmarshalCreditPoolAsProperty(m map[string]interface{}, propertyName string) (result *CreditPool, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'CreditPool'", propertyName)
-			return
-		}
-		result, err = UnmarshalCreditPool(objMap)
-	}
-	return
-}
-
-// UnmarshalCreditPoolSliceAsProperty unmarshals a slice of CreditPool instances that are stored as a property
-// within the specified map.
-func UnmarshalCreditPoolSliceAsProperty(m map[string]interface{}, propertyName string) (slice []CreditPool, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'CreditPool'", propertyName)
-			return
-		}
-		slice, err = UnmarshalCreditPoolSlice(vSlice)
-	}
-	return
-}
-
-// GetBillingOptionByQueryOptions : The GetBillingOptionByQuery options.
-type GetBillingOptionByQueryOptions struct {
-	// The billing unit ID.
-	BillingUnitID *string `json:"billing_unit_id" validate:"required"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewGetBillingOptionByQueryOptions : Instantiate GetBillingOptionByQueryOptions
-func (*EnterpriseBillingUnitsV1) NewGetBillingOptionByQueryOptions(billingUnitID string) *GetBillingOptionByQueryOptions {
-	return &GetBillingOptionByQueryOptions{
-		BillingUnitID: core.StringPtr(billingUnitID),
-	}
-}
-
-// SetBillingUnitID : Allow user to set BillingUnitID
-func (options *GetBillingOptionByQueryOptions) SetBillingUnitID(billingUnitID string) *GetBillingOptionByQueryOptions {
-	options.BillingUnitID = core.StringPtr(billingUnitID)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *GetBillingOptionByQueryOptions) SetHeaders(param map[string]string) *GetBillingOptionByQueryOptions {
-	options.Headers = param
-	return options
-}
-
-// GetBillingUnitByIdOptions : The GetBillingUnitByID options.
-type GetBillingUnitByIdOptions struct {
-	// The ID of the requested billing unit.
-	BillingUnitID *string `json:"billing_unit_id" validate:"required"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewGetBillingUnitByIdOptions : Instantiate GetBillingUnitByIdOptions
-func (*EnterpriseBillingUnitsV1) NewGetBillingUnitByIdOptions(billingUnitID string) *GetBillingUnitByIdOptions {
-	return &GetBillingUnitByIdOptions{
-		BillingUnitID: core.StringPtr(billingUnitID),
-	}
-}
-
-// SetBillingUnitID : Allow user to set BillingUnitID
-func (options *GetBillingUnitByIdOptions) SetBillingUnitID(billingUnitID string) *GetBillingUnitByIdOptions {
-	options.BillingUnitID = core.StringPtr(billingUnitID)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *GetBillingUnitByIdOptions) SetHeaders(param map[string]string) *GetBillingUnitByIdOptions {
-	options.Headers = param
-	return options
-}
-
-// GetBillingUnitByQueryOptions : The GetBillingUnitByQuery options.
-type GetBillingUnitByQueryOptions struct {
-	// The enterprise account ID.
-	AccountID *string `json:"account_id,omitempty"`
-
-	// The enterprise ID.
-	EnterpriseID *string `json:"enterprise_id,omitempty"`
-
-	// The account group ID.
-	AccountGroupID *string `json:"account_group_id,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewGetBillingUnitByQueryOptions : Instantiate GetBillingUnitByQueryOptions
-func (*EnterpriseBillingUnitsV1) NewGetBillingUnitByQueryOptions() *GetBillingUnitByQueryOptions {
-	return &GetBillingUnitByQueryOptions{}
-}
-
-// SetAccountID : Allow user to set AccountID
-func (options *GetBillingUnitByQueryOptions) SetAccountID(accountID string) *GetBillingUnitByQueryOptions {
-	options.AccountID = core.StringPtr(accountID)
-	return options
-}
-
-// SetEnterpriseID : Allow user to set EnterpriseID
-func (options *GetBillingUnitByQueryOptions) SetEnterpriseID(enterpriseID string) *GetBillingUnitByQueryOptions {
-	options.EnterpriseID = core.StringPtr(enterpriseID)
-	return options
-}
-
-// SetAccountGroupID : Allow user to set AccountGroupID
-func (options *GetBillingUnitByQueryOptions) SetAccountGroupID(accountGroupID string) *GetBillingUnitByQueryOptions {
-	options.AccountGroupID = core.StringPtr(accountGroupID)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *GetBillingUnitByQueryOptions) SetHeaders(param map[string]string) *GetBillingUnitByQueryOptions {
-	options.Headers = param
-	return options
-}
-
-// GetCreditPoolsOptions : The GetCreditPools options.
-type GetCreditPoolsOptions struct {
-	// The ID of the billing unit.
-	BillingUnitID *string `json:"billing_unit_id" validate:"required"`
-
-	// The date in the format of YYYY-MM.
-	Date *string `json:"date,omitempty"`
-
-	// Filters the credit pool by type, either `PLATFORM` or `SUPPORT`.
-	Type *string `json:"type,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewGetCreditPoolsOptions : Instantiate GetCreditPoolsOptions
-func (*EnterpriseBillingUnitsV1) NewGetCreditPoolsOptions(billingUnitID string) *GetCreditPoolsOptions {
-	return &GetCreditPoolsOptions{
-		BillingUnitID: core.StringPtr(billingUnitID),
-	}
-}
-
-// SetBillingUnitID : Allow user to set BillingUnitID
-func (options *GetCreditPoolsOptions) SetBillingUnitID(billingUnitID string) *GetCreditPoolsOptions {
-	options.BillingUnitID = core.StringPtr(billingUnitID)
-	return options
-}
-
-// SetDate : Allow user to set Date
-func (options *GetCreditPoolsOptions) SetDate(date string) *GetCreditPoolsOptions {
-	options.Date = core.StringPtr(date)
-	return options
-}
-
-// SetType : Allow user to set Type
-func (options *GetCreditPoolsOptions) SetType(typeVar string) *GetCreditPoolsOptions {
-	options.Type = core.StringPtr(typeVar)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *GetCreditPoolsOptions) SetHeaders(param map[string]string) *GetCreditPoolsOptions {
-	options.Headers = param
-	return options
-}
-
-// ResponseBillingUnitsByQuery : Aggregated usage and charges for all the plans in the account.
-type ResponseBillingUnitsByQuery struct {
-	// A count of the billing units that were found by the query.
-	RowsCount *float64 `json:"rows_count,omitempty"`
-
-	// Bookmark URL to query for next batch of billing units. This returns `null` if no additional pages are required.
-	NextURL *string `json:"next_url,omitempty"`
-
-	// A list of billing units found.
-	Resources []BillingUnit `json:"resources,omitempty"`
-}
-
-
-// UnmarshalResponseBillingUnitsByQuery constructs an instance of ResponseBillingUnitsByQuery from the specified map.
-func UnmarshalResponseBillingUnitsByQuery(m map[string]interface{}) (result *ResponseBillingUnitsByQuery, err error) {
-	obj := new(ResponseBillingUnitsByQuery)
-	obj.RowsCount, err = core.UnmarshalFloat64(m, "rows_count")
-	if err != nil {
-		return
-	}
-	obj.NextURL, err = core.UnmarshalString(m, "next_url")
-	if err != nil {
-		return
-	}
-	obj.Resources, err = UnmarshalBillingUnitSliceAsProperty(m, "resources")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalResponseBillingUnitsByQuerySlice unmarshals a slice of ResponseBillingUnitsByQuery instances from the specified list of maps.
-func UnmarshalResponseBillingUnitsByQuerySlice(s []interface{}) (slice []ResponseBillingUnitsByQuery, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'ResponseBillingUnitsByQuery'")
-			return
-		}
-		obj, e := UnmarshalResponseBillingUnitsByQuery(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalResponseBillingUnitsByQueryAsProperty unmarshals an instance of ResponseBillingUnitsByQuery that is stored as a property
-// within the specified map.
-func UnmarshalResponseBillingUnitsByQueryAsProperty(m map[string]interface{}, propertyName string) (result *ResponseBillingUnitsByQuery, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'ResponseBillingUnitsByQuery'", propertyName)
-			return
-		}
-		result, err = UnmarshalResponseBillingUnitsByQuery(objMap)
-	}
-	return
-}
-
-// UnmarshalResponseBillingUnitsByQuerySliceAsProperty unmarshals a slice of ResponseBillingUnitsByQuery instances that are stored as a property
-// within the specified map.
-func UnmarshalResponseBillingUnitsByQuerySliceAsProperty(m map[string]interface{}, propertyName string) (slice []ResponseBillingUnitsByQuery, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'ResponseBillingUnitsByQuery'", propertyName)
-			return
-		}
-		slice, err = UnmarshalResponseBillingUnitsByQuerySlice(vSlice)
-	}
-	return
-}
-
-// ResponseCreditPoolsByQuery : Aggregated usage and charges for all the plans in the account.
-type ResponseCreditPoolsByQuery struct {
-	// The number of credit pools that were found by the query.
-	RowsCount *float64 `json:"rows_count,omitempty"`
-
-	// A bookmark URL to the query for the next batch of billing units. Use a value of `null` if no additional pages are
-	// required.
-	NextURL *string `json:"next_url,omitempty"`
-
-	// A list of credit pools found by the query.
-	Resources []CreditPool `json:"resources,omitempty"`
-}
-
-
-// UnmarshalResponseCreditPoolsByQuery constructs an instance of ResponseCreditPoolsByQuery from the specified map.
-func UnmarshalResponseCreditPoolsByQuery(m map[string]interface{}) (result *ResponseCreditPoolsByQuery, err error) {
-	obj := new(ResponseCreditPoolsByQuery)
-	obj.RowsCount, err = core.UnmarshalFloat64(m, "rows_count")
-	if err != nil {
-		return
-	}
-	obj.NextURL, err = core.UnmarshalString(m, "next_url")
-	if err != nil {
-		return
-	}
-	obj.Resources, err = UnmarshalCreditPoolSliceAsProperty(m, "resources")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalResponseCreditPoolsByQuerySlice unmarshals a slice of ResponseCreditPoolsByQuery instances from the specified list of maps.
-func UnmarshalResponseCreditPoolsByQuerySlice(s []interface{}) (slice []ResponseCreditPoolsByQuery, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'ResponseCreditPoolsByQuery'")
-			return
-		}
-		obj, e := UnmarshalResponseCreditPoolsByQuery(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalResponseCreditPoolsByQueryAsProperty unmarshals an instance of ResponseCreditPoolsByQuery that is stored as a property
-// within the specified map.
-func UnmarshalResponseCreditPoolsByQueryAsProperty(m map[string]interface{}, propertyName string) (result *ResponseCreditPoolsByQuery, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'ResponseCreditPoolsByQuery'", propertyName)
-			return
-		}
-		result, err = UnmarshalResponseCreditPoolsByQuery(objMap)
-	}
-	return
-}
-
-// UnmarshalResponseCreditPoolsByQuerySliceAsProperty unmarshals a slice of ResponseCreditPoolsByQuery instances that are stored as a property
-// within the specified map.
-func UnmarshalResponseCreditPoolsByQuerySliceAsProperty(m map[string]interface{}, propertyName string) (slice []ResponseCreditPoolsByQuery, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'ResponseCreditPoolsByQuery'", propertyName)
-			return
-		}
-		slice, err = UnmarshalResponseCreditPoolsByQuerySlice(vSlice)
-	}
-	return
-}
-
-// TermCredits : The subscription term that is active in the current month.
-type TermCredits struct {
-	// The ID of the billing option from which the subscription term is derived.
-	BillingOptionID *string `json:"billing_option_id,omitempty"`
-
-	// The category of the credit pool. The valid values are `PLATFORM`, `OFFER`, or `SERVICE` for platform credit and
-	// `SUPPORT` for support credit.
-	Category *string `json:"category,omitempty"`
-
-	// The start date of the term in ISO format.
-	StartDate *string `json:"start_date,omitempty"`
-
-	// The end date of the term in ISO format.
-	EndDate *string `json:"end_date,omitempty"`
-
-	// The total credit available in this term.
-	TotalCredits *float64 `json:"total_credits,omitempty"`
-
-	// The balance of available credit at the start of the current month.
-	StartingBalance *float64 `json:"starting_balance,omitempty"`
-
-	// The amount of credit used during the current month.
-	UsedCredits *float64 `json:"used_credits,omitempty"`
-
-	// The balance of remaining credit in the subscription term.
-	CurrentBalance *float64 `json:"current_balance,omitempty"`
-
-	// A list of resources that used credit during the month.
-	Resources []interface{} `json:"resources,omitempty"`
-}
-
-
-// UnmarshalTermCredits constructs an instance of TermCredits from the specified map.
-func UnmarshalTermCredits(m map[string]interface{}) (result *TermCredits, err error) {
-	obj := new(TermCredits)
-	obj.BillingOptionID, err = core.UnmarshalString(m, "billing_option_id")
-	if err != nil {
-		return
-	}
-	obj.Category, err = core.UnmarshalString(m, "category")
-	if err != nil {
-		return
-	}
-	obj.StartDate, err = core.UnmarshalString(m, "start_date")
-	if err != nil {
-		return
-	}
-	obj.EndDate, err = core.UnmarshalString(m, "end_date")
-	if err != nil {
-		return
-	}
-	obj.TotalCredits, err = core.UnmarshalFloat64(m, "total_credits")
-	if err != nil {
-		return
-	}
-	obj.StartingBalance, err = core.UnmarshalFloat64(m, "starting_balance")
-	if err != nil {
-		return
-	}
-	obj.UsedCredits, err = core.UnmarshalFloat64(m, "used_credits")
-	if err != nil {
-		return
-	}
-	obj.CurrentBalance, err = core.UnmarshalFloat64(m, "current_balance")
-	if err != nil {
-		return
-	}
-	obj.Resources, err = core.UnmarshalAnySlice(m, "resources")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalTermCreditsSlice unmarshals a slice of TermCredits instances from the specified list of maps.
-func UnmarshalTermCreditsSlice(s []interface{}) (slice []TermCredits, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'TermCredits'")
-			return
-		}
-		obj, e := UnmarshalTermCredits(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalTermCreditsAsProperty unmarshals an instance of TermCredits that is stored as a property
-// within the specified map.
-func UnmarshalTermCreditsAsProperty(m map[string]interface{}, propertyName string) (result *TermCredits, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'TermCredits'", propertyName)
-			return
-		}
-		result, err = UnmarshalTermCredits(objMap)
-	}
-	return
-}
-
-// UnmarshalTermCreditsSliceAsProperty unmarshals a slice of TermCredits instances that are stored as a property
-// within the specified map.
-func UnmarshalTermCreditsSliceAsProperty(m map[string]interface{}, propertyName string) (slice []TermCredits, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'TermCredits'", propertyName)
-			return
-		}
-		slice, err = UnmarshalTermCreditsSlice(vSlice)
-	}
-	return
-}
diff --git a/enterprisebillingunitsv1/enterprise_billing_units_v1_suite_test.go b/enterprisebillingunitsv1/enterprise_billing_units_v1_suite_test.go
deleted file mode 100644
index 2baa0621..00000000
--- a/enterprisebillingunitsv1/enterprise_billing_units_v1_suite_test.go
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * (C) Copyright IBM Corp. 2020.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package enterprisebillingunitsv1_test
-
-import (
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-	"testing"
-)
-
-func TestEnterpriseBillingUnitsV1(t *testing.T) {
-	RegisterFailHandler(Fail)
-	RunSpecs(t, "EnterpriseBillingUnitsV1 Suite")
-}
diff --git a/enterprisebillingunitsv1/enterprise_billing_units_v1_test.go b/enterprisebillingunitsv1/enterprise_billing_units_v1_test.go
deleted file mode 100644
index eb9d6530..00000000
--- a/enterprisebillingunitsv1/enterprise_billing_units_v1_test.go
+++ /dev/null
@@ -1,297 +0,0 @@
-/**
- * (C) Copyright IBM Corp. 2020.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package enterprisebillingunitsv1_test
-
-import (
-	"bytes"
-	"fmt"
-	"github.com/IBM/go-sdk-core/v3/core"
-	"github.com/go-openapi/strfmt"
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-	"github.ibm.com/ibmcloud/platform-services-go-sdk/enterprisebillingunitsv1"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"net/http/httptest"
-	"time"
-)
-
-var _ = Describe(`EnterpriseBillingUnitsV1`, func() {
-	Describe(`GetBillingOptionByQuery(getBillingOptionByQueryOptions *GetBillingOptionByQueryOptions)`, func() {
-		bearerToken := "0ui9876453"
-		getBillingOptionByQueryPath := "/v1/billing-options"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(getBillingOptionByQueryPath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				Expect(req.URL.Query()["billing_unit_id"]).To(Equal([]string{"testString"}))
-
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"id": "ID", "billing_unit_id": "BillingUnitID", "start_date": "2019-05-01T00:00:00.000Z", "end_date": "2020-05-01T00:00:00.000Z", "state": "ACTIVE", "type": "SUBSCRIPTION", "category": "PLATFORM", "payment_instrument": {"anyKey": "anyValue"}, "duration_in_months": 11, "line_item_id": 10, "billing_system": {"anyKey": "anyValue"}, "renewal_mode_code": "RenewalModeCode", "updated_at": "2019-06-01T00:00:00.000Z"}`)
-			}))
-			It(`Invoke GetBillingOptionByQuery successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := enterprisebillingunitsv1.NewEnterpriseBillingUnitsV1(&enterprisebillingunitsv1.EnterpriseBillingUnitsV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.GetBillingOptionByQuery(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the GetBillingOptionByQueryOptions model
-				getBillingOptionByQueryOptionsModel := new(enterprisebillingunitsv1.GetBillingOptionByQueryOptions)
-				getBillingOptionByQueryOptionsModel.BillingUnitID = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.GetBillingOptionByQuery(getBillingOptionByQueryOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`GetBillingUnitByID(getBillingUnitByIdOptions *GetBillingUnitByIdOptions)`, func() {
-		bearerToken := "0ui9876453"
-		getBillingUnitByIDPath := "/v1/billing-units/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(getBillingUnitByIDPath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"id": "ID", "crn": "crn:v1:bluemix:public:billing::a/<<enterprise_account_id>>::billing-unit:<<billing_unit_id>>", "name": "Name", "enterprise_id": "EnterpriseID", "currency_code": "USD", "country_code": "USA", "master": true, "created_at": "2019-05-01T00:00:00.000Z"}`)
-			}))
-			It(`Invoke GetBillingUnitByID successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := enterprisebillingunitsv1.NewEnterpriseBillingUnitsV1(&enterprisebillingunitsv1.EnterpriseBillingUnitsV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.GetBillingUnitByID(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the GetBillingUnitByIdOptions model
-				getBillingUnitByIdOptionsModel := new(enterprisebillingunitsv1.GetBillingUnitByIdOptions)
-				getBillingUnitByIdOptionsModel.BillingUnitID = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.GetBillingUnitByID(getBillingUnitByIdOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`GetBillingUnitByQuery(getBillingUnitByQueryOptions *GetBillingUnitByQueryOptions)`, func() {
-		bearerToken := "0ui9876453"
-		getBillingUnitByQueryPath := "/v1/billing-units"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(getBillingUnitByQueryPath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				Expect(req.URL.Query()["account_id"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["enterprise_id"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["account_group_id"]).To(Equal([]string{"testString"}))
-
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"rows_count": 9, "next_url": "NextURL", "resources": [{"id": "ID", "crn": "crn:v1:bluemix:public:billing::a/<<enterprise_account_id>>::billing-unit:<<billing_unit_id>>", "name": "Name", "enterprise_id": "EnterpriseID", "currency_code": "USD", "country_code": "USA", "master": true, "created_at": "2019-05-01T00:00:00.000Z"}]}`)
-			}))
-			It(`Invoke GetBillingUnitByQuery successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := enterprisebillingunitsv1.NewEnterpriseBillingUnitsV1(&enterprisebillingunitsv1.EnterpriseBillingUnitsV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.GetBillingUnitByQuery(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the GetBillingUnitByQueryOptions model
-				getBillingUnitByQueryOptionsModel := new(enterprisebillingunitsv1.GetBillingUnitByQueryOptions)
-				getBillingUnitByQueryOptionsModel.AccountID = core.StringPtr("testString")
-				getBillingUnitByQueryOptionsModel.EnterpriseID = core.StringPtr("testString")
-				getBillingUnitByQueryOptionsModel.AccountGroupID = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.GetBillingUnitByQuery(getBillingUnitByQueryOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`GetCreditPools(getCreditPoolsOptions *GetCreditPoolsOptions)`, func() {
-		bearerToken := "0ui9876453"
-		getCreditPoolsPath := "/v1/credit-pools"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(getCreditPoolsPath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				Expect(req.URL.Query()["billing_unit_id"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["date"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["type"]).To(Equal([]string{"testString"}))
-
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"rows_count": 2, "next_url": "NextURL", "resources": [{"type": "Type", "currency_code": "USD", "billing_unit_id": "BillingUnitID", "term_credits": [{"billing_option_id": "JWX986YRGFSHACQUEFOI", "category": "PLATFORM", "start_date": "2019-05-01T00:00:00.000Z", "end_date": "2020-04-30T23:59:29.999Z", "total_credits": 10000, "starting_balance": 9000, "used_credits": 9500, "current_balance": 0, "resources": [{"anyKey": "anyValue"}]}], "overage": {"cost": 500, "resources": [{"anyKey": "anyValue"}]}}]}`)
-			}))
-			It(`Invoke GetCreditPools successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := enterprisebillingunitsv1.NewEnterpriseBillingUnitsV1(&enterprisebillingunitsv1.EnterpriseBillingUnitsV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.GetCreditPools(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the GetCreditPoolsOptions model
-				getCreditPoolsOptionsModel := new(enterprisebillingunitsv1.GetCreditPoolsOptions)
-				getCreditPoolsOptionsModel.BillingUnitID = core.StringPtr("testString")
-				getCreditPoolsOptionsModel.Date = core.StringPtr("testString")
-				getCreditPoolsOptionsModel.Type = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.GetCreditPools(getCreditPoolsOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`Utility function tests`, func() {
-		It(`Invoke CreateMockMap() successfully`, func() {
-			mockMap := CreateMockMap()
-			Expect(mockMap).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockByteArray() successfully`, func() {
-			mockByteArray := CreateMockByteArray("This is a test")
-			Expect(mockByteArray).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockUUID() successfully`, func() {
-			mockUUID := CreateMockUUID("9fab83da-98cb-4f18-a7ba-b6f0435c9673")
-			Expect(mockUUID).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockReader() successfully`, func() {
-			mockReader := CreateMockReader("This is a test.")
-			Expect(mockReader).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockDate() successfully`, func() {
-			mockDate := CreateMockDate()
-			Expect(mockDate).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockDateTime() successfully`, func() {
-			mockDateTime := CreateMockDateTime()
-			Expect(mockDateTime).ToNot(BeNil())
-		})
-	})
-})
-
-//
-// Utility functions used by the generated test code
-//
-
-func CreateMockMap() map[string]interface{} {
-	m := make(map[string]interface{})
-	return m
-}
-
-func CreateMockByteArray(mockData string) *[]byte {
-	ba := make([]byte, len(mockData))
-	ba = append(ba, mockData...)
-	return &ba
-}
-
-func CreateMockUUID(mockData string) *strfmt.UUID {
-	uuid := strfmt.UUID(mockData)
-	return &uuid
-}
-
-func CreateMockReader(mockData string) io.ReadCloser {
-	return ioutil.NopCloser(bytes.NewReader([]byte(mockData)))
-}
-
-func CreateMockDate() *strfmt.Date {
-	d := strfmt.Date(time.Now())
-	return &d
-}
-
-func CreateMockDateTime() *strfmt.DateTime {
-	d := strfmt.DateTime(time.Now())
-	return &d
-}
diff --git a/enterprisemanagementv1/enterprise_management_v1.go b/enterprisemanagementv1/enterprise_management_v1.go
deleted file mode 100644
index 9b2b3b5d..00000000
--- a/enterprisemanagementv1/enterprise_management_v1.go
+++ /dev/null
@@ -1,3182 +0,0 @@
-/**
- * (C) Copyright IBM Corp. 2020.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// Package enterprisemanagementv1 : Operations and models for the EnterpriseManagementV1 service
-package enterprisemanagementv1
-
-import (
-	"fmt"
-	"github.com/IBM/go-sdk-core/v3/core"
-	common "github.ibm.com/ibmcloud/platform-services-go-sdk/common"
-)
-
-// EnterpriseManagementV1 : The Enterprise Management API enables you to create and manage an enterprise, account
-// groups, and accounts within the enterprise.
-//
-// Version: 1.0
-type EnterpriseManagementV1 struct {
-	Service *core.BaseService
-}
-
-// DefaultServiceURL is the default URL to make service requests to.
-const DefaultServiceURL = "https://enterprise.test.cloud.ibm.com/v1"
-
-// DefaultServiceName is the default key used to find external configuration information.
-const DefaultServiceName = "enterprise_management"
-
-// EnterpriseManagementV1Options : Service options
-type EnterpriseManagementV1Options struct {
-	ServiceName   string
-	URL           string
-	Authenticator core.Authenticator
-}
-
-// NewEnterpriseManagementV1UsingExternalConfig : constructs an instance of EnterpriseManagementV1 with passed in options and external configuration.
-func NewEnterpriseManagementV1UsingExternalConfig(options *EnterpriseManagementV1Options) (enterpriseManagement *EnterpriseManagementV1, err error) {
-	if options.ServiceName == "" {
-		options.ServiceName = DefaultServiceName
-	}
-
-	if options.Authenticator == nil {
-		options.Authenticator, err = core.GetAuthenticatorFromEnvironment(options.ServiceName)
-		if err != nil {
-			return
-		}
-	}
-
-	enterpriseManagement, err = NewEnterpriseManagementV1(options)
-	if err != nil {
-		return
-	}
-
-	err = enterpriseManagement.Service.ConfigureService(options.ServiceName)
-	if err != nil {
-		return
-	}
-
-	if options.URL != "" {
-		err = enterpriseManagement.Service.SetServiceURL(options.URL)
-	}
-	return
-}
-
-// NewEnterpriseManagementV1 : constructs an instance of EnterpriseManagementV1 with passed in options.
-func NewEnterpriseManagementV1(options *EnterpriseManagementV1Options) (service *EnterpriseManagementV1, err error) {
-	serviceOptions := &core.ServiceOptions{
-		URL:           DefaultServiceURL,
-		Authenticator: options.Authenticator,
-	}
-
-	baseService, err := core.NewBaseService(serviceOptions)
-	if err != nil {
-		return
-	}
-
-	if options.URL != "" {
-		err = baseService.SetServiceURL(options.URL)
-		if err != nil {
-			return
-		}
-	}
-
-	service = &EnterpriseManagementV1{
-		Service: baseService,
-	}
-
-	return
-}
-
-// SetServiceURL sets the service URL
-func (enterpriseManagement *EnterpriseManagementV1) SetServiceURL(url string) error {
-	return enterpriseManagement.Service.SetServiceURL(url)
-}
-
-// CreateAccountGroup : Create an account group
-// Create a new account group, which can be used to group together multiple accounts. To create an account group, you
-// must have an existing enterprise. The API creates an account group entity under the parent that is specified in the
-// payload of the request. The request also takes in the name and the primary contact of this new account group.
-func (enterpriseManagement *EnterpriseManagementV1) CreateAccountGroup(createAccountGroupOptions *CreateAccountGroupOptions) (result *CreateAccountGroupResponse, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(createAccountGroupOptions, "createAccountGroupOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(createAccountGroupOptions, "createAccountGroupOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"account-groups"}
-	pathParameters := []string{}
-
-	builder := core.NewRequestBuilder(core.POST)
-	_, err = builder.ConstructHTTPURL(enterpriseManagement.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range createAccountGroupOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("enterprise_management", "V1", "CreateAccountGroup")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-	builder.AddHeader("Content-Type", "application/json")
-
-	body := make(map[string]interface{})
-	if createAccountGroupOptions.Parent != nil {
-		body["parent"] = createAccountGroupOptions.Parent
-	}
-	if createAccountGroupOptions.Name != nil {
-		body["name"] = createAccountGroupOptions.Name
-	}
-	if createAccountGroupOptions.PrimaryContactIamID != nil {
-		body["primary_contact_iam_id"] = createAccountGroupOptions.PrimaryContactIamID
-	}
-	_, err = builder.SetBodyContentJSON(body)
-	if err != nil {
-		return
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = enterpriseManagement.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalCreateAccountGroupResponse(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// ListAccountGroups : Get account groups by query parameter
-// Retrieve all account groups based on the values that are passed in the query parameters. If no query parameter is
-// passed, all of the account groups in the enterprise for which the calling identity has access are returned.
-// <br/><br/>You can use pagination parameters to filter the results. The `limit` field can be used to limit the number
-// of results that are displayed for this method.<br/><br/>This method ensures that only the account groups that the
-// user has access to are returned. Access can be controlled either through a policy on a specific account group, or
-// account-level platform services access roles, such as Administrator, Editor, Operator, or Viewer. When you call the
-// method with the `enterprise_id`, `parent_account_group_id` or `parent` query parameter, all of the account groups
-// that are immediate children of this entity are returned. Authentication is performed on all account groups before
-// they are returned to the user to ensure that only those account groups are returned to which the calling identity has
-// access.
-func (enterpriseManagement *EnterpriseManagementV1) ListAccountGroups(listAccountGroupsOptions *ListAccountGroupsOptions) (result *ListAccountGroupsResponse, response *core.DetailedResponse, err error) {
-	err = core.ValidateStruct(listAccountGroupsOptions, "listAccountGroupsOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"account-groups"}
-	pathParameters := []string{}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(enterpriseManagement.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range listAccountGroupsOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("enterprise_management", "V1", "ListAccountGroups")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	if listAccountGroupsOptions.EnterpriseID != nil {
-		builder.AddQuery("enterprise_id", fmt.Sprint(*listAccountGroupsOptions.EnterpriseID))
-	}
-	if listAccountGroupsOptions.ParentAccountGroupID != nil {
-		builder.AddQuery("parent_account_group_id", fmt.Sprint(*listAccountGroupsOptions.ParentAccountGroupID))
-	}
-	if listAccountGroupsOptions.Parent != nil {
-		builder.AddQuery("parent", fmt.Sprint(*listAccountGroupsOptions.Parent))
-	}
-	if listAccountGroupsOptions.Limit != nil {
-		builder.AddQuery("limit", fmt.Sprint(*listAccountGroupsOptions.Limit))
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = enterpriseManagement.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalListAccountGroupsResponse(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// GetAccountGroupByID : Get account group by ID
-// Retrieve an account by the `account_group_id` parameter. All data related to the account group is returned only if
-// the caller has access to retrieve the account group.
-func (enterpriseManagement *EnterpriseManagementV1) GetAccountGroupByID(getAccountGroupByIdOptions *GetAccountGroupByIdOptions) (result *AccountGroupResponse, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(getAccountGroupByIdOptions, "getAccountGroupByIdOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(getAccountGroupByIdOptions, "getAccountGroupByIdOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"account-groups"}
-	pathParameters := []string{*getAccountGroupByIdOptions.AccountGroupID}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(enterpriseManagement.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range getAccountGroupByIdOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("enterprise_management", "V1", "GetAccountGroupByID")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = enterpriseManagement.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalAccountGroupResponse(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// UpdateAccountGroup : Update an account group
-// Update the name or IAM ID of the primary contact for an existing account group. The new primary contact must already
-// be a user in the enterprise account.
-func (enterpriseManagement *EnterpriseManagementV1) UpdateAccountGroup(updateAccountGroupOptions *UpdateAccountGroupOptions) (response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(updateAccountGroupOptions, "updateAccountGroupOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(updateAccountGroupOptions, "updateAccountGroupOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"account-groups"}
-	pathParameters := []string{*updateAccountGroupOptions.AccountGroupID}
-
-	builder := core.NewRequestBuilder(core.PATCH)
-	_, err = builder.ConstructHTTPURL(enterpriseManagement.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range updateAccountGroupOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("enterprise_management", "V1", "UpdateAccountGroup")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Content-Type", "application/json")
-
-	body := make(map[string]interface{})
-	if updateAccountGroupOptions.Name != nil {
-		body["name"] = updateAccountGroupOptions.Name
-	}
-	if updateAccountGroupOptions.PrimaryContactIamID != nil {
-		body["primary_contact_iam_id"] = updateAccountGroupOptions.PrimaryContactIamID
-	}
-	_, err = builder.SetBodyContentJSON(body)
-	if err != nil {
-		return
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = enterpriseManagement.Service.Request(request, nil)
-
-	return
-}
-
-// GetAccountGroupPermissibleActions : Get permissible actions for an account group
-// Return all the actions that are allowed on a particular account group. This method takes an array of IAM actions in
-// the body of the request and returns those actions that can be performed by the caller. An authentication check is
-// performed for each action that is passed in the payload.
-func (enterpriseManagement *EnterpriseManagementV1) GetAccountGroupPermissibleActions(getAccountGroupPermissibleActionsOptions *GetAccountGroupPermissibleActionsOptions) (response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(getAccountGroupPermissibleActionsOptions, "getAccountGroupPermissibleActionsOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(getAccountGroupPermissibleActionsOptions, "getAccountGroupPermissibleActionsOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"account-groups", "permissible-actions"}
-	pathParameters := []string{*getAccountGroupPermissibleActionsOptions.AccountGroupID}
-
-	builder := core.NewRequestBuilder(core.POST)
-	_, err = builder.ConstructHTTPURL(enterpriseManagement.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range getAccountGroupPermissibleActionsOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("enterprise_management", "V1", "GetAccountGroupPermissibleActions")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Content-Type", "application/json")
-
-	body := make(map[string]interface{})
-	if getAccountGroupPermissibleActionsOptions.Actions != nil {
-		body["actions"] = getAccountGroupPermissibleActionsOptions.Actions
-	}
-	_, err = builder.SetBodyContentJSON(body)
-	if err != nil {
-		return
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = enterpriseManagement.Service.Request(request, nil)
-
-	return
-}
-
-// ImportAccountToEnterprise : Import an account into an enterprise
-// Import an existing stand-alone account into an enterprise. The existing account can be any type: trial (`TRIAL`),
-// Lite (`STANDARD`), Pay-As-You-Go (`PAYG`), or Subscription (`SUBSCRIPTION`). In the case of a `SUBSCRIPTION` account,
-// the credits, promotional offers, and discounts are migrated to the billing unit of the enterprise. For a billable
-// account (`PAYG` or `SUBSCRIPTION`), the country and currency code of the existing account and the billing unit of the
-// enterprise must match. The API returns a `202` response and performs asynchronous operations to import the account
-// into the enterprise. <br/></br>For more information about impacts to the account, see [Adding accounts to an
-// enterprise](https://{DomainName}/docs/account?topic=account-enterprise-add).
-func (enterpriseManagement *EnterpriseManagementV1) ImportAccountToEnterprise(importAccountToEnterpriseOptions *ImportAccountToEnterpriseOptions) (response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(importAccountToEnterpriseOptions, "importAccountToEnterpriseOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(importAccountToEnterpriseOptions, "importAccountToEnterpriseOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"enterprises", "import/accounts"}
-	pathParameters := []string{*importAccountToEnterpriseOptions.EnterpriseID, *importAccountToEnterpriseOptions.AccountID}
-
-	builder := core.NewRequestBuilder(core.PUT)
-	_, err = builder.ConstructHTTPURL(enterpriseManagement.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range importAccountToEnterpriseOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("enterprise_management", "V1", "ImportAccountToEnterprise")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Content-Type", "application/json")
-
-	body := make(map[string]interface{})
-	if importAccountToEnterpriseOptions.Parent != nil {
-		body["parent"] = importAccountToEnterpriseOptions.Parent
-	}
-	if importAccountToEnterpriseOptions.BillingUnitID != nil {
-		body["billing_unit_id"] = importAccountToEnterpriseOptions.BillingUnitID
-	}
-	_, err = builder.SetBodyContentJSON(body)
-	if err != nil {
-		return
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = enterpriseManagement.Service.Request(request, nil)
-
-	return
-}
-
-// CreateAccount : Create a new account in an enterprise
-// Create a new account as a part of an existing enterprise. The API creates an account entity under the parent that is
-// specified in the payload of the request. The request also takes in the name and the owner of this new account. The
-// owner must have a valid IBMid that's registered with {{site.data.keyword.cloud_notm}}, but they don't need to be a
-// user in the enterprise account.
-func (enterpriseManagement *EnterpriseManagementV1) CreateAccount(createAccountOptions *CreateAccountOptions) (result *CreateAccountResponse, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(createAccountOptions, "createAccountOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(createAccountOptions, "createAccountOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"accounts"}
-	pathParameters := []string{}
-
-	builder := core.NewRequestBuilder(core.POST)
-	_, err = builder.ConstructHTTPURL(enterpriseManagement.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range createAccountOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("enterprise_management", "V1", "CreateAccount")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-	builder.AddHeader("Content-Type", "application/json")
-
-	body := make(map[string]interface{})
-	if createAccountOptions.Parent != nil {
-		body["parent"] = createAccountOptions.Parent
-	}
-	if createAccountOptions.Name != nil {
-		body["name"] = createAccountOptions.Name
-	}
-	if createAccountOptions.OwnerIamID != nil {
-		body["owner_iam_id"] = createAccountOptions.OwnerIamID
-	}
-	_, err = builder.SetBodyContentJSON(body)
-	if err != nil {
-		return
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = enterpriseManagement.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalCreateAccountResponse(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// ListAccounts : Get accounts by query parameter
-// Retrieve all accounts based on the values that are passed in the query parameters. If no query parameter is passed,
-// all of the accounts in the enterprise for which the calling identity has access are returned. <br/><br/>You can use
-// pagination parameters to filter the results. The `limit` field can be used to limit the number of results that are
-// displayed for this method.<br/><br/>This method ensures that only the accounts that the user has access to are
-// returned. Access can be controlled either through a policy on a specific account, or account-level platform services
-// access roles, such as Administrator, Editor, Operator, or Viewer. When you call the method with the `enterprise_id`,
-// `account_group_id` or `parent` query parameter, all of the accounts that are immediate children of this entity are
-// returned. Authentication is performed on all the accounts before they are returned to the user to ensure that only
-// those accounts are returned to which the calling identity has access to.
-func (enterpriseManagement *EnterpriseManagementV1) ListAccounts(listAccountsOptions *ListAccountsOptions) (result *ListAccountsResponse, response *core.DetailedResponse, err error) {
-	err = core.ValidateStruct(listAccountsOptions, "listAccountsOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"accounts"}
-	pathParameters := []string{}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(enterpriseManagement.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range listAccountsOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("enterprise_management", "V1", "ListAccounts")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	if listAccountsOptions.EnterpriseID != nil {
-		builder.AddQuery("enterprise_id", fmt.Sprint(*listAccountsOptions.EnterpriseID))
-	}
-	if listAccountsOptions.AccountGroupID != nil {
-		builder.AddQuery("account_group_id", fmt.Sprint(*listAccountsOptions.AccountGroupID))
-	}
-	if listAccountsOptions.Parent != nil {
-		builder.AddQuery("parent", fmt.Sprint(*listAccountsOptions.Parent))
-	}
-	if listAccountsOptions.Limit != nil {
-		builder.AddQuery("limit", fmt.Sprint(*listAccountsOptions.Limit))
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = enterpriseManagement.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalListAccountsResponse(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// GetAccountByID : Get account by ID
-// Retrieve an account by the `account_id` parameter. All data related to the account is returned only if the caller has
-// access to retrieve the account.
-func (enterpriseManagement *EnterpriseManagementV1) GetAccountByID(getAccountByIdOptions *GetAccountByIdOptions) (result *AccountResponse, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(getAccountByIdOptions, "getAccountByIdOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(getAccountByIdOptions, "getAccountByIdOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"accounts"}
-	pathParameters := []string{*getAccountByIdOptions.AccountID}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(enterpriseManagement.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range getAccountByIdOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("enterprise_management", "V1", "GetAccountByID")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = enterpriseManagement.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalAccountResponse(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// UpdateAccount : Move an account with the enterprise
-// Move an account to a different parent within the same enterprise.
-func (enterpriseManagement *EnterpriseManagementV1) UpdateAccount(updateAccountOptions *UpdateAccountOptions) (response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(updateAccountOptions, "updateAccountOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(updateAccountOptions, "updateAccountOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"accounts"}
-	pathParameters := []string{*updateAccountOptions.AccountID}
-
-	builder := core.NewRequestBuilder(core.PATCH)
-	_, err = builder.ConstructHTTPURL(enterpriseManagement.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range updateAccountOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("enterprise_management", "V1", "UpdateAccount")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Content-Type", "application/json")
-
-	body := make(map[string]interface{})
-	if updateAccountOptions.Parent != nil {
-		body["parent"] = updateAccountOptions.Parent
-	}
-	_, err = builder.SetBodyContentJSON(body)
-	if err != nil {
-		return
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = enterpriseManagement.Service.Request(request, nil)
-
-	return
-}
-
-// GetAccountPermissibleActions : Get permissible actions for an account
-// Return all the actions that are allowed on a particular account. This method takes an array of IAM actions in the
-// body of the request and returns those actions which can be performed by the caller. An authentication check is
-// performed for each action that is passed in the payload.
-func (enterpriseManagement *EnterpriseManagementV1) GetAccountPermissibleActions(getAccountPermissibleActionsOptions *GetAccountPermissibleActionsOptions) (response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(getAccountPermissibleActionsOptions, "getAccountPermissibleActionsOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(getAccountPermissibleActionsOptions, "getAccountPermissibleActionsOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"accounts", "permissible-actions"}
-	pathParameters := []string{*getAccountPermissibleActionsOptions.AccountID}
-
-	builder := core.NewRequestBuilder(core.POST)
-	_, err = builder.ConstructHTTPURL(enterpriseManagement.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range getAccountPermissibleActionsOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("enterprise_management", "V1", "GetAccountPermissibleActions")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Content-Type", "application/json")
-
-	body := make(map[string]interface{})
-	if getAccountPermissibleActionsOptions.Actions != nil {
-		body["actions"] = getAccountPermissibleActionsOptions.Actions
-	}
-	_, err = builder.SetBodyContentJSON(body)
-	if err != nil {
-		return
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = enterpriseManagement.Service.Request(request, nil)
-
-	return
-}
-
-// CreateEnterprise : Create an enterprise
-// Create a new enterprise, which you can use to centrally manage multiple accounts. To create an enterprise, you must
-// have an active Subscription account. <br/><br/>The API creates an enterprise entity, which is the root of the
-// enterprise hierarchy. It also creates a new enterprise account that is used to manage the enterprise. All
-// subscriptions, support entitlements, credits, and discounts from the source subscription account are migrated to the
-// enterprise account, and the source account becomes a child account in the hierarchy. The user that you assign as the
-// enterprise primary contact is also assigned as the owner of the enterprise account.
-func (enterpriseManagement *EnterpriseManagementV1) CreateEnterprise(createEnterpriseOptions *CreateEnterpriseOptions) (result *CreateEnterpriseResponse, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(createEnterpriseOptions, "createEnterpriseOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(createEnterpriseOptions, "createEnterpriseOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"enterprises"}
-	pathParameters := []string{}
-
-	builder := core.NewRequestBuilder(core.POST)
-	_, err = builder.ConstructHTTPURL(enterpriseManagement.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range createEnterpriseOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("enterprise_management", "V1", "CreateEnterprise")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-	builder.AddHeader("Content-Type", "application/json")
-
-	body := make(map[string]interface{})
-	if createEnterpriseOptions.SourceAccountID != nil {
-		body["source_account_id"] = createEnterpriseOptions.SourceAccountID
-	}
-	if createEnterpriseOptions.Name != nil {
-		body["name"] = createEnterpriseOptions.Name
-	}
-	if createEnterpriseOptions.PrimaryContactIamID != nil {
-		body["primary_contact_iam_id"] = createEnterpriseOptions.PrimaryContactIamID
-	}
-	if createEnterpriseOptions.Domain != nil {
-		body["domain"] = createEnterpriseOptions.Domain
-	}
-	_, err = builder.SetBodyContentJSON(body)
-	if err != nil {
-		return
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = enterpriseManagement.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalCreateEnterpriseResponse(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// ListEnterprises : Get enterprise by query parameter
-// Retrieve all enterprises for a given ID by passing the IDs on query parameters. If no ID is passed, the enterprises
-// for which the calling identity is the primary contact are returned. You can use pagination parameters to filter the
-// results. <br/><br/>This method ensures that only the enterprises that the user has access to are returned. Access can
-// be controlled either through a policy on a specific enterprise, or account-level platform services access roles, such
-// as Administrator, Editor, Operator, or Viewer. When you call the method with the `enterprise_account_id` or
-// `account_id` query parameter, the account ID in the token is compared with that in the query parameter. If these
-// account IDs match, authentication isn't performed and the enterprise information is returned. If the account IDs
-// don't match, authentication is performed and only then is the enterprise information returned in the response.
-func (enterpriseManagement *EnterpriseManagementV1) ListEnterprises(listEnterprisesOptions *ListEnterprisesOptions) (result *ListEnterprisesResponse, response *core.DetailedResponse, err error) {
-	err = core.ValidateStruct(listEnterprisesOptions, "listEnterprisesOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"enterprises"}
-	pathParameters := []string{}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(enterpriseManagement.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range listEnterprisesOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("enterprise_management", "V1", "ListEnterprises")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	if listEnterprisesOptions.EnterpriseAccountID != nil {
-		builder.AddQuery("enterprise_account_id", fmt.Sprint(*listEnterprisesOptions.EnterpriseAccountID))
-	}
-	if listEnterprisesOptions.AccountGroupID != nil {
-		builder.AddQuery("account_group_id", fmt.Sprint(*listEnterprisesOptions.AccountGroupID))
-	}
-	if listEnterprisesOptions.AccountID != nil {
-		builder.AddQuery("account_id", fmt.Sprint(*listEnterprisesOptions.AccountID))
-	}
-	if listEnterprisesOptions.Limit != nil {
-		builder.AddQuery("limit", fmt.Sprint(*listEnterprisesOptions.Limit))
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = enterpriseManagement.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalListEnterprisesResponse(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// GetEnterprise : Get enterprise by ID
-// Retrieve an enterprise by the `enterprise_id` parameter. All data related to the enterprise is returned only if the
-// caller has access to retrieve the enterprise.
-func (enterpriseManagement *EnterpriseManagementV1) GetEnterprise(getEnterpriseOptions *GetEnterpriseOptions) (result *EnterpriseResponse, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(getEnterpriseOptions, "getEnterpriseOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(getEnterpriseOptions, "getEnterpriseOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"enterprises"}
-	pathParameters := []string{*getEnterpriseOptions.EnterpriseID}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(enterpriseManagement.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range getEnterpriseOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("enterprise_management", "V1", "GetEnterprise")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = enterpriseManagement.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalEnterpriseResponse(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// UpdateEnterprise : Update an enterprise
-// Update the name, domain, or IAM ID of the primary contact for an existing enterprise. The new primary contact must
-// already be a user in the enterprise account.
-func (enterpriseManagement *EnterpriseManagementV1) UpdateEnterprise(updateEnterpriseOptions *UpdateEnterpriseOptions) (response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(updateEnterpriseOptions, "updateEnterpriseOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(updateEnterpriseOptions, "updateEnterpriseOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"enterprises"}
-	pathParameters := []string{*updateEnterpriseOptions.EnterpriseID}
-
-	builder := core.NewRequestBuilder(core.PATCH)
-	_, err = builder.ConstructHTTPURL(enterpriseManagement.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range updateEnterpriseOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("enterprise_management", "V1", "UpdateEnterprise")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Content-Type", "application/json")
-
-	body := make(map[string]interface{})
-	if updateEnterpriseOptions.Name != nil {
-		body["name"] = updateEnterpriseOptions.Name
-	}
-	if updateEnterpriseOptions.Domain != nil {
-		body["domain"] = updateEnterpriseOptions.Domain
-	}
-	if updateEnterpriseOptions.PrimaryContactIamID != nil {
-		body["primary_contact_iam_id"] = updateEnterpriseOptions.PrimaryContactIamID
-	}
-	_, err = builder.SetBodyContentJSON(body)
-	if err != nil {
-		return
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = enterpriseManagement.Service.Request(request, nil)
-
-	return
-}
-
-// GetEnterprisePermissibleActions : Get permissible actions for an enterprise
-// Return all the actions that are allowed on a particular enterprise. This method takes an array of IAM actions in the
-// body of the request and returns those actions which can be performed by the caller. An authentication check is
-// performed for each action that is passed in the payload.
-func (enterpriseManagement *EnterpriseManagementV1) GetEnterprisePermissibleActions(getEnterprisePermissibleActionsOptions *GetEnterprisePermissibleActionsOptions) (response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(getEnterprisePermissibleActionsOptions, "getEnterprisePermissibleActionsOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(getEnterprisePermissibleActionsOptions, "getEnterprisePermissibleActionsOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"enterprises", "permissible-actions"}
-	pathParameters := []string{*getEnterprisePermissibleActionsOptions.EnterpriseID}
-
-	builder := core.NewRequestBuilder(core.POST)
-	_, err = builder.ConstructHTTPURL(enterpriseManagement.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range getEnterprisePermissibleActionsOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("enterprise_management", "V1", "GetEnterprisePermissibleActions")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Content-Type", "application/json")
-
-	body := make(map[string]interface{})
-	if getEnterprisePermissibleActionsOptions.Actions != nil {
-		body["actions"] = getEnterprisePermissibleActionsOptions.Actions
-	}
-	_, err = builder.SetBodyContentJSON(body)
-	if err != nil {
-		return
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = enterpriseManagement.Service.Request(request, nil)
-
-	return
-}
-
-// AccountGroupResponse : An object that represents account group.
-type AccountGroupResponse struct {
-	// The URL of the account group.
-	URL *string `json:"url,omitempty"`
-
-	// The account group ID.
-	ID *string `json:"id,omitempty"`
-
-	// The CRN of the account group.
-	Crn *string `json:"crn,omitempty"`
-
-	// The CRN of the parent of the account group.
-	Parent *string `json:"parent,omitempty"`
-
-	// The enterprise account ID.
-	EnterpriseAccountID *string `json:"enterprise_account_id,omitempty"`
-
-	// The enterprise ID that the account group is a part of.
-	EnterpriseID *string `json:"enterprise_id,omitempty"`
-
-	// The path from the enterprise to this particular account group.
-	EnterprisePath *string `json:"enterprise_path,omitempty"`
-
-	// The name of the account group.
-	Name *string `json:"name,omitempty"`
-
-	// The state of the account group.
-	State *string `json:"state,omitempty"`
-
-	// The IAM ID of the primary contact of the account group.
-	PrimaryContactIamID *string `json:"primary_contact_iam_id,omitempty"`
-
-	// The email address of the primary contact of the account group.
-	PrimaryContactEmail *string `json:"primary_contact_email,omitempty"`
-
-	// The time stamp at which the account group was created.
-	CreatedAt *string `json:"created_at,omitempty"`
-
-	// The IAM ID of the user or service that created the account group.
-	CreatedBy *string `json:"created_by,omitempty"`
-
-	// The time stamp at which the account group was last updated.
-	UpdatedAt *string `json:"updated_at,omitempty"`
-
-	// The IAM ID of the user or service that updated the account group.
-	UpdatedBy *string `json:"updated_by,omitempty"`
-}
-
-
-// UnmarshalAccountGroupResponse constructs an instance of AccountGroupResponse from the specified map.
-func UnmarshalAccountGroupResponse(m map[string]interface{}) (result *AccountGroupResponse, err error) {
-	obj := new(AccountGroupResponse)
-	obj.URL, err = core.UnmarshalString(m, "url")
-	if err != nil {
-		return
-	}
-	obj.ID, err = core.UnmarshalString(m, "id")
-	if err != nil {
-		return
-	}
-	obj.Crn, err = core.UnmarshalString(m, "crn")
-	if err != nil {
-		return
-	}
-	obj.Parent, err = core.UnmarshalString(m, "parent")
-	if err != nil {
-		return
-	}
-	obj.EnterpriseAccountID, err = core.UnmarshalString(m, "enterprise_account_id")
-	if err != nil {
-		return
-	}
-	obj.EnterpriseID, err = core.UnmarshalString(m, "enterprise_id")
-	if err != nil {
-		return
-	}
-	obj.EnterprisePath, err = core.UnmarshalString(m, "enterprise_path")
-	if err != nil {
-		return
-	}
-	obj.Name, err = core.UnmarshalString(m, "name")
-	if err != nil {
-		return
-	}
-	obj.State, err = core.UnmarshalString(m, "state")
-	if err != nil {
-		return
-	}
-	obj.PrimaryContactIamID, err = core.UnmarshalString(m, "primary_contact_iam_id")
-	if err != nil {
-		return
-	}
-	obj.PrimaryContactEmail, err = core.UnmarshalString(m, "primary_contact_email")
-	if err != nil {
-		return
-	}
-	obj.CreatedAt, err = core.UnmarshalString(m, "created_at")
-	if err != nil {
-		return
-	}
-	obj.CreatedBy, err = core.UnmarshalString(m, "created_by")
-	if err != nil {
-		return
-	}
-	obj.UpdatedAt, err = core.UnmarshalString(m, "updated_at")
-	if err != nil {
-		return
-	}
-	obj.UpdatedBy, err = core.UnmarshalString(m, "updated_by")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalAccountGroupResponseSlice unmarshals a slice of AccountGroupResponse instances from the specified list of maps.
-func UnmarshalAccountGroupResponseSlice(s []interface{}) (slice []AccountGroupResponse, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'AccountGroupResponse'")
-			return
-		}
-		obj, e := UnmarshalAccountGroupResponse(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalAccountGroupResponseAsProperty unmarshals an instance of AccountGroupResponse that is stored as a property
-// within the specified map.
-func UnmarshalAccountGroupResponseAsProperty(m map[string]interface{}, propertyName string) (result *AccountGroupResponse, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'AccountGroupResponse'", propertyName)
-			return
-		}
-		result, err = UnmarshalAccountGroupResponse(objMap)
-	}
-	return
-}
-
-// UnmarshalAccountGroupResponseSliceAsProperty unmarshals a slice of AccountGroupResponse instances that are stored as a property
-// within the specified map.
-func UnmarshalAccountGroupResponseSliceAsProperty(m map[string]interface{}, propertyName string) (slice []AccountGroupResponse, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'AccountGroupResponse'", propertyName)
-			return
-		}
-		slice, err = UnmarshalAccountGroupResponseSlice(vSlice)
-	}
-	return
-}
-
-// AccountResponse : The response from successfully calling get account.
-type AccountResponse struct {
-	// The URL of the account.
-	URL *string `json:"url,omitempty"`
-
-	// The account ID.
-	ID *string `json:"id,omitempty"`
-
-	// The Cloud Resource Name (CRN) of the account.
-	Crn *string `json:"crn,omitempty"`
-
-	// The CRN of the parent of the account.
-	Parent *string `json:"parent,omitempty"`
-
-	// The enterprise account ID.
-	EnterpriseAccountID *string `json:"enterprise_account_id,omitempty"`
-
-	// The enterprise ID that the account is a part of.
-	EnterpriseID *string `json:"enterprise_id,omitempty"`
-
-	// The path from the enterprise to this particular account.
-	EnterprisePath *string `json:"enterprise_path,omitempty"`
-
-	// The name of the account.
-	Name *string `json:"name,omitempty"`
-
-	// The state of the account.
-	State *string `json:"state,omitempty"`
-
-	// The IAM ID of the owner of the account.
-	OwnerIamID *string `json:"owner_iam_id,omitempty"`
-
-	// The type of account - whether it is free or paid.
-	Paid *bool `json:"paid,omitempty"`
-
-	// The email address of the owner of the account.
-	OwnerEmail *string `json:"owner_email,omitempty"`
-
-	// The flag to indicate whether the account is an enterprise account or not.
-	IsEnterpriseAccount *bool `json:"is_enterprise_account,omitempty"`
-
-	// The time stamp at which the account was created.
-	CreatedAt *string `json:"created_at,omitempty"`
-
-	// The IAM ID of the user or service that created the account.
-	CreatedBy *string `json:"created_by,omitempty"`
-
-	// The time stamp at which the account was last updated.
-	UpdatedAt *string `json:"updated_at,omitempty"`
-
-	// The IAM ID of the user or service that updated the account.
-	UpdatedBy *string `json:"updated_by,omitempty"`
-}
-
-
-// UnmarshalAccountResponse constructs an instance of AccountResponse from the specified map.
-func UnmarshalAccountResponse(m map[string]interface{}) (result *AccountResponse, err error) {
-	obj := new(AccountResponse)
-	obj.URL, err = core.UnmarshalString(m, "url")
-	if err != nil {
-		return
-	}
-	obj.ID, err = core.UnmarshalString(m, "id")
-	if err != nil {
-		return
-	}
-	obj.Crn, err = core.UnmarshalString(m, "crn")
-	if err != nil {
-		return
-	}
-	obj.Parent, err = core.UnmarshalString(m, "parent")
-	if err != nil {
-		return
-	}
-	obj.EnterpriseAccountID, err = core.UnmarshalString(m, "enterprise_account_id")
-	if err != nil {
-		return
-	}
-	obj.EnterpriseID, err = core.UnmarshalString(m, "enterprise_id")
-	if err != nil {
-		return
-	}
-	obj.EnterprisePath, err = core.UnmarshalString(m, "enterprise_path")
-	if err != nil {
-		return
-	}
-	obj.Name, err = core.UnmarshalString(m, "name")
-	if err != nil {
-		return
-	}
-	obj.State, err = core.UnmarshalString(m, "state")
-	if err != nil {
-		return
-	}
-	obj.OwnerIamID, err = core.UnmarshalString(m, "owner_iam_id")
-	if err != nil {
-		return
-	}
-	obj.Paid, err = core.UnmarshalBool(m, "paid")
-	if err != nil {
-		return
-	}
-	obj.OwnerEmail, err = core.UnmarshalString(m, "owner_email")
-	if err != nil {
-		return
-	}
-	obj.IsEnterpriseAccount, err = core.UnmarshalBool(m, "is_enterprise_account")
-	if err != nil {
-		return
-	}
-	obj.CreatedAt, err = core.UnmarshalString(m, "created_at")
-	if err != nil {
-		return
-	}
-	obj.CreatedBy, err = core.UnmarshalString(m, "created_by")
-	if err != nil {
-		return
-	}
-	obj.UpdatedAt, err = core.UnmarshalString(m, "updated_at")
-	if err != nil {
-		return
-	}
-	obj.UpdatedBy, err = core.UnmarshalString(m, "updated_by")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalAccountResponseSlice unmarshals a slice of AccountResponse instances from the specified list of maps.
-func UnmarshalAccountResponseSlice(s []interface{}) (slice []AccountResponse, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'AccountResponse'")
-			return
-		}
-		obj, e := UnmarshalAccountResponse(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalAccountResponseAsProperty unmarshals an instance of AccountResponse that is stored as a property
-// within the specified map.
-func UnmarshalAccountResponseAsProperty(m map[string]interface{}, propertyName string) (result *AccountResponse, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'AccountResponse'", propertyName)
-			return
-		}
-		result, err = UnmarshalAccountResponse(objMap)
-	}
-	return
-}
-
-// UnmarshalAccountResponseSliceAsProperty unmarshals a slice of AccountResponse instances that are stored as a property
-// within the specified map.
-func UnmarshalAccountResponseSliceAsProperty(m map[string]interface{}, propertyName string) (slice []AccountResponse, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'AccountResponse'", propertyName)
-			return
-		}
-		slice, err = UnmarshalAccountResponseSlice(vSlice)
-	}
-	return
-}
-
-// CreateAccountGroupOptions : The CreateAccountGroup options.
-type CreateAccountGroupOptions struct {
-	// The CRN of the parent under which the account group will be created. The parent can be an existing account group or
-	// the enterprise itself.
-	Parent *string `json:"parent" validate:"required"`
-
-	// The name of the account group. This field must have 3 - 60 characters.
-	Name *string `json:"name" validate:"required"`
-
-	// The IAM ID of the primary contact for this account group, such as `IBMid-0123ABC`. The IAM ID must already exist.
-	PrimaryContactIamID *string `json:"primary_contact_iam_id" validate:"required"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewCreateAccountGroupOptions : Instantiate CreateAccountGroupOptions
-func (*EnterpriseManagementV1) NewCreateAccountGroupOptions(parent string, name string, primaryContactIamID string) *CreateAccountGroupOptions {
-	return &CreateAccountGroupOptions{
-		Parent: core.StringPtr(parent),
-		Name: core.StringPtr(name),
-		PrimaryContactIamID: core.StringPtr(primaryContactIamID),
-	}
-}
-
-// SetParent : Allow user to set Parent
-func (options *CreateAccountGroupOptions) SetParent(parent string) *CreateAccountGroupOptions {
-	options.Parent = core.StringPtr(parent)
-	return options
-}
-
-// SetName : Allow user to set Name
-func (options *CreateAccountGroupOptions) SetName(name string) *CreateAccountGroupOptions {
-	options.Name = core.StringPtr(name)
-	return options
-}
-
-// SetPrimaryContactIamID : Allow user to set PrimaryContactIamID
-func (options *CreateAccountGroupOptions) SetPrimaryContactIamID(primaryContactIamID string) *CreateAccountGroupOptions {
-	options.PrimaryContactIamID = core.StringPtr(primaryContactIamID)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *CreateAccountGroupOptions) SetHeaders(param map[string]string) *CreateAccountGroupOptions {
-	options.Headers = param
-	return options
-}
-
-// CreateAccountGroupResponse : Create account group request completed successfully.
-type CreateAccountGroupResponse struct {
-	// The ID of the account group entity that was created.
-	AccountGroupID *string `json:"account_group_id,omitempty"`
-}
-
-
-// UnmarshalCreateAccountGroupResponse constructs an instance of CreateAccountGroupResponse from the specified map.
-func UnmarshalCreateAccountGroupResponse(m map[string]interface{}) (result *CreateAccountGroupResponse, err error) {
-	obj := new(CreateAccountGroupResponse)
-	obj.AccountGroupID, err = core.UnmarshalString(m, "account_group_id")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalCreateAccountGroupResponseSlice unmarshals a slice of CreateAccountGroupResponse instances from the specified list of maps.
-func UnmarshalCreateAccountGroupResponseSlice(s []interface{}) (slice []CreateAccountGroupResponse, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'CreateAccountGroupResponse'")
-			return
-		}
-		obj, e := UnmarshalCreateAccountGroupResponse(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalCreateAccountGroupResponseAsProperty unmarshals an instance of CreateAccountGroupResponse that is stored as a property
-// within the specified map.
-func UnmarshalCreateAccountGroupResponseAsProperty(m map[string]interface{}, propertyName string) (result *CreateAccountGroupResponse, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'CreateAccountGroupResponse'", propertyName)
-			return
-		}
-		result, err = UnmarshalCreateAccountGroupResponse(objMap)
-	}
-	return
-}
-
-// UnmarshalCreateAccountGroupResponseSliceAsProperty unmarshals a slice of CreateAccountGroupResponse instances that are stored as a property
-// within the specified map.
-func UnmarshalCreateAccountGroupResponseSliceAsProperty(m map[string]interface{}, propertyName string) (slice []CreateAccountGroupResponse, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'CreateAccountGroupResponse'", propertyName)
-			return
-		}
-		slice, err = UnmarshalCreateAccountGroupResponseSlice(vSlice)
-	}
-	return
-}
-
-// CreateAccountOptions : The CreateAccount options.
-type CreateAccountOptions struct {
-	// The CRN of the parent under which the account will be created. The parent can be an existing account group or the
-	// enterprise itself.
-	Parent *string `json:"parent" validate:"required"`
-
-	// The name of the account group. This field must have 3 - 60 characters.
-	Name *string `json:"name" validate:"required"`
-
-	// The IAM ID of the account owner, such as `IBMid-0123ABC`. The IAM ID must already exist.
-	OwnerIamID *string `json:"owner_iam_id" validate:"required"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewCreateAccountOptions : Instantiate CreateAccountOptions
-func (*EnterpriseManagementV1) NewCreateAccountOptions(parent string, name string, ownerIamID string) *CreateAccountOptions {
-	return &CreateAccountOptions{
-		Parent: core.StringPtr(parent),
-		Name: core.StringPtr(name),
-		OwnerIamID: core.StringPtr(ownerIamID),
-	}
-}
-
-// SetParent : Allow user to set Parent
-func (options *CreateAccountOptions) SetParent(parent string) *CreateAccountOptions {
-	options.Parent = core.StringPtr(parent)
-	return options
-}
-
-// SetName : Allow user to set Name
-func (options *CreateAccountOptions) SetName(name string) *CreateAccountOptions {
-	options.Name = core.StringPtr(name)
-	return options
-}
-
-// SetOwnerIamID : Allow user to set OwnerIamID
-func (options *CreateAccountOptions) SetOwnerIamID(ownerIamID string) *CreateAccountOptions {
-	options.OwnerIamID = core.StringPtr(ownerIamID)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *CreateAccountOptions) SetHeaders(param map[string]string) *CreateAccountOptions {
-	options.Headers = param
-	return options
-}
-
-// CreateAccountResponse : The create account request completed successfully.
-type CreateAccountResponse struct {
-	// The ID of the account group entity that was created.
-	AccountGroupID *string `json:"account_group_id,omitempty"`
-}
-
-
-// UnmarshalCreateAccountResponse constructs an instance of CreateAccountResponse from the specified map.
-func UnmarshalCreateAccountResponse(m map[string]interface{}) (result *CreateAccountResponse, err error) {
-	obj := new(CreateAccountResponse)
-	obj.AccountGroupID, err = core.UnmarshalString(m, "account_group_id")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalCreateAccountResponseSlice unmarshals a slice of CreateAccountResponse instances from the specified list of maps.
-func UnmarshalCreateAccountResponseSlice(s []interface{}) (slice []CreateAccountResponse, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'CreateAccountResponse'")
-			return
-		}
-		obj, e := UnmarshalCreateAccountResponse(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalCreateAccountResponseAsProperty unmarshals an instance of CreateAccountResponse that is stored as a property
-// within the specified map.
-func UnmarshalCreateAccountResponseAsProperty(m map[string]interface{}, propertyName string) (result *CreateAccountResponse, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'CreateAccountResponse'", propertyName)
-			return
-		}
-		result, err = UnmarshalCreateAccountResponse(objMap)
-	}
-	return
-}
-
-// UnmarshalCreateAccountResponseSliceAsProperty unmarshals a slice of CreateAccountResponse instances that are stored as a property
-// within the specified map.
-func UnmarshalCreateAccountResponseSliceAsProperty(m map[string]interface{}, propertyName string) (slice []CreateAccountResponse, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'CreateAccountResponse'", propertyName)
-			return
-		}
-		slice, err = UnmarshalCreateAccountResponseSlice(vSlice)
-	}
-	return
-}
-
-// CreateEnterpriseOptions : The CreateEnterprise options.
-type CreateEnterpriseOptions struct {
-	// The ID of the account that is used to create the enterprise.
-	SourceAccountID *string `json:"source_account_id" validate:"required"`
-
-	// The name of the enterprise. This field must have 3 - 60 characters.
-	Name *string `json:"name" validate:"required"`
-
-	// The IAM ID of the enterprise primary contact, such as `IBMid-0123ABC`. The IAM ID must already exist.
-	PrimaryContactIamID *string `json:"primary_contact_iam_id" validate:"required"`
-
-	// A domain or subdomain for the enterprise, such as `example.com` or `my.example.com`.
-	Domain *string `json:"domain,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewCreateEnterpriseOptions : Instantiate CreateEnterpriseOptions
-func (*EnterpriseManagementV1) NewCreateEnterpriseOptions(sourceAccountID string, name string, primaryContactIamID string) *CreateEnterpriseOptions {
-	return &CreateEnterpriseOptions{
-		SourceAccountID: core.StringPtr(sourceAccountID),
-		Name: core.StringPtr(name),
-		PrimaryContactIamID: core.StringPtr(primaryContactIamID),
-	}
-}
-
-// SetSourceAccountID : Allow user to set SourceAccountID
-func (options *CreateEnterpriseOptions) SetSourceAccountID(sourceAccountID string) *CreateEnterpriseOptions {
-	options.SourceAccountID = core.StringPtr(sourceAccountID)
-	return options
-}
-
-// SetName : Allow user to set Name
-func (options *CreateEnterpriseOptions) SetName(name string) *CreateEnterpriseOptions {
-	options.Name = core.StringPtr(name)
-	return options
-}
-
-// SetPrimaryContactIamID : Allow user to set PrimaryContactIamID
-func (options *CreateEnterpriseOptions) SetPrimaryContactIamID(primaryContactIamID string) *CreateEnterpriseOptions {
-	options.PrimaryContactIamID = core.StringPtr(primaryContactIamID)
-	return options
-}
-
-// SetDomain : Allow user to set Domain
-func (options *CreateEnterpriseOptions) SetDomain(domain string) *CreateEnterpriseOptions {
-	options.Domain = core.StringPtr(domain)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *CreateEnterpriseOptions) SetHeaders(param map[string]string) *CreateEnterpriseOptions {
-	options.Headers = param
-	return options
-}
-
-// CreateEnterpriseResponse : The response from calling create enterprise.
-type CreateEnterpriseResponse struct {
-	// The ID of the enterprise entity that was created. This entity is the root of the hierarchy.
-	EnterpriseID *string `json:"enterprise_id,omitempty"`
-
-	// The ID of the enterprise account that was created. The enterprise account is used to manage billing and access to
-	// the enterprise management.
-	EnterpriseAccountID *string `json:"enterprise_account_id,omitempty"`
-}
-
-
-// UnmarshalCreateEnterpriseResponse constructs an instance of CreateEnterpriseResponse from the specified map.
-func UnmarshalCreateEnterpriseResponse(m map[string]interface{}) (result *CreateEnterpriseResponse, err error) {
-	obj := new(CreateEnterpriseResponse)
-	obj.EnterpriseID, err = core.UnmarshalString(m, "enterprise_id")
-	if err != nil {
-		return
-	}
-	obj.EnterpriseAccountID, err = core.UnmarshalString(m, "enterprise_account_id")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalCreateEnterpriseResponseSlice unmarshals a slice of CreateEnterpriseResponse instances from the specified list of maps.
-func UnmarshalCreateEnterpriseResponseSlice(s []interface{}) (slice []CreateEnterpriseResponse, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'CreateEnterpriseResponse'")
-			return
-		}
-		obj, e := UnmarshalCreateEnterpriseResponse(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalCreateEnterpriseResponseAsProperty unmarshals an instance of CreateEnterpriseResponse that is stored as a property
-// within the specified map.
-func UnmarshalCreateEnterpriseResponseAsProperty(m map[string]interface{}, propertyName string) (result *CreateEnterpriseResponse, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'CreateEnterpriseResponse'", propertyName)
-			return
-		}
-		result, err = UnmarshalCreateEnterpriseResponse(objMap)
-	}
-	return
-}
-
-// UnmarshalCreateEnterpriseResponseSliceAsProperty unmarshals a slice of CreateEnterpriseResponse instances that are stored as a property
-// within the specified map.
-func UnmarshalCreateEnterpriseResponseSliceAsProperty(m map[string]interface{}, propertyName string) (slice []CreateEnterpriseResponse, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'CreateEnterpriseResponse'", propertyName)
-			return
-		}
-		slice, err = UnmarshalCreateEnterpriseResponseSlice(vSlice)
-	}
-	return
-}
-
-// EnterpriseResponse : The response from calling get enterprise.
-type EnterpriseResponse struct {
-	// The URL of the enterprise.
-	URL *string `json:"url,omitempty"`
-
-	// The enterprise ID.
-	ID *string `json:"id,omitempty"`
-
-	// The enterprise account ID.
-	EnterpriseAccountID *string `json:"enterprise_account_id,omitempty"`
-
-	// The Cloud Resource Name (CRN) of the enterprise.
-	Crn *string `json:"crn,omitempty"`
-
-	// The name of the enterprise.
-	Name *string `json:"name,omitempty"`
-
-	// The domain of the enterprise.
-	Domain *string `json:"domain,omitempty"`
-
-	// The state of the enterprise.
-	State *string `json:"state,omitempty"`
-
-	// The IAM ID of the primary contact of the enterprise, such as `IBMid-0123ABC`.
-	PrimaryContactIamID *string `json:"primary_contact_iam_id,omitempty"`
-
-	// The email of the primary contact of the enterprise.
-	PrimaryContactEmail *string `json:"primary_contact_email,omitempty"`
-
-	// The time stamp at which the enterprise was created.
-	CreatedAt *string `json:"created_at,omitempty"`
-
-	// The IAM ID of the user or service that created the enterprise.
-	CreatedBy *string `json:"created_by,omitempty"`
-
-	// The time stamp at which the enterprise was last updated.
-	UpdatedAt *string `json:"updated_at,omitempty"`
-
-	// The IAM ID of the user or service that updated the enterprise.
-	UpdatedBy *string `json:"updated_by,omitempty"`
-}
-
-
-// UnmarshalEnterpriseResponse constructs an instance of EnterpriseResponse from the specified map.
-func UnmarshalEnterpriseResponse(m map[string]interface{}) (result *EnterpriseResponse, err error) {
-	obj := new(EnterpriseResponse)
-	obj.URL, err = core.UnmarshalString(m, "url")
-	if err != nil {
-		return
-	}
-	obj.ID, err = core.UnmarshalString(m, "id")
-	if err != nil {
-		return
-	}
-	obj.EnterpriseAccountID, err = core.UnmarshalString(m, "enterprise_account_id")
-	if err != nil {
-		return
-	}
-	obj.Crn, err = core.UnmarshalString(m, "crn")
-	if err != nil {
-		return
-	}
-	obj.Name, err = core.UnmarshalString(m, "name")
-	if err != nil {
-		return
-	}
-	obj.Domain, err = core.UnmarshalString(m, "domain")
-	if err != nil {
-		return
-	}
-	obj.State, err = core.UnmarshalString(m, "state")
-	if err != nil {
-		return
-	}
-	obj.PrimaryContactIamID, err = core.UnmarshalString(m, "primary_contact_iam_id")
-	if err != nil {
-		return
-	}
-	obj.PrimaryContactEmail, err = core.UnmarshalString(m, "primary_contact_email")
-	if err != nil {
-		return
-	}
-	obj.CreatedAt, err = core.UnmarshalString(m, "created_at")
-	if err != nil {
-		return
-	}
-	obj.CreatedBy, err = core.UnmarshalString(m, "created_by")
-	if err != nil {
-		return
-	}
-	obj.UpdatedAt, err = core.UnmarshalString(m, "updated_at")
-	if err != nil {
-		return
-	}
-	obj.UpdatedBy, err = core.UnmarshalString(m, "updated_by")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalEnterpriseResponseSlice unmarshals a slice of EnterpriseResponse instances from the specified list of maps.
-func UnmarshalEnterpriseResponseSlice(s []interface{}) (slice []EnterpriseResponse, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'EnterpriseResponse'")
-			return
-		}
-		obj, e := UnmarshalEnterpriseResponse(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalEnterpriseResponseAsProperty unmarshals an instance of EnterpriseResponse that is stored as a property
-// within the specified map.
-func UnmarshalEnterpriseResponseAsProperty(m map[string]interface{}, propertyName string) (result *EnterpriseResponse, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'EnterpriseResponse'", propertyName)
-			return
-		}
-		result, err = UnmarshalEnterpriseResponse(objMap)
-	}
-	return
-}
-
-// UnmarshalEnterpriseResponseSliceAsProperty unmarshals a slice of EnterpriseResponse instances that are stored as a property
-// within the specified map.
-func UnmarshalEnterpriseResponseSliceAsProperty(m map[string]interface{}, propertyName string) (slice []EnterpriseResponse, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'EnterpriseResponse'", propertyName)
-			return
-		}
-		slice, err = UnmarshalEnterpriseResponseSlice(vSlice)
-	}
-	return
-}
-
-// GetAccountByIdOptions : The GetAccountByID options.
-type GetAccountByIdOptions struct {
-	// The ID of the account to retrieve.
-	AccountID *string `json:"account_id" validate:"required"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewGetAccountByIdOptions : Instantiate GetAccountByIdOptions
-func (*EnterpriseManagementV1) NewGetAccountByIdOptions(accountID string) *GetAccountByIdOptions {
-	return &GetAccountByIdOptions{
-		AccountID: core.StringPtr(accountID),
-	}
-}
-
-// SetAccountID : Allow user to set AccountID
-func (options *GetAccountByIdOptions) SetAccountID(accountID string) *GetAccountByIdOptions {
-	options.AccountID = core.StringPtr(accountID)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *GetAccountByIdOptions) SetHeaders(param map[string]string) *GetAccountByIdOptions {
-	options.Headers = param
-	return options
-}
-
-// GetAccountGroupByIdOptions : The GetAccountGroupByID options.
-type GetAccountGroupByIdOptions struct {
-	// The ID of the account group to retrieve.
-	AccountGroupID *string `json:"account_group_id" validate:"required"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewGetAccountGroupByIdOptions : Instantiate GetAccountGroupByIdOptions
-func (*EnterpriseManagementV1) NewGetAccountGroupByIdOptions(accountGroupID string) *GetAccountGroupByIdOptions {
-	return &GetAccountGroupByIdOptions{
-		AccountGroupID: core.StringPtr(accountGroupID),
-	}
-}
-
-// SetAccountGroupID : Allow user to set AccountGroupID
-func (options *GetAccountGroupByIdOptions) SetAccountGroupID(accountGroupID string) *GetAccountGroupByIdOptions {
-	options.AccountGroupID = core.StringPtr(accountGroupID)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *GetAccountGroupByIdOptions) SetHeaders(param map[string]string) *GetAccountGroupByIdOptions {
-	options.Headers = param
-	return options
-}
-
-// GetAccountGroupPermissibleActionsOptions : The GetAccountGroupPermissibleActions options.
-type GetAccountGroupPermissibleActionsOptions struct {
-	// The ID of the account group to check for permissible actions.
-	AccountGroupID *string `json:"account_group_id" validate:"required"`
-
-	// A list of names of permissible actions.
-	Actions []string `json:"actions,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewGetAccountGroupPermissibleActionsOptions : Instantiate GetAccountGroupPermissibleActionsOptions
-func (*EnterpriseManagementV1) NewGetAccountGroupPermissibleActionsOptions(accountGroupID string) *GetAccountGroupPermissibleActionsOptions {
-	return &GetAccountGroupPermissibleActionsOptions{
-		AccountGroupID: core.StringPtr(accountGroupID),
-	}
-}
-
-// SetAccountGroupID : Allow user to set AccountGroupID
-func (options *GetAccountGroupPermissibleActionsOptions) SetAccountGroupID(accountGroupID string) *GetAccountGroupPermissibleActionsOptions {
-	options.AccountGroupID = core.StringPtr(accountGroupID)
-	return options
-}
-
-// SetActions : Allow user to set Actions
-func (options *GetAccountGroupPermissibleActionsOptions) SetActions(actions []string) *GetAccountGroupPermissibleActionsOptions {
-	options.Actions = actions
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *GetAccountGroupPermissibleActionsOptions) SetHeaders(param map[string]string) *GetAccountGroupPermissibleActionsOptions {
-	options.Headers = param
-	return options
-}
-
-// GetAccountPermissibleActionsOptions : The GetAccountPermissibleActions options.
-type GetAccountPermissibleActionsOptions struct {
-	// The ID of the account to check for permissible actions.
-	AccountID *string `json:"account_id" validate:"required"`
-
-	// A list of names of permissible actions.
-	Actions []string `json:"actions,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewGetAccountPermissibleActionsOptions : Instantiate GetAccountPermissibleActionsOptions
-func (*EnterpriseManagementV1) NewGetAccountPermissibleActionsOptions(accountID string) *GetAccountPermissibleActionsOptions {
-	return &GetAccountPermissibleActionsOptions{
-		AccountID: core.StringPtr(accountID),
-	}
-}
-
-// SetAccountID : Allow user to set AccountID
-func (options *GetAccountPermissibleActionsOptions) SetAccountID(accountID string) *GetAccountPermissibleActionsOptions {
-	options.AccountID = core.StringPtr(accountID)
-	return options
-}
-
-// SetActions : Allow user to set Actions
-func (options *GetAccountPermissibleActionsOptions) SetActions(actions []string) *GetAccountPermissibleActionsOptions {
-	options.Actions = actions
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *GetAccountPermissibleActionsOptions) SetHeaders(param map[string]string) *GetAccountPermissibleActionsOptions {
-	options.Headers = param
-	return options
-}
-
-// GetEnterpriseOptions : The GetEnterprise options.
-type GetEnterpriseOptions struct {
-	// The ID of the enterprise to retrieve.
-	EnterpriseID *string `json:"enterprise_id" validate:"required"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewGetEnterpriseOptions : Instantiate GetEnterpriseOptions
-func (*EnterpriseManagementV1) NewGetEnterpriseOptions(enterpriseID string) *GetEnterpriseOptions {
-	return &GetEnterpriseOptions{
-		EnterpriseID: core.StringPtr(enterpriseID),
-	}
-}
-
-// SetEnterpriseID : Allow user to set EnterpriseID
-func (options *GetEnterpriseOptions) SetEnterpriseID(enterpriseID string) *GetEnterpriseOptions {
-	options.EnterpriseID = core.StringPtr(enterpriseID)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *GetEnterpriseOptions) SetHeaders(param map[string]string) *GetEnterpriseOptions {
-	options.Headers = param
-	return options
-}
-
-// GetEnterprisePermissibleActionsOptions : The GetEnterprisePermissibleActions options.
-type GetEnterprisePermissibleActionsOptions struct {
-	// The ID of the enterprise to check for permissible actions.
-	EnterpriseID *string `json:"enterprise_id" validate:"required"`
-
-	// A list of names of permissible actions.
-	Actions []string `json:"actions,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewGetEnterprisePermissibleActionsOptions : Instantiate GetEnterprisePermissibleActionsOptions
-func (*EnterpriseManagementV1) NewGetEnterprisePermissibleActionsOptions(enterpriseID string) *GetEnterprisePermissibleActionsOptions {
-	return &GetEnterprisePermissibleActionsOptions{
-		EnterpriseID: core.StringPtr(enterpriseID),
-	}
-}
-
-// SetEnterpriseID : Allow user to set EnterpriseID
-func (options *GetEnterprisePermissibleActionsOptions) SetEnterpriseID(enterpriseID string) *GetEnterprisePermissibleActionsOptions {
-	options.EnterpriseID = core.StringPtr(enterpriseID)
-	return options
-}
-
-// SetActions : Allow user to set Actions
-func (options *GetEnterprisePermissibleActionsOptions) SetActions(actions []string) *GetEnterprisePermissibleActionsOptions {
-	options.Actions = actions
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *GetEnterprisePermissibleActionsOptions) SetHeaders(param map[string]string) *GetEnterprisePermissibleActionsOptions {
-	options.Headers = param
-	return options
-}
-
-// ImportAccountToEnterpriseOptions : The ImportAccountToEnterprise options.
-type ImportAccountToEnterpriseOptions struct {
-	// The ID of the enterprise to import the stand-alone account into.
-	EnterpriseID *string `json:"enterprise_id" validate:"required"`
-
-	// The ID of the existing stand-alone account to be imported.
-	AccountID *string `json:"account_id" validate:"required"`
-
-	// The CRN of the expected parent of the imported account. The parent is the enterprise or account group that the
-	// account is added to.
-	Parent *string `json:"parent,omitempty"`
-
-	// The ID of the [billing unit](/apidocs/enterprise-apis/billing-unit) to use for billing this account in the
-	// enterprise.
-	BillingUnitID *string `json:"billing_unit_id,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewImportAccountToEnterpriseOptions : Instantiate ImportAccountToEnterpriseOptions
-func (*EnterpriseManagementV1) NewImportAccountToEnterpriseOptions(enterpriseID string, accountID string) *ImportAccountToEnterpriseOptions {
-	return &ImportAccountToEnterpriseOptions{
-		EnterpriseID: core.StringPtr(enterpriseID),
-		AccountID: core.StringPtr(accountID),
-	}
-}
-
-// SetEnterpriseID : Allow user to set EnterpriseID
-func (options *ImportAccountToEnterpriseOptions) SetEnterpriseID(enterpriseID string) *ImportAccountToEnterpriseOptions {
-	options.EnterpriseID = core.StringPtr(enterpriseID)
-	return options
-}
-
-// SetAccountID : Allow user to set AccountID
-func (options *ImportAccountToEnterpriseOptions) SetAccountID(accountID string) *ImportAccountToEnterpriseOptions {
-	options.AccountID = core.StringPtr(accountID)
-	return options
-}
-
-// SetParent : Allow user to set Parent
-func (options *ImportAccountToEnterpriseOptions) SetParent(parent string) *ImportAccountToEnterpriseOptions {
-	options.Parent = core.StringPtr(parent)
-	return options
-}
-
-// SetBillingUnitID : Allow user to set BillingUnitID
-func (options *ImportAccountToEnterpriseOptions) SetBillingUnitID(billingUnitID string) *ImportAccountToEnterpriseOptions {
-	options.BillingUnitID = core.StringPtr(billingUnitID)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *ImportAccountToEnterpriseOptions) SetHeaders(param map[string]string) *ImportAccountToEnterpriseOptions {
-	options.Headers = param
-	return options
-}
-
-// ListAccountGroupsOptions : The ListAccountGroups options.
-type ListAccountGroupsOptions struct {
-	// Get account groups that are either immediate children or are a part of the hierarchy for a given enterprise ID.
-	EnterpriseID *string `json:"enterprise_id,omitempty"`
-
-	// Get account groups that are either immediate children or are a part of the hierarchy for a given account group ID.
-	ParentAccountGroupID *string `json:"parent_account_group_id,omitempty"`
-
-	// Get account groups that are either immediate children or are a part of the hierarchy for a given parent CRN.
-	Parent *string `json:"parent,omitempty"`
-
-	// Return results up to this limit. Valid values are between `0` and `100`.
-	Limit *int64 `json:"limit,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewListAccountGroupsOptions : Instantiate ListAccountGroupsOptions
-func (*EnterpriseManagementV1) NewListAccountGroupsOptions() *ListAccountGroupsOptions {
-	return &ListAccountGroupsOptions{}
-}
-
-// SetEnterpriseID : Allow user to set EnterpriseID
-func (options *ListAccountGroupsOptions) SetEnterpriseID(enterpriseID string) *ListAccountGroupsOptions {
-	options.EnterpriseID = core.StringPtr(enterpriseID)
-	return options
-}
-
-// SetParentAccountGroupID : Allow user to set ParentAccountGroupID
-func (options *ListAccountGroupsOptions) SetParentAccountGroupID(parentAccountGroupID string) *ListAccountGroupsOptions {
-	options.ParentAccountGroupID = core.StringPtr(parentAccountGroupID)
-	return options
-}
-
-// SetParent : Allow user to set Parent
-func (options *ListAccountGroupsOptions) SetParent(parent string) *ListAccountGroupsOptions {
-	options.Parent = core.StringPtr(parent)
-	return options
-}
-
-// SetLimit : Allow user to set Limit
-func (options *ListAccountGroupsOptions) SetLimit(limit int64) *ListAccountGroupsOptions {
-	options.Limit = core.Int64Ptr(limit)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *ListAccountGroupsOptions) SetHeaders(param map[string]string) *ListAccountGroupsOptions {
-	options.Headers = param
-	return options
-}
-
-// ListAccountGroupsResources : An object that represents account groups resource.
-type ListAccountGroupsResources struct {
-	// The URL of the account group.
-	URL *string `json:"url,omitempty"`
-
-	// The account group ID.
-	ID *string `json:"id,omitempty"`
-
-	// The Cloud Resource Name (CRN) of the account group.
-	Crn *string `json:"crn,omitempty"`
-
-	// The CRN of the parent of the account group.
-	Parent *string `json:"parent,omitempty"`
-
-	// The enterprise account ID.
-	EnterpriseAccountID *string `json:"enterprise_account_id,omitempty"`
-
-	// The enterprise ID that the account group is a part of.
-	EnterpriseID *string `json:"enterprise_id,omitempty"`
-
-	// The path from the enterprise to this particular account group.
-	EnterprisePath *string `json:"enterprise_path,omitempty"`
-
-	// The name of the account group.
-	Name *string `json:"name,omitempty"`
-
-	// The state of the account group.
-	State *string `json:"state,omitempty"`
-
-	// The IAM ID of the primary contact of the account group.
-	PrimaryContactIamID *string `json:"primary_contact_iam_id,omitempty"`
-
-	// The email address of the primary contact of the account group.
-	PrimaryContactEmail *string `json:"primary_contact_email,omitempty"`
-
-	// The time stamp at which the account group was created.
-	CreatedAt *string `json:"created_at,omitempty"`
-
-	// The IAM ID of the user or service that created the account group.
-	CreatedBy *string `json:"created_by,omitempty"`
-
-	// The time stamp at which the account group was last updated.
-	UpdatedAt *string `json:"updated_at,omitempty"`
-
-	// The IAM ID of the user or service that updated the account group.
-	UpdatedBy *string `json:"updated_by,omitempty"`
-}
-
-
-// UnmarshalListAccountGroupsResources constructs an instance of ListAccountGroupsResources from the specified map.
-func UnmarshalListAccountGroupsResources(m map[string]interface{}) (result *ListAccountGroupsResources, err error) {
-	obj := new(ListAccountGroupsResources)
-	obj.URL, err = core.UnmarshalString(m, "url")
-	if err != nil {
-		return
-	}
-	obj.ID, err = core.UnmarshalString(m, "id")
-	if err != nil {
-		return
-	}
-	obj.Crn, err = core.UnmarshalString(m, "crn")
-	if err != nil {
-		return
-	}
-	obj.Parent, err = core.UnmarshalString(m, "parent")
-	if err != nil {
-		return
-	}
-	obj.EnterpriseAccountID, err = core.UnmarshalString(m, "enterprise_account_id")
-	if err != nil {
-		return
-	}
-	obj.EnterpriseID, err = core.UnmarshalString(m, "enterprise_id")
-	if err != nil {
-		return
-	}
-	obj.EnterprisePath, err = core.UnmarshalString(m, "enterprise_path")
-	if err != nil {
-		return
-	}
-	obj.Name, err = core.UnmarshalString(m, "name")
-	if err != nil {
-		return
-	}
-	obj.State, err = core.UnmarshalString(m, "state")
-	if err != nil {
-		return
-	}
-	obj.PrimaryContactIamID, err = core.UnmarshalString(m, "primary_contact_iam_id")
-	if err != nil {
-		return
-	}
-	obj.PrimaryContactEmail, err = core.UnmarshalString(m, "primary_contact_email")
-	if err != nil {
-		return
-	}
-	obj.CreatedAt, err = core.UnmarshalString(m, "created_at")
-	if err != nil {
-		return
-	}
-	obj.CreatedBy, err = core.UnmarshalString(m, "created_by")
-	if err != nil {
-		return
-	}
-	obj.UpdatedAt, err = core.UnmarshalString(m, "updated_at")
-	if err != nil {
-		return
-	}
-	obj.UpdatedBy, err = core.UnmarshalString(m, "updated_by")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalListAccountGroupsResourcesSlice unmarshals a slice of ListAccountGroupsResources instances from the specified list of maps.
-func UnmarshalListAccountGroupsResourcesSlice(s []interface{}) (slice []ListAccountGroupsResources, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'ListAccountGroupsResources'")
-			return
-		}
-		obj, e := UnmarshalListAccountGroupsResources(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalListAccountGroupsResourcesAsProperty unmarshals an instance of ListAccountGroupsResources that is stored as a property
-// within the specified map.
-func UnmarshalListAccountGroupsResourcesAsProperty(m map[string]interface{}, propertyName string) (result *ListAccountGroupsResources, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'ListAccountGroupsResources'", propertyName)
-			return
-		}
-		result, err = UnmarshalListAccountGroupsResources(objMap)
-	}
-	return
-}
-
-// UnmarshalListAccountGroupsResourcesSliceAsProperty unmarshals a slice of ListAccountGroupsResources instances that are stored as a property
-// within the specified map.
-func UnmarshalListAccountGroupsResourcesSliceAsProperty(m map[string]interface{}, propertyName string) (slice []ListAccountGroupsResources, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'ListAccountGroupsResources'", propertyName)
-			return
-		}
-		slice, err = UnmarshalListAccountGroupsResourcesSlice(vSlice)
-	}
-	return
-}
-
-// ListAccountGroupsResponse : The response from successfully calling list account groups.
-type ListAccountGroupsResponse struct {
-	// The number of enterprises returned from calling list account groups.
-	RowsCount *int64 `json:"rows_count,omitempty"`
-
-	// A string that represents the link to the next page of results.
-	NextURL *string `json:"next_url,omitempty"`
-
-	// A list of account groups.
-	Resources []ListAccountGroupsResources `json:"resources,omitempty"`
-}
-
-
-// UnmarshalListAccountGroupsResponse constructs an instance of ListAccountGroupsResponse from the specified map.
-func UnmarshalListAccountGroupsResponse(m map[string]interface{}) (result *ListAccountGroupsResponse, err error) {
-	obj := new(ListAccountGroupsResponse)
-	obj.RowsCount, err = core.UnmarshalInt64(m, "rows_count")
-	if err != nil {
-		return
-	}
-	obj.NextURL, err = core.UnmarshalString(m, "next_url")
-	if err != nil {
-		return
-	}
-	obj.Resources, err = UnmarshalListAccountGroupsResourcesSliceAsProperty(m, "resources")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalListAccountGroupsResponseSlice unmarshals a slice of ListAccountGroupsResponse instances from the specified list of maps.
-func UnmarshalListAccountGroupsResponseSlice(s []interface{}) (slice []ListAccountGroupsResponse, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'ListAccountGroupsResponse'")
-			return
-		}
-		obj, e := UnmarshalListAccountGroupsResponse(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalListAccountGroupsResponseAsProperty unmarshals an instance of ListAccountGroupsResponse that is stored as a property
-// within the specified map.
-func UnmarshalListAccountGroupsResponseAsProperty(m map[string]interface{}, propertyName string) (result *ListAccountGroupsResponse, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'ListAccountGroupsResponse'", propertyName)
-			return
-		}
-		result, err = UnmarshalListAccountGroupsResponse(objMap)
-	}
-	return
-}
-
-// UnmarshalListAccountGroupsResponseSliceAsProperty unmarshals a slice of ListAccountGroupsResponse instances that are stored as a property
-// within the specified map.
-func UnmarshalListAccountGroupsResponseSliceAsProperty(m map[string]interface{}, propertyName string) (slice []ListAccountGroupsResponse, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'ListAccountGroupsResponse'", propertyName)
-			return
-		}
-		slice, err = UnmarshalListAccountGroupsResponseSlice(vSlice)
-	}
-	return
-}
-
-// ListAccountResources : An object that represents account resource.
-type ListAccountResources struct {
-	// The URL of the account.
-	URL *string `json:"url,omitempty"`
-
-	// The account ID.
-	ID *string `json:"id,omitempty"`
-
-	// The Cloud Resource Name (CRN) of the account.
-	Crn *string `json:"crn,omitempty"`
-
-	// The CRN of the parent of the account.
-	Parent *string `json:"parent,omitempty"`
-
-	// The enterprise account ID.
-	EnterpriseAccountID *string `json:"enterprise_account_id,omitempty"`
-
-	// The enterprise ID that the account is a part of.
-	EnterpriseID *string `json:"enterprise_id,omitempty"`
-
-	// The path from the enterprise to this particular account.
-	EnterprisePath *string `json:"enterprise_path,omitempty"`
-
-	// The name of the account.
-	Name *string `json:"name,omitempty"`
-
-	// The state of the account.
-	State *string `json:"state,omitempty"`
-
-	// The IAM ID of the owner of the account.
-	OwnerIamID *string `json:"owner_iam_id,omitempty"`
-
-	// The type of account - whether it is free or paid.
-	Paid *bool `json:"paid,omitempty"`
-
-	// The email address of the owner of the account.
-	OwnerEmail *string `json:"owner_email,omitempty"`
-
-	// The flag to indicate whether the account is an enterprise account or not.
-	IsEnterpriseAccount *bool `json:"is_enterprise_account,omitempty"`
-
-	// The time stamp at which the account was created.
-	CreatedAt *string `json:"created_at,omitempty"`
-
-	// The IAM ID of the user or service that created the account.
-	CreatedBy *string `json:"created_by,omitempty"`
-
-	// The time stamp at which the account was last updated.
-	UpdatedAt *string `json:"updated_at,omitempty"`
-
-	// The IAM ID of the user or service that updated the account.
-	UpdatedBy *string `json:"updated_by,omitempty"`
-}
-
-
-// UnmarshalListAccountResources constructs an instance of ListAccountResources from the specified map.
-func UnmarshalListAccountResources(m map[string]interface{}) (result *ListAccountResources, err error) {
-	obj := new(ListAccountResources)
-	obj.URL, err = core.UnmarshalString(m, "url")
-	if err != nil {
-		return
-	}
-	obj.ID, err = core.UnmarshalString(m, "id")
-	if err != nil {
-		return
-	}
-	obj.Crn, err = core.UnmarshalString(m, "crn")
-	if err != nil {
-		return
-	}
-	obj.Parent, err = core.UnmarshalString(m, "parent")
-	if err != nil {
-		return
-	}
-	obj.EnterpriseAccountID, err = core.UnmarshalString(m, "enterprise_account_id")
-	if err != nil {
-		return
-	}
-	obj.EnterpriseID, err = core.UnmarshalString(m, "enterprise_id")
-	if err != nil {
-		return
-	}
-	obj.EnterprisePath, err = core.UnmarshalString(m, "enterprise_path")
-	if err != nil {
-		return
-	}
-	obj.Name, err = core.UnmarshalString(m, "name")
-	if err != nil {
-		return
-	}
-	obj.State, err = core.UnmarshalString(m, "state")
-	if err != nil {
-		return
-	}
-	obj.OwnerIamID, err = core.UnmarshalString(m, "owner_iam_id")
-	if err != nil {
-		return
-	}
-	obj.Paid, err = core.UnmarshalBool(m, "paid")
-	if err != nil {
-		return
-	}
-	obj.OwnerEmail, err = core.UnmarshalString(m, "owner_email")
-	if err != nil {
-		return
-	}
-	obj.IsEnterpriseAccount, err = core.UnmarshalBool(m, "is_enterprise_account")
-	if err != nil {
-		return
-	}
-	obj.CreatedAt, err = core.UnmarshalString(m, "created_at")
-	if err != nil {
-		return
-	}
-	obj.CreatedBy, err = core.UnmarshalString(m, "created_by")
-	if err != nil {
-		return
-	}
-	obj.UpdatedAt, err = core.UnmarshalString(m, "updated_at")
-	if err != nil {
-		return
-	}
-	obj.UpdatedBy, err = core.UnmarshalString(m, "updated_by")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalListAccountResourcesSlice unmarshals a slice of ListAccountResources instances from the specified list of maps.
-func UnmarshalListAccountResourcesSlice(s []interface{}) (slice []ListAccountResources, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'ListAccountResources'")
-			return
-		}
-		obj, e := UnmarshalListAccountResources(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalListAccountResourcesAsProperty unmarshals an instance of ListAccountResources that is stored as a property
-// within the specified map.
-func UnmarshalListAccountResourcesAsProperty(m map[string]interface{}, propertyName string) (result *ListAccountResources, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'ListAccountResources'", propertyName)
-			return
-		}
-		result, err = UnmarshalListAccountResources(objMap)
-	}
-	return
-}
-
-// UnmarshalListAccountResourcesSliceAsProperty unmarshals a slice of ListAccountResources instances that are stored as a property
-// within the specified map.
-func UnmarshalListAccountResourcesSliceAsProperty(m map[string]interface{}, propertyName string) (slice []ListAccountResources, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'ListAccountResources'", propertyName)
-			return
-		}
-		slice, err = UnmarshalListAccountResourcesSlice(vSlice)
-	}
-	return
-}
-
-// ListAccountsOptions : The ListAccounts options.
-type ListAccountsOptions struct {
-	// Get accounts that are either immediate children or are a part of the hierarchy for a given enterprise ID.
-	EnterpriseID *string `json:"enterprise_id,omitempty"`
-
-	// Get accounts that are either immediate children or are a part of the hierarchy for a given account group ID.
-	AccountGroupID *string `json:"account_group_id,omitempty"`
-
-	// Get accounts that are either immediate children or are a part of the hierarchy for a given parent CRN.
-	Parent *string `json:"parent,omitempty"`
-
-	// Return results up to this limit. Valid values are between `0` and `100`.
-	Limit *int64 `json:"limit,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewListAccountsOptions : Instantiate ListAccountsOptions
-func (*EnterpriseManagementV1) NewListAccountsOptions() *ListAccountsOptions {
-	return &ListAccountsOptions{}
-}
-
-// SetEnterpriseID : Allow user to set EnterpriseID
-func (options *ListAccountsOptions) SetEnterpriseID(enterpriseID string) *ListAccountsOptions {
-	options.EnterpriseID = core.StringPtr(enterpriseID)
-	return options
-}
-
-// SetAccountGroupID : Allow user to set AccountGroupID
-func (options *ListAccountsOptions) SetAccountGroupID(accountGroupID string) *ListAccountsOptions {
-	options.AccountGroupID = core.StringPtr(accountGroupID)
-	return options
-}
-
-// SetParent : Allow user to set Parent
-func (options *ListAccountsOptions) SetParent(parent string) *ListAccountsOptions {
-	options.Parent = core.StringPtr(parent)
-	return options
-}
-
-// SetLimit : Allow user to set Limit
-func (options *ListAccountsOptions) SetLimit(limit int64) *ListAccountsOptions {
-	options.Limit = core.Int64Ptr(limit)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *ListAccountsOptions) SetHeaders(param map[string]string) *ListAccountsOptions {
-	options.Headers = param
-	return options
-}
-
-// ListAccountsResponse : The response from successfully calling list accounts.
-type ListAccountsResponse struct {
-	// The number of enterprises returned from calling list accounts.
-	RowsCount *int64 `json:"rows_count,omitempty"`
-
-	// A string that represents the link to the next page of results.
-	NextURL *string `json:"next_url,omitempty"`
-
-	// A list of accounts.
-	Resources []ListAccountResources `json:"resources,omitempty"`
-}
-
-
-// UnmarshalListAccountsResponse constructs an instance of ListAccountsResponse from the specified map.
-func UnmarshalListAccountsResponse(m map[string]interface{}) (result *ListAccountsResponse, err error) {
-	obj := new(ListAccountsResponse)
-	obj.RowsCount, err = core.UnmarshalInt64(m, "rows_count")
-	if err != nil {
-		return
-	}
-	obj.NextURL, err = core.UnmarshalString(m, "next_url")
-	if err != nil {
-		return
-	}
-	obj.Resources, err = UnmarshalListAccountResourcesSliceAsProperty(m, "resources")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalListAccountsResponseSlice unmarshals a slice of ListAccountsResponse instances from the specified list of maps.
-func UnmarshalListAccountsResponseSlice(s []interface{}) (slice []ListAccountsResponse, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'ListAccountsResponse'")
-			return
-		}
-		obj, e := UnmarshalListAccountsResponse(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalListAccountsResponseAsProperty unmarshals an instance of ListAccountsResponse that is stored as a property
-// within the specified map.
-func UnmarshalListAccountsResponseAsProperty(m map[string]interface{}, propertyName string) (result *ListAccountsResponse, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'ListAccountsResponse'", propertyName)
-			return
-		}
-		result, err = UnmarshalListAccountsResponse(objMap)
-	}
-	return
-}
-
-// UnmarshalListAccountsResponseSliceAsProperty unmarshals a slice of ListAccountsResponse instances that are stored as a property
-// within the specified map.
-func UnmarshalListAccountsResponseSliceAsProperty(m map[string]interface{}, propertyName string) (slice []ListAccountsResponse, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'ListAccountsResponse'", propertyName)
-			return
-		}
-		slice, err = UnmarshalListAccountsResponseSlice(vSlice)
-	}
-	return
-}
-
-// ListEnterpriseResources : An object that represents an enterprise.
-type ListEnterpriseResources struct {
-	// The URL of the enterprise.
-	URL *string `json:"url,omitempty"`
-
-	// The enterprise ID.
-	ID *string `json:"id,omitempty"`
-
-	// The enterprise account ID.
-	EnterpriseAccountID *string `json:"enterprise_account_id,omitempty"`
-
-	// The Cloud Resource Name (CRN) of the enterprise.
-	Crn *string `json:"crn,omitempty"`
-
-	// The name of the enterprise.
-	Name *string `json:"name,omitempty"`
-
-	// The domain of the enterprise.
-	Domain *string `json:"domain,omitempty"`
-
-	// The state of the enterprise.
-	State *string `json:"state,omitempty"`
-
-	// The IAM ID of the primary contact of the enterprise, such as `IBMid-0123ABC`.
-	PrimaryContactIamID *string `json:"primary_contact_iam_id,omitempty"`
-
-	// The email of the primary contact of the enterprise.
-	PrimaryContactEmail *string `json:"primary_contact_email,omitempty"`
-
-	// The time stamp at which the enterprise was created.
-	CreatedAt *string `json:"created_at,omitempty"`
-
-	// The IAM ID of the user or service that created the enterprise.
-	CreatedBy *string `json:"created_by,omitempty"`
-
-	// The time stamp at which the enterprise was last updated.
-	UpdatedAt *string `json:"updated_at,omitempty"`
-
-	// The IAM ID of the user or service that updated the enterprise.
-	UpdatedBy *string `json:"updated_by,omitempty"`
-}
-
-
-// UnmarshalListEnterpriseResources constructs an instance of ListEnterpriseResources from the specified map.
-func UnmarshalListEnterpriseResources(m map[string]interface{}) (result *ListEnterpriseResources, err error) {
-	obj := new(ListEnterpriseResources)
-	obj.URL, err = core.UnmarshalString(m, "url")
-	if err != nil {
-		return
-	}
-	obj.ID, err = core.UnmarshalString(m, "id")
-	if err != nil {
-		return
-	}
-	obj.EnterpriseAccountID, err = core.UnmarshalString(m, "enterprise_account_id")
-	if err != nil {
-		return
-	}
-	obj.Crn, err = core.UnmarshalString(m, "crn")
-	if err != nil {
-		return
-	}
-	obj.Name, err = core.UnmarshalString(m, "name")
-	if err != nil {
-		return
-	}
-	obj.Domain, err = core.UnmarshalString(m, "domain")
-	if err != nil {
-		return
-	}
-	obj.State, err = core.UnmarshalString(m, "state")
-	if err != nil {
-		return
-	}
-	obj.PrimaryContactIamID, err = core.UnmarshalString(m, "primary_contact_iam_id")
-	if err != nil {
-		return
-	}
-	obj.PrimaryContactEmail, err = core.UnmarshalString(m, "primary_contact_email")
-	if err != nil {
-		return
-	}
-	obj.CreatedAt, err = core.UnmarshalString(m, "created_at")
-	if err != nil {
-		return
-	}
-	obj.CreatedBy, err = core.UnmarshalString(m, "created_by")
-	if err != nil {
-		return
-	}
-	obj.UpdatedAt, err = core.UnmarshalString(m, "updated_at")
-	if err != nil {
-		return
-	}
-	obj.UpdatedBy, err = core.UnmarshalString(m, "updated_by")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalListEnterpriseResourcesSlice unmarshals a slice of ListEnterpriseResources instances from the specified list of maps.
-func UnmarshalListEnterpriseResourcesSlice(s []interface{}) (slice []ListEnterpriseResources, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'ListEnterpriseResources'")
-			return
-		}
-		obj, e := UnmarshalListEnterpriseResources(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalListEnterpriseResourcesAsProperty unmarshals an instance of ListEnterpriseResources that is stored as a property
-// within the specified map.
-func UnmarshalListEnterpriseResourcesAsProperty(m map[string]interface{}, propertyName string) (result *ListEnterpriseResources, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'ListEnterpriseResources'", propertyName)
-			return
-		}
-		result, err = UnmarshalListEnterpriseResources(objMap)
-	}
-	return
-}
-
-// UnmarshalListEnterpriseResourcesSliceAsProperty unmarshals a slice of ListEnterpriseResources instances that are stored as a property
-// within the specified map.
-func UnmarshalListEnterpriseResourcesSliceAsProperty(m map[string]interface{}, propertyName string) (slice []ListEnterpriseResources, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'ListEnterpriseResources'", propertyName)
-			return
-		}
-		slice, err = UnmarshalListEnterpriseResourcesSlice(vSlice)
-	}
-	return
-}
-
-// ListEnterprisesOptions : The ListEnterprises options.
-type ListEnterprisesOptions struct {
-	// Get enterprises for a given enterprise account ID.
-	EnterpriseAccountID *string `json:"enterprise_account_id,omitempty"`
-
-	// Get enterprises for a given account group ID.
-	AccountGroupID *string `json:"account_group_id,omitempty"`
-
-	// Get enterprises for a given account ID.
-	AccountID *string `json:"account_id,omitempty"`
-
-	// Return results up to this limit. Valid values are between `0` and `100`.
-	Limit *int64 `json:"limit,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewListEnterprisesOptions : Instantiate ListEnterprisesOptions
-func (*EnterpriseManagementV1) NewListEnterprisesOptions() *ListEnterprisesOptions {
-	return &ListEnterprisesOptions{}
-}
-
-// SetEnterpriseAccountID : Allow user to set EnterpriseAccountID
-func (options *ListEnterprisesOptions) SetEnterpriseAccountID(enterpriseAccountID string) *ListEnterprisesOptions {
-	options.EnterpriseAccountID = core.StringPtr(enterpriseAccountID)
-	return options
-}
-
-// SetAccountGroupID : Allow user to set AccountGroupID
-func (options *ListEnterprisesOptions) SetAccountGroupID(accountGroupID string) *ListEnterprisesOptions {
-	options.AccountGroupID = core.StringPtr(accountGroupID)
-	return options
-}
-
-// SetAccountID : Allow user to set AccountID
-func (options *ListEnterprisesOptions) SetAccountID(accountID string) *ListEnterprisesOptions {
-	options.AccountID = core.StringPtr(accountID)
-	return options
-}
-
-// SetLimit : Allow user to set Limit
-func (options *ListEnterprisesOptions) SetLimit(limit int64) *ListEnterprisesOptions {
-	options.Limit = core.Int64Ptr(limit)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *ListEnterprisesOptions) SetHeaders(param map[string]string) *ListEnterprisesOptions {
-	options.Headers = param
-	return options
-}
-
-// ListEnterprisesResponse : The response from calling list enterprises.
-type ListEnterprisesResponse struct {
-	// The number of enterprises returned from calling list enterprise.
-	RowsCount *int64 `json:"rows_count,omitempty"`
-
-	// A string that represents the link to the next page of results.
-	NextURL *string `json:"next_url,omitempty"`
-
-	// A list of enterprise objects.
-	Resources []ListEnterpriseResources `json:"resources,omitempty"`
-}
-
-
-// UnmarshalListEnterprisesResponse constructs an instance of ListEnterprisesResponse from the specified map.
-func UnmarshalListEnterprisesResponse(m map[string]interface{}) (result *ListEnterprisesResponse, err error) {
-	obj := new(ListEnterprisesResponse)
-	obj.RowsCount, err = core.UnmarshalInt64(m, "rows_count")
-	if err != nil {
-		return
-	}
-	obj.NextURL, err = core.UnmarshalString(m, "next_url")
-	if err != nil {
-		return
-	}
-	obj.Resources, err = UnmarshalListEnterpriseResourcesSliceAsProperty(m, "resources")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalListEnterprisesResponseSlice unmarshals a slice of ListEnterprisesResponse instances from the specified list of maps.
-func UnmarshalListEnterprisesResponseSlice(s []interface{}) (slice []ListEnterprisesResponse, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'ListEnterprisesResponse'")
-			return
-		}
-		obj, e := UnmarshalListEnterprisesResponse(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalListEnterprisesResponseAsProperty unmarshals an instance of ListEnterprisesResponse that is stored as a property
-// within the specified map.
-func UnmarshalListEnterprisesResponseAsProperty(m map[string]interface{}, propertyName string) (result *ListEnterprisesResponse, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'ListEnterprisesResponse'", propertyName)
-			return
-		}
-		result, err = UnmarshalListEnterprisesResponse(objMap)
-	}
-	return
-}
-
-// UnmarshalListEnterprisesResponseSliceAsProperty unmarshals a slice of ListEnterprisesResponse instances that are stored as a property
-// within the specified map.
-func UnmarshalListEnterprisesResponseSliceAsProperty(m map[string]interface{}, propertyName string) (slice []ListEnterprisesResponse, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'ListEnterprisesResponse'", propertyName)
-			return
-		}
-		slice, err = UnmarshalListEnterprisesResponseSlice(vSlice)
-	}
-	return
-}
-
-// UpdateAccountGroupOptions : The UpdateAccountGroup options.
-type UpdateAccountGroupOptions struct {
-	// The ID of the account group to retrieve.
-	AccountGroupID *string `json:"account_group_id" validate:"required"`
-
-	// The new name of the account group. This field must have 3 - 60 characters.
-	Name *string `json:"name,omitempty"`
-
-	// The IAM ID of the user to be the new primary contact for the account group.
-	PrimaryContactIamID *string `json:"primary_contact_iam_id,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewUpdateAccountGroupOptions : Instantiate UpdateAccountGroupOptions
-func (*EnterpriseManagementV1) NewUpdateAccountGroupOptions(accountGroupID string) *UpdateAccountGroupOptions {
-	return &UpdateAccountGroupOptions{
-		AccountGroupID: core.StringPtr(accountGroupID),
-	}
-}
-
-// SetAccountGroupID : Allow user to set AccountGroupID
-func (options *UpdateAccountGroupOptions) SetAccountGroupID(accountGroupID string) *UpdateAccountGroupOptions {
-	options.AccountGroupID = core.StringPtr(accountGroupID)
-	return options
-}
-
-// SetName : Allow user to set Name
-func (options *UpdateAccountGroupOptions) SetName(name string) *UpdateAccountGroupOptions {
-	options.Name = core.StringPtr(name)
-	return options
-}
-
-// SetPrimaryContactIamID : Allow user to set PrimaryContactIamID
-func (options *UpdateAccountGroupOptions) SetPrimaryContactIamID(primaryContactIamID string) *UpdateAccountGroupOptions {
-	options.PrimaryContactIamID = core.StringPtr(primaryContactIamID)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *UpdateAccountGroupOptions) SetHeaders(param map[string]string) *UpdateAccountGroupOptions {
-	options.Headers = param
-	return options
-}
-
-// UpdateAccountOptions : The UpdateAccount options.
-type UpdateAccountOptions struct {
-	// The ID of the account to retrieve.
-	AccountID *string `json:"account_id" validate:"required"`
-
-	// The CRN of the new parent within the enterprise.
-	Parent *string `json:"parent" validate:"required"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewUpdateAccountOptions : Instantiate UpdateAccountOptions
-func (*EnterpriseManagementV1) NewUpdateAccountOptions(accountID string, parent string) *UpdateAccountOptions {
-	return &UpdateAccountOptions{
-		AccountID: core.StringPtr(accountID),
-		Parent: core.StringPtr(parent),
-	}
-}
-
-// SetAccountID : Allow user to set AccountID
-func (options *UpdateAccountOptions) SetAccountID(accountID string) *UpdateAccountOptions {
-	options.AccountID = core.StringPtr(accountID)
-	return options
-}
-
-// SetParent : Allow user to set Parent
-func (options *UpdateAccountOptions) SetParent(parent string) *UpdateAccountOptions {
-	options.Parent = core.StringPtr(parent)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *UpdateAccountOptions) SetHeaders(param map[string]string) *UpdateAccountOptions {
-	options.Headers = param
-	return options
-}
-
-// UpdateEnterpriseOptions : The UpdateEnterprise options.
-type UpdateEnterpriseOptions struct {
-	// The ID of the enterprise to retrieve.
-	EnterpriseID *string `json:"enterprise_id" validate:"required"`
-
-	// The new name of the enterprise. This field must have 3 - 60 characters.
-	Name *string `json:"name,omitempty"`
-
-	// The new domain of the enterprise. This field has a limit of 60 characters.
-	Domain *string `json:"domain,omitempty"`
-
-	// The IAM ID of the user to be the new primary contact for the enterprise.
-	PrimaryContactIamID *string `json:"primary_contact_iam_id,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewUpdateEnterpriseOptions : Instantiate UpdateEnterpriseOptions
-func (*EnterpriseManagementV1) NewUpdateEnterpriseOptions(enterpriseID string) *UpdateEnterpriseOptions {
-	return &UpdateEnterpriseOptions{
-		EnterpriseID: core.StringPtr(enterpriseID),
-	}
-}
-
-// SetEnterpriseID : Allow user to set EnterpriseID
-func (options *UpdateEnterpriseOptions) SetEnterpriseID(enterpriseID string) *UpdateEnterpriseOptions {
-	options.EnterpriseID = core.StringPtr(enterpriseID)
-	return options
-}
-
-// SetName : Allow user to set Name
-func (options *UpdateEnterpriseOptions) SetName(name string) *UpdateEnterpriseOptions {
-	options.Name = core.StringPtr(name)
-	return options
-}
-
-// SetDomain : Allow user to set Domain
-func (options *UpdateEnterpriseOptions) SetDomain(domain string) *UpdateEnterpriseOptions {
-	options.Domain = core.StringPtr(domain)
-	return options
-}
-
-// SetPrimaryContactIamID : Allow user to set PrimaryContactIamID
-func (options *UpdateEnterpriseOptions) SetPrimaryContactIamID(primaryContactIamID string) *UpdateEnterpriseOptions {
-	options.PrimaryContactIamID = core.StringPtr(primaryContactIamID)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *UpdateEnterpriseOptions) SetHeaders(param map[string]string) *UpdateEnterpriseOptions {
-	options.Headers = param
-	return options
-}
diff --git a/enterprisemanagementv1/enterprise_management_v1_suite_test.go b/enterprisemanagementv1/enterprise_management_v1_suite_test.go
deleted file mode 100644
index 17a5f74b..00000000
--- a/enterprisemanagementv1/enterprise_management_v1_suite_test.go
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * (C) Copyright IBM Corp. 2020.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package enterprisemanagementv1_test
-
-import (
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-	"testing"
-)
-
-func TestEnterpriseManagementV1(t *testing.T) {
-	RegisterFailHandler(Fail)
-	RunSpecs(t, "EnterpriseManagementV1 Suite")
-}
diff --git a/enterprisemanagementv1/enterprise_management_v1_test.go b/enterprisemanagementv1/enterprise_management_v1_test.go
deleted file mode 100644
index 311d5db5..00000000
--- a/enterprisemanagementv1/enterprise_management_v1_test.go
+++ /dev/null
@@ -1,775 +0,0 @@
-/**
- * (C) Copyright IBM Corp. 2020.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package enterprisemanagementv1_test
-
-import (
-	"bytes"
-	"fmt"
-	"github.com/IBM/go-sdk-core/v3/core"
-	"github.com/go-openapi/strfmt"
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-	"github.ibm.com/ibmcloud/platform-services-go-sdk/enterprisemanagementv1"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"net/http/httptest"
-	"time"
-)
-
-var _ = Describe(`EnterpriseManagementV1`, func() {
-	Describe(`CreateAccountGroup(createAccountGroupOptions *CreateAccountGroupOptions)`, func() {
-		createAccountGroupPath := "/account-groups"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(createAccountGroupPath))
-				Expect(req.Method).To(Equal("POST"))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(201)
-				fmt.Fprintf(res, `{"account_group_id": "AccountGroupID"}`)
-			}))
-			It(`Invoke CreateAccountGroup successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := enterprisemanagementv1.NewEnterpriseManagementV1(&enterprisemanagementv1.EnterpriseManagementV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.CreateAccountGroup(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the CreateAccountGroupOptions model
-				createAccountGroupOptionsModel := new(enterprisemanagementv1.CreateAccountGroupOptions)
-				createAccountGroupOptionsModel.Parent = core.StringPtr("testString")
-				createAccountGroupOptionsModel.Name = core.StringPtr("testString")
-				createAccountGroupOptionsModel.PrimaryContactIamID = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.CreateAccountGroup(createAccountGroupOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`ListAccountGroups(listAccountGroupsOptions *ListAccountGroupsOptions)`, func() {
-		listAccountGroupsPath := "/account-groups"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(listAccountGroupsPath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.URL.Query()["enterprise_id"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["parent_account_group_id"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["parent"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["limit"]).To(Equal([]string{fmt.Sprint(int64(38))}))
-
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"rows_count": 9, "next_url": "NextURL", "resources": [{"url": "URL", "id": "ID", "crn": "Crn", "parent": "Parent", "enterprise_account_id": "EnterpriseAccountID", "enterprise_id": "EnterpriseID", "enterprise_path": "EnterprisePath", "name": "Name", "state": "State", "primary_contact_iam_id": "PrimaryContactIamID", "primary_contact_email": "PrimaryContactEmail", "created_at": "CreatedAt", "created_by": "CreatedBy", "updated_at": "UpdatedAt", "updated_by": "UpdatedBy"}]}`)
-			}))
-			It(`Invoke ListAccountGroups successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := enterprisemanagementv1.NewEnterpriseManagementV1(&enterprisemanagementv1.EnterpriseManagementV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.ListAccountGroups(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the ListAccountGroupsOptions model
-				listAccountGroupsOptionsModel := new(enterprisemanagementv1.ListAccountGroupsOptions)
-				listAccountGroupsOptionsModel.EnterpriseID = core.StringPtr("testString")
-				listAccountGroupsOptionsModel.ParentAccountGroupID = core.StringPtr("testString")
-				listAccountGroupsOptionsModel.Parent = core.StringPtr("testString")
-				listAccountGroupsOptionsModel.Limit = core.Int64Ptr(int64(38))
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.ListAccountGroups(listAccountGroupsOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`GetAccountGroupByID(getAccountGroupByIdOptions *GetAccountGroupByIdOptions)`, func() {
-		getAccountGroupByIDPath := "/account-groups/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(getAccountGroupByIDPath))
-				Expect(req.Method).To(Equal("GET"))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"url": "URL", "id": "ID", "crn": "Crn", "parent": "Parent", "enterprise_account_id": "EnterpriseAccountID", "enterprise_id": "EnterpriseID", "enterprise_path": "EnterprisePath", "name": "Name", "state": "State", "primary_contact_iam_id": "PrimaryContactIamID", "primary_contact_email": "PrimaryContactEmail", "created_at": "CreatedAt", "created_by": "CreatedBy", "updated_at": "UpdatedAt", "updated_by": "UpdatedBy"}`)
-			}))
-			It(`Invoke GetAccountGroupByID successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := enterprisemanagementv1.NewEnterpriseManagementV1(&enterprisemanagementv1.EnterpriseManagementV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.GetAccountGroupByID(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the GetAccountGroupByIdOptions model
-				getAccountGroupByIdOptionsModel := new(enterprisemanagementv1.GetAccountGroupByIdOptions)
-				getAccountGroupByIdOptionsModel.AccountGroupID = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.GetAccountGroupByID(getAccountGroupByIdOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`UpdateAccountGroup(updateAccountGroupOptions *UpdateAccountGroupOptions)`, func() {
-		updateAccountGroupPath := "/account-groups/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(updateAccountGroupPath))
-				Expect(req.Method).To(Equal("PATCH"))
-				res.WriteHeader(204)
-			}))
-			It(`Invoke UpdateAccountGroup successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := enterprisemanagementv1.NewEnterpriseManagementV1(&enterprisemanagementv1.EnterpriseManagementV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				response, operationErr := testService.UpdateAccountGroup(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-
-				// Construct an instance of the UpdateAccountGroupOptions model
-				updateAccountGroupOptionsModel := new(enterprisemanagementv1.UpdateAccountGroupOptions)
-				updateAccountGroupOptionsModel.AccountGroupID = core.StringPtr("testString")
-				updateAccountGroupOptionsModel.Name = core.StringPtr("testString")
-				updateAccountGroupOptionsModel.PrimaryContactIamID = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				response, operationErr = testService.UpdateAccountGroup(updateAccountGroupOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`GetAccountGroupPermissibleActions(getAccountGroupPermissibleActionsOptions *GetAccountGroupPermissibleActionsOptions)`, func() {
-		getAccountGroupPermissibleActionsPath := "/account-groups/testString/permissible-actions"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(getAccountGroupPermissibleActionsPath))
-				Expect(req.Method).To(Equal("POST"))
-				res.WriteHeader(200)
-			}))
-			It(`Invoke GetAccountGroupPermissibleActions successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := enterprisemanagementv1.NewEnterpriseManagementV1(&enterprisemanagementv1.EnterpriseManagementV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				response, operationErr := testService.GetAccountGroupPermissibleActions(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-
-				// Construct an instance of the GetAccountGroupPermissibleActionsOptions model
-				getAccountGroupPermissibleActionsOptionsModel := new(enterprisemanagementv1.GetAccountGroupPermissibleActionsOptions)
-				getAccountGroupPermissibleActionsOptionsModel.AccountGroupID = core.StringPtr("testString")
-				getAccountGroupPermissibleActionsOptionsModel.Actions = []string{"testString"}
-
-				// Invoke operation with valid options model (positive test)
-				response, operationErr = testService.GetAccountGroupPermissibleActions(getAccountGroupPermissibleActionsOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`ImportAccountToEnterprise(importAccountToEnterpriseOptions *ImportAccountToEnterpriseOptions)`, func() {
-		importAccountToEnterprisePath := "/enterprises/testString/import/accounts/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(importAccountToEnterprisePath))
-				Expect(req.Method).To(Equal("PUT"))
-				res.WriteHeader(202)
-			}))
-			It(`Invoke ImportAccountToEnterprise successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := enterprisemanagementv1.NewEnterpriseManagementV1(&enterprisemanagementv1.EnterpriseManagementV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				response, operationErr := testService.ImportAccountToEnterprise(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-
-				// Construct an instance of the ImportAccountToEnterpriseOptions model
-				importAccountToEnterpriseOptionsModel := new(enterprisemanagementv1.ImportAccountToEnterpriseOptions)
-				importAccountToEnterpriseOptionsModel.EnterpriseID = core.StringPtr("testString")
-				importAccountToEnterpriseOptionsModel.AccountID = core.StringPtr("testString")
-				importAccountToEnterpriseOptionsModel.Parent = core.StringPtr("testString")
-				importAccountToEnterpriseOptionsModel.BillingUnitID = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				response, operationErr = testService.ImportAccountToEnterprise(importAccountToEnterpriseOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`CreateAccount(createAccountOptions *CreateAccountOptions)`, func() {
-		createAccountPath := "/accounts"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(createAccountPath))
-				Expect(req.Method).To(Equal("POST"))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(201)
-				fmt.Fprintf(res, `{"account_group_id": "AccountGroupID"}`)
-			}))
-			It(`Invoke CreateAccount successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := enterprisemanagementv1.NewEnterpriseManagementV1(&enterprisemanagementv1.EnterpriseManagementV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.CreateAccount(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the CreateAccountOptions model
-				createAccountOptionsModel := new(enterprisemanagementv1.CreateAccountOptions)
-				createAccountOptionsModel.Parent = core.StringPtr("testString")
-				createAccountOptionsModel.Name = core.StringPtr("testString")
-				createAccountOptionsModel.OwnerIamID = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.CreateAccount(createAccountOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`ListAccounts(listAccountsOptions *ListAccountsOptions)`, func() {
-		listAccountsPath := "/accounts"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(listAccountsPath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.URL.Query()["enterprise_id"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["account_group_id"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["parent"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["limit"]).To(Equal([]string{fmt.Sprint(int64(38))}))
-
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"rows_count": 9, "next_url": "NextURL", "resources": [{"url": "URL", "id": "ID", "crn": "Crn", "parent": "Parent", "enterprise_account_id": "EnterpriseAccountID", "enterprise_id": "EnterpriseID", "enterprise_path": "EnterprisePath", "name": "Name", "state": "State", "owner_iam_id": "OwnerIamID", "paid": true, "owner_email": "OwnerEmail", "is_enterprise_account": false, "created_at": "CreatedAt", "created_by": "CreatedBy", "updated_at": "UpdatedAt", "updated_by": "UpdatedBy"}]}`)
-			}))
-			It(`Invoke ListAccounts successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := enterprisemanagementv1.NewEnterpriseManagementV1(&enterprisemanagementv1.EnterpriseManagementV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.ListAccounts(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the ListAccountsOptions model
-				listAccountsOptionsModel := new(enterprisemanagementv1.ListAccountsOptions)
-				listAccountsOptionsModel.EnterpriseID = core.StringPtr("testString")
-				listAccountsOptionsModel.AccountGroupID = core.StringPtr("testString")
-				listAccountsOptionsModel.Parent = core.StringPtr("testString")
-				listAccountsOptionsModel.Limit = core.Int64Ptr(int64(38))
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.ListAccounts(listAccountsOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`GetAccountByID(getAccountByIdOptions *GetAccountByIdOptions)`, func() {
-		getAccountByIDPath := "/accounts/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(getAccountByIDPath))
-				Expect(req.Method).To(Equal("GET"))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"url": "URL", "id": "ID", "crn": "Crn", "parent": "Parent", "enterprise_account_id": "EnterpriseAccountID", "enterprise_id": "EnterpriseID", "enterprise_path": "EnterprisePath", "name": "Name", "state": "State", "owner_iam_id": "OwnerIamID", "paid": true, "owner_email": "OwnerEmail", "is_enterprise_account": false, "created_at": "CreatedAt", "created_by": "CreatedBy", "updated_at": "UpdatedAt", "updated_by": "UpdatedBy"}`)
-			}))
-			It(`Invoke GetAccountByID successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := enterprisemanagementv1.NewEnterpriseManagementV1(&enterprisemanagementv1.EnterpriseManagementV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.GetAccountByID(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the GetAccountByIdOptions model
-				getAccountByIdOptionsModel := new(enterprisemanagementv1.GetAccountByIdOptions)
-				getAccountByIdOptionsModel.AccountID = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.GetAccountByID(getAccountByIdOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`UpdateAccount(updateAccountOptions *UpdateAccountOptions)`, func() {
-		updateAccountPath := "/accounts/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(updateAccountPath))
-				Expect(req.Method).To(Equal("PATCH"))
-				res.WriteHeader(204)
-			}))
-			It(`Invoke UpdateAccount successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := enterprisemanagementv1.NewEnterpriseManagementV1(&enterprisemanagementv1.EnterpriseManagementV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				response, operationErr := testService.UpdateAccount(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-
-				// Construct an instance of the UpdateAccountOptions model
-				updateAccountOptionsModel := new(enterprisemanagementv1.UpdateAccountOptions)
-				updateAccountOptionsModel.AccountID = core.StringPtr("testString")
-				updateAccountOptionsModel.Parent = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				response, operationErr = testService.UpdateAccount(updateAccountOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`GetAccountPermissibleActions(getAccountPermissibleActionsOptions *GetAccountPermissibleActionsOptions)`, func() {
-		getAccountPermissibleActionsPath := "/accounts/testString/permissible-actions"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(getAccountPermissibleActionsPath))
-				Expect(req.Method).To(Equal("POST"))
-				res.WriteHeader(200)
-			}))
-			It(`Invoke GetAccountPermissibleActions successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := enterprisemanagementv1.NewEnterpriseManagementV1(&enterprisemanagementv1.EnterpriseManagementV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				response, operationErr := testService.GetAccountPermissibleActions(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-
-				// Construct an instance of the GetAccountPermissibleActionsOptions model
-				getAccountPermissibleActionsOptionsModel := new(enterprisemanagementv1.GetAccountPermissibleActionsOptions)
-				getAccountPermissibleActionsOptionsModel.AccountID = core.StringPtr("testString")
-				getAccountPermissibleActionsOptionsModel.Actions = []string{"testString"}
-
-				// Invoke operation with valid options model (positive test)
-				response, operationErr = testService.GetAccountPermissibleActions(getAccountPermissibleActionsOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`CreateEnterprise(createEnterpriseOptions *CreateEnterpriseOptions)`, func() {
-		createEnterprisePath := "/enterprises"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(createEnterprisePath))
-				Expect(req.Method).To(Equal("POST"))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(202)
-				fmt.Fprintf(res, `{"enterprise_id": "EnterpriseID", "enterprise_account_id": "EnterpriseAccountID"}`)
-			}))
-			It(`Invoke CreateEnterprise successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := enterprisemanagementv1.NewEnterpriseManagementV1(&enterprisemanagementv1.EnterpriseManagementV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.CreateEnterprise(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the CreateEnterpriseOptions model
-				createEnterpriseOptionsModel := new(enterprisemanagementv1.CreateEnterpriseOptions)
-				createEnterpriseOptionsModel.SourceAccountID = core.StringPtr("testString")
-				createEnterpriseOptionsModel.Name = core.StringPtr("testString")
-				createEnterpriseOptionsModel.PrimaryContactIamID = core.StringPtr("testString")
-				createEnterpriseOptionsModel.Domain = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.CreateEnterprise(createEnterpriseOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`ListEnterprises(listEnterprisesOptions *ListEnterprisesOptions)`, func() {
-		listEnterprisesPath := "/enterprises"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(listEnterprisesPath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.URL.Query()["enterprise_account_id"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["account_group_id"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["account_id"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["limit"]).To(Equal([]string{fmt.Sprint(int64(38))}))
-
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"rows_count": 9, "next_url": "NextURL", "resources": [{"url": "URL", "id": "ID", "enterprise_account_id": "EnterpriseAccountID", "crn": "Crn", "name": "Name", "domain": "Domain", "state": "State", "primary_contact_iam_id": "PrimaryContactIamID", "primary_contact_email": "PrimaryContactEmail", "created_at": "CreatedAt", "created_by": "CreatedBy", "updated_at": "UpdatedAt", "updated_by": "UpdatedBy"}]}`)
-			}))
-			It(`Invoke ListEnterprises successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := enterprisemanagementv1.NewEnterpriseManagementV1(&enterprisemanagementv1.EnterpriseManagementV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.ListEnterprises(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the ListEnterprisesOptions model
-				listEnterprisesOptionsModel := new(enterprisemanagementv1.ListEnterprisesOptions)
-				listEnterprisesOptionsModel.EnterpriseAccountID = core.StringPtr("testString")
-				listEnterprisesOptionsModel.AccountGroupID = core.StringPtr("testString")
-				listEnterprisesOptionsModel.AccountID = core.StringPtr("testString")
-				listEnterprisesOptionsModel.Limit = core.Int64Ptr(int64(38))
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.ListEnterprises(listEnterprisesOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`GetEnterprise(getEnterpriseOptions *GetEnterpriseOptions)`, func() {
-		getEnterprisePath := "/enterprises/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(getEnterprisePath))
-				Expect(req.Method).To(Equal("GET"))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"url": "URL", "id": "ID", "enterprise_account_id": "EnterpriseAccountID", "crn": "Crn", "name": "Name", "domain": "Domain", "state": "State", "primary_contact_iam_id": "PrimaryContactIamID", "primary_contact_email": "PrimaryContactEmail", "created_at": "CreatedAt", "created_by": "CreatedBy", "updated_at": "UpdatedAt", "updated_by": "UpdatedBy"}`)
-			}))
-			It(`Invoke GetEnterprise successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := enterprisemanagementv1.NewEnterpriseManagementV1(&enterprisemanagementv1.EnterpriseManagementV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.GetEnterprise(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the GetEnterpriseOptions model
-				getEnterpriseOptionsModel := new(enterprisemanagementv1.GetEnterpriseOptions)
-				getEnterpriseOptionsModel.EnterpriseID = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.GetEnterprise(getEnterpriseOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`UpdateEnterprise(updateEnterpriseOptions *UpdateEnterpriseOptions)`, func() {
-		updateEnterprisePath := "/enterprises/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(updateEnterprisePath))
-				Expect(req.Method).To(Equal("PATCH"))
-				res.WriteHeader(204)
-			}))
-			It(`Invoke UpdateEnterprise successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := enterprisemanagementv1.NewEnterpriseManagementV1(&enterprisemanagementv1.EnterpriseManagementV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				response, operationErr := testService.UpdateEnterprise(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-
-				// Construct an instance of the UpdateEnterpriseOptions model
-				updateEnterpriseOptionsModel := new(enterprisemanagementv1.UpdateEnterpriseOptions)
-				updateEnterpriseOptionsModel.EnterpriseID = core.StringPtr("testString")
-				updateEnterpriseOptionsModel.Name = core.StringPtr("testString")
-				updateEnterpriseOptionsModel.Domain = core.StringPtr("testString")
-				updateEnterpriseOptionsModel.PrimaryContactIamID = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				response, operationErr = testService.UpdateEnterprise(updateEnterpriseOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`GetEnterprisePermissibleActions(getEnterprisePermissibleActionsOptions *GetEnterprisePermissibleActionsOptions)`, func() {
-		getEnterprisePermissibleActionsPath := "/enterprises/testString/permissible-actions"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(getEnterprisePermissibleActionsPath))
-				Expect(req.Method).To(Equal("POST"))
-				res.WriteHeader(200)
-			}))
-			It(`Invoke GetEnterprisePermissibleActions successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := enterprisemanagementv1.NewEnterpriseManagementV1(&enterprisemanagementv1.EnterpriseManagementV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				response, operationErr := testService.GetEnterprisePermissibleActions(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-
-				// Construct an instance of the GetEnterprisePermissibleActionsOptions model
-				getEnterprisePermissibleActionsOptionsModel := new(enterprisemanagementv1.GetEnterprisePermissibleActionsOptions)
-				getEnterprisePermissibleActionsOptionsModel.EnterpriseID = core.StringPtr("testString")
-				getEnterprisePermissibleActionsOptionsModel.Actions = []string{"testString"}
-
-				// Invoke operation with valid options model (positive test)
-				response, operationErr = testService.GetEnterprisePermissibleActions(getEnterprisePermissibleActionsOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`Utility function tests`, func() {
-		It(`Invoke CreateMockMap() successfully`, func() {
-			mockMap := CreateMockMap()
-			Expect(mockMap).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockByteArray() successfully`, func() {
-			mockByteArray := CreateMockByteArray("This is a test")
-			Expect(mockByteArray).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockUUID() successfully`, func() {
-			mockUUID := CreateMockUUID("9fab83da-98cb-4f18-a7ba-b6f0435c9673")
-			Expect(mockUUID).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockReader() successfully`, func() {
-			mockReader := CreateMockReader("This is a test.")
-			Expect(mockReader).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockDate() successfully`, func() {
-			mockDate := CreateMockDate()
-			Expect(mockDate).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockDateTime() successfully`, func() {
-			mockDateTime := CreateMockDateTime()
-			Expect(mockDateTime).ToNot(BeNil())
-		})
-	})
-})
-
-//
-// Utility functions used by the generated test code
-//
-
-func CreateMockMap() map[string]interface{} {
-	m := make(map[string]interface{})
-	return m
-}
-
-func CreateMockByteArray(mockData string) *[]byte {
-	ba := make([]byte, len(mockData))
-	ba = append(ba, mockData...)
-	return &ba
-}
-
-func CreateMockUUID(mockData string) *strfmt.UUID {
-	uuid := strfmt.UUID(mockData)
-	return &uuid
-}
-
-func CreateMockReader(mockData string) io.ReadCloser {
-	return ioutil.NopCloser(bytes.NewReader([]byte(mockData)))
-}
-
-func CreateMockDate() *strfmt.Date {
-	d := strfmt.Date(time.Now())
-	return &d
-}
-
-func CreateMockDateTime() *strfmt.DateTime {
-	d := strfmt.DateTime(time.Now())
-	return &d
-}
diff --git a/enterpriseusagereportsv1/enterprise_usage_reports_v1.go b/enterpriseusagereportsv1/enterprise_usage_reports_v1.go
deleted file mode 100644
index 04996bef..00000000
--- a/enterpriseusagereportsv1/enterprise_usage_reports_v1.go
+++ /dev/null
@@ -1,954 +0,0 @@
-/**
- * (C) Copyright IBM Corp. 2020.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// Package enterpriseusagereportsv1 : Operations and models for the EnterpriseUsageReportsV1 service
-package enterpriseusagereportsv1
-
-import (
-	"fmt"
-	"github.com/IBM/go-sdk-core/v3/core"
-	common "github.ibm.com/ibmcloud/platform-services-go-sdk/common"
-)
-
-// EnterpriseUsageReportsV1 : Usage reports for IBM Cloud enterprise entities
-//
-// Version: 1.0.0-beta.1
-type EnterpriseUsageReportsV1 struct {
-	Service *core.BaseService
-}
-
-// DefaultServiceURL is the default URL to make service requests to.
-const DefaultServiceURL = "https://enterprise.cloud.ibm.com"
-
-// DefaultServiceName is the default key used to find external configuration information.
-const DefaultServiceName = "enterprise_usage_reports"
-
-// EnterpriseUsageReportsV1Options : Service options
-type EnterpriseUsageReportsV1Options struct {
-	ServiceName   string
-	URL           string
-	Authenticator core.Authenticator
-}
-
-// NewEnterpriseUsageReportsV1UsingExternalConfig : constructs an instance of EnterpriseUsageReportsV1 with passed in options and external configuration.
-func NewEnterpriseUsageReportsV1UsingExternalConfig(options *EnterpriseUsageReportsV1Options) (enterpriseUsageReports *EnterpriseUsageReportsV1, err error) {
-	if options.ServiceName == "" {
-		options.ServiceName = DefaultServiceName
-	}
-
-	if options.Authenticator == nil {
-		options.Authenticator, err = core.GetAuthenticatorFromEnvironment(options.ServiceName)
-		if err != nil {
-			return
-		}
-	}
-
-	enterpriseUsageReports, err = NewEnterpriseUsageReportsV1(options)
-	if err != nil {
-		return
-	}
-
-	err = enterpriseUsageReports.Service.ConfigureService(options.ServiceName)
-	if err != nil {
-		return
-	}
-
-	if options.URL != "" {
-		err = enterpriseUsageReports.Service.SetServiceURL(options.URL)
-	}
-	return
-}
-
-// NewEnterpriseUsageReportsV1 : constructs an instance of EnterpriseUsageReportsV1 with passed in options.
-func NewEnterpriseUsageReportsV1(options *EnterpriseUsageReportsV1Options) (service *EnterpriseUsageReportsV1, err error) {
-	serviceOptions := &core.ServiceOptions{
-		URL:           DefaultServiceURL,
-		Authenticator: options.Authenticator,
-	}
-
-	baseService, err := core.NewBaseService(serviceOptions)
-	if err != nil {
-		return
-	}
-
-	if options.URL != "" {
-		err = baseService.SetServiceURL(options.URL)
-		if err != nil {
-			return
-		}
-	}
-
-	service = &EnterpriseUsageReportsV1{
-		Service: baseService,
-	}
-
-	return
-}
-
-// SetServiceURL sets the service URL
-func (enterpriseUsageReports *EnterpriseUsageReportsV1) SetServiceURL(url string) error {
-	return enterpriseUsageReports.Service.SetServiceURL(url)
-}
-
-// ListResourceUsageReport : Get usage reports for enterprise entities
-// Usage reports for entities in the IBM Cloud enterprise. These entities can be the enterprise, an account group, or an
-// account.
-func (enterpriseUsageReports *EnterpriseUsageReportsV1) ListResourceUsageReport(listResourceUsageReportOptions *ListResourceUsageReportOptions) (result *Reports, response *core.DetailedResponse, err error) {
-	err = core.ValidateStruct(listResourceUsageReportOptions, "listResourceUsageReportOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v1/resource-usage-reports"}
-	pathParameters := []string{}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(enterpriseUsageReports.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range listResourceUsageReportOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("enterprise_usage_reports", "V1", "ListResourceUsageReport")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	if listResourceUsageReportOptions.EnterpriseID != nil {
-		builder.AddQuery("enterprise_id", fmt.Sprint(*listResourceUsageReportOptions.EnterpriseID))
-	}
-	if listResourceUsageReportOptions.AccountGroupID != nil {
-		builder.AddQuery("account_group_id", fmt.Sprint(*listResourceUsageReportOptions.AccountGroupID))
-	}
-	if listResourceUsageReportOptions.AccountID != nil {
-		builder.AddQuery("account_id", fmt.Sprint(*listResourceUsageReportOptions.AccountID))
-	}
-	if listResourceUsageReportOptions.Children != nil {
-		builder.AddQuery("children", fmt.Sprint(*listResourceUsageReportOptions.Children))
-	}
-	if listResourceUsageReportOptions.Month != nil {
-		builder.AddQuery("month", fmt.Sprint(*listResourceUsageReportOptions.Month))
-	}
-	if listResourceUsageReportOptions.BillingUnitID != nil {
-		builder.AddQuery("billing_unit_id", fmt.Sprint(*listResourceUsageReportOptions.BillingUnitID))
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = enterpriseUsageReports.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalReports(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// ListResourceUsageReportOptions : The ListResourceUsageReport options.
-type ListResourceUsageReportOptions struct {
-	// The ID of the enterprise for which the reports are queried. This parameter cannot be used with the `account_id` or
-	// `account_group_id` query parameters.
-	EnterpriseID *string `json:"enterprise_id,omitempty"`
-
-	// The ID of the account group for which the reports are queried. This parameter cannot be used with the `account_id`
-	// or `enterprise_id` query parameters.
-	AccountGroupID *string `json:"account_group_id,omitempty"`
-
-	// The ID of the account for which the reports are queried. This parameter cannot be used with the `account_group_id`
-	// or `enterprise_id` query parameters.
-	AccountID *string `json:"account_id,omitempty"`
-
-	// Returns the reports for the immediate child entities under the current account group or enterprise. This parameter
-	// cannot be used with the `account_id` query parameter.
-	Children *bool `json:"children,omitempty"`
-
-	// The billing month for which the usage report is requested. The format is in yyyy-mm. Defaults to the month in which
-	// the report is queried.
-	Month *string `json:"month,omitempty"`
-
-	// The ID of the billing unit by which to filter the reports.
-	BillingUnitID *string `json:"billing_unit_id,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewListResourceUsageReportOptions : Instantiate ListResourceUsageReportOptions
-func (*EnterpriseUsageReportsV1) NewListResourceUsageReportOptions() *ListResourceUsageReportOptions {
-	return &ListResourceUsageReportOptions{}
-}
-
-// SetEnterpriseID : Allow user to set EnterpriseID
-func (options *ListResourceUsageReportOptions) SetEnterpriseID(enterpriseID string) *ListResourceUsageReportOptions {
-	options.EnterpriseID = core.StringPtr(enterpriseID)
-	return options
-}
-
-// SetAccountGroupID : Allow user to set AccountGroupID
-func (options *ListResourceUsageReportOptions) SetAccountGroupID(accountGroupID string) *ListResourceUsageReportOptions {
-	options.AccountGroupID = core.StringPtr(accountGroupID)
-	return options
-}
-
-// SetAccountID : Allow user to set AccountID
-func (options *ListResourceUsageReportOptions) SetAccountID(accountID string) *ListResourceUsageReportOptions {
-	options.AccountID = core.StringPtr(accountID)
-	return options
-}
-
-// SetChildren : Allow user to set Children
-func (options *ListResourceUsageReportOptions) SetChildren(children bool) *ListResourceUsageReportOptions {
-	options.Children = core.BoolPtr(children)
-	return options
-}
-
-// SetMonth : Allow user to set Month
-func (options *ListResourceUsageReportOptions) SetMonth(month string) *ListResourceUsageReportOptions {
-	options.Month = core.StringPtr(month)
-	return options
-}
-
-// SetBillingUnitID : Allow user to set BillingUnitID
-func (options *ListResourceUsageReportOptions) SetBillingUnitID(billingUnitID string) *ListResourceUsageReportOptions {
-	options.BillingUnitID = core.StringPtr(billingUnitID)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *ListResourceUsageReportOptions) SetHeaders(param map[string]string) *ListResourceUsageReportOptions {
-	options.Headers = param
-	return options
-}
-
-// MetricUsageModel : An object that represents a metric.
-type MetricUsageModel struct {
-	// The name of the metric.
-	Metric *string `json:"metric" validate:"required"`
-
-	// A unit to qualify the quantity.
-	Unit *string `json:"unit" validate:"required"`
-
-	// The aggregated value for the metric.
-	Quantity *float64 `json:"quantity" validate:"required"`
-
-	// The quantity that is used for calculating charges.
-	RateableQuantity *float64 `json:"rateable_quantity" validate:"required"`
-
-	// The cost that was incurred by the metric.
-	Cost *float64 `json:"cost" validate:"required"`
-
-	// The pre-discounted cost that was incurred by the metric.
-	RatedCost *float64 `json:"rated_cost" validate:"required"`
-
-	// The price with which cost was calculated.
-	Price []interface{} `json:"price,omitempty"`
-}
-
-
-// UnmarshalMetricUsageModel constructs an instance of MetricUsageModel from the specified map.
-func UnmarshalMetricUsageModel(m map[string]interface{}) (result *MetricUsageModel, err error) {
-	obj := new(MetricUsageModel)
-	obj.Metric, err = core.UnmarshalString(m, "metric")
-	if err != nil {
-		return
-	}
-	obj.Unit, err = core.UnmarshalString(m, "unit")
-	if err != nil {
-		return
-	}
-	obj.Quantity, err = core.UnmarshalFloat64(m, "quantity")
-	if err != nil {
-		return
-	}
-	obj.RateableQuantity, err = core.UnmarshalFloat64(m, "rateable_quantity")
-	if err != nil {
-		return
-	}
-	obj.Cost, err = core.UnmarshalFloat64(m, "cost")
-	if err != nil {
-		return
-	}
-	obj.RatedCost, err = core.UnmarshalFloat64(m, "rated_cost")
-	if err != nil {
-		return
-	}
-	obj.Price, err = core.UnmarshalAnySlice(m, "price")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalMetricUsageModelSlice unmarshals a slice of MetricUsageModel instances from the specified list of maps.
-func UnmarshalMetricUsageModelSlice(s []interface{}) (slice []MetricUsageModel, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'MetricUsageModel'")
-			return
-		}
-		obj, e := UnmarshalMetricUsageModel(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalMetricUsageModelAsProperty unmarshals an instance of MetricUsageModel that is stored as a property
-// within the specified map.
-func UnmarshalMetricUsageModelAsProperty(m map[string]interface{}, propertyName string) (result *MetricUsageModel, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'MetricUsageModel'", propertyName)
-			return
-		}
-		result, err = UnmarshalMetricUsageModel(objMap)
-	}
-	return
-}
-
-// UnmarshalMetricUsageModelSliceAsProperty unmarshals a slice of MetricUsageModel instances that are stored as a property
-// within the specified map.
-func UnmarshalMetricUsageModelSliceAsProperty(m map[string]interface{}, propertyName string) (slice []MetricUsageModel, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'MetricUsageModel'", propertyName)
-			return
-		}
-		slice, err = UnmarshalMetricUsageModelSlice(vSlice)
-	}
-	return
-}
-
-// PlanUsageModel : Aggregated values for the plan.
-type PlanUsageModel struct {
-	// The ID of the plan.
-	PlanID *string `json:"plan_id" validate:"required"`
-
-	// The pricing region for the plan.
-	PricingRegion *string `json:"pricing_region,omitempty"`
-
-	// The pricing plan with which the usage was rated.
-	PricingPlanID *string `json:"pricing_plan_id,omitempty"`
-
-	// Whether the plan charges are billed to the customer.
-	Billable *bool `json:"billable" validate:"required"`
-
-	// The total cost that was incurred by the plan.
-	Cost *float64 `json:"cost" validate:"required"`
-
-	// The total pre-discounted cost that was incurred by the plan.
-	RatedCost *float64 `json:"rated_cost" validate:"required"`
-
-	// All of the metrics in the plan.
-	Usage []MetricUsageModel `json:"usage" validate:"required"`
-}
-
-
-// UnmarshalPlanUsageModel constructs an instance of PlanUsageModel from the specified map.
-func UnmarshalPlanUsageModel(m map[string]interface{}) (result *PlanUsageModel, err error) {
-	obj := new(PlanUsageModel)
-	obj.PlanID, err = core.UnmarshalString(m, "plan_id")
-	if err != nil {
-		return
-	}
-	obj.PricingRegion, err = core.UnmarshalString(m, "pricing_region")
-	if err != nil {
-		return
-	}
-	obj.PricingPlanID, err = core.UnmarshalString(m, "pricing_plan_id")
-	if err != nil {
-		return
-	}
-	obj.Billable, err = core.UnmarshalBool(m, "billable")
-	if err != nil {
-		return
-	}
-	obj.Cost, err = core.UnmarshalFloat64(m, "cost")
-	if err != nil {
-		return
-	}
-	obj.RatedCost, err = core.UnmarshalFloat64(m, "rated_cost")
-	if err != nil {
-		return
-	}
-	obj.Usage, err = UnmarshalMetricUsageModelSliceAsProperty(m, "usage")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalPlanUsageModelSlice unmarshals a slice of PlanUsageModel instances from the specified list of maps.
-func UnmarshalPlanUsageModelSlice(s []interface{}) (slice []PlanUsageModel, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'PlanUsageModel'")
-			return
-		}
-		obj, e := UnmarshalPlanUsageModel(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalPlanUsageModelAsProperty unmarshals an instance of PlanUsageModel that is stored as a property
-// within the specified map.
-func UnmarshalPlanUsageModelAsProperty(m map[string]interface{}, propertyName string) (result *PlanUsageModel, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'PlanUsageModel'", propertyName)
-			return
-		}
-		result, err = UnmarshalPlanUsageModel(objMap)
-	}
-	return
-}
-
-// UnmarshalPlanUsageModelSliceAsProperty unmarshals a slice of PlanUsageModel instances that are stored as a property
-// within the specified map.
-func UnmarshalPlanUsageModelSliceAsProperty(m map[string]interface{}, propertyName string) (slice []PlanUsageModel, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'PlanUsageModel'", propertyName)
-			return
-		}
-		slice, err = UnmarshalPlanUsageModelSlice(vSlice)
-	}
-	return
-}
-
-// Reports : Resource Usage Reports API response.
-type Reports struct {
-	// The maximum number of reports in the response.
-	Limit *float64 `json:"limit,omitempty"`
-
-	// An object that contains the link to the first page of the search query.
-	First *ReportsFirst `json:"first,omitempty"`
-
-	// An object that contains the link to the first page of the search query.
-	Next *ReportsNext `json:"next,omitempty"`
-
-	// The list of usage reports.
-	Reports []ResourceUsageReportModel `json:"reports,omitempty"`
-}
-
-
-// UnmarshalReports constructs an instance of Reports from the specified map.
-func UnmarshalReports(m map[string]interface{}) (result *Reports, err error) {
-	obj := new(Reports)
-	obj.Limit, err = core.UnmarshalFloat64(m, "limit")
-	if err != nil {
-		return
-	}
-	obj.First, err = UnmarshalReportsFirstAsProperty(m, "first")
-	if err != nil {
-		return
-	}
-	obj.Next, err = UnmarshalReportsNextAsProperty(m, "next")
-	if err != nil {
-		return
-	}
-	obj.Reports, err = UnmarshalResourceUsageReportModelSliceAsProperty(m, "reports")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalReportsSlice unmarshals a slice of Reports instances from the specified list of maps.
-func UnmarshalReportsSlice(s []interface{}) (slice []Reports, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'Reports'")
-			return
-		}
-		obj, e := UnmarshalReports(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalReportsAsProperty unmarshals an instance of Reports that is stored as a property
-// within the specified map.
-func UnmarshalReportsAsProperty(m map[string]interface{}, propertyName string) (result *Reports, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'Reports'", propertyName)
-			return
-		}
-		result, err = UnmarshalReports(objMap)
-	}
-	return
-}
-
-// UnmarshalReportsSliceAsProperty unmarshals a slice of Reports instances that are stored as a property
-// within the specified map.
-func UnmarshalReportsSliceAsProperty(m map[string]interface{}, propertyName string) (slice []Reports, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'Reports'", propertyName)
-			return
-		}
-		slice, err = UnmarshalReportsSlice(vSlice)
-	}
-	return
-}
-
-// ReportsFirst : An object that contains the link to the first page of the search query.
-type ReportsFirst struct {
-	// A link to the first page of the search query.
-	Href *string `json:"href,omitempty"`
-}
-
-
-// UnmarshalReportsFirst constructs an instance of ReportsFirst from the specified map.
-func UnmarshalReportsFirst(m map[string]interface{}) (result *ReportsFirst, err error) {
-	obj := new(ReportsFirst)
-	obj.Href, err = core.UnmarshalString(m, "href")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalReportsFirstSlice unmarshals a slice of ReportsFirst instances from the specified list of maps.
-func UnmarshalReportsFirstSlice(s []interface{}) (slice []ReportsFirst, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'ReportsFirst'")
-			return
-		}
-		obj, e := UnmarshalReportsFirst(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalReportsFirstAsProperty unmarshals an instance of ReportsFirst that is stored as a property
-// within the specified map.
-func UnmarshalReportsFirstAsProperty(m map[string]interface{}, propertyName string) (result *ReportsFirst, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'ReportsFirst'", propertyName)
-			return
-		}
-		result, err = UnmarshalReportsFirst(objMap)
-	}
-	return
-}
-
-// UnmarshalReportsFirstSliceAsProperty unmarshals a slice of ReportsFirst instances that are stored as a property
-// within the specified map.
-func UnmarshalReportsFirstSliceAsProperty(m map[string]interface{}, propertyName string) (slice []ReportsFirst, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'ReportsFirst'", propertyName)
-			return
-		}
-		slice, err = UnmarshalReportsFirstSlice(vSlice)
-	}
-	return
-}
-
-// ReportsNext : An object that contains the link to the first page of the search query.
-type ReportsNext struct {
-	// A link to the first page of the search query.
-	Href *string `json:"href,omitempty"`
-}
-
-
-// UnmarshalReportsNext constructs an instance of ReportsNext from the specified map.
-func UnmarshalReportsNext(m map[string]interface{}) (result *ReportsNext, err error) {
-	obj := new(ReportsNext)
-	obj.Href, err = core.UnmarshalString(m, "href")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalReportsNextSlice unmarshals a slice of ReportsNext instances from the specified list of maps.
-func UnmarshalReportsNextSlice(s []interface{}) (slice []ReportsNext, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'ReportsNext'")
-			return
-		}
-		obj, e := UnmarshalReportsNext(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalReportsNextAsProperty unmarshals an instance of ReportsNext that is stored as a property
-// within the specified map.
-func UnmarshalReportsNextAsProperty(m map[string]interface{}, propertyName string) (result *ReportsNext, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'ReportsNext'", propertyName)
-			return
-		}
-		result, err = UnmarshalReportsNext(objMap)
-	}
-	return
-}
-
-// UnmarshalReportsNextSliceAsProperty unmarshals a slice of ReportsNext instances that are stored as a property
-// within the specified map.
-func UnmarshalReportsNextSliceAsProperty(m map[string]interface{}, propertyName string) (slice []ReportsNext, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'ReportsNext'", propertyName)
-			return
-		}
-		slice, err = UnmarshalReportsNextSlice(vSlice)
-	}
-	return
-}
-
-// ResourceUsageModel : A container for all the plans in the resource.
-type ResourceUsageModel struct {
-	// The ID of the resource.
-	ResourceID *string `json:"resource_id" validate:"required"`
-
-	// The billable charges for the account.
-	BillableCost *float64 `json:"billable_cost" validate:"required"`
-
-	// The pre-discounted billable charges for the account.
-	BillableRatedCost *float64 `json:"billable_rated_cost" validate:"required"`
-
-	// The non-billable charges for the account.
-	NonBillableCost *float64 `json:"non_billable_cost" validate:"required"`
-
-	// The pre-discounted, non-billable charges for the account.
-	NonBillableRatedCost *float64 `json:"non_billable_rated_cost" validate:"required"`
-
-	// All of the plans in the resource.
-	Plans []PlanUsageModel `json:"plans" validate:"required"`
-}
-
-
-// UnmarshalResourceUsageModel constructs an instance of ResourceUsageModel from the specified map.
-func UnmarshalResourceUsageModel(m map[string]interface{}) (result *ResourceUsageModel, err error) {
-	obj := new(ResourceUsageModel)
-	obj.ResourceID, err = core.UnmarshalString(m, "resource_id")
-	if err != nil {
-		return
-	}
-	obj.BillableCost, err = core.UnmarshalFloat64(m, "billable_cost")
-	if err != nil {
-		return
-	}
-	obj.BillableRatedCost, err = core.UnmarshalFloat64(m, "billable_rated_cost")
-	if err != nil {
-		return
-	}
-	obj.NonBillableCost, err = core.UnmarshalFloat64(m, "non_billable_cost")
-	if err != nil {
-		return
-	}
-	obj.NonBillableRatedCost, err = core.UnmarshalFloat64(m, "non_billable_rated_cost")
-	if err != nil {
-		return
-	}
-	obj.Plans, err = UnmarshalPlanUsageModelSliceAsProperty(m, "plans")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalResourceUsageModelSlice unmarshals a slice of ResourceUsageModel instances from the specified list of maps.
-func UnmarshalResourceUsageModelSlice(s []interface{}) (slice []ResourceUsageModel, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'ResourceUsageModel'")
-			return
-		}
-		obj, e := UnmarshalResourceUsageModel(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalResourceUsageModelAsProperty unmarshals an instance of ResourceUsageModel that is stored as a property
-// within the specified map.
-func UnmarshalResourceUsageModelAsProperty(m map[string]interface{}, propertyName string) (result *ResourceUsageModel, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'ResourceUsageModel'", propertyName)
-			return
-		}
-		result, err = UnmarshalResourceUsageModel(objMap)
-	}
-	return
-}
-
-// UnmarshalResourceUsageModelSliceAsProperty unmarshals a slice of ResourceUsageModel instances that are stored as a property
-// within the specified map.
-func UnmarshalResourceUsageModelSliceAsProperty(m map[string]interface{}, propertyName string) (slice []ResourceUsageModel, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'ResourceUsageModel'", propertyName)
-			return
-		}
-		slice, err = UnmarshalResourceUsageModelSlice(vSlice)
-	}
-	return
-}
-
-// ResourceUsageReportModel : An object that represents a usage report.
-type ResourceUsageReportModel struct {
-	// The ID of the entity.
-	EntityID *string `json:"entity_id" validate:"required"`
-
-	// The entity type.
-	EntityType *string `json:"entity_type" validate:"required"`
-
-	// The Cloud Resource Name (CRN) of the entity towards which the resource usages were rolled up.
-	EntityCrn *string `json:"entity_crn" validate:"required"`
-
-	// A user-defined name for the entity, such as the enterprise name or account group name.
-	EntityName *string `json:"entity_name" validate:"required"`
-
-	// The ID of the billing unit.
-	BillingUnitID *string `json:"billing_unit_id" validate:"required"`
-
-	// The CRN of the billing unit.
-	BillingUnitCrn *string `json:"billing_unit_crn" validate:"required"`
-
-	// The name of the billing unit.
-	BillingUnitName *string `json:"billing_unit_name" validate:"required"`
-
-	// The country code of the billing unit.
-	CountryCode *string `json:"country_code" validate:"required"`
-
-	// The currency code of the billing unit.
-	CurrencyCode *string `json:"currency_code" validate:"required"`
-
-	// Billing month.
-	Month *string `json:"month" validate:"required"`
-
-	// Billable charges that are aggregated from all entities in the report.
-	BillableCost *float64 `json:"billable_cost" validate:"required"`
-
-	// Non-billable charges that are aggregated from all entities in the report.
-	NonBillableCost *float64 `json:"non_billable_cost" validate:"required"`
-
-	// Aggregated billable charges before discounts.
-	BillableRatedCost *float64 `json:"billable_rated_cost" validate:"required"`
-
-	// Aggregated non-billable charges before discounts.
-	NonBillableRatedCost *float64 `json:"non_billable_rated_cost" validate:"required"`
-
-	// Details about all the resources that are included in the aggregated charges.
-	Resources []ResourceUsageModel `json:"resources" validate:"required"`
-}
-
-// Constants associated with the ResourceUsageReportModel.EntityType property.
-// The entity type.
-const (
-	ResourceUsageReportModel_EntityType_Account = "account"
-	ResourceUsageReportModel_EntityType_AccountGroup = "account-group"
-	ResourceUsageReportModel_EntityType_Enterprise = "enterprise"
-)
-
-
-// UnmarshalResourceUsageReportModel constructs an instance of ResourceUsageReportModel from the specified map.
-func UnmarshalResourceUsageReportModel(m map[string]interface{}) (result *ResourceUsageReportModel, err error) {
-	obj := new(ResourceUsageReportModel)
-	obj.EntityID, err = core.UnmarshalString(m, "entity_id")
-	if err != nil {
-		return
-	}
-	obj.EntityType, err = core.UnmarshalString(m, "entity_type")
-	if err != nil {
-		return
-	}
-	obj.EntityCrn, err = core.UnmarshalString(m, "entity_crn")
-	if err != nil {
-		return
-	}
-	obj.EntityName, err = core.UnmarshalString(m, "entity_name")
-	if err != nil {
-		return
-	}
-	obj.BillingUnitID, err = core.UnmarshalString(m, "billing_unit_id")
-	if err != nil {
-		return
-	}
-	obj.BillingUnitCrn, err = core.UnmarshalString(m, "billing_unit_crn")
-	if err != nil {
-		return
-	}
-	obj.BillingUnitName, err = core.UnmarshalString(m, "billing_unit_name")
-	if err != nil {
-		return
-	}
-	obj.CountryCode, err = core.UnmarshalString(m, "country_code")
-	if err != nil {
-		return
-	}
-	obj.CurrencyCode, err = core.UnmarshalString(m, "currency_code")
-	if err != nil {
-		return
-	}
-	obj.Month, err = core.UnmarshalString(m, "month")
-	if err != nil {
-		return
-	}
-	obj.BillableCost, err = core.UnmarshalFloat64(m, "billable_cost")
-	if err != nil {
-		return
-	}
-	obj.NonBillableCost, err = core.UnmarshalFloat64(m, "non_billable_cost")
-	if err != nil {
-		return
-	}
-	obj.BillableRatedCost, err = core.UnmarshalFloat64(m, "billable_rated_cost")
-	if err != nil {
-		return
-	}
-	obj.NonBillableRatedCost, err = core.UnmarshalFloat64(m, "non_billable_rated_cost")
-	if err != nil {
-		return
-	}
-	obj.Resources, err = UnmarshalResourceUsageModelSliceAsProperty(m, "resources")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalResourceUsageReportModelSlice unmarshals a slice of ResourceUsageReportModel instances from the specified list of maps.
-func UnmarshalResourceUsageReportModelSlice(s []interface{}) (slice []ResourceUsageReportModel, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'ResourceUsageReportModel'")
-			return
-		}
-		obj, e := UnmarshalResourceUsageReportModel(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalResourceUsageReportModelAsProperty unmarshals an instance of ResourceUsageReportModel that is stored as a property
-// within the specified map.
-func UnmarshalResourceUsageReportModelAsProperty(m map[string]interface{}, propertyName string) (result *ResourceUsageReportModel, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'ResourceUsageReportModel'", propertyName)
-			return
-		}
-		result, err = UnmarshalResourceUsageReportModel(objMap)
-	}
-	return
-}
-
-// UnmarshalResourceUsageReportModelSliceAsProperty unmarshals a slice of ResourceUsageReportModel instances that are stored as a property
-// within the specified map.
-func UnmarshalResourceUsageReportModelSliceAsProperty(m map[string]interface{}, propertyName string) (slice []ResourceUsageReportModel, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'ResourceUsageReportModel'", propertyName)
-			return
-		}
-		slice, err = UnmarshalResourceUsageReportModelSlice(vSlice)
-	}
-	return
-}
diff --git a/enterpriseusagereportsv1/enterprise_usage_reports_v1_suite_test.go b/enterpriseusagereportsv1/enterprise_usage_reports_v1_suite_test.go
deleted file mode 100644
index 739baf84..00000000
--- a/enterpriseusagereportsv1/enterprise_usage_reports_v1_suite_test.go
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * (C) Copyright IBM Corp. 2020.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package enterpriseusagereportsv1_test
-
-import (
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-	"testing"
-)
-
-func TestEnterpriseUsageReportsV1(t *testing.T) {
-	RegisterFailHandler(Fail)
-	RunSpecs(t, "EnterpriseUsageReportsV1 Suite")
-}
diff --git a/enterpriseusagereportsv1/enterprise_usage_reports_v1_test.go b/enterpriseusagereportsv1/enterprise_usage_reports_v1_test.go
deleted file mode 100644
index 26b730bd..00000000
--- a/enterpriseusagereportsv1/enterprise_usage_reports_v1_test.go
+++ /dev/null
@@ -1,163 +0,0 @@
-/**
- * (C) Copyright IBM Corp. 2020.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package enterpriseusagereportsv1_test
-
-import (
-	"bytes"
-	"encoding/base64"
-	"fmt"
-	"github.com/IBM/go-sdk-core/v3/core"
-	"github.com/go-openapi/strfmt"
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-	"github.ibm.com/ibmcloud/platform-services-go-sdk/enterpriseusagereportsv1"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"net/http/httptest"
-	"time"
-)
-
-var _ = Describe(`EnterpriseUsageReportsV1`, func() {
-	Describe(`ListResourceUsageReport(listResourceUsageReportOptions *ListResourceUsageReportOptions)`, func() {
-		username := "user1"
-		password := "pass1"
-		encodedBasicAuth := base64.StdEncoding.EncodeToString([]byte(username + ":" + password))
-		listResourceUsageReportPath := "/v1/resource-usage-reports"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(listResourceUsageReportPath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Basic " + encodedBasicAuth))
-				Expect(req.URL.Query()["enterprise_id"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["account_group_id"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["account_id"]).To(Equal([]string{"testString"}))
-
-
-				// TODO: Add check for children query parameter
-
-				Expect(req.URL.Query()["month"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["billing_unit_id"]).To(Equal([]string{"testString"}))
-
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"limit": 5, "first": {"href": "Href"}, "next": {"href": "Href"}, "reports": [{"entity_id": "de129b787b86403db7d3a14be2ae5f76", "entity_type": "enterprise", "entity_crn": "crn:v1:bluemix:public:enterprise::a/e9a57260546c4b4aa9ebfa316a82e56e::enterprise:de129b787b86403db7d3a14be2ae5f76", "entity_name": "Platform-Services", "billing_unit_id": "65719a07280a4022a9efa2f6ff4c3369", "billing_unit_crn": "crn:v1:bluemix:public:billing::a/3f99f8accbc848ea96f3c61a0ae22c44::billing-unit:65719a07280a4022a9efa2f6ff4c3369", "billing_unit_name": "Operations", "country_code": "USA", "currency_code": "USD", "month": "2017-08", "billable_cost": 12, "non_billable_cost": 15, "billable_rated_cost": 17, "non_billable_rated_cost": 20, "resources": [{"resource_id": "ResourceID", "billable_cost": 12, "billable_rated_cost": 17, "non_billable_cost": 15, "non_billable_rated_cost": 20, "plans": [{"plan_id": "PlanID", "pricing_region": "PricingRegion", "pricing_plan_id": "PricingPlanID", "billable": true, "cost": 4, "rated_cost": 9, "usage": [{"metric": "UP-TIME", "unit": "HOURS", "quantity": 711.11, "rateable_quantity": 700, "cost": 123.45, "rated_cost": 130, "price": [{"anyKey": "anyValue"}]}]}]}]}]}`)
-			}))
-			It(`Invoke ListResourceUsageReport successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := enterpriseusagereportsv1.NewEnterpriseUsageReportsV1(&enterpriseusagereportsv1.EnterpriseUsageReportsV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BasicAuthenticator{
-						Username: username,
-						Password: password,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.ListResourceUsageReport(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the ListResourceUsageReportOptions model
-				listResourceUsageReportOptionsModel := new(enterpriseusagereportsv1.ListResourceUsageReportOptions)
-				listResourceUsageReportOptionsModel.EnterpriseID = core.StringPtr("testString")
-				listResourceUsageReportOptionsModel.AccountGroupID = core.StringPtr("testString")
-				listResourceUsageReportOptionsModel.AccountID = core.StringPtr("testString")
-				listResourceUsageReportOptionsModel.Children = core.BoolPtr(true)
-				listResourceUsageReportOptionsModel.Month = core.StringPtr("testString")
-				listResourceUsageReportOptionsModel.BillingUnitID = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.ListResourceUsageReport(listResourceUsageReportOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`Utility function tests`, func() {
-		It(`Invoke CreateMockMap() successfully`, func() {
-			mockMap := CreateMockMap()
-			Expect(mockMap).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockByteArray() successfully`, func() {
-			mockByteArray := CreateMockByteArray("This is a test")
-			Expect(mockByteArray).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockUUID() successfully`, func() {
-			mockUUID := CreateMockUUID("9fab83da-98cb-4f18-a7ba-b6f0435c9673")
-			Expect(mockUUID).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockReader() successfully`, func() {
-			mockReader := CreateMockReader("This is a test.")
-			Expect(mockReader).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockDate() successfully`, func() {
-			mockDate := CreateMockDate()
-			Expect(mockDate).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockDateTime() successfully`, func() {
-			mockDateTime := CreateMockDateTime()
-			Expect(mockDateTime).ToNot(BeNil())
-		})
-	})
-})
-
-//
-// Utility functions used by the generated test code
-//
-
-func CreateMockMap() map[string]interface{} {
-	m := make(map[string]interface{})
-	return m
-}
-
-func CreateMockByteArray(mockData string) *[]byte {
-	ba := make([]byte, len(mockData))
-	ba = append(ba, mockData...)
-	return &ba
-}
-
-func CreateMockUUID(mockData string) *strfmt.UUID {
-	uuid := strfmt.UUID(mockData)
-	return &uuid
-}
-
-func CreateMockReader(mockData string) io.ReadCloser {
-	return ioutil.NopCloser(bytes.NewReader([]byte(mockData)))
-}
-
-func CreateMockDate() *strfmt.Date {
-	d := strfmt.Date(time.Now())
-	return &d
-}
-
-func CreateMockDateTime() *strfmt.DateTime {
-	d := strfmt.DateTime(time.Now())
-	return &d
-}
diff --git a/globalcatalogv1/global_catalog_v1.go b/globalcatalogv1/global_catalog_v1.go
deleted file mode 100644
index 382e111b..00000000
--- a/globalcatalogv1/global_catalog_v1.go
+++ /dev/null
@@ -1,5891 +0,0 @@
-/**
- * (C) Copyright IBM Corp. 2020.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// Package globalcatalogv1 : Operations and models for the GlobalCatalogV1 service
-package globalcatalogv1
-
-import (
-	"fmt"
-	"github.com/IBM/go-sdk-core/v3/core"
-	"github.com/go-openapi/strfmt"
-	common "github.ibm.com/ibmcloud/platform-services-go-sdk/common"
-)
-
-// GlobalCatalogV1 : The catalog service manages offerings across geographies as the system of record. The catalog
-// supports a RESTful API where users can retrieve information about existing offerings and create, manage, and delete
-// their offerings. Start with the base URL and use the endpoints to retrieve metadata about services in the catalog and
-// manage service visbility. Depending on the kind of object, the metadata can include information about pricing,
-// provisioning, regions, and more. For more information, see the [catalog
-// documentation](https://cloud.ibm.com/docs/overview/catalog.html#global-catalog-overview).
-//
-// Version: 1.0.3
-type GlobalCatalogV1 struct {
-	Service *core.BaseService
-}
-
-// DefaultServiceURL is the default URL to make service requests to.
-const DefaultServiceURL = "https://globalcatalog.cloud.ibm.com/api/v1"
-
-// DefaultServiceName is the default key used to find external configuration information.
-const DefaultServiceName = "global_catalog"
-
-// GlobalCatalogV1Options : Service options
-type GlobalCatalogV1Options struct {
-	ServiceName   string
-	URL           string
-	Authenticator core.Authenticator
-}
-
-// NewGlobalCatalogV1UsingExternalConfig : constructs an instance of GlobalCatalogV1 with passed in options and external configuration.
-func NewGlobalCatalogV1UsingExternalConfig(options *GlobalCatalogV1Options) (globalCatalog *GlobalCatalogV1, err error) {
-	if options.ServiceName == "" {
-		options.ServiceName = DefaultServiceName
-	}
-
-	if options.Authenticator == nil {
-		options.Authenticator, err = core.GetAuthenticatorFromEnvironment(options.ServiceName)
-		if err != nil {
-			return
-		}
-	}
-
-	globalCatalog, err = NewGlobalCatalogV1(options)
-	if err != nil {
-		return
-	}
-
-	err = globalCatalog.Service.ConfigureService(options.ServiceName)
-	if err != nil {
-		return
-	}
-
-	if options.URL != "" {
-		err = globalCatalog.Service.SetServiceURL(options.URL)
-	}
-	return
-}
-
-// NewGlobalCatalogV1 : constructs an instance of GlobalCatalogV1 with passed in options.
-func NewGlobalCatalogV1(options *GlobalCatalogV1Options) (service *GlobalCatalogV1, err error) {
-	serviceOptions := &core.ServiceOptions{
-		URL:           DefaultServiceURL,
-		Authenticator: options.Authenticator,
-	}
-
-	baseService, err := core.NewBaseService(serviceOptions)
-	if err != nil {
-		return
-	}
-
-	if options.URL != "" {
-		err = baseService.SetServiceURL(options.URL)
-		if err != nil {
-			return
-		}
-	}
-
-	service = &GlobalCatalogV1{
-		Service: baseService,
-	}
-
-	return
-}
-
-// SetServiceURL sets the service URL
-func (globalCatalog *GlobalCatalogV1) SetServiceURL(url string) error {
-	return globalCatalog.Service.SetServiceURL(url)
-}
-
-// ListCatalogEntries : Returns parent catalog entries
-// Includes key information, such as ID, name, kind, CRN, tags, and provider. This endpoint is ETag enabled.
-func (globalCatalog *GlobalCatalogV1) ListCatalogEntries(listCatalogEntriesOptions *ListCatalogEntriesOptions) (result *SearchResult, response *core.DetailedResponse, err error) {
-	err = core.ValidateStruct(listCatalogEntriesOptions, "listCatalogEntriesOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{""}
-	pathParameters := []string{}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(globalCatalog.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range listCatalogEntriesOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("global_catalog", "V1", "ListCatalogEntries")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	if listCatalogEntriesOptions.Account != nil {
-		builder.AddQuery("account", fmt.Sprint(*listCatalogEntriesOptions.Account))
-	}
-	if listCatalogEntriesOptions.Include != nil {
-		builder.AddQuery("include", fmt.Sprint(*listCatalogEntriesOptions.Include))
-	}
-	if listCatalogEntriesOptions.Q != nil {
-		builder.AddQuery("q", fmt.Sprint(*listCatalogEntriesOptions.Q))
-	}
-	if listCatalogEntriesOptions.SortBy != nil {
-		builder.AddQuery("sort-by", fmt.Sprint(*listCatalogEntriesOptions.SortBy))
-	}
-	if listCatalogEntriesOptions.Descending != nil {
-		builder.AddQuery("descending", fmt.Sprint(*listCatalogEntriesOptions.Descending))
-	}
-	if listCatalogEntriesOptions.Languages != nil {
-		builder.AddQuery("languages", fmt.Sprint(*listCatalogEntriesOptions.Languages))
-	}
-	if listCatalogEntriesOptions.Complete != nil {
-		builder.AddQuery("complete", fmt.Sprint(*listCatalogEntriesOptions.Complete))
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = globalCatalog.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalSearchResult(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// CreateCatalogEntry : Create a catalog entry
-// The created catalog entry is restricted by default. You must have an administrator or editor role in the scope of the
-// provided token. This API will return an ETag that can be used for standard ETag processing, except when depth query
-// is used.
-func (globalCatalog *GlobalCatalogV1) CreateCatalogEntry(createCatalogEntryOptions *CreateCatalogEntryOptions) (response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(createCatalogEntryOptions, "createCatalogEntryOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(createCatalogEntryOptions, "createCatalogEntryOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{""}
-	pathParameters := []string{}
-
-	builder := core.NewRequestBuilder(core.POST)
-	_, err = builder.ConstructHTTPURL(globalCatalog.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range createCatalogEntryOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("global_catalog", "V1", "CreateCatalogEntry")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Content-Type", "application/json")
-
-	if createCatalogEntryOptions.Account != nil {
-		builder.AddQuery("account", fmt.Sprint(*createCatalogEntryOptions.Account))
-	}
-
-	body := make(map[string]interface{})
-	if createCatalogEntryOptions.ID != nil {
-		body["id"] = createCatalogEntryOptions.ID
-	}
-	if createCatalogEntryOptions.Name != nil {
-		body["name"] = createCatalogEntryOptions.Name
-	}
-	if createCatalogEntryOptions.OverviewUi != nil {
-		body["overview_ui"] = createCatalogEntryOptions.OverviewUi
-	}
-	if createCatalogEntryOptions.Kind != nil {
-		body["kind"] = createCatalogEntryOptions.Kind
-	}
-	if createCatalogEntryOptions.Images != nil {
-		body["images"] = createCatalogEntryOptions.Images
-	}
-	if createCatalogEntryOptions.Disabled != nil {
-		body["disabled"] = createCatalogEntryOptions.Disabled
-	}
-	if createCatalogEntryOptions.Tags != nil {
-		body["tags"] = createCatalogEntryOptions.Tags
-	}
-	if createCatalogEntryOptions.GeoTags != nil {
-		body["geo_tags"] = createCatalogEntryOptions.GeoTags
-	}
-	if createCatalogEntryOptions.PricingTags != nil {
-		body["pricing_tags"] = createCatalogEntryOptions.PricingTags
-	}
-	if createCatalogEntryOptions.Group != nil {
-		body["group"] = createCatalogEntryOptions.Group
-	}
-	if createCatalogEntryOptions.Provider != nil {
-		body["provider"] = createCatalogEntryOptions.Provider
-	}
-	if createCatalogEntryOptions.CatalogCrn != nil {
-		body["catalog_crn"] = createCatalogEntryOptions.CatalogCrn
-	}
-	if createCatalogEntryOptions.URL != nil {
-		body["url"] = createCatalogEntryOptions.URL
-	}
-	if createCatalogEntryOptions.ParentID != nil {
-		body["parent_id"] = createCatalogEntryOptions.ParentID
-	}
-	if createCatalogEntryOptions.ChildrenURL != nil {
-		body["children_url"] = createCatalogEntryOptions.ChildrenURL
-	}
-	if createCatalogEntryOptions.ParentURL != nil {
-		body["parent_url"] = createCatalogEntryOptions.ParentURL
-	}
-	if createCatalogEntryOptions.Created != nil {
-		body["created"] = createCatalogEntryOptions.Created
-	}
-	if createCatalogEntryOptions.Updated != nil {
-		body["updated"] = createCatalogEntryOptions.Updated
-	}
-	if createCatalogEntryOptions.Metadata != nil {
-		body["metadata"] = createCatalogEntryOptions.Metadata
-	}
-	if createCatalogEntryOptions.Active != nil {
-		body["active"] = createCatalogEntryOptions.Active
-	}
-	if createCatalogEntryOptions.Children != nil {
-		body["children"] = createCatalogEntryOptions.Children
-	}
-	_, err = builder.SetBodyContentJSON(body)
-	if err != nil {
-		return
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = globalCatalog.Service.Request(request, nil)
-
-	return
-}
-
-// GetCatalogEntry : Get a specific catalog object
-// This endpoint returns a specific catalog entry using the object's unique identifier, for example
-// `/_*service_name*?complete=true`. This endpoint is ETag enabled.
-func (globalCatalog *GlobalCatalogV1) GetCatalogEntry(getCatalogEntryOptions *GetCatalogEntryOptions) (result *CatalogEntry, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(getCatalogEntryOptions, "getCatalogEntryOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(getCatalogEntryOptions, "getCatalogEntryOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{""}
-	pathParameters := []string{*getCatalogEntryOptions.ID}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(globalCatalog.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range getCatalogEntryOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("global_catalog", "V1", "GetCatalogEntry")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	if getCatalogEntryOptions.Account != nil {
-		builder.AddQuery("account", fmt.Sprint(*getCatalogEntryOptions.Account))
-	}
-	if getCatalogEntryOptions.Include != nil {
-		builder.AddQuery("include", fmt.Sprint(*getCatalogEntryOptions.Include))
-	}
-	if getCatalogEntryOptions.Languages != nil {
-		builder.AddQuery("languages", fmt.Sprint(*getCatalogEntryOptions.Languages))
-	}
-	if getCatalogEntryOptions.Complete != nil {
-		builder.AddQuery("complete", fmt.Sprint(*getCatalogEntryOptions.Complete))
-	}
-	if getCatalogEntryOptions.Depth != nil {
-		builder.AddQuery("depth", fmt.Sprint(*getCatalogEntryOptions.Depth))
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = globalCatalog.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalCatalogEntry(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// UpdateCatalogEntry : Update a catalog entry
-// Update a catalog entry. The visibility of the catalog entry cannot be modified with this endpoint. You must be an
-// administrator or editor in the scope of the provided token. This endpoint is ETag enabled.
-func (globalCatalog *GlobalCatalogV1) UpdateCatalogEntry(updateCatalogEntryOptions *UpdateCatalogEntryOptions) (response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(updateCatalogEntryOptions, "updateCatalogEntryOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(updateCatalogEntryOptions, "updateCatalogEntryOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{""}
-	pathParameters := []string{*updateCatalogEntryOptions.ID}
-
-	builder := core.NewRequestBuilder(core.PUT)
-	_, err = builder.ConstructHTTPURL(globalCatalog.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range updateCatalogEntryOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("global_catalog", "V1", "UpdateCatalogEntry")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Content-Type", "application/json")
-
-	if updateCatalogEntryOptions.Account != nil {
-		builder.AddQuery("account", fmt.Sprint(*updateCatalogEntryOptions.Account))
-	}
-	if updateCatalogEntryOptions.Move != nil {
-		builder.AddQuery("move", fmt.Sprint(*updateCatalogEntryOptions.Move))
-	}
-
-	body := make(map[string]interface{})
-	if updateCatalogEntryOptions.NewID != nil {
-		body["id"] = updateCatalogEntryOptions.NewID
-	}
-	if updateCatalogEntryOptions.NewName != nil {
-		body["name"] = updateCatalogEntryOptions.NewName
-	}
-	if updateCatalogEntryOptions.NewOverviewUi != nil {
-		body["overview_ui"] = updateCatalogEntryOptions.NewOverviewUi
-	}
-	if updateCatalogEntryOptions.NewKind != nil {
-		body["kind"] = updateCatalogEntryOptions.NewKind
-	}
-	if updateCatalogEntryOptions.NewImages != nil {
-		body["images"] = updateCatalogEntryOptions.NewImages
-	}
-	if updateCatalogEntryOptions.NewDisabled != nil {
-		body["disabled"] = updateCatalogEntryOptions.NewDisabled
-	}
-	if updateCatalogEntryOptions.NewTags != nil {
-		body["tags"] = updateCatalogEntryOptions.NewTags
-	}
-	if updateCatalogEntryOptions.NewGeoTags != nil {
-		body["geo_tags"] = updateCatalogEntryOptions.NewGeoTags
-	}
-	if updateCatalogEntryOptions.NewPricingTags != nil {
-		body["pricing_tags"] = updateCatalogEntryOptions.NewPricingTags
-	}
-	if updateCatalogEntryOptions.NewGroup != nil {
-		body["group"] = updateCatalogEntryOptions.NewGroup
-	}
-	if updateCatalogEntryOptions.NewProvider != nil {
-		body["provider"] = updateCatalogEntryOptions.NewProvider
-	}
-	if updateCatalogEntryOptions.NewCatalogCrn != nil {
-		body["catalog_crn"] = updateCatalogEntryOptions.NewCatalogCrn
-	}
-	if updateCatalogEntryOptions.NewURL != nil {
-		body["url"] = updateCatalogEntryOptions.NewURL
-	}
-	if updateCatalogEntryOptions.NewParentID != nil {
-		body["parent_id"] = updateCatalogEntryOptions.NewParentID
-	}
-	if updateCatalogEntryOptions.NewChildrenURL != nil {
-		body["children_url"] = updateCatalogEntryOptions.NewChildrenURL
-	}
-	if updateCatalogEntryOptions.NewParentURL != nil {
-		body["parent_url"] = updateCatalogEntryOptions.NewParentURL
-	}
-	if updateCatalogEntryOptions.NewCreated != nil {
-		body["created"] = updateCatalogEntryOptions.NewCreated
-	}
-	if updateCatalogEntryOptions.NewUpdated != nil {
-		body["updated"] = updateCatalogEntryOptions.NewUpdated
-	}
-	if updateCatalogEntryOptions.NewMetadata != nil {
-		body["metadata"] = updateCatalogEntryOptions.NewMetadata
-	}
-	if updateCatalogEntryOptions.NewActive != nil {
-		body["active"] = updateCatalogEntryOptions.NewActive
-	}
-	if updateCatalogEntryOptions.NewChildren != nil {
-		body["children"] = updateCatalogEntryOptions.NewChildren
-	}
-	_, err = builder.SetBodyContentJSON(body)
-	if err != nil {
-		return
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = globalCatalog.Service.Request(request, nil)
-
-	return
-}
-
-// ArchiveCatalogEntry : Archive a catalog entry
-// Archive a catalog entry. This will archive the catalog entry for a minimum of two weeks. While archived, it can be
-// restored using the PUT restore API. After two weeks, it will be deleted and cannot be restored. You must have
-// administrator role in the scope of the provided token to modify it. This endpoint is ETag enabled.
-func (globalCatalog *GlobalCatalogV1) ArchiveCatalogEntry(archiveCatalogEntryOptions *ArchiveCatalogEntryOptions) (response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(archiveCatalogEntryOptions, "archiveCatalogEntryOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(archiveCatalogEntryOptions, "archiveCatalogEntryOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{""}
-	pathParameters := []string{*archiveCatalogEntryOptions.ID}
-
-	builder := core.NewRequestBuilder(core.DELETE)
-	_, err = builder.ConstructHTTPURL(globalCatalog.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range archiveCatalogEntryOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("global_catalog", "V1", "ArchiveCatalogEntry")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	if archiveCatalogEntryOptions.Account != nil {
-		builder.AddQuery("account", fmt.Sprint(*archiveCatalogEntryOptions.Account))
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = globalCatalog.Service.Request(request, nil)
-
-	return
-}
-
-// GetChildObjects : Get child catalog entries of a specific kind
-// Fetch child catalog entries for a catalog entry with a specific id. This endpoint is ETag enabled.
-func (globalCatalog *GlobalCatalogV1) GetChildObjects(getChildObjectsOptions *GetChildObjectsOptions) (result *[]SearchResult, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(getChildObjectsOptions, "getChildObjectsOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(getChildObjectsOptions, "getChildObjectsOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"", ""}
-	pathParameters := []string{*getChildObjectsOptions.ID, *getChildObjectsOptions.Kind}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(globalCatalog.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range getChildObjectsOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("global_catalog", "V1", "GetChildObjects")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	if getChildObjectsOptions.Account != nil {
-		builder.AddQuery("account", fmt.Sprint(*getChildObjectsOptions.Account))
-	}
-	if getChildObjectsOptions.Include != nil {
-		builder.AddQuery("include", fmt.Sprint(*getChildObjectsOptions.Include))
-	}
-	if getChildObjectsOptions.Q != nil {
-		builder.AddQuery("q", fmt.Sprint(*getChildObjectsOptions.Q))
-	}
-	if getChildObjectsOptions.SortBy != nil {
-		builder.AddQuery("sort-by", fmt.Sprint(*getChildObjectsOptions.SortBy))
-	}
-	if getChildObjectsOptions.Descending != nil {
-		builder.AddQuery("descending", fmt.Sprint(*getChildObjectsOptions.Descending))
-	}
-	if getChildObjectsOptions.Languages != nil {
-		builder.AddQuery("languages", fmt.Sprint(*getChildObjectsOptions.Languages))
-	}
-	if getChildObjectsOptions.Complete != nil {
-		builder.AddQuery("complete", fmt.Sprint(*getChildObjectsOptions.Complete))
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = globalCatalog.Service.Request(request, make([]map[string]interface{}, 1))
-	if err == nil {
-		s, ok := response.Result.([]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		slice, e := UnmarshalSearchResultSlice(s)
-		result = &slice
-		err = e
-		response.Result = result
-	}
-
-	return
-}
-
-// RestoreCatalogEntry : Restore archived catalog entry
-// Restore an archived catalog entry. You must have an administrator role in the scope of the provided token.
-func (globalCatalog *GlobalCatalogV1) RestoreCatalogEntry(restoreCatalogEntryOptions *RestoreCatalogEntryOptions) (response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(restoreCatalogEntryOptions, "restoreCatalogEntryOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(restoreCatalogEntryOptions, "restoreCatalogEntryOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"", "restore"}
-	pathParameters := []string{*restoreCatalogEntryOptions.ID}
-
-	builder := core.NewRequestBuilder(core.PUT)
-	_, err = builder.ConstructHTTPURL(globalCatalog.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range restoreCatalogEntryOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("global_catalog", "V1", "RestoreCatalogEntry")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	if restoreCatalogEntryOptions.Account != nil {
-		builder.AddQuery("account", fmt.Sprint(*restoreCatalogEntryOptions.Account))
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = globalCatalog.Service.Request(request, nil)
-
-	return
-}
-
-// GetVisibility : Get the visibility constraints for an object
-// This endpoint returns the visibility rules for this object. Overall visibility is determined by the parent objects
-// and any further restrictions on this object. You must have an administrator role in the scope of the provided token.
-// This endpoint is ETag enabled.
-func (globalCatalog *GlobalCatalogV1) GetVisibility(getVisibilityOptions *GetVisibilityOptions) (result *Visibility, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(getVisibilityOptions, "getVisibilityOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(getVisibilityOptions, "getVisibilityOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"", "visibility"}
-	pathParameters := []string{*getVisibilityOptions.ID}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(globalCatalog.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range getVisibilityOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("global_catalog", "V1", "GetVisibility")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	if getVisibilityOptions.Account != nil {
-		builder.AddQuery("account", fmt.Sprint(*getVisibilityOptions.Account))
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = globalCatalog.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalVisibility(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// UpdateVisibility : Update visibility
-// Update an Object's Visibility. You must have an administrator role in the scope of the provided token. This endpoint
-// is ETag enabled.
-func (globalCatalog *GlobalCatalogV1) UpdateVisibility(updateVisibilityOptions *UpdateVisibilityOptions) (response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(updateVisibilityOptions, "updateVisibilityOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(updateVisibilityOptions, "updateVisibilityOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"", "visibility"}
-	pathParameters := []string{*updateVisibilityOptions.ID}
-
-	builder := core.NewRequestBuilder(core.PUT)
-	_, err = builder.ConstructHTTPURL(globalCatalog.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range updateVisibilityOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("global_catalog", "V1", "UpdateVisibility")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Content-Type", "application/json")
-
-	if updateVisibilityOptions.Account != nil {
-		builder.AddQuery("account", fmt.Sprint(*updateVisibilityOptions.Account))
-	}
-
-	body := make(map[string]interface{})
-	if updateVisibilityOptions.Restrictions != nil {
-		body["restrictions"] = updateVisibilityOptions.Restrictions
-	}
-	if updateVisibilityOptions.Owner != nil {
-		body["owner"] = updateVisibilityOptions.Owner
-	}
-	if updateVisibilityOptions.Include != nil {
-		body["include"] = updateVisibilityOptions.Include
-	}
-	if updateVisibilityOptions.Exclude != nil {
-		body["exclude"] = updateVisibilityOptions.Exclude
-	}
-	if updateVisibilityOptions.Approved != nil {
-		body["approved"] = updateVisibilityOptions.Approved
-	}
-	_, err = builder.SetBodyContentJSON(body)
-	if err != nil {
-		return
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = globalCatalog.Service.Request(request, nil)
-
-	return
-}
-
-// GetPricing : Get the pricing for an object
-// This endpoint returns the pricing for an object. Static pricing is defined in the catalog. Dynamic pricing is stored
-// in Bluemix Pricing Catalog.
-func (globalCatalog *GlobalCatalogV1) GetPricing(getPricingOptions *GetPricingOptions) (result *Pricing, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(getPricingOptions, "getPricingOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(getPricingOptions, "getPricingOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"", "pricing"}
-	pathParameters := []string{*getPricingOptions.ID}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(globalCatalog.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range getPricingOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("global_catalog", "V1", "GetPricing")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	if getPricingOptions.Account != nil {
-		builder.AddQuery("account", fmt.Sprint(*getPricingOptions.Account))
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = globalCatalog.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalPricing(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// GetAuditLogs : Get the audit logs for an object
-// This endpoint returns the audit logs for an object. Only administrators and editors can get logs.
-func (globalCatalog *GlobalCatalogV1) GetAuditLogs(getAuditLogsOptions *GetAuditLogsOptions) (result *SearchResult, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(getAuditLogsOptions, "getAuditLogsOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(getAuditLogsOptions, "getAuditLogsOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"", "logs"}
-	pathParameters := []string{*getAuditLogsOptions.ID}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(globalCatalog.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range getAuditLogsOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("global_catalog", "V1", "GetAuditLogs")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	if getAuditLogsOptions.Account != nil {
-		builder.AddQuery("account", fmt.Sprint(*getAuditLogsOptions.Account))
-	}
-	if getAuditLogsOptions.Ascending != nil {
-		builder.AddQuery("ascending", fmt.Sprint(*getAuditLogsOptions.Ascending))
-	}
-	if getAuditLogsOptions.Startat != nil {
-		builder.AddQuery("startat", fmt.Sprint(*getAuditLogsOptions.Startat))
-	}
-	if getAuditLogsOptions.Offset != nil {
-		builder.AddQuery("_offset", fmt.Sprint(*getAuditLogsOptions.Offset))
-	}
-	if getAuditLogsOptions.Limit != nil {
-		builder.AddQuery("_limit", fmt.Sprint(*getAuditLogsOptions.Limit))
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = globalCatalog.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalSearchResult(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// ListArtifacts : Get artifacts
-// This endpoint returns a list of artifacts for an object.
-func (globalCatalog *GlobalCatalogV1) ListArtifacts(listArtifactsOptions *ListArtifactsOptions) (result *Artifacts, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(listArtifactsOptions, "listArtifactsOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(listArtifactsOptions, "listArtifactsOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"", "artifacts"}
-	pathParameters := []string{*listArtifactsOptions.ObjectID}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(globalCatalog.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range listArtifactsOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("global_catalog", "V1", "ListArtifacts")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	if listArtifactsOptions.Account != nil {
-		builder.AddQuery("account", fmt.Sprint(*listArtifactsOptions.Account))
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = globalCatalog.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalArtifacts(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// GetArtifact : Get artifact
-// This endpoint returns the binary of an artifact.
-func (globalCatalog *GlobalCatalogV1) GetArtifact(getArtifactOptions *GetArtifactOptions) (response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(getArtifactOptions, "getArtifactOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(getArtifactOptions, "getArtifactOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"", "artifacts"}
-	pathParameters := []string{*getArtifactOptions.ObjectID, *getArtifactOptions.ArtifactID}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(globalCatalog.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range getArtifactOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("global_catalog", "V1", "GetArtifact")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	if getArtifactOptions.Account != nil {
-		builder.AddQuery("account", fmt.Sprint(*getArtifactOptions.Account))
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = globalCatalog.Service.Request(request, nil)
-
-	return
-}
-
-// UploadArtifact : Upload artifact
-// This endpoint uploads the binary for an artifact. Only administrators and editors can upload artifacts.
-func (globalCatalog *GlobalCatalogV1) UploadArtifact(uploadArtifactOptions *UploadArtifactOptions) (response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(uploadArtifactOptions, "uploadArtifactOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(uploadArtifactOptions, "uploadArtifactOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"", "artifacts"}
-	pathParameters := []string{*uploadArtifactOptions.ObjectID, *uploadArtifactOptions.ArtifactID}
-
-	builder := core.NewRequestBuilder(core.PUT)
-	_, err = builder.ConstructHTTPURL(globalCatalog.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range uploadArtifactOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("global_catalog", "V1", "UploadArtifact")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	if uploadArtifactOptions.Account != nil {
-		builder.AddQuery("account", fmt.Sprint(*uploadArtifactOptions.Account))
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = globalCatalog.Service.Request(request, nil)
-
-	return
-}
-
-// DeleteArtifact : Delete artifact
-// This endpoint deletes an artifact. Only administrators and editors can delete artifacts.
-func (globalCatalog *GlobalCatalogV1) DeleteArtifact(deleteArtifactOptions *DeleteArtifactOptions) (response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(deleteArtifactOptions, "deleteArtifactOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(deleteArtifactOptions, "deleteArtifactOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"", "artifacts"}
-	pathParameters := []string{*deleteArtifactOptions.ObjectID, *deleteArtifactOptions.ArtifactID}
-
-	builder := core.NewRequestBuilder(core.DELETE)
-	_, err = builder.ConstructHTTPURL(globalCatalog.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range deleteArtifactOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("global_catalog", "V1", "DeleteArtifact")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	if deleteArtifactOptions.Account != nil {
-		builder.AddQuery("account", fmt.Sprint(*deleteArtifactOptions.Account))
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = globalCatalog.Service.Request(request, nil)
-
-	return
-}
-
-// Amount : Country-specific pricing information.
-type Amount struct {
-	// Country.
-	Counrty *string `json:"counrty,omitempty"`
-
-	// Currency.
-	Currency *string `json:"currency,omitempty"`
-
-	// See Price for nested fields.
-	Prices []Price `json:"prices,omitempty"`
-}
-
-
-// UnmarshalAmount constructs an instance of Amount from the specified map.
-func UnmarshalAmount(m map[string]interface{}) (result *Amount, err error) {
-	obj := new(Amount)
-	obj.Counrty, err = core.UnmarshalString(m, "counrty")
-	if err != nil {
-		return
-	}
-	obj.Currency, err = core.UnmarshalString(m, "currency")
-	if err != nil {
-		return
-	}
-	obj.Prices, err = UnmarshalPriceSliceAsProperty(m, "prices")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalAmountSlice unmarshals a slice of Amount instances from the specified list of maps.
-func UnmarshalAmountSlice(s []interface{}) (slice []Amount, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'Amount'")
-			return
-		}
-		obj, e := UnmarshalAmount(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalAmountAsProperty unmarshals an instance of Amount that is stored as a property
-// within the specified map.
-func UnmarshalAmountAsProperty(m map[string]interface{}, propertyName string) (result *Amount, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'Amount'", propertyName)
-			return
-		}
-		result, err = UnmarshalAmount(objMap)
-	}
-	return
-}
-
-// UnmarshalAmountSliceAsProperty unmarshals a slice of Amount instances that are stored as a property
-// within the specified map.
-func UnmarshalAmountSliceAsProperty(m map[string]interface{}, propertyName string) (slice []Amount, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'Amount'", propertyName)
-			return
-		}
-		slice, err = UnmarshalAmountSlice(vSlice)
-	}
-	return
-}
-
-// ArchiveCatalogEntryOptions : The ArchiveCatalogEntry options.
-type ArchiveCatalogEntryOptions struct {
-	// The object's unique ID.
-	ID *string `json:"id" validate:"required"`
-
-	// This changes the scope of the request regardless of the authorization header. Example scopes are `account` and
-	// `global`. `account=global` is reqired if operating with a service ID that has a global admin policy, for example
-	// `GET /?account=global`.
-	Account *string `json:"account,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewArchiveCatalogEntryOptions : Instantiate ArchiveCatalogEntryOptions
-func (*GlobalCatalogV1) NewArchiveCatalogEntryOptions(id string) *ArchiveCatalogEntryOptions {
-	return &ArchiveCatalogEntryOptions{
-		ID: core.StringPtr(id),
-	}
-}
-
-// SetID : Allow user to set ID
-func (options *ArchiveCatalogEntryOptions) SetID(id string) *ArchiveCatalogEntryOptions {
-	options.ID = core.StringPtr(id)
-	return options
-}
-
-// SetAccount : Allow user to set Account
-func (options *ArchiveCatalogEntryOptions) SetAccount(account string) *ArchiveCatalogEntryOptions {
-	options.Account = core.StringPtr(account)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *ArchiveCatalogEntryOptions) SetHeaders(param map[string]string) *ArchiveCatalogEntryOptions {
-	options.Headers = param
-	return options
-}
-
-// Artifact : Artifact Details.
-type Artifact struct {
-	// The name of the artifact.
-	Name *string `json:"name,omitempty"`
-
-	// The timestamp of the last update to the artifact.
-	Updated *string `json:"updated,omitempty"`
-
-	// The url for the artifact.
-	URL *string `json:"url,omitempty"`
-
-	// The etag of the artifact.
-	Etag *string `json:"etag,omitempty"`
-
-	// The content length of the artifact.
-	Size *int64 `json:"size,omitempty"`
-}
-
-
-// UnmarshalArtifact constructs an instance of Artifact from the specified map.
-func UnmarshalArtifact(m map[string]interface{}) (result *Artifact, err error) {
-	obj := new(Artifact)
-	obj.Name, err = core.UnmarshalString(m, "name")
-	if err != nil {
-		return
-	}
-	obj.Updated, err = core.UnmarshalString(m, "updated")
-	if err != nil {
-		return
-	}
-	obj.URL, err = core.UnmarshalString(m, "url")
-	if err != nil {
-		return
-	}
-	obj.Etag, err = core.UnmarshalString(m, "etag")
-	if err != nil {
-		return
-	}
-	obj.Size, err = core.UnmarshalInt64(m, "size")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalArtifactSlice unmarshals a slice of Artifact instances from the specified list of maps.
-func UnmarshalArtifactSlice(s []interface{}) (slice []Artifact, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'Artifact'")
-			return
-		}
-		obj, e := UnmarshalArtifact(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalArtifactAsProperty unmarshals an instance of Artifact that is stored as a property
-// within the specified map.
-func UnmarshalArtifactAsProperty(m map[string]interface{}, propertyName string) (result *Artifact, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'Artifact'", propertyName)
-			return
-		}
-		result, err = UnmarshalArtifact(objMap)
-	}
-	return
-}
-
-// UnmarshalArtifactSliceAsProperty unmarshals a slice of Artifact instances that are stored as a property
-// within the specified map.
-func UnmarshalArtifactSliceAsProperty(m map[string]interface{}, propertyName string) (slice []Artifact, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'Artifact'", propertyName)
-			return
-		}
-		slice, err = UnmarshalArtifactSlice(vSlice)
-	}
-	return
-}
-
-// Artifacts : Artifacts List.
-type Artifacts struct {
-	// The total number of artifacts.
-	Count *int64 `json:"count,omitempty"`
-
-	// The list of artifacts.
-	Resources []Artifact `json:"resources,omitempty"`
-}
-
-
-// UnmarshalArtifacts constructs an instance of Artifacts from the specified map.
-func UnmarshalArtifacts(m map[string]interface{}) (result *Artifacts, err error) {
-	obj := new(Artifacts)
-	obj.Count, err = core.UnmarshalInt64(m, "count")
-	if err != nil {
-		return
-	}
-	obj.Resources, err = UnmarshalArtifactSliceAsProperty(m, "resources")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalArtifactsSlice unmarshals a slice of Artifacts instances from the specified list of maps.
-func UnmarshalArtifactsSlice(s []interface{}) (slice []Artifacts, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'Artifacts'")
-			return
-		}
-		obj, e := UnmarshalArtifacts(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalArtifactsAsProperty unmarshals an instance of Artifacts that is stored as a property
-// within the specified map.
-func UnmarshalArtifactsAsProperty(m map[string]interface{}, propertyName string) (result *Artifacts, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'Artifacts'", propertyName)
-			return
-		}
-		result, err = UnmarshalArtifacts(objMap)
-	}
-	return
-}
-
-// UnmarshalArtifactsSliceAsProperty unmarshals a slice of Artifacts instances that are stored as a property
-// within the specified map.
-func UnmarshalArtifactsSliceAsProperty(m map[string]interface{}, propertyName string) (slice []Artifacts, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'Artifacts'", propertyName)
-			return
-		}
-		slice, err = UnmarshalArtifactsSlice(vSlice)
-	}
-	return
-}
-
-// Bullets : Information related to list delimiters.
-type Bullets struct {
-	// The bullet title.
-	Title *string `json:"title,omitempty"`
-
-	// The bullet description.
-	Description *string `json:"description,omitempty"`
-
-	// The icon to use for rendering the bullet.
-	Icon *string `json:"icon,omitempty"`
-
-	// The bullet quantity.
-	Quantity *string `json:"quantity,omitempty"`
-}
-
-
-// UnmarshalBullets constructs an instance of Bullets from the specified map.
-func UnmarshalBullets(m map[string]interface{}) (result *Bullets, err error) {
-	obj := new(Bullets)
-	obj.Title, err = core.UnmarshalString(m, "title")
-	if err != nil {
-		return
-	}
-	obj.Description, err = core.UnmarshalString(m, "description")
-	if err != nil {
-		return
-	}
-	obj.Icon, err = core.UnmarshalString(m, "icon")
-	if err != nil {
-		return
-	}
-	obj.Quantity, err = core.UnmarshalString(m, "quantity")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalBulletsSlice unmarshals a slice of Bullets instances from the specified list of maps.
-func UnmarshalBulletsSlice(s []interface{}) (slice []Bullets, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'Bullets'")
-			return
-		}
-		obj, e := UnmarshalBullets(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalBulletsAsProperty unmarshals an instance of Bullets that is stored as a property
-// within the specified map.
-func UnmarshalBulletsAsProperty(m map[string]interface{}, propertyName string) (result *Bullets, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'Bullets'", propertyName)
-			return
-		}
-		result, err = UnmarshalBullets(objMap)
-	}
-	return
-}
-
-// UnmarshalBulletsSliceAsProperty unmarshals a slice of Bullets instances that are stored as a property
-// within the specified map.
-func UnmarshalBulletsSliceAsProperty(m map[string]interface{}, propertyName string) (slice []Bullets, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'Bullets'", propertyName)
-			return
-		}
-		slice, err = UnmarshalBulletsSlice(vSlice)
-	}
-	return
-}
-
-// Callbacks : Callback-related information associated with a catalog entry.
-type Callbacks struct {
-	// The URL of the deployment broker.
-	BrokerUtl *string `json:"broker_utl,omitempty"`
-
-	// The URL of the deployment broker SC proxy.
-	BrokerProxyURL *string `json:"broker_proxy_url,omitempty"`
-
-	// The URL of dashboard callback.
-	DashboardURL *string `json:"dashboard_url,omitempty"`
-
-	// The URL of dashboard data.
-	DashboardDataURL *string `json:"dashboard_data_url,omitempty"`
-
-	// The URL of the dashboard detail tab.
-	DashboardDetailTabURL *string `json:"dashboard_detail_tab_url,omitempty"`
-
-	// The URL of the dashboard detail tab extension.
-	DashboardDetailTabExtURL *string `json:"dashboard_detail_tab_ext_url,omitempty"`
-
-	// Service monitor API URL.
-	ServiceMonitorApi *string `json:"service_monitor_api,omitempty"`
-
-	// Service monitor app URL.
-	ServiceMonitorApp *string `json:"service_monitor_app,omitempty"`
-
-	// Service URL in staging.
-	ServiceStagingURL *string `json:"service_staging_url,omitempty"`
-
-	// Service URL in production.
-	ServiceProductionURL *string `json:"service_production_url,omitempty"`
-}
-
-
-// UnmarshalCallbacks constructs an instance of Callbacks from the specified map.
-func UnmarshalCallbacks(m map[string]interface{}) (result *Callbacks, err error) {
-	obj := new(Callbacks)
-	obj.BrokerUtl, err = core.UnmarshalString(m, "broker_utl")
-	if err != nil {
-		return
-	}
-	obj.BrokerProxyURL, err = core.UnmarshalString(m, "broker_proxy_url")
-	if err != nil {
-		return
-	}
-	obj.DashboardURL, err = core.UnmarshalString(m, "dashboard_url")
-	if err != nil {
-		return
-	}
-	obj.DashboardDataURL, err = core.UnmarshalString(m, "dashboard_data_url")
-	if err != nil {
-		return
-	}
-	obj.DashboardDetailTabURL, err = core.UnmarshalString(m, "dashboard_detail_tab_url")
-	if err != nil {
-		return
-	}
-	obj.DashboardDetailTabExtURL, err = core.UnmarshalString(m, "dashboard_detail_tab_ext_url")
-	if err != nil {
-		return
-	}
-	obj.ServiceMonitorApi, err = core.UnmarshalString(m, "service_monitor_api")
-	if err != nil {
-		return
-	}
-	obj.ServiceMonitorApp, err = core.UnmarshalString(m, "service_monitor_app")
-	if err != nil {
-		return
-	}
-	obj.ServiceStagingURL, err = core.UnmarshalString(m, "service_staging_url")
-	if err != nil {
-		return
-	}
-	obj.ServiceProductionURL, err = core.UnmarshalString(m, "service_production_url")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalCallbacksSlice unmarshals a slice of Callbacks instances from the specified list of maps.
-func UnmarshalCallbacksSlice(s []interface{}) (slice []Callbacks, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'Callbacks'")
-			return
-		}
-		obj, e := UnmarshalCallbacks(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalCallbacksAsProperty unmarshals an instance of Callbacks that is stored as a property
-// within the specified map.
-func UnmarshalCallbacksAsProperty(m map[string]interface{}, propertyName string) (result *Callbacks, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'Callbacks'", propertyName)
-			return
-		}
-		result, err = UnmarshalCallbacks(objMap)
-	}
-	return
-}
-
-// UnmarshalCallbacksSliceAsProperty unmarshals a slice of Callbacks instances that are stored as a property
-// within the specified map.
-func UnmarshalCallbacksSliceAsProperty(m map[string]interface{}, propertyName string) (slice []Callbacks, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'Callbacks'", propertyName)
-			return
-		}
-		slice, err = UnmarshalCallbacksSlice(vSlice)
-	}
-	return
-}
-
-// CatalogEntry : An entry in the global catalog.
-type CatalogEntry struct {
-	// Catalog entry's unique ID. It's the same across all catalog instances.
-	ID *string `json:"id" validate:"required"`
-
-	// The cloud resource name of the catalog entry.
-	CatalogCrn *string `json:"catalog_crn,omitempty"`
-
-	// The catalog URL for the catalog entry.
-	URL *string `json:"url,omitempty"`
-
-	// Programmatic name for this catalog entry, which must be formatted like a CRN segment. See the display name in
-	// OverviewUI for a user-readable name.
-	Name *string `json:"name" validate:"required"`
-
-	// Overview is nested in the top level. The key value pair is `[_language_]overview_ui`.
-	OverviewUi *OverviewUI `json:"overview_ui" validate:"required"`
-
-	// The type of catalog entry, **service**, **template**, **dashboard**, which determines the type and shape of the
-	// object.
-	Kind *string `json:"kind" validate:"required"`
-
-	// Image annotation for this catalog entry. The image is a URL.
-	Images *Image `json:"images" validate:"required"`
-
-	// The ID of the parent catalog entry if it exists.
-	ParentID *string `json:"parent_id,omitempty"`
-
-	// The catalog URL of child elements for the catalog entry.
-	ChildrenURL *string `json:"children_url,omitempty"`
-
-	// The catalog URL of the parent catalog entry.
-	ParentURL *string `json:"parent_url,omitempty"`
-
-	// Boolean value that determines the global visibility for the catalog entry, and its children. If it is not enabled,
-	// all plans are disabled.
-	Disabled *bool `json:"disabled" validate:"required"`
-
-	// A list of tags. For example, IBM, 3rd Party, Beta, GA, and Single Tenant.
-	Tags []string `json:"tags" validate:"required"`
-
-	// A list of tags representing deployment locations, for example, `us-south`, `eu-gb`, `us-south-dal10`.
-	GeoTags []string `json:"geo_tags" validate:"required"`
-
-	// A list of tags representing pricing types, for example, free lite, subscription, paid only.
-	PricingTags []string `json:"pricing_tags" validate:"required"`
-
-	// Boolean value that determines whether the catalog entry is a group.
-	Group *bool `json:"group" validate:"required"`
-
-	// Information related to the provider associated with a catalog entry.
-	Provider *Provider `json:"provider" validate:"required"`
-
-	// The date the catalog entry was created.
-	Created *strfmt.DateTime `json:"created,omitempty"`
-
-	// The date the catalog entry was last updated.
-	Updated *strfmt.DateTime `json:"updated,omitempty"`
-
-	// Metadata is not returned by default, and includes specific data depending on the object **kind**.
-	Metadata *ObjectMetaData `json:"metadata,omitempty"`
-
-	// Boolean value that describes whether the service is active.
-	Active *bool `json:"active,omitempty"`
-
-	// The children of this catalog entry. This is read-only and ignored on put or post. It is filled in when
-	// `?depth=_value_` is used.
-	Children []CatalogEntry `json:"children,omitempty"`
-}
-
-
-// NewCatalogEntry : Instantiate CatalogEntry (Generic Model Constructor)
-func (*GlobalCatalogV1) NewCatalogEntry(id string, name string, overviewUi *OverviewUI, kind string, images *Image, disabled bool, tags []string, geoTags []string, pricingTags []string, group bool, provider *Provider) (model *CatalogEntry, err error) {
-	model = &CatalogEntry{
-		ID: core.StringPtr(id),
-		Name: core.StringPtr(name),
-		OverviewUi: overviewUi,
-		Kind: core.StringPtr(kind),
-		Images: images,
-		Disabled: core.BoolPtr(disabled),
-		Tags: tags,
-		GeoTags: geoTags,
-		PricingTags: pricingTags,
-		Group: core.BoolPtr(group),
-		Provider: provider,
-	}
-	err = core.ValidateStruct(model, "required parameters")
-	return
-}
-
-// UnmarshalCatalogEntry constructs an instance of CatalogEntry from the specified map.
-func UnmarshalCatalogEntry(m map[string]interface{}) (result *CatalogEntry, err error) {
-	obj := new(CatalogEntry)
-	obj.ID, err = core.UnmarshalString(m, "id")
-	if err != nil {
-		return
-	}
-	obj.CatalogCrn, err = core.UnmarshalString(m, "catalog_crn")
-	if err != nil {
-		return
-	}
-	obj.URL, err = core.UnmarshalString(m, "url")
-	if err != nil {
-		return
-	}
-	obj.Name, err = core.UnmarshalString(m, "name")
-	if err != nil {
-		return
-	}
-	obj.OverviewUi, err = UnmarshalOverviewUIAsProperty(m, "overview_ui")
-	if err != nil {
-		return
-	}
-	obj.Kind, err = core.UnmarshalString(m, "kind")
-	if err != nil {
-		return
-	}
-	obj.Images, err = UnmarshalImageAsProperty(m, "images")
-	if err != nil {
-		return
-	}
-	obj.ParentID, err = core.UnmarshalString(m, "parent_id")
-	if err != nil {
-		return
-	}
-	obj.ChildrenURL, err = core.UnmarshalString(m, "children_url")
-	if err != nil {
-		return
-	}
-	obj.ParentURL, err = core.UnmarshalString(m, "parent_url")
-	if err != nil {
-		return
-	}
-	obj.Disabled, err = core.UnmarshalBool(m, "disabled")
-	if err != nil {
-		return
-	}
-	obj.Tags, err = core.UnmarshalStringSlice(m, "tags")
-	if err != nil {
-		return
-	}
-	obj.GeoTags, err = core.UnmarshalStringSlice(m, "geo_tags")
-	if err != nil {
-		return
-	}
-	obj.PricingTags, err = core.UnmarshalStringSlice(m, "pricing_tags")
-	if err != nil {
-		return
-	}
-	obj.Group, err = core.UnmarshalBool(m, "group")
-	if err != nil {
-		return
-	}
-	obj.Provider, err = UnmarshalProviderAsProperty(m, "provider")
-	if err != nil {
-		return
-	}
-	obj.Created, err = core.UnmarshalDateTime(m, "created")
-	if err != nil {
-		return
-	}
-	obj.Updated, err = core.UnmarshalDateTime(m, "updated")
-	if err != nil {
-		return
-	}
-	obj.Metadata, err = UnmarshalObjectMetaDataAsProperty(m, "metadata")
-	if err != nil {
-		return
-	}
-	obj.Active, err = core.UnmarshalBool(m, "active")
-	if err != nil {
-		return
-	}
-	obj.Children, err = UnmarshalCatalogEntrySliceAsProperty(m, "children")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalCatalogEntrySlice unmarshals a slice of CatalogEntry instances from the specified list of maps.
-func UnmarshalCatalogEntrySlice(s []interface{}) (slice []CatalogEntry, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'CatalogEntry'")
-			return
-		}
-		obj, e := UnmarshalCatalogEntry(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalCatalogEntryAsProperty unmarshals an instance of CatalogEntry that is stored as a property
-// within the specified map.
-func UnmarshalCatalogEntryAsProperty(m map[string]interface{}, propertyName string) (result *CatalogEntry, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'CatalogEntry'", propertyName)
-			return
-		}
-		result, err = UnmarshalCatalogEntry(objMap)
-	}
-	return
-}
-
-// UnmarshalCatalogEntrySliceAsProperty unmarshals a slice of CatalogEntry instances that are stored as a property
-// within the specified map.
-func UnmarshalCatalogEntrySliceAsProperty(m map[string]interface{}, propertyName string) (slice []CatalogEntry, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'CatalogEntry'", propertyName)
-			return
-		}
-		slice, err = UnmarshalCatalogEntrySlice(vSlice)
-	}
-	return
-}
-
-// CreateCatalogEntryOptions : The CreateCatalogEntry options.
-type CreateCatalogEntryOptions struct {
-	// Catalog entry's unique ID. It's the same across all catalog instances.
-	ID *string `json:"id" validate:"required"`
-
-	// Programmatic name for this catalog entry, which must be formatted like a CRN segment. See the display name in
-	// OverviewUI for a user-readable name.
-	Name *string `json:"name" validate:"required"`
-
-	// Overview is nested in the top level. The key value pair is `[_language_]overview_ui`.
-	OverviewUi *OverviewUI `json:"overview_ui" validate:"required"`
-
-	// The type of catalog entry, **service**, **template**, **dashboard**, which determines the type and shape of the
-	// object.
-	Kind *string `json:"kind" validate:"required"`
-
-	// Image annotation for this catalog entry. The image is a URL.
-	Images *Image `json:"images" validate:"required"`
-
-	// Boolean value that determines the global visibility for the catalog entry, and its children. If it is not enabled,
-	// all plans are disabled.
-	Disabled *bool `json:"disabled" validate:"required"`
-
-	// A list of tags. For example, IBM, 3rd Party, Beta, GA, and Single Tenant.
-	Tags []string `json:"tags" validate:"required"`
-
-	// A list of tags representing deployment locations, for example, `us-south`, `eu-gb`, `us-south-dal10`.
-	GeoTags []string `json:"geo_tags" validate:"required"`
-
-	// A list of tags representing pricing types, for example, free lite, subscription, paid only.
-	PricingTags []string `json:"pricing_tags" validate:"required"`
-
-	// Boolean value that determines whether the catalog entry is a group.
-	Group *bool `json:"group" validate:"required"`
-
-	// Information related to the provider associated with a catalog entry.
-	Provider *Provider `json:"provider" validate:"required"`
-
-	// The cloud resource name of the catalog entry.
-	CatalogCrn *string `json:"catalog_crn,omitempty"`
-
-	// The catalog URL for the catalog entry.
-	URL *string `json:"url,omitempty"`
-
-	// The ID of the parent catalog entry if it exists.
-	ParentID *string `json:"parent_id,omitempty"`
-
-	// The catalog URL of child elements for the catalog entry.
-	ChildrenURL *string `json:"children_url,omitempty"`
-
-	// The catalog URL of the parent catalog entry.
-	ParentURL *string `json:"parent_url,omitempty"`
-
-	// The date the catalog entry was created.
-	Created *strfmt.DateTime `json:"created,omitempty"`
-
-	// The date the catalog entry was last updated.
-	Updated *strfmt.DateTime `json:"updated,omitempty"`
-
-	// Metadata is not returned by default, and includes specific data depending on the object **kind**.
-	Metadata *ObjectMetaData `json:"metadata,omitempty"`
-
-	// Boolean value that describes whether the service is active.
-	Active *bool `json:"active,omitempty"`
-
-	// The children of this catalog entry. This is read-only and ignored on put or post. It is filled in when
-	// `?depth=_value_` is used.
-	Children []CatalogEntry `json:"children,omitempty"`
-
-	// This changes the scope of the request regardless of the authorization header. Example scopes are `account` and
-	// `global`. `account=global` is reqired if operating with a service ID that has a global admin policy, for example
-	// `GET /?account=global`.
-	Account *string `json:"account,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewCreateCatalogEntryOptions : Instantiate CreateCatalogEntryOptions
-func (*GlobalCatalogV1) NewCreateCatalogEntryOptions(id string, name string, overviewUi *OverviewUI, kind string, images *Image, disabled bool, tags []string, geoTags []string, pricingTags []string, group bool, provider *Provider) *CreateCatalogEntryOptions {
-	return &CreateCatalogEntryOptions{
-		ID: core.StringPtr(id),
-		Name: core.StringPtr(name),
-		OverviewUi: overviewUi,
-		Kind: core.StringPtr(kind),
-		Images: images,
-		Disabled: core.BoolPtr(disabled),
-		Tags: tags,
-		GeoTags: geoTags,
-		PricingTags: pricingTags,
-		Group: core.BoolPtr(group),
-		Provider: provider,
-	}
-}
-
-// SetID : Allow user to set ID
-func (options *CreateCatalogEntryOptions) SetID(id string) *CreateCatalogEntryOptions {
-	options.ID = core.StringPtr(id)
-	return options
-}
-
-// SetName : Allow user to set Name
-func (options *CreateCatalogEntryOptions) SetName(name string) *CreateCatalogEntryOptions {
-	options.Name = core.StringPtr(name)
-	return options
-}
-
-// SetOverviewUi : Allow user to set OverviewUi
-func (options *CreateCatalogEntryOptions) SetOverviewUi(overviewUi *OverviewUI) *CreateCatalogEntryOptions {
-	options.OverviewUi = overviewUi
-	return options
-}
-
-// SetKind : Allow user to set Kind
-func (options *CreateCatalogEntryOptions) SetKind(kind string) *CreateCatalogEntryOptions {
-	options.Kind = core.StringPtr(kind)
-	return options
-}
-
-// SetImages : Allow user to set Images
-func (options *CreateCatalogEntryOptions) SetImages(images *Image) *CreateCatalogEntryOptions {
-	options.Images = images
-	return options
-}
-
-// SetDisabled : Allow user to set Disabled
-func (options *CreateCatalogEntryOptions) SetDisabled(disabled bool) *CreateCatalogEntryOptions {
-	options.Disabled = core.BoolPtr(disabled)
-	return options
-}
-
-// SetTags : Allow user to set Tags
-func (options *CreateCatalogEntryOptions) SetTags(tags []string) *CreateCatalogEntryOptions {
-	options.Tags = tags
-	return options
-}
-
-// SetGeoTags : Allow user to set GeoTags
-func (options *CreateCatalogEntryOptions) SetGeoTags(geoTags []string) *CreateCatalogEntryOptions {
-	options.GeoTags = geoTags
-	return options
-}
-
-// SetPricingTags : Allow user to set PricingTags
-func (options *CreateCatalogEntryOptions) SetPricingTags(pricingTags []string) *CreateCatalogEntryOptions {
-	options.PricingTags = pricingTags
-	return options
-}
-
-// SetGroup : Allow user to set Group
-func (options *CreateCatalogEntryOptions) SetGroup(group bool) *CreateCatalogEntryOptions {
-	options.Group = core.BoolPtr(group)
-	return options
-}
-
-// SetProvider : Allow user to set Provider
-func (options *CreateCatalogEntryOptions) SetProvider(provider *Provider) *CreateCatalogEntryOptions {
-	options.Provider = provider
-	return options
-}
-
-// SetCatalogCrn : Allow user to set CatalogCrn
-func (options *CreateCatalogEntryOptions) SetCatalogCrn(catalogCrn string) *CreateCatalogEntryOptions {
-	options.CatalogCrn = core.StringPtr(catalogCrn)
-	return options
-}
-
-// SetURL : Allow user to set URL
-func (options *CreateCatalogEntryOptions) SetURL(url string) *CreateCatalogEntryOptions {
-	options.URL = core.StringPtr(url)
-	return options
-}
-
-// SetParentID : Allow user to set ParentID
-func (options *CreateCatalogEntryOptions) SetParentID(parentID string) *CreateCatalogEntryOptions {
-	options.ParentID = core.StringPtr(parentID)
-	return options
-}
-
-// SetChildrenURL : Allow user to set ChildrenURL
-func (options *CreateCatalogEntryOptions) SetChildrenURL(childrenURL string) *CreateCatalogEntryOptions {
-	options.ChildrenURL = core.StringPtr(childrenURL)
-	return options
-}
-
-// SetParentURL : Allow user to set ParentURL
-func (options *CreateCatalogEntryOptions) SetParentURL(parentURL string) *CreateCatalogEntryOptions {
-	options.ParentURL = core.StringPtr(parentURL)
-	return options
-}
-
-// SetCreated : Allow user to set Created
-func (options *CreateCatalogEntryOptions) SetCreated(created *strfmt.DateTime) *CreateCatalogEntryOptions {
-	options.Created = created
-	return options
-}
-
-// SetUpdated : Allow user to set Updated
-func (options *CreateCatalogEntryOptions) SetUpdated(updated *strfmt.DateTime) *CreateCatalogEntryOptions {
-	options.Updated = updated
-	return options
-}
-
-// SetMetadata : Allow user to set Metadata
-func (options *CreateCatalogEntryOptions) SetMetadata(metadata *ObjectMetaData) *CreateCatalogEntryOptions {
-	options.Metadata = metadata
-	return options
-}
-
-// SetActive : Allow user to set Active
-func (options *CreateCatalogEntryOptions) SetActive(active bool) *CreateCatalogEntryOptions {
-	options.Active = core.BoolPtr(active)
-	return options
-}
-
-// SetChildren : Allow user to set Children
-func (options *CreateCatalogEntryOptions) SetChildren(children []CatalogEntry) *CreateCatalogEntryOptions {
-	options.Children = children
-	return options
-}
-
-// SetAccount : Allow user to set Account
-func (options *CreateCatalogEntryOptions) SetAccount(account string) *CreateCatalogEntryOptions {
-	options.Account = core.StringPtr(account)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *CreateCatalogEntryOptions) SetHeaders(param map[string]string) *CreateCatalogEntryOptions {
-	options.Headers = param
-	return options
-}
-
-// DeleteArtifactOptions : The DeleteArtifact options.
-type DeleteArtifactOptions struct {
-	// The object's unique ID.
-	ObjectID *string `json:"object_id" validate:"required"`
-
-	// The artifact's ID.
-	ArtifactID *string `json:"artifact_id" validate:"required"`
-
-	// This changes the scope of the request regardless of the authorization header. Example scopes are `account` and
-	// `global`. `account=global` is reqired if operating with a service ID that has a global admin policy, for example
-	// `GET /?account=global`.
-	Account *string `json:"account,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewDeleteArtifactOptions : Instantiate DeleteArtifactOptions
-func (*GlobalCatalogV1) NewDeleteArtifactOptions(objectID string, artifactID string) *DeleteArtifactOptions {
-	return &DeleteArtifactOptions{
-		ObjectID: core.StringPtr(objectID),
-		ArtifactID: core.StringPtr(artifactID),
-	}
-}
-
-// SetObjectID : Allow user to set ObjectID
-func (options *DeleteArtifactOptions) SetObjectID(objectID string) *DeleteArtifactOptions {
-	options.ObjectID = core.StringPtr(objectID)
-	return options
-}
-
-// SetArtifactID : Allow user to set ArtifactID
-func (options *DeleteArtifactOptions) SetArtifactID(artifactID string) *DeleteArtifactOptions {
-	options.ArtifactID = core.StringPtr(artifactID)
-	return options
-}
-
-// SetAccount : Allow user to set Account
-func (options *DeleteArtifactOptions) SetAccount(account string) *DeleteArtifactOptions {
-	options.Account = core.StringPtr(account)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *DeleteArtifactOptions) SetHeaders(param map[string]string) *DeleteArtifactOptions {
-	options.Headers = param
-	return options
-}
-
-// GetArtifactOptions : The GetArtifact options.
-type GetArtifactOptions struct {
-	// The object's unique ID.
-	ObjectID *string `json:"object_id" validate:"required"`
-
-	// The artifact's ID.
-	ArtifactID *string `json:"artifact_id" validate:"required"`
-
-	// This changes the scope of the request regardless of the authorization header. Example scopes are `account` and
-	// `global`. `account=global` is reqired if operating with a service ID that has a global admin policy, for example
-	// `GET /?account=global`.
-	Account *string `json:"account,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewGetArtifactOptions : Instantiate GetArtifactOptions
-func (*GlobalCatalogV1) NewGetArtifactOptions(objectID string, artifactID string) *GetArtifactOptions {
-	return &GetArtifactOptions{
-		ObjectID: core.StringPtr(objectID),
-		ArtifactID: core.StringPtr(artifactID),
-	}
-}
-
-// SetObjectID : Allow user to set ObjectID
-func (options *GetArtifactOptions) SetObjectID(objectID string) *GetArtifactOptions {
-	options.ObjectID = core.StringPtr(objectID)
-	return options
-}
-
-// SetArtifactID : Allow user to set ArtifactID
-func (options *GetArtifactOptions) SetArtifactID(artifactID string) *GetArtifactOptions {
-	options.ArtifactID = core.StringPtr(artifactID)
-	return options
-}
-
-// SetAccount : Allow user to set Account
-func (options *GetArtifactOptions) SetAccount(account string) *GetArtifactOptions {
-	options.Account = core.StringPtr(account)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *GetArtifactOptions) SetHeaders(param map[string]string) *GetArtifactOptions {
-	options.Headers = param
-	return options
-}
-
-// GetAuditLogsOptions : The GetAuditLogs options.
-type GetAuditLogsOptions struct {
-	// The object's unique ID.
-	ID *string `json:"id" validate:"required"`
-
-	// This changes the scope of the request regardless of the authorization header. Example scopes are `account` and
-	// `global`. `account=global` is reqired if operating with a service ID that has a global admin policy, for example
-	// `GET /?account=global`.
-	Account *string `json:"account,omitempty"`
-
-	// Sets the sort order. False is descending.
-	Ascending *string `json:"ascending,omitempty"`
-
-	// Starting time for the logs. If it's descending then the entries will be equal or earlier. The default is latest. For
-	// ascending it will entries equal or later. The default is earliest. It can be either a number or a string. If a
-	// number then it is in the format of Unix timestamps. If it is a string then it is a date in the format
-	// YYYY-MM-DDTHH:MM:SSZ  and the time is UTC. The T and the Z are required. For example: 2017-12-24T12:00:00Z for Noon
-	// UTC on Dec 24, 2017.
-	Startat *string `json:"startat,omitempty"`
-
-	// Count of number of log entries to skip before returning logs. The default is zero.
-	Offset *int64 `json:"_offset,omitempty"`
-
-	// Count of number of entries to return. The default is fifty. The maximum value is two hundred.
-	Limit *int64 `json:"_limit,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewGetAuditLogsOptions : Instantiate GetAuditLogsOptions
-func (*GlobalCatalogV1) NewGetAuditLogsOptions(id string) *GetAuditLogsOptions {
-	return &GetAuditLogsOptions{
-		ID: core.StringPtr(id),
-	}
-}
-
-// SetID : Allow user to set ID
-func (options *GetAuditLogsOptions) SetID(id string) *GetAuditLogsOptions {
-	options.ID = core.StringPtr(id)
-	return options
-}
-
-// SetAccount : Allow user to set Account
-func (options *GetAuditLogsOptions) SetAccount(account string) *GetAuditLogsOptions {
-	options.Account = core.StringPtr(account)
-	return options
-}
-
-// SetAscending : Allow user to set Ascending
-func (options *GetAuditLogsOptions) SetAscending(ascending string) *GetAuditLogsOptions {
-	options.Ascending = core.StringPtr(ascending)
-	return options
-}
-
-// SetStartat : Allow user to set Startat
-func (options *GetAuditLogsOptions) SetStartat(startat string) *GetAuditLogsOptions {
-	options.Startat = core.StringPtr(startat)
-	return options
-}
-
-// SetOffset : Allow user to set Offset
-func (options *GetAuditLogsOptions) SetOffset(offset int64) *GetAuditLogsOptions {
-	options.Offset = core.Int64Ptr(offset)
-	return options
-}
-
-// SetLimit : Allow user to set Limit
-func (options *GetAuditLogsOptions) SetLimit(limit int64) *GetAuditLogsOptions {
-	options.Limit = core.Int64Ptr(limit)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *GetAuditLogsOptions) SetHeaders(param map[string]string) *GetAuditLogsOptions {
-	options.Headers = param
-	return options
-}
-
-// GetCatalogEntryOptions : The GetCatalogEntry options.
-type GetCatalogEntryOptions struct {
-	// The catalog entry's unqiue ID.
-	ID *string `json:"id" validate:"required"`
-
-	// This changes the scope of the request regardless of the authorization header. Example scopes are `account` and
-	// `global`. `account=global` is reqired if operating with a service ID that has a global admin policy, for example
-	// `GET /?account=global`.
-	Account *string `json:"account,omitempty"`
-
-	// A GET call by default returns a basic set of properties. To include other properties, you must add this parameter. A
-	// wildcard (`*`) includes all properties for an object, for example `GET /id?include=*`. To include specific metadata
-	// fields, separate each field with a colon (:), for example `GET /id?include=metadata.ui:metadata.pricing`.
-	Include *string `json:"include,omitempty"`
-
-	// Return the data strings in the specified langauge. By default the strings returned are of the language preferred by
-	// your browser through the Accept-Langauge header, which allows an override of the header. Languages are specified in
-	// standard form, such as `en-us`. To include all languages use a wildcard (*).
-	Languages *string `json:"languages,omitempty"`
-
-	// Returns all available fields for all languages. Use the value `?complete=true` as shortcut for
-	// ?include=*&languages=*.
-	Complete *string `json:"complete,omitempty"`
-
-	// Return the children down to the requested depth. Use * to include the entire children tree. If there are more
-	// children than the maximum permitted an error will be returned. Be judicious with this as it can cause a large number
-	// of database accesses and can result in a large amount of data returned.
-	Depth *int64 `json:"depth,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewGetCatalogEntryOptions : Instantiate GetCatalogEntryOptions
-func (*GlobalCatalogV1) NewGetCatalogEntryOptions(id string) *GetCatalogEntryOptions {
-	return &GetCatalogEntryOptions{
-		ID: core.StringPtr(id),
-	}
-}
-
-// SetID : Allow user to set ID
-func (options *GetCatalogEntryOptions) SetID(id string) *GetCatalogEntryOptions {
-	options.ID = core.StringPtr(id)
-	return options
-}
-
-// SetAccount : Allow user to set Account
-func (options *GetCatalogEntryOptions) SetAccount(account string) *GetCatalogEntryOptions {
-	options.Account = core.StringPtr(account)
-	return options
-}
-
-// SetInclude : Allow user to set Include
-func (options *GetCatalogEntryOptions) SetInclude(include string) *GetCatalogEntryOptions {
-	options.Include = core.StringPtr(include)
-	return options
-}
-
-// SetLanguages : Allow user to set Languages
-func (options *GetCatalogEntryOptions) SetLanguages(languages string) *GetCatalogEntryOptions {
-	options.Languages = core.StringPtr(languages)
-	return options
-}
-
-// SetComplete : Allow user to set Complete
-func (options *GetCatalogEntryOptions) SetComplete(complete string) *GetCatalogEntryOptions {
-	options.Complete = core.StringPtr(complete)
-	return options
-}
-
-// SetDepth : Allow user to set Depth
-func (options *GetCatalogEntryOptions) SetDepth(depth int64) *GetCatalogEntryOptions {
-	options.Depth = core.Int64Ptr(depth)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *GetCatalogEntryOptions) SetHeaders(param map[string]string) *GetCatalogEntryOptions {
-	options.Headers = param
-	return options
-}
-
-// GetChildObjectsOptions : The GetChildObjects options.
-type GetChildObjectsOptions struct {
-	// The parent catalog entry's ID.
-	ID *string `json:"id" validate:"required"`
-
-	// The **kind** of child catalog entries to search for. A wildcard (*) includes all child catalog entries for all
-	// kinds, for example `GET /service_name/_*`.
-	Kind *string `json:"kind" validate:"required"`
-
-	// This changes the scope of the request regardless of the authorization header. Example scopes are `account` and
-	// `global`. `account=global` is reqired if operating with a service ID that has a global admin policy, for example
-	// `GET /?account=global`.
-	Account *string `json:"account,omitempty"`
-
-	// A colon (:) separated list of properties to include. A GET call by defaults return a limited set of properties. To
-	// include other properties, you must add the include parameter.  A wildcard (*) includes all properties.
-	Include *string `json:"include,omitempty"`
-
-	// A query filter, for example, `q=kind:iaas IBM`  will filter on entries of **kind** iaas that has `IBM` in their
-	// name, display name, or description.
-	Q *string `json:"q,omitempty"`
-
-	// The field on which to sort the output. By default by name. Available fields are **name**, **kind**, and
-	// **provider**.
-	SortBy *string `json:"sort-by,omitempty"`
-
-	// The sort order. The default is false, which is ascending.
-	Descending *string `json:"descending,omitempty"`
-
-	// Return the data strings in the specified langauge. By default the strings returned are of the language preferred by
-	// your browser through the Accept-Langauge header. This allows an override of the header. Languages are specified in
-	// standard form, such as `en-us`. To include all languages use the wildcard (*).
-	Languages *string `json:"languages,omitempty"`
-
-	// Use the value `?complete=true` as shortcut for ?include=*&languages=*.
-	Complete *string `json:"complete,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewGetChildObjectsOptions : Instantiate GetChildObjectsOptions
-func (*GlobalCatalogV1) NewGetChildObjectsOptions(id string, kind string) *GetChildObjectsOptions {
-	return &GetChildObjectsOptions{
-		ID: core.StringPtr(id),
-		Kind: core.StringPtr(kind),
-	}
-}
-
-// SetID : Allow user to set ID
-func (options *GetChildObjectsOptions) SetID(id string) *GetChildObjectsOptions {
-	options.ID = core.StringPtr(id)
-	return options
-}
-
-// SetKind : Allow user to set Kind
-func (options *GetChildObjectsOptions) SetKind(kind string) *GetChildObjectsOptions {
-	options.Kind = core.StringPtr(kind)
-	return options
-}
-
-// SetAccount : Allow user to set Account
-func (options *GetChildObjectsOptions) SetAccount(account string) *GetChildObjectsOptions {
-	options.Account = core.StringPtr(account)
-	return options
-}
-
-// SetInclude : Allow user to set Include
-func (options *GetChildObjectsOptions) SetInclude(include string) *GetChildObjectsOptions {
-	options.Include = core.StringPtr(include)
-	return options
-}
-
-// SetQ : Allow user to set Q
-func (options *GetChildObjectsOptions) SetQ(q string) *GetChildObjectsOptions {
-	options.Q = core.StringPtr(q)
-	return options
-}
-
-// SetSortBy : Allow user to set SortBy
-func (options *GetChildObjectsOptions) SetSortBy(sortBy string) *GetChildObjectsOptions {
-	options.SortBy = core.StringPtr(sortBy)
-	return options
-}
-
-// SetDescending : Allow user to set Descending
-func (options *GetChildObjectsOptions) SetDescending(descending string) *GetChildObjectsOptions {
-	options.Descending = core.StringPtr(descending)
-	return options
-}
-
-// SetLanguages : Allow user to set Languages
-func (options *GetChildObjectsOptions) SetLanguages(languages string) *GetChildObjectsOptions {
-	options.Languages = core.StringPtr(languages)
-	return options
-}
-
-// SetComplete : Allow user to set Complete
-func (options *GetChildObjectsOptions) SetComplete(complete string) *GetChildObjectsOptions {
-	options.Complete = core.StringPtr(complete)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *GetChildObjectsOptions) SetHeaders(param map[string]string) *GetChildObjectsOptions {
-	options.Headers = param
-	return options
-}
-
-// GetPricingOptions : The GetPricing options.
-type GetPricingOptions struct {
-	// The object's unique ID.
-	ID *string `json:"id" validate:"required"`
-
-	// This changes the scope of the request regardless of the authorization header. Example scopes are `account` and
-	// `global`. `account=global` is reqired if operating with a service ID that has a global admin policy, for example
-	// `GET /?account=global`.
-	Account *string `json:"account,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewGetPricingOptions : Instantiate GetPricingOptions
-func (*GlobalCatalogV1) NewGetPricingOptions(id string) *GetPricingOptions {
-	return &GetPricingOptions{
-		ID: core.StringPtr(id),
-	}
-}
-
-// SetID : Allow user to set ID
-func (options *GetPricingOptions) SetID(id string) *GetPricingOptions {
-	options.ID = core.StringPtr(id)
-	return options
-}
-
-// SetAccount : Allow user to set Account
-func (options *GetPricingOptions) SetAccount(account string) *GetPricingOptions {
-	options.Account = core.StringPtr(account)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *GetPricingOptions) SetHeaders(param map[string]string) *GetPricingOptions {
-	options.Headers = param
-	return options
-}
-
-// GetVisibilityOptions : The GetVisibility options.
-type GetVisibilityOptions struct {
-	// The object's unique ID.
-	ID *string `json:"id" validate:"required"`
-
-	// This changes the scope of the request regardless of the authorization header. Example scopes are `account` and
-	// `global`. `account=global` is reqired if operating with a service ID that has a global admin policy, for example
-	// `GET /?account=global`.
-	Account *string `json:"account,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewGetVisibilityOptions : Instantiate GetVisibilityOptions
-func (*GlobalCatalogV1) NewGetVisibilityOptions(id string) *GetVisibilityOptions {
-	return &GetVisibilityOptions{
-		ID: core.StringPtr(id),
-	}
-}
-
-// SetID : Allow user to set ID
-func (options *GetVisibilityOptions) SetID(id string) *GetVisibilityOptions {
-	options.ID = core.StringPtr(id)
-	return options
-}
-
-// SetAccount : Allow user to set Account
-func (options *GetVisibilityOptions) SetAccount(account string) *GetVisibilityOptions {
-	options.Account = core.StringPtr(account)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *GetVisibilityOptions) SetHeaders(param map[string]string) *GetVisibilityOptions {
-	options.Headers = param
-	return options
-}
-
-// I18N : Language specific translation of translation properties, like label and description.
-type I18N struct {
-	// Information related to a translated text message.
-	Language *Strings `json:"_language_,omitempty"`
-}
-
-
-// UnmarshalI18N constructs an instance of I18N from the specified map.
-func UnmarshalI18N(m map[string]interface{}) (result *I18N, err error) {
-	obj := new(I18N)
-	obj.Language, err = UnmarshalStringsAsProperty(m, "_language_")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalI18NSlice unmarshals a slice of I18N instances from the specified list of maps.
-func UnmarshalI18NSlice(s []interface{}) (slice []I18N, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'I18N'")
-			return
-		}
-		obj, e := UnmarshalI18N(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalI18NAsProperty unmarshals an instance of I18N that is stored as a property
-// within the specified map.
-func UnmarshalI18NAsProperty(m map[string]interface{}, propertyName string) (result *I18N, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'I18N'", propertyName)
-			return
-		}
-		result, err = UnmarshalI18N(objMap)
-	}
-	return
-}
-
-// UnmarshalI18NSliceAsProperty unmarshals a slice of I18N instances that are stored as a property
-// within the specified map.
-func UnmarshalI18NSliceAsProperty(m map[string]interface{}, propertyName string) (slice []I18N, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'I18N'", propertyName)
-			return
-		}
-		slice, err = UnmarshalI18NSlice(vSlice)
-	}
-	return
-}
-
-// Image : Image annotation for this catalog entry. The image is a URL.
-type Image struct {
-	// URL for the large, default image.
-	Image *string `json:"image" validate:"required"`
-
-	// URL for a small image.
-	SmallImage *string `json:"small_image,omitempty"`
-
-	// URL for a medium image.
-	MediumImage *string `json:"medium_image,omitempty"`
-
-	// URL for a featured image.
-	FeatureImage *string `json:"feature_image,omitempty"`
-}
-
-
-// NewImage : Instantiate Image (Generic Model Constructor)
-func (*GlobalCatalogV1) NewImage(image string) (model *Image, err error) {
-	model = &Image{
-		Image: core.StringPtr(image),
-	}
-	err = core.ValidateStruct(model, "required parameters")
-	return
-}
-
-// UnmarshalImage constructs an instance of Image from the specified map.
-func UnmarshalImage(m map[string]interface{}) (result *Image, err error) {
-	obj := new(Image)
-	obj.Image, err = core.UnmarshalString(m, "image")
-	if err != nil {
-		return
-	}
-	obj.SmallImage, err = core.UnmarshalString(m, "small_image")
-	if err != nil {
-		return
-	}
-	obj.MediumImage, err = core.UnmarshalString(m, "medium_image")
-	if err != nil {
-		return
-	}
-	obj.FeatureImage, err = core.UnmarshalString(m, "feature_image")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalImageSlice unmarshals a slice of Image instances from the specified list of maps.
-func UnmarshalImageSlice(s []interface{}) (slice []Image, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'Image'")
-			return
-		}
-		obj, e := UnmarshalImage(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalImageAsProperty unmarshals an instance of Image that is stored as a property
-// within the specified map.
-func UnmarshalImageAsProperty(m map[string]interface{}, propertyName string) (result *Image, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'Image'", propertyName)
-			return
-		}
-		result, err = UnmarshalImage(objMap)
-	}
-	return
-}
-
-// UnmarshalImageSliceAsProperty unmarshals a slice of Image instances that are stored as a property
-// within the specified map.
-func UnmarshalImageSliceAsProperty(m map[string]interface{}, propertyName string) (slice []Image, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'Image'", propertyName)
-			return
-		}
-		slice, err = UnmarshalImageSlice(vSlice)
-	}
-	return
-}
-
-// ListArtifactsOptions : The ListArtifacts options.
-type ListArtifactsOptions struct {
-	// The object's unique ID.
-	ObjectID *string `json:"object_id" validate:"required"`
-
-	// This changes the scope of the request regardless of the authorization header. Example scopes are `account` and
-	// `global`. `account=global` is reqired if operating with a service ID that has a global admin policy, for example
-	// `GET /?account=global`.
-	Account *string `json:"account,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewListArtifactsOptions : Instantiate ListArtifactsOptions
-func (*GlobalCatalogV1) NewListArtifactsOptions(objectID string) *ListArtifactsOptions {
-	return &ListArtifactsOptions{
-		ObjectID: core.StringPtr(objectID),
-	}
-}
-
-// SetObjectID : Allow user to set ObjectID
-func (options *ListArtifactsOptions) SetObjectID(objectID string) *ListArtifactsOptions {
-	options.ObjectID = core.StringPtr(objectID)
-	return options
-}
-
-// SetAccount : Allow user to set Account
-func (options *ListArtifactsOptions) SetAccount(account string) *ListArtifactsOptions {
-	options.Account = core.StringPtr(account)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *ListArtifactsOptions) SetHeaders(param map[string]string) *ListArtifactsOptions {
-	options.Headers = param
-	return options
-}
-
-// ListCatalogEntriesOptions : The ListCatalogEntries options.
-type ListCatalogEntriesOptions struct {
-	// This changes the scope of the request regardless of the authorization header. Example scopes are `account` and
-	// `global`. `account=global` is reqired if operating with a service ID that has a global admin policy, for example
-	// `GET /?account=global`.
-	Account *string `json:"account,omitempty"`
-
-	// A GET call by default returns a basic set of properties. To include other properties, you must add this parameter. A
-	// wildcard (`*`) includes all properties for an object, for example `GET /?include=*`. To include specific metadata
-	// fields, separate each field with a colon (:), for example `GET /?include=metadata.ui:metadata.pricing`.
-	Include *string `json:"include,omitempty"`
-
-	// Searches the catalog entries for keywords. Add filters to refine your search. A query filter, for example,
-	// `q=kind:iaas service_name rc:true`, filters entries of kind iaas with metadata.service.rc_compatible set to true and
-	//  have a service name is in their name, display name, or description.  Valid tags are **kind**:<string>,
-	// **tag**:<strging>, **rc**:[true|false], **iam**:[true|false], **active**:[true|false], **geo**:<string>, and
-	// **price**:<string>.
-	Q *string `json:"q,omitempty"`
-
-	// The field on which the output is sorted. Sorts by default by **name** property. Available fields are **name**,
-	// **displayname** (overview_ui.display_name), **kind**, **provider** (provider.name), **sbsindex**
-	// (metadata.ui.side_by_side_index), and the time **created**, and **updated**.
-	SortBy *string `json:"sort-by,omitempty"`
-
-	// Sets the sort order. The default is false, which is ascending.
-	Descending *string `json:"descending,omitempty"`
-
-	// Return the data strings in a specified langauge. By default, the strings returned are of the language preferred by
-	// your browser through the Accept-Langauge header, which allows an override of the header. Languages are specified in
-	// standard form, such as `en-us`. To include all languages use a wildcard (*).
-	Languages *string `json:"languages,omitempty"`
-
-	// Returns all available fields for all languages. Use the value `?complete=true` as shortcut for
-	// ?include=*&languages=*.
-	Complete *string `json:"complete,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewListCatalogEntriesOptions : Instantiate ListCatalogEntriesOptions
-func (*GlobalCatalogV1) NewListCatalogEntriesOptions() *ListCatalogEntriesOptions {
-	return &ListCatalogEntriesOptions{}
-}
-
-// SetAccount : Allow user to set Account
-func (options *ListCatalogEntriesOptions) SetAccount(account string) *ListCatalogEntriesOptions {
-	options.Account = core.StringPtr(account)
-	return options
-}
-
-// SetInclude : Allow user to set Include
-func (options *ListCatalogEntriesOptions) SetInclude(include string) *ListCatalogEntriesOptions {
-	options.Include = core.StringPtr(include)
-	return options
-}
-
-// SetQ : Allow user to set Q
-func (options *ListCatalogEntriesOptions) SetQ(q string) *ListCatalogEntriesOptions {
-	options.Q = core.StringPtr(q)
-	return options
-}
-
-// SetSortBy : Allow user to set SortBy
-func (options *ListCatalogEntriesOptions) SetSortBy(sortBy string) *ListCatalogEntriesOptions {
-	options.SortBy = core.StringPtr(sortBy)
-	return options
-}
-
-// SetDescending : Allow user to set Descending
-func (options *ListCatalogEntriesOptions) SetDescending(descending string) *ListCatalogEntriesOptions {
-	options.Descending = core.StringPtr(descending)
-	return options
-}
-
-// SetLanguages : Allow user to set Languages
-func (options *ListCatalogEntriesOptions) SetLanguages(languages string) *ListCatalogEntriesOptions {
-	options.Languages = core.StringPtr(languages)
-	return options
-}
-
-// SetComplete : Allow user to set Complete
-func (options *ListCatalogEntriesOptions) SetComplete(complete string) *ListCatalogEntriesOptions {
-	options.Complete = core.StringPtr(complete)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *ListCatalogEntriesOptions) SetHeaders(param map[string]string) *ListCatalogEntriesOptions {
-	options.Headers = param
-	return options
-}
-
-// Metrics : Plan-specific cost metrics information.
-type Metrics struct {
-	// The metric ID or part number.
-	MetricID *string `json:"metric_id,omitempty"`
-
-	// The tier model.
-	TierModel *string `json:"tier_model,omitempty"`
-
-	// The charge unit name.
-	ChargeUnitName *string `json:"charge_unit_name,omitempty"`
-
-	// The charge unit quantity.
-	ChargeUnitQuantity *string `json:"charge_unit_quantity,omitempty"`
-
-	// Display name of the resource.
-	ResourceDisplayName *string `json:"resource_display_name,omitempty"`
-
-	// Display name of the charge unit.
-	ChargeUnitDisplayName *string `json:"charge_unit_display_name,omitempty"`
-
-	// Usage limit for the metric.
-	UsageCapQty *int64 `json:"usage_cap_qty,omitempty"`
-
-	// The pricing per metric by country and currency.
-	Amounts []Amount `json:"amounts,omitempty"`
-}
-
-
-// UnmarshalMetrics constructs an instance of Metrics from the specified map.
-func UnmarshalMetrics(m map[string]interface{}) (result *Metrics, err error) {
-	obj := new(Metrics)
-	obj.MetricID, err = core.UnmarshalString(m, "metric_id")
-	if err != nil {
-		return
-	}
-	obj.TierModel, err = core.UnmarshalString(m, "tier_model")
-	if err != nil {
-		return
-	}
-	obj.ChargeUnitName, err = core.UnmarshalString(m, "charge_unit_name")
-	if err != nil {
-		return
-	}
-	obj.ChargeUnitQuantity, err = core.UnmarshalString(m, "charge_unit_quantity")
-	if err != nil {
-		return
-	}
-	obj.ResourceDisplayName, err = core.UnmarshalString(m, "resource_display_name")
-	if err != nil {
-		return
-	}
-	obj.ChargeUnitDisplayName, err = core.UnmarshalString(m, "charge_unit_display_name")
-	if err != nil {
-		return
-	}
-	obj.UsageCapQty, err = core.UnmarshalInt64(m, "usage_cap_qty")
-	if err != nil {
-		return
-	}
-	obj.Amounts, err = UnmarshalAmountSliceAsProperty(m, "amounts")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalMetricsSlice unmarshals a slice of Metrics instances from the specified list of maps.
-func UnmarshalMetricsSlice(s []interface{}) (slice []Metrics, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'Metrics'")
-			return
-		}
-		obj, e := UnmarshalMetrics(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalMetricsAsProperty unmarshals an instance of Metrics that is stored as a property
-// within the specified map.
-func UnmarshalMetricsAsProperty(m map[string]interface{}, propertyName string) (result *Metrics, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'Metrics'", propertyName)
-			return
-		}
-		result, err = UnmarshalMetrics(objMap)
-	}
-	return
-}
-
-// UnmarshalMetricsSliceAsProperty unmarshals a slice of Metrics instances that are stored as a property
-// within the specified map.
-func UnmarshalMetricsSliceAsProperty(m map[string]interface{}, propertyName string) (slice []Metrics, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'Metrics'", propertyName)
-			return
-		}
-		slice, err = UnmarshalMetricsSlice(vSlice)
-	}
-	return
-}
-
-// ObjectMetaData : Metadata is not returned by default, and includes specific data depending on the object **kind**.
-type ObjectMetaData struct {
-	// Boolean value that describes whether the service is compatible with the Resource Controller.
-	RcCompatible *bool `json:"rc_compatible,omitempty"`
-
-	// Information related to the UI presentation associated with a catalog entry.
-	Ui *UIMetaData `json:"ui,omitempty"`
-
-	// Pricing-related information.
-	Pricing *Pricing `json:"pricing,omitempty"`
-
-	// Compliance information for HIPAA and PCI.
-	Compliance []string `json:"compliance,omitempty"`
-
-	// Service-related metadata.
-	Service *ObjectMetaDataService `json:"service,omitempty"`
-
-	// Plan-related metadata.
-	Plan *ObjectMetaDataPlan `json:"plan,omitempty"`
-
-	// Template-related metadata.
-	Template *ObjectMetaDataTemplate `json:"template,omitempty"`
-
-	// Deployment-related metadata.
-	Deployment *ObjectMetaDataDeployment `json:"deployment,omitempty"`
-
-	// Alias-related metadata.
-	Alias *ObjectMetaDataAlias `json:"alias,omitempty"`
-
-	// Service Level Agreement related metadata.
-	Sla *ObjectMetaDataSla `json:"sla,omitempty"`
-
-	// Callback-related information associated with a catalog entry.
-	Callbacks *Callbacks `json:"callbacks,omitempty"`
-
-	// Optional version of the object.
-	Version *string `json:"version,omitempty"`
-
-	// The original name of the object.
-	OriginName *string `json:"origin_name,omitempty"`
-
-	// Additional information.
-	Other interface{} `json:"other,omitempty"`
-}
-
-
-// UnmarshalObjectMetaData constructs an instance of ObjectMetaData from the specified map.
-func UnmarshalObjectMetaData(m map[string]interface{}) (result *ObjectMetaData, err error) {
-	obj := new(ObjectMetaData)
-	obj.RcCompatible, err = core.UnmarshalBool(m, "rc_compatible")
-	if err != nil {
-		return
-	}
-	obj.Ui, err = UnmarshalUIMetaDataAsProperty(m, "ui")
-	if err != nil {
-		return
-	}
-	obj.Pricing, err = UnmarshalPricingAsProperty(m, "pricing")
-	if err != nil {
-		return
-	}
-	obj.Compliance, err = core.UnmarshalStringSlice(m, "compliance")
-	if err != nil {
-		return
-	}
-	obj.Service, err = UnmarshalObjectMetaDataServiceAsProperty(m, "service")
-	if err != nil {
-		return
-	}
-	obj.Plan, err = UnmarshalObjectMetaDataPlanAsProperty(m, "plan")
-	if err != nil {
-		return
-	}
-	obj.Template, err = UnmarshalObjectMetaDataTemplateAsProperty(m, "template")
-	if err != nil {
-		return
-	}
-	obj.Deployment, err = UnmarshalObjectMetaDataDeploymentAsProperty(m, "deployment")
-	if err != nil {
-		return
-	}
-	obj.Alias, err = UnmarshalObjectMetaDataAliasAsProperty(m, "alias")
-	if err != nil {
-		return
-	}
-	obj.Sla, err = UnmarshalObjectMetaDataSlaAsProperty(m, "sla")
-	if err != nil {
-		return
-	}
-	obj.Callbacks, err = UnmarshalCallbacksAsProperty(m, "callbacks")
-	if err != nil {
-		return
-	}
-	obj.Version, err = core.UnmarshalString(m, "version")
-	if err != nil {
-		return
-	}
-	obj.OriginName, err = core.UnmarshalString(m, "origin_name")
-	if err != nil {
-		return
-	}
-	obj.Other, err = core.UnmarshalAny(m, "other")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalObjectMetaDataSlice unmarshals a slice of ObjectMetaData instances from the specified list of maps.
-func UnmarshalObjectMetaDataSlice(s []interface{}) (slice []ObjectMetaData, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'ObjectMetaData'")
-			return
-		}
-		obj, e := UnmarshalObjectMetaData(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalObjectMetaDataAsProperty unmarshals an instance of ObjectMetaData that is stored as a property
-// within the specified map.
-func UnmarshalObjectMetaDataAsProperty(m map[string]interface{}, propertyName string) (result *ObjectMetaData, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'ObjectMetaData'", propertyName)
-			return
-		}
-		result, err = UnmarshalObjectMetaData(objMap)
-	}
-	return
-}
-
-// UnmarshalObjectMetaDataSliceAsProperty unmarshals a slice of ObjectMetaData instances that are stored as a property
-// within the specified map.
-func UnmarshalObjectMetaDataSliceAsProperty(m map[string]interface{}, propertyName string) (slice []ObjectMetaData, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'ObjectMetaData'", propertyName)
-			return
-		}
-		slice, err = UnmarshalObjectMetaDataSlice(vSlice)
-	}
-	return
-}
-
-// ObjectMetaDataAlias : Alias-related metadata.
-type ObjectMetaDataAlias struct {
-	// Type of alias.
-	Type *string `json:"type,omitempty"`
-
-	// Points to the plan that this object is an alias for.
-	PlanID *string `json:"plan_id,omitempty"`
-}
-
-
-// UnmarshalObjectMetaDataAlias constructs an instance of ObjectMetaDataAlias from the specified map.
-func UnmarshalObjectMetaDataAlias(m map[string]interface{}) (result *ObjectMetaDataAlias, err error) {
-	obj := new(ObjectMetaDataAlias)
-	obj.Type, err = core.UnmarshalString(m, "type")
-	if err != nil {
-		return
-	}
-	obj.PlanID, err = core.UnmarshalString(m, "plan_id")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalObjectMetaDataAliasSlice unmarshals a slice of ObjectMetaDataAlias instances from the specified list of maps.
-func UnmarshalObjectMetaDataAliasSlice(s []interface{}) (slice []ObjectMetaDataAlias, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'ObjectMetaDataAlias'")
-			return
-		}
-		obj, e := UnmarshalObjectMetaDataAlias(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalObjectMetaDataAliasAsProperty unmarshals an instance of ObjectMetaDataAlias that is stored as a property
-// within the specified map.
-func UnmarshalObjectMetaDataAliasAsProperty(m map[string]interface{}, propertyName string) (result *ObjectMetaDataAlias, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'ObjectMetaDataAlias'", propertyName)
-			return
-		}
-		result, err = UnmarshalObjectMetaDataAlias(objMap)
-	}
-	return
-}
-
-// UnmarshalObjectMetaDataAliasSliceAsProperty unmarshals a slice of ObjectMetaDataAlias instances that are stored as a property
-// within the specified map.
-func UnmarshalObjectMetaDataAliasSliceAsProperty(m map[string]interface{}, propertyName string) (slice []ObjectMetaDataAlias, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'ObjectMetaDataAlias'", propertyName)
-			return
-		}
-		slice, err = UnmarshalObjectMetaDataAliasSlice(vSlice)
-	}
-	return
-}
-
-// ObjectMetaDataDeployment : Deployment-related metadata.
-type ObjectMetaDataDeployment struct {
-	// Describes the region where the service is located.
-	Location *string `json:"location,omitempty"`
-
-	// Pointer to the location resource in the catalog.
-	LocationURL *string `json:"location_url,omitempty"`
-
-	// A CRN that describes the deployment. crn:v1:[cname]:[ctype]:[location]:[scope]::[resource-type]:[resource].
-	TargetCrn *string `json:"target_crn,omitempty"`
-
-	// The broker associated with a catalog entry.
-	Broker *ObjectMetaDataDeploymentBroker `json:"broker,omitempty"`
-
-	// This deployment not only supports RC but is ready to migrate and support the RC broker for a location.
-	SupportsRcMigration *bool `json:"supports_rc_migration,omitempty"`
-}
-
-
-// UnmarshalObjectMetaDataDeployment constructs an instance of ObjectMetaDataDeployment from the specified map.
-func UnmarshalObjectMetaDataDeployment(m map[string]interface{}) (result *ObjectMetaDataDeployment, err error) {
-	obj := new(ObjectMetaDataDeployment)
-	obj.Location, err = core.UnmarshalString(m, "location")
-	if err != nil {
-		return
-	}
-	obj.LocationURL, err = core.UnmarshalString(m, "location_url")
-	if err != nil {
-		return
-	}
-	obj.TargetCrn, err = core.UnmarshalString(m, "target_crn")
-	if err != nil {
-		return
-	}
-	obj.Broker, err = UnmarshalObjectMetaDataDeploymentBrokerAsProperty(m, "broker")
-	if err != nil {
-		return
-	}
-	obj.SupportsRcMigration, err = core.UnmarshalBool(m, "supports_rc_migration")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalObjectMetaDataDeploymentSlice unmarshals a slice of ObjectMetaDataDeployment instances from the specified list of maps.
-func UnmarshalObjectMetaDataDeploymentSlice(s []interface{}) (slice []ObjectMetaDataDeployment, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'ObjectMetaDataDeployment'")
-			return
-		}
-		obj, e := UnmarshalObjectMetaDataDeployment(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalObjectMetaDataDeploymentAsProperty unmarshals an instance of ObjectMetaDataDeployment that is stored as a property
-// within the specified map.
-func UnmarshalObjectMetaDataDeploymentAsProperty(m map[string]interface{}, propertyName string) (result *ObjectMetaDataDeployment, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'ObjectMetaDataDeployment'", propertyName)
-			return
-		}
-		result, err = UnmarshalObjectMetaDataDeployment(objMap)
-	}
-	return
-}
-
-// UnmarshalObjectMetaDataDeploymentSliceAsProperty unmarshals a slice of ObjectMetaDataDeployment instances that are stored as a property
-// within the specified map.
-func UnmarshalObjectMetaDataDeploymentSliceAsProperty(m map[string]interface{}, propertyName string) (slice []ObjectMetaDataDeployment, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'ObjectMetaDataDeployment'", propertyName)
-			return
-		}
-		slice, err = UnmarshalObjectMetaDataDeploymentSlice(vSlice)
-	}
-	return
-}
-
-// ObjectMetaDataDeploymentBroker : The broker associated with a catalog entry.
-type ObjectMetaDataDeploymentBroker struct {
-	// Broker name.
-	Name *string `json:"name,omitempty"`
-
-	// Broker guid.
-	Guid *string `json:"guid,omitempty"`
-
-	// Broker password.
-	Password *ObjectMetaDataDeploymentBrokerPassword `json:"password,omitempty"`
-}
-
-
-// UnmarshalObjectMetaDataDeploymentBroker constructs an instance of ObjectMetaDataDeploymentBroker from the specified map.
-func UnmarshalObjectMetaDataDeploymentBroker(m map[string]interface{}) (result *ObjectMetaDataDeploymentBroker, err error) {
-	obj := new(ObjectMetaDataDeploymentBroker)
-	obj.Name, err = core.UnmarshalString(m, "name")
-	if err != nil {
-		return
-	}
-	obj.Guid, err = core.UnmarshalString(m, "guid")
-	if err != nil {
-		return
-	}
-	obj.Password, err = UnmarshalObjectMetaDataDeploymentBrokerPasswordAsProperty(m, "password")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalObjectMetaDataDeploymentBrokerSlice unmarshals a slice of ObjectMetaDataDeploymentBroker instances from the specified list of maps.
-func UnmarshalObjectMetaDataDeploymentBrokerSlice(s []interface{}) (slice []ObjectMetaDataDeploymentBroker, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'ObjectMetaDataDeploymentBroker'")
-			return
-		}
-		obj, e := UnmarshalObjectMetaDataDeploymentBroker(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalObjectMetaDataDeploymentBrokerAsProperty unmarshals an instance of ObjectMetaDataDeploymentBroker that is stored as a property
-// within the specified map.
-func UnmarshalObjectMetaDataDeploymentBrokerAsProperty(m map[string]interface{}, propertyName string) (result *ObjectMetaDataDeploymentBroker, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'ObjectMetaDataDeploymentBroker'", propertyName)
-			return
-		}
-		result, err = UnmarshalObjectMetaDataDeploymentBroker(objMap)
-	}
-	return
-}
-
-// UnmarshalObjectMetaDataDeploymentBrokerSliceAsProperty unmarshals a slice of ObjectMetaDataDeploymentBroker instances that are stored as a property
-// within the specified map.
-func UnmarshalObjectMetaDataDeploymentBrokerSliceAsProperty(m map[string]interface{}, propertyName string) (slice []ObjectMetaDataDeploymentBroker, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'ObjectMetaDataDeploymentBroker'", propertyName)
-			return
-		}
-		slice, err = UnmarshalObjectMetaDataDeploymentBrokerSlice(vSlice)
-	}
-	return
-}
-
-// ObjectMetaDataDeploymentBrokerPassword : Broker password.
-type ObjectMetaDataDeploymentBrokerPassword struct {
-	// Broker password string.
-	Text *string `json:"text,omitempty"`
-
-	// Broker password key.
-	Key *string `json:"key,omitempty"`
-
-	// Broker password IV.
-	Iv *string `json:"iv,omitempty"`
-}
-
-
-// UnmarshalObjectMetaDataDeploymentBrokerPassword constructs an instance of ObjectMetaDataDeploymentBrokerPassword from the specified map.
-func UnmarshalObjectMetaDataDeploymentBrokerPassword(m map[string]interface{}) (result *ObjectMetaDataDeploymentBrokerPassword, err error) {
-	obj := new(ObjectMetaDataDeploymentBrokerPassword)
-	obj.Text, err = core.UnmarshalString(m, "text")
-	if err != nil {
-		return
-	}
-	obj.Key, err = core.UnmarshalString(m, "key")
-	if err != nil {
-		return
-	}
-	obj.Iv, err = core.UnmarshalString(m, "iv")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalObjectMetaDataDeploymentBrokerPasswordSlice unmarshals a slice of ObjectMetaDataDeploymentBrokerPassword instances from the specified list of maps.
-func UnmarshalObjectMetaDataDeploymentBrokerPasswordSlice(s []interface{}) (slice []ObjectMetaDataDeploymentBrokerPassword, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'ObjectMetaDataDeploymentBrokerPassword'")
-			return
-		}
-		obj, e := UnmarshalObjectMetaDataDeploymentBrokerPassword(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalObjectMetaDataDeploymentBrokerPasswordAsProperty unmarshals an instance of ObjectMetaDataDeploymentBrokerPassword that is stored as a property
-// within the specified map.
-func UnmarshalObjectMetaDataDeploymentBrokerPasswordAsProperty(m map[string]interface{}, propertyName string) (result *ObjectMetaDataDeploymentBrokerPassword, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'ObjectMetaDataDeploymentBrokerPassword'", propertyName)
-			return
-		}
-		result, err = UnmarshalObjectMetaDataDeploymentBrokerPassword(objMap)
-	}
-	return
-}
-
-// UnmarshalObjectMetaDataDeploymentBrokerPasswordSliceAsProperty unmarshals a slice of ObjectMetaDataDeploymentBrokerPassword instances that are stored as a property
-// within the specified map.
-func UnmarshalObjectMetaDataDeploymentBrokerPasswordSliceAsProperty(m map[string]interface{}, propertyName string) (slice []ObjectMetaDataDeploymentBrokerPassword, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'ObjectMetaDataDeploymentBrokerPassword'", propertyName)
-			return
-		}
-		slice, err = UnmarshalObjectMetaDataDeploymentBrokerPasswordSlice(vSlice)
-	}
-	return
-}
-
-// ObjectMetaDataPlan : Plan-related metadata.
-type ObjectMetaDataPlan struct {
-	// Boolean value that describes whether the service can be bound to an application.
-	Bindable *bool `json:"bindable,omitempty"`
-
-	// Boolean value that describes whether the service can be reserved.
-	Reservable *bool `json:"reservable,omitempty"`
-
-	// Boolean value that describes whether the service can be used internally.
-	AllowInternalUsers *bool `json:"allow_internal_users,omitempty"`
-
-	// Boolean value that describes whether the service can be provisioned asynchronously.
-	AsyncProvisioningSupported *bool `json:"async_provisioning_supported,omitempty"`
-
-	// Boolean value that describes whether the service can be unprovisioned asynchronously.
-	AsyncUnprovisioningSupported *bool `json:"async_unprovisioning_supported,omitempty"`
-
-	// Test check interval.
-	TestCheckInterval *int64 `json:"test_check_interval,omitempty"`
-
-	// Single scope instance.
-	SingleScopeInstance *string `json:"single_scope_instance,omitempty"`
-
-	// Boolean value that describes whether the service check is enabled.
-	ServiceCheckEnabled *bool `json:"service_check_enabled,omitempty"`
-
-	// If the field is imported from Cloud Foundry, the Cloud Foundry region's GUID. This is a required field. For example,
-	// `us-south=123`.
-	CfGuid *string `json:"cf_guid,omitempty"`
-}
-
-
-// UnmarshalObjectMetaDataPlan constructs an instance of ObjectMetaDataPlan from the specified map.
-func UnmarshalObjectMetaDataPlan(m map[string]interface{}) (result *ObjectMetaDataPlan, err error) {
-	obj := new(ObjectMetaDataPlan)
-	obj.Bindable, err = core.UnmarshalBool(m, "bindable")
-	if err != nil {
-		return
-	}
-	obj.Reservable, err = core.UnmarshalBool(m, "reservable")
-	if err != nil {
-		return
-	}
-	obj.AllowInternalUsers, err = core.UnmarshalBool(m, "allow_internal_users")
-	if err != nil {
-		return
-	}
-	obj.AsyncProvisioningSupported, err = core.UnmarshalBool(m, "async_provisioning_supported")
-	if err != nil {
-		return
-	}
-	obj.AsyncUnprovisioningSupported, err = core.UnmarshalBool(m, "async_unprovisioning_supported")
-	if err != nil {
-		return
-	}
-	obj.TestCheckInterval, err = core.UnmarshalInt64(m, "test_check_interval")
-	if err != nil {
-		return
-	}
-	obj.SingleScopeInstance, err = core.UnmarshalString(m, "single_scope_instance")
-	if err != nil {
-		return
-	}
-	obj.ServiceCheckEnabled, err = core.UnmarshalBool(m, "service_check_enabled")
-	if err != nil {
-		return
-	}
-	obj.CfGuid, err = core.UnmarshalString(m, "cf_guid")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalObjectMetaDataPlanSlice unmarshals a slice of ObjectMetaDataPlan instances from the specified list of maps.
-func UnmarshalObjectMetaDataPlanSlice(s []interface{}) (slice []ObjectMetaDataPlan, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'ObjectMetaDataPlan'")
-			return
-		}
-		obj, e := UnmarshalObjectMetaDataPlan(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalObjectMetaDataPlanAsProperty unmarshals an instance of ObjectMetaDataPlan that is stored as a property
-// within the specified map.
-func UnmarshalObjectMetaDataPlanAsProperty(m map[string]interface{}, propertyName string) (result *ObjectMetaDataPlan, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'ObjectMetaDataPlan'", propertyName)
-			return
-		}
-		result, err = UnmarshalObjectMetaDataPlan(objMap)
-	}
-	return
-}
-
-// UnmarshalObjectMetaDataPlanSliceAsProperty unmarshals a slice of ObjectMetaDataPlan instances that are stored as a property
-// within the specified map.
-func UnmarshalObjectMetaDataPlanSliceAsProperty(m map[string]interface{}, propertyName string) (slice []ObjectMetaDataPlan, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'ObjectMetaDataPlan'", propertyName)
-			return
-		}
-		slice, err = UnmarshalObjectMetaDataPlanSlice(vSlice)
-	}
-	return
-}
-
-// ObjectMetaDataService : Service-related metadata.
-type ObjectMetaDataService struct {
-	// Type of service.
-	Type *string `json:"type,omitempty"`
-
-	// Boolean value that describes whether the service is compatible with Identity and Access Management.
-	IamCompatible *bool `json:"iam_compatible,omitempty"`
-
-	// Boolean value that describes whether the service has a unique API key.
-	UniqueApiKey *bool `json:"unique_api_key,omitempty"`
-
-	// Boolean value that describes whether the service is provisionable or not. You may need sales or support to create
-	// this service.
-	Provisionable *bool `json:"provisionable,omitempty"`
-
-	// Boolean value that describes whether the service supports asynchronous provisioning.
-	AsyncProvisioningSupported *bool `json:"async_provisioning_supported,omitempty"`
-
-	// Boolean value that describes whether the service supports asynchronous unprovisioning.
-	AsyncUnprovisioningSupported *bool `json:"async_unprovisioning_supported,omitempty"`
-
-	// If the field is imported from Cloud Foundry, the Cloud Foundry region's GUID. This is a required field. For example,
-	// `us-south=123`.
-	CfGuid *string `json:"cf_guid,omitempty"`
-
-	// Boolean value that describes whether you can create bindings for this service.
-	Bindable *bool `json:"bindable,omitempty"`
-
-	// Service dependencies.
-	Requires []string `json:"requires,omitempty"`
-
-	// Boolean value that describes whether the service supports upgrade or downgrade for some plans.
-	PlanUpdateable *bool `json:"plan_updateable,omitempty"`
-
-	// String that describes whether the service is active or inactive.
-	State *string `json:"state,omitempty"`
-
-	// Boolean value that describes whether the service check is enabled.
-	ServiceCheckEnabled *bool `json:"service_check_enabled,omitempty"`
-
-	// Test check interval.
-	TestCheckInterval *int64 `json:"test_check_interval,omitempty"`
-
-	// Boolean value that describes whether the service supports service keys.
-	ServiceKeySupported *bool `json:"service_key_supported,omitempty"`
-}
-
-
-// UnmarshalObjectMetaDataService constructs an instance of ObjectMetaDataService from the specified map.
-func UnmarshalObjectMetaDataService(m map[string]interface{}) (result *ObjectMetaDataService, err error) {
-	obj := new(ObjectMetaDataService)
-	obj.Type, err = core.UnmarshalString(m, "type")
-	if err != nil {
-		return
-	}
-	obj.IamCompatible, err = core.UnmarshalBool(m, "iam_compatible")
-	if err != nil {
-		return
-	}
-	obj.UniqueApiKey, err = core.UnmarshalBool(m, "unique_api_key")
-	if err != nil {
-		return
-	}
-	obj.Provisionable, err = core.UnmarshalBool(m, "provisionable")
-	if err != nil {
-		return
-	}
-	obj.AsyncProvisioningSupported, err = core.UnmarshalBool(m, "async_provisioning_supported")
-	if err != nil {
-		return
-	}
-	obj.AsyncUnprovisioningSupported, err = core.UnmarshalBool(m, "async_unprovisioning_supported")
-	if err != nil {
-		return
-	}
-	obj.CfGuid, err = core.UnmarshalString(m, "cf_guid")
-	if err != nil {
-		return
-	}
-	obj.Bindable, err = core.UnmarshalBool(m, "bindable")
-	if err != nil {
-		return
-	}
-	obj.Requires, err = core.UnmarshalStringSlice(m, "requires")
-	if err != nil {
-		return
-	}
-	obj.PlanUpdateable, err = core.UnmarshalBool(m, "plan_updateable")
-	if err != nil {
-		return
-	}
-	obj.State, err = core.UnmarshalString(m, "state")
-	if err != nil {
-		return
-	}
-	obj.ServiceCheckEnabled, err = core.UnmarshalBool(m, "service_check_enabled")
-	if err != nil {
-		return
-	}
-	obj.TestCheckInterval, err = core.UnmarshalInt64(m, "test_check_interval")
-	if err != nil {
-		return
-	}
-	obj.ServiceKeySupported, err = core.UnmarshalBool(m, "service_key_supported")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalObjectMetaDataServiceSlice unmarshals a slice of ObjectMetaDataService instances from the specified list of maps.
-func UnmarshalObjectMetaDataServiceSlice(s []interface{}) (slice []ObjectMetaDataService, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'ObjectMetaDataService'")
-			return
-		}
-		obj, e := UnmarshalObjectMetaDataService(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalObjectMetaDataServiceAsProperty unmarshals an instance of ObjectMetaDataService that is stored as a property
-// within the specified map.
-func UnmarshalObjectMetaDataServiceAsProperty(m map[string]interface{}, propertyName string) (result *ObjectMetaDataService, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'ObjectMetaDataService'", propertyName)
-			return
-		}
-		result, err = UnmarshalObjectMetaDataService(objMap)
-	}
-	return
-}
-
-// UnmarshalObjectMetaDataServiceSliceAsProperty unmarshals a slice of ObjectMetaDataService instances that are stored as a property
-// within the specified map.
-func UnmarshalObjectMetaDataServiceSliceAsProperty(m map[string]interface{}, propertyName string) (slice []ObjectMetaDataService, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'ObjectMetaDataService'", propertyName)
-			return
-		}
-		slice, err = UnmarshalObjectMetaDataServiceSlice(vSlice)
-	}
-	return
-}
-
-// ObjectMetaDataSla : Service Level Agreement related metadata.
-type ObjectMetaDataSla struct {
-	// Required Service License Agreement Terms of Use.
-	Terms *string `json:"terms,omitempty"`
-
-	// Required deployment type. Valid values are dedicated, local, or public. It can be Single or Multi tennancy, more
-	// specifically on a Server, VM, Physical, or Pod.
-	Tenancy *string `json:"tenancy,omitempty"`
-
-	// Provisioning reliability, for example, 99.95.
-	Provisioning *string `json:"provisioning,omitempty"`
-
-	// Uptime reliability of the service, for example, 99.95.
-	Responsiveness *string `json:"responsiveness,omitempty"`
-
-	// SLA Disaster Recovery-related metadata.
-	Dr *ObjectMetaDataSlaDr `json:"dr,omitempty"`
-}
-
-
-// UnmarshalObjectMetaDataSla constructs an instance of ObjectMetaDataSla from the specified map.
-func UnmarshalObjectMetaDataSla(m map[string]interface{}) (result *ObjectMetaDataSla, err error) {
-	obj := new(ObjectMetaDataSla)
-	obj.Terms, err = core.UnmarshalString(m, "terms")
-	if err != nil {
-		return
-	}
-	obj.Tenancy, err = core.UnmarshalString(m, "tenancy")
-	if err != nil {
-		return
-	}
-	obj.Provisioning, err = core.UnmarshalString(m, "provisioning")
-	if err != nil {
-		return
-	}
-	obj.Responsiveness, err = core.UnmarshalString(m, "responsiveness")
-	if err != nil {
-		return
-	}
-	obj.Dr, err = UnmarshalObjectMetaDataSlaDrAsProperty(m, "dr")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalObjectMetaDataSlaSlice unmarshals a slice of ObjectMetaDataSla instances from the specified list of maps.
-func UnmarshalObjectMetaDataSlaSlice(s []interface{}) (slice []ObjectMetaDataSla, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'ObjectMetaDataSla'")
-			return
-		}
-		obj, e := UnmarshalObjectMetaDataSla(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalObjectMetaDataSlaAsProperty unmarshals an instance of ObjectMetaDataSla that is stored as a property
-// within the specified map.
-func UnmarshalObjectMetaDataSlaAsProperty(m map[string]interface{}, propertyName string) (result *ObjectMetaDataSla, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'ObjectMetaDataSla'", propertyName)
-			return
-		}
-		result, err = UnmarshalObjectMetaDataSla(objMap)
-	}
-	return
-}
-
-// UnmarshalObjectMetaDataSlaSliceAsProperty unmarshals a slice of ObjectMetaDataSla instances that are stored as a property
-// within the specified map.
-func UnmarshalObjectMetaDataSlaSliceAsProperty(m map[string]interface{}, propertyName string) (slice []ObjectMetaDataSla, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'ObjectMetaDataSla'", propertyName)
-			return
-		}
-		slice, err = UnmarshalObjectMetaDataSlaSlice(vSlice)
-	}
-	return
-}
-
-// ObjectMetaDataSlaDr : SLA Disaster Recovery-related metadata.
-type ObjectMetaDataSlaDr struct {
-	// Required boolean value that describes whether disaster recovery is on.
-	Dr *bool `json:"dr,omitempty"`
-
-	// Description of the disaster recovery implementation.
-	Description *string `json:"description,omitempty"`
-}
-
-
-// UnmarshalObjectMetaDataSlaDr constructs an instance of ObjectMetaDataSlaDr from the specified map.
-func UnmarshalObjectMetaDataSlaDr(m map[string]interface{}) (result *ObjectMetaDataSlaDr, err error) {
-	obj := new(ObjectMetaDataSlaDr)
-	obj.Dr, err = core.UnmarshalBool(m, "dr")
-	if err != nil {
-		return
-	}
-	obj.Description, err = core.UnmarshalString(m, "description")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalObjectMetaDataSlaDrSlice unmarshals a slice of ObjectMetaDataSlaDr instances from the specified list of maps.
-func UnmarshalObjectMetaDataSlaDrSlice(s []interface{}) (slice []ObjectMetaDataSlaDr, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'ObjectMetaDataSlaDr'")
-			return
-		}
-		obj, e := UnmarshalObjectMetaDataSlaDr(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalObjectMetaDataSlaDrAsProperty unmarshals an instance of ObjectMetaDataSlaDr that is stored as a property
-// within the specified map.
-func UnmarshalObjectMetaDataSlaDrAsProperty(m map[string]interface{}, propertyName string) (result *ObjectMetaDataSlaDr, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'ObjectMetaDataSlaDr'", propertyName)
-			return
-		}
-		result, err = UnmarshalObjectMetaDataSlaDr(objMap)
-	}
-	return
-}
-
-// UnmarshalObjectMetaDataSlaDrSliceAsProperty unmarshals a slice of ObjectMetaDataSlaDr instances that are stored as a property
-// within the specified map.
-func UnmarshalObjectMetaDataSlaDrSliceAsProperty(m map[string]interface{}, propertyName string) (slice []ObjectMetaDataSlaDr, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'ObjectMetaDataSlaDr'", propertyName)
-			return
-		}
-		slice, err = UnmarshalObjectMetaDataSlaDrSlice(vSlice)
-	}
-	return
-}
-
-// ObjectMetaDataTemplate : Template-related metadata.
-type ObjectMetaDataTemplate struct {
-	// List of required offering or plan IDs.
-	Services []string `json:"services,omitempty"`
-
-	// Cloud Foundry instance memory value.
-	DefaultMemory *int64 `json:"default_memory,omitempty"`
-
-	// Start Command.
-	StartCmd *string `json:"start_cmd,omitempty"`
-
-	// Location of your applications source files.
-	Source *ObjectMetaDataTemplateSource `json:"source,omitempty"`
-
-	// ID of the runtime.
-	RuntimeCatalogID *string `json:"runtime_catalog_id,omitempty"`
-
-	// ID of the Cloud Foundry runtime.
-	CfRuntimeID *string `json:"cf_runtime_id,omitempty"`
-
-	// ID of the boilerplate or template.
-	TemplateID *string `json:"template_id,omitempty"`
-
-	// File path to the executable file for the template.
-	ExecutableFile *string `json:"executable_file,omitempty"`
-
-	// ID of the buildpack used by the template.
-	Buildpack *string `json:"buildpack,omitempty"`
-
-	// Environment variables for the template.
-	EnvironmentVariables *ObjectMetaDataTemplateEnvironmentVariables `json:"environment_variables,omitempty"`
-}
-
-
-// UnmarshalObjectMetaDataTemplate constructs an instance of ObjectMetaDataTemplate from the specified map.
-func UnmarshalObjectMetaDataTemplate(m map[string]interface{}) (result *ObjectMetaDataTemplate, err error) {
-	obj := new(ObjectMetaDataTemplate)
-	obj.Services, err = core.UnmarshalStringSlice(m, "services")
-	if err != nil {
-		return
-	}
-	obj.DefaultMemory, err = core.UnmarshalInt64(m, "default_memory")
-	if err != nil {
-		return
-	}
-	obj.StartCmd, err = core.UnmarshalString(m, "start_cmd")
-	if err != nil {
-		return
-	}
-	obj.Source, err = UnmarshalObjectMetaDataTemplateSourceAsProperty(m, "source")
-	if err != nil {
-		return
-	}
-	obj.RuntimeCatalogID, err = core.UnmarshalString(m, "runtime_catalog_id")
-	if err != nil {
-		return
-	}
-	obj.CfRuntimeID, err = core.UnmarshalString(m, "cf_runtime_id")
-	if err != nil {
-		return
-	}
-	obj.TemplateID, err = core.UnmarshalString(m, "template_id")
-	if err != nil {
-		return
-	}
-	obj.ExecutableFile, err = core.UnmarshalString(m, "executable_file")
-	if err != nil {
-		return
-	}
-	obj.Buildpack, err = core.UnmarshalString(m, "buildpack")
-	if err != nil {
-		return
-	}
-	obj.EnvironmentVariables, err = UnmarshalObjectMetaDataTemplateEnvironmentVariablesAsProperty(m, "environment_variables")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalObjectMetaDataTemplateSlice unmarshals a slice of ObjectMetaDataTemplate instances from the specified list of maps.
-func UnmarshalObjectMetaDataTemplateSlice(s []interface{}) (slice []ObjectMetaDataTemplate, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'ObjectMetaDataTemplate'")
-			return
-		}
-		obj, e := UnmarshalObjectMetaDataTemplate(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalObjectMetaDataTemplateAsProperty unmarshals an instance of ObjectMetaDataTemplate that is stored as a property
-// within the specified map.
-func UnmarshalObjectMetaDataTemplateAsProperty(m map[string]interface{}, propertyName string) (result *ObjectMetaDataTemplate, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'ObjectMetaDataTemplate'", propertyName)
-			return
-		}
-		result, err = UnmarshalObjectMetaDataTemplate(objMap)
-	}
-	return
-}
-
-// UnmarshalObjectMetaDataTemplateSliceAsProperty unmarshals a slice of ObjectMetaDataTemplate instances that are stored as a property
-// within the specified map.
-func UnmarshalObjectMetaDataTemplateSliceAsProperty(m map[string]interface{}, propertyName string) (slice []ObjectMetaDataTemplate, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'ObjectMetaDataTemplate'", propertyName)
-			return
-		}
-		slice, err = UnmarshalObjectMetaDataTemplateSlice(vSlice)
-	}
-	return
-}
-
-// ObjectMetaDataTemplateEnvironmentVariables : Environment variables for the template.
-type ObjectMetaDataTemplateEnvironmentVariables struct {
-	// Key is the editable first string in a key:value pair of environment variables.
-	Key *string `json:"_key_,omitempty"`
-}
-
-
-// UnmarshalObjectMetaDataTemplateEnvironmentVariables constructs an instance of ObjectMetaDataTemplateEnvironmentVariables from the specified map.
-func UnmarshalObjectMetaDataTemplateEnvironmentVariables(m map[string]interface{}) (result *ObjectMetaDataTemplateEnvironmentVariables, err error) {
-	obj := new(ObjectMetaDataTemplateEnvironmentVariables)
-	obj.Key, err = core.UnmarshalString(m, "_key_")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalObjectMetaDataTemplateEnvironmentVariablesSlice unmarshals a slice of ObjectMetaDataTemplateEnvironmentVariables instances from the specified list of maps.
-func UnmarshalObjectMetaDataTemplateEnvironmentVariablesSlice(s []interface{}) (slice []ObjectMetaDataTemplateEnvironmentVariables, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'ObjectMetaDataTemplateEnvironmentVariables'")
-			return
-		}
-		obj, e := UnmarshalObjectMetaDataTemplateEnvironmentVariables(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalObjectMetaDataTemplateEnvironmentVariablesAsProperty unmarshals an instance of ObjectMetaDataTemplateEnvironmentVariables that is stored as a property
-// within the specified map.
-func UnmarshalObjectMetaDataTemplateEnvironmentVariablesAsProperty(m map[string]interface{}, propertyName string) (result *ObjectMetaDataTemplateEnvironmentVariables, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'ObjectMetaDataTemplateEnvironmentVariables'", propertyName)
-			return
-		}
-		result, err = UnmarshalObjectMetaDataTemplateEnvironmentVariables(objMap)
-	}
-	return
-}
-
-// UnmarshalObjectMetaDataTemplateEnvironmentVariablesSliceAsProperty unmarshals a slice of ObjectMetaDataTemplateEnvironmentVariables instances that are stored as a property
-// within the specified map.
-func UnmarshalObjectMetaDataTemplateEnvironmentVariablesSliceAsProperty(m map[string]interface{}, propertyName string) (slice []ObjectMetaDataTemplateEnvironmentVariables, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'ObjectMetaDataTemplateEnvironmentVariables'", propertyName)
-			return
-		}
-		slice, err = UnmarshalObjectMetaDataTemplateEnvironmentVariablesSlice(vSlice)
-	}
-	return
-}
-
-// ObjectMetaDataTemplateSource : Location of your applications source files.
-type ObjectMetaDataTemplateSource struct {
-	// Path to your application.
-	Path *string `json:"path,omitempty"`
-
-	// Type of source, for example, git.
-	Type *string `json:"type,omitempty"`
-
-	// URL to source.
-	URL *string `json:"url,omitempty"`
-}
-
-
-// UnmarshalObjectMetaDataTemplateSource constructs an instance of ObjectMetaDataTemplateSource from the specified map.
-func UnmarshalObjectMetaDataTemplateSource(m map[string]interface{}) (result *ObjectMetaDataTemplateSource, err error) {
-	obj := new(ObjectMetaDataTemplateSource)
-	obj.Path, err = core.UnmarshalString(m, "path")
-	if err != nil {
-		return
-	}
-	obj.Type, err = core.UnmarshalString(m, "type")
-	if err != nil {
-		return
-	}
-	obj.URL, err = core.UnmarshalString(m, "url")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalObjectMetaDataTemplateSourceSlice unmarshals a slice of ObjectMetaDataTemplateSource instances from the specified list of maps.
-func UnmarshalObjectMetaDataTemplateSourceSlice(s []interface{}) (slice []ObjectMetaDataTemplateSource, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'ObjectMetaDataTemplateSource'")
-			return
-		}
-		obj, e := UnmarshalObjectMetaDataTemplateSource(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalObjectMetaDataTemplateSourceAsProperty unmarshals an instance of ObjectMetaDataTemplateSource that is stored as a property
-// within the specified map.
-func UnmarshalObjectMetaDataTemplateSourceAsProperty(m map[string]interface{}, propertyName string) (result *ObjectMetaDataTemplateSource, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'ObjectMetaDataTemplateSource'", propertyName)
-			return
-		}
-		result, err = UnmarshalObjectMetaDataTemplateSource(objMap)
-	}
-	return
-}
-
-// UnmarshalObjectMetaDataTemplateSourceSliceAsProperty unmarshals a slice of ObjectMetaDataTemplateSource instances that are stored as a property
-// within the specified map.
-func UnmarshalObjectMetaDataTemplateSourceSliceAsProperty(m map[string]interface{}, propertyName string) (slice []ObjectMetaDataTemplateSource, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'ObjectMetaDataTemplateSource'", propertyName)
-			return
-		}
-		slice, err = UnmarshalObjectMetaDataTemplateSourceSlice(vSlice)
-	}
-	return
-}
-
-// Overview : Overview is nested in the top level. The key value pair is `[_language_]overview_ui`.
-type Overview struct {
-	// The translated display name.
-	DisplayName *string `json:"display_name" validate:"required"`
-
-	// The translated long description.
-	LongDescription *string `json:"long_description" validate:"required"`
-
-	// The translated description.
-	Description *string `json:"description" validate:"required"`
-}
-
-
-// NewOverview : Instantiate Overview (Generic Model Constructor)
-func (*GlobalCatalogV1) NewOverview(displayName string, longDescription string, description string) (model *Overview, err error) {
-	model = &Overview{
-		DisplayName: core.StringPtr(displayName),
-		LongDescription: core.StringPtr(longDescription),
-		Description: core.StringPtr(description),
-	}
-	err = core.ValidateStruct(model, "required parameters")
-	return
-}
-
-// UnmarshalOverview constructs an instance of Overview from the specified map.
-func UnmarshalOverview(m map[string]interface{}) (result *Overview, err error) {
-	obj := new(Overview)
-	obj.DisplayName, err = core.UnmarshalString(m, "display_name")
-	if err != nil {
-		return
-	}
-	obj.LongDescription, err = core.UnmarshalString(m, "long_description")
-	if err != nil {
-		return
-	}
-	obj.Description, err = core.UnmarshalString(m, "description")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalOverviewSlice unmarshals a slice of Overview instances from the specified list of maps.
-func UnmarshalOverviewSlice(s []interface{}) (slice []Overview, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'Overview'")
-			return
-		}
-		obj, e := UnmarshalOverview(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalOverviewAsProperty unmarshals an instance of Overview that is stored as a property
-// within the specified map.
-func UnmarshalOverviewAsProperty(m map[string]interface{}, propertyName string) (result *Overview, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'Overview'", propertyName)
-			return
-		}
-		result, err = UnmarshalOverview(objMap)
-	}
-	return
-}
-
-// UnmarshalOverviewSliceAsProperty unmarshals a slice of Overview instances that are stored as a property
-// within the specified map.
-func UnmarshalOverviewSliceAsProperty(m map[string]interface{}, propertyName string) (slice []Overview, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'Overview'", propertyName)
-			return
-		}
-		slice, err = UnmarshalOverviewSlice(vSlice)
-	}
-	return
-}
-
-// OverviewUI : Overview is nested in the top level. The key value pair is `[_language_]overview_ui`.
-type OverviewUI struct {
-	// Overview is nested in the top level. The key value pair is `[_language_]overview_ui`.
-	Language *Overview `json:"_language_,omitempty"`
-}
-
-
-// UnmarshalOverviewUI constructs an instance of OverviewUI from the specified map.
-func UnmarshalOverviewUI(m map[string]interface{}) (result *OverviewUI, err error) {
-	obj := new(OverviewUI)
-	obj.Language, err = UnmarshalOverviewAsProperty(m, "_language_")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalOverviewUISlice unmarshals a slice of OverviewUI instances from the specified list of maps.
-func UnmarshalOverviewUISlice(s []interface{}) (slice []OverviewUI, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'OverviewUI'")
-			return
-		}
-		obj, e := UnmarshalOverviewUI(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalOverviewUIAsProperty unmarshals an instance of OverviewUI that is stored as a property
-// within the specified map.
-func UnmarshalOverviewUIAsProperty(m map[string]interface{}, propertyName string) (result *OverviewUI, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'OverviewUI'", propertyName)
-			return
-		}
-		result, err = UnmarshalOverviewUI(objMap)
-	}
-	return
-}
-
-// UnmarshalOverviewUISliceAsProperty unmarshals a slice of OverviewUI instances that are stored as a property
-// within the specified map.
-func UnmarshalOverviewUISliceAsProperty(m map[string]interface{}, propertyName string) (slice []OverviewUI, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'OverviewUI'", propertyName)
-			return
-		}
-		slice, err = UnmarshalOverviewUISlice(vSlice)
-	}
-	return
-}
-
-// Price : Pricing-related information.
-type Price struct {
-	// Pricing tier.
-	QuantityTier *int64 `json:"quantity_tier,omitempty"`
-
-	// Price in the selected currency.
-	Price *float64 `json:"Price,omitempty"`
-}
-
-
-// UnmarshalPrice constructs an instance of Price from the specified map.
-func UnmarshalPrice(m map[string]interface{}) (result *Price, err error) {
-	obj := new(Price)
-	obj.QuantityTier, err = core.UnmarshalInt64(m, "quantity_tier")
-	if err != nil {
-		return
-	}
-	obj.Price, err = core.UnmarshalFloat64(m, "Price")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalPriceSlice unmarshals a slice of Price instances from the specified list of maps.
-func UnmarshalPriceSlice(s []interface{}) (slice []Price, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'Price'")
-			return
-		}
-		obj, e := UnmarshalPrice(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalPriceAsProperty unmarshals an instance of Price that is stored as a property
-// within the specified map.
-func UnmarshalPriceAsProperty(m map[string]interface{}, propertyName string) (result *Price, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'Price'", propertyName)
-			return
-		}
-		result, err = UnmarshalPrice(objMap)
-	}
-	return
-}
-
-// UnmarshalPriceSliceAsProperty unmarshals a slice of Price instances that are stored as a property
-// within the specified map.
-func UnmarshalPriceSliceAsProperty(m map[string]interface{}, propertyName string) (slice []Price, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'Price'", propertyName)
-			return
-		}
-		slice, err = UnmarshalPriceSlice(vSlice)
-	}
-	return
-}
-
-// Pricing : Pricing-related information.
-type Pricing struct {
-	// Type of plan. Valid values are `free`, `trial`, `paygo`, `bluemix-subscription`, and `ibm-subscription`.
-	Type *string `json:"type,omitempty"`
-
-	// Defines where the pricing originates.
-	Origin *string `json:"origin,omitempty"`
-
-	// Plan-specific starting price information.
-	StartingPrice *StartingPrice `json:"starting_price,omitempty"`
-
-	// Plan-specific cost metric structure.
-	Metrics []Metrics `json:"metrics,omitempty"`
-}
-
-
-// UnmarshalPricing constructs an instance of Pricing from the specified map.
-func UnmarshalPricing(m map[string]interface{}) (result *Pricing, err error) {
-	obj := new(Pricing)
-	obj.Type, err = core.UnmarshalString(m, "type")
-	if err != nil {
-		return
-	}
-	obj.Origin, err = core.UnmarshalString(m, "origin")
-	if err != nil {
-		return
-	}
-	obj.StartingPrice, err = UnmarshalStartingPriceAsProperty(m, "starting_price")
-	if err != nil {
-		return
-	}
-	obj.Metrics, err = UnmarshalMetricsSliceAsProperty(m, "metrics")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalPricingSlice unmarshals a slice of Pricing instances from the specified list of maps.
-func UnmarshalPricingSlice(s []interface{}) (slice []Pricing, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'Pricing'")
-			return
-		}
-		obj, e := UnmarshalPricing(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalPricingAsProperty unmarshals an instance of Pricing that is stored as a property
-// within the specified map.
-func UnmarshalPricingAsProperty(m map[string]interface{}, propertyName string) (result *Pricing, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'Pricing'", propertyName)
-			return
-		}
-		result, err = UnmarshalPricing(objMap)
-	}
-	return
-}
-
-// UnmarshalPricingSliceAsProperty unmarshals a slice of Pricing instances that are stored as a property
-// within the specified map.
-func UnmarshalPricingSliceAsProperty(m map[string]interface{}, propertyName string) (slice []Pricing, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'Pricing'", propertyName)
-			return
-		}
-		slice, err = UnmarshalPricingSlice(vSlice)
-	}
-	return
-}
-
-// Provider : Information related to the provider associated with a catalog entry.
-type Provider struct {
-	// Provider's email address for this catalog entry.
-	Email *string `json:"email" validate:"required"`
-
-	// Provider's name, for example, IBM.
-	Name *string `json:"name" validate:"required"`
-
-	// Provider's contact name.
-	Contact *string `json:"contact,omitempty"`
-
-	// Provider's support email.
-	SupportEmail *string `json:"support_email,omitempty"`
-
-	// Provider's contact phone.
-	Phone *string `json:"phone,omitempty"`
-}
-
-
-// NewProvider : Instantiate Provider (Generic Model Constructor)
-func (*GlobalCatalogV1) NewProvider(email string, name string) (model *Provider, err error) {
-	model = &Provider{
-		Email: core.StringPtr(email),
-		Name: core.StringPtr(name),
-	}
-	err = core.ValidateStruct(model, "required parameters")
-	return
-}
-
-// UnmarshalProvider constructs an instance of Provider from the specified map.
-func UnmarshalProvider(m map[string]interface{}) (result *Provider, err error) {
-	obj := new(Provider)
-	obj.Email, err = core.UnmarshalString(m, "email")
-	if err != nil {
-		return
-	}
-	obj.Name, err = core.UnmarshalString(m, "name")
-	if err != nil {
-		return
-	}
-	obj.Contact, err = core.UnmarshalString(m, "contact")
-	if err != nil {
-		return
-	}
-	obj.SupportEmail, err = core.UnmarshalString(m, "support_email")
-	if err != nil {
-		return
-	}
-	obj.Phone, err = core.UnmarshalString(m, "phone")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalProviderSlice unmarshals a slice of Provider instances from the specified list of maps.
-func UnmarshalProviderSlice(s []interface{}) (slice []Provider, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'Provider'")
-			return
-		}
-		obj, e := UnmarshalProvider(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalProviderAsProperty unmarshals an instance of Provider that is stored as a property
-// within the specified map.
-func UnmarshalProviderAsProperty(m map[string]interface{}, propertyName string) (result *Provider, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'Provider'", propertyName)
-			return
-		}
-		result, err = UnmarshalProvider(objMap)
-	}
-	return
-}
-
-// UnmarshalProviderSliceAsProperty unmarshals a slice of Provider instances that are stored as a property
-// within the specified map.
-func UnmarshalProviderSliceAsProperty(m map[string]interface{}, propertyName string) (slice []Provider, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'Provider'", propertyName)
-			return
-		}
-		slice, err = UnmarshalProviderSlice(vSlice)
-	}
-	return
-}
-
-// RestoreCatalogEntryOptions : The RestoreCatalogEntry options.
-type RestoreCatalogEntryOptions struct {
-	// The catalog entry's unique ID.
-	ID *string `json:"id" validate:"required"`
-
-	// This changes the scope of the request regardless of the authorization header. Example scopes are `account` and
-	// `global`. `account=global` is reqired if operating with a service ID that has a global admin policy, for example
-	// `GET /?account=global`.
-	Account *string `json:"account,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewRestoreCatalogEntryOptions : Instantiate RestoreCatalogEntryOptions
-func (*GlobalCatalogV1) NewRestoreCatalogEntryOptions(id string) *RestoreCatalogEntryOptions {
-	return &RestoreCatalogEntryOptions{
-		ID: core.StringPtr(id),
-	}
-}
-
-// SetID : Allow user to set ID
-func (options *RestoreCatalogEntryOptions) SetID(id string) *RestoreCatalogEntryOptions {
-	options.ID = core.StringPtr(id)
-	return options
-}
-
-// SetAccount : Allow user to set Account
-func (options *RestoreCatalogEntryOptions) SetAccount(account string) *RestoreCatalogEntryOptions {
-	options.Account = core.StringPtr(account)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *RestoreCatalogEntryOptions) SetHeaders(param map[string]string) *RestoreCatalogEntryOptions {
-	options.Headers = param
-	return options
-}
-
-// Scope : IAM Scope-related information associated with a catalog entry.
-type Scope struct {
-	// Type of IAM scope. Valid values are `global`, `account`, or `org`.
-	Type *string `json:"type,omitempty"`
-
-	// Specific account or organization.
-	Value *string `json:"value,omitempty"`
-}
-
-
-// UnmarshalScope constructs an instance of Scope from the specified map.
-func UnmarshalScope(m map[string]interface{}) (result *Scope, err error) {
-	obj := new(Scope)
-	obj.Type, err = core.UnmarshalString(m, "type")
-	if err != nil {
-		return
-	}
-	obj.Value, err = core.UnmarshalString(m, "value")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalScopeSlice unmarshals a slice of Scope instances from the specified list of maps.
-func UnmarshalScopeSlice(s []interface{}) (slice []Scope, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'Scope'")
-			return
-		}
-		obj, e := UnmarshalScope(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalScopeAsProperty unmarshals an instance of Scope that is stored as a property
-// within the specified map.
-func UnmarshalScopeAsProperty(m map[string]interface{}, propertyName string) (result *Scope, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'Scope'", propertyName)
-			return
-		}
-		result, err = UnmarshalScope(objMap)
-	}
-	return
-}
-
-// UnmarshalScopeSliceAsProperty unmarshals a slice of Scope instances that are stored as a property
-// within the specified map.
-func UnmarshalScopeSliceAsProperty(m map[string]interface{}, propertyName string) (slice []Scope, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'Scope'", propertyName)
-			return
-		}
-		slice, err = UnmarshalScopeSlice(vSlice)
-	}
-	return
-}
-
-// SearchResult : The results obtained by performing a search.
-type SearchResult struct {
-	// Returned Page Number.
-	Page *string `json:"page,omitempty"`
-
-	// Results Per Page – if the page is full.
-	ResultsPerPage *string `json:"results_per_page,omitempty"`
-
-	// Total number of results.
-	TotalResults *string `json:"total_results,omitempty"`
-
-	// Resulting objects.
-	Resources []interface{} `json:"resources,omitempty"`
-}
-
-
-// UnmarshalSearchResult constructs an instance of SearchResult from the specified map.
-func UnmarshalSearchResult(m map[string]interface{}) (result *SearchResult, err error) {
-	obj := new(SearchResult)
-	obj.Page, err = core.UnmarshalString(m, "page")
-	if err != nil {
-		return
-	}
-	obj.ResultsPerPage, err = core.UnmarshalString(m, "results_per_page")
-	if err != nil {
-		return
-	}
-	obj.TotalResults, err = core.UnmarshalString(m, "total_results")
-	if err != nil {
-		return
-	}
-	obj.Resources, err = core.UnmarshalAnySlice(m, "resources")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalSearchResultSlice unmarshals a slice of SearchResult instances from the specified list of maps.
-func UnmarshalSearchResultSlice(s []interface{}) (slice []SearchResult, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'SearchResult'")
-			return
-		}
-		obj, e := UnmarshalSearchResult(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalSearchResultAsProperty unmarshals an instance of SearchResult that is stored as a property
-// within the specified map.
-func UnmarshalSearchResultAsProperty(m map[string]interface{}, propertyName string) (result *SearchResult, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'SearchResult'", propertyName)
-			return
-		}
-		result, err = UnmarshalSearchResult(objMap)
-	}
-	return
-}
-
-// UnmarshalSearchResultSliceAsProperty unmarshals a slice of SearchResult instances that are stored as a property
-// within the specified map.
-func UnmarshalSearchResultSliceAsProperty(m map[string]interface{}, propertyName string) (slice []SearchResult, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'SearchResult'", propertyName)
-			return
-		}
-		slice, err = UnmarshalSearchResultSlice(vSlice)
-	}
-	return
-}
-
-// StartingPrice : Plan-specific starting price information.
-type StartingPrice struct {
-	// ID of the plan the starting price is calculated.
-	PlanID *string `json:"plan_id,omitempty"`
-
-	// ID of the deployment the starting price is calculated.
-	DeploymentID *string `json:"deployment_id,omitempty"`
-
-	// The pricing per metric by country and currency.
-	Amount []Amount `json:"amount,omitempty"`
-}
-
-
-// UnmarshalStartingPrice constructs an instance of StartingPrice from the specified map.
-func UnmarshalStartingPrice(m map[string]interface{}) (result *StartingPrice, err error) {
-	obj := new(StartingPrice)
-	obj.PlanID, err = core.UnmarshalString(m, "plan_id")
-	if err != nil {
-		return
-	}
-	obj.DeploymentID, err = core.UnmarshalString(m, "deployment_id")
-	if err != nil {
-		return
-	}
-	obj.Amount, err = UnmarshalAmountSliceAsProperty(m, "amount")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalStartingPriceSlice unmarshals a slice of StartingPrice instances from the specified list of maps.
-func UnmarshalStartingPriceSlice(s []interface{}) (slice []StartingPrice, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'StartingPrice'")
-			return
-		}
-		obj, e := UnmarshalStartingPrice(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalStartingPriceAsProperty unmarshals an instance of StartingPrice that is stored as a property
-// within the specified map.
-func UnmarshalStartingPriceAsProperty(m map[string]interface{}, propertyName string) (result *StartingPrice, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'StartingPrice'", propertyName)
-			return
-		}
-		result, err = UnmarshalStartingPrice(objMap)
-	}
-	return
-}
-
-// UnmarshalStartingPriceSliceAsProperty unmarshals a slice of StartingPrice instances that are stored as a property
-// within the specified map.
-func UnmarshalStartingPriceSliceAsProperty(m map[string]interface{}, propertyName string) (slice []StartingPrice, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'StartingPrice'", propertyName)
-			return
-		}
-		slice, err = UnmarshalStartingPriceSlice(vSlice)
-	}
-	return
-}
-
-// Strings : Information related to a translated text message.
-type Strings struct {
-	// Presentation information related to list delimiters.
-	Bullets []Bullets `json:"bullets,omitempty"`
-
-	// Media-related metadata.
-	Media []UIMetaMedia `json:"media,omitempty"`
-
-	// Warning that a message is not creatable.
-	NotCreatableMsg *string `json:"not_creatable_msg,omitempty"`
-
-	// Warning that a robot message is not creatable.
-	NotCreatableRobotMsg *string `json:"not_creatable__robot_msg,omitempty"`
-
-	// Warning for deprecation.
-	DeprecationWarning *string `json:"deprecation_warning,omitempty"`
-
-	// Popup warning message.
-	PopupWarningMessage *string `json:"popup_warning_message,omitempty"`
-
-	// Instructions for UI strings.
-	Instruction *string `json:"instruction,omitempty"`
-}
-
-
-// UnmarshalStrings constructs an instance of Strings from the specified map.
-func UnmarshalStrings(m map[string]interface{}) (result *Strings, err error) {
-	obj := new(Strings)
-	obj.Bullets, err = UnmarshalBulletsSliceAsProperty(m, "bullets")
-	if err != nil {
-		return
-	}
-	obj.Media, err = UnmarshalUIMetaMediaSliceAsProperty(m, "media")
-	if err != nil {
-		return
-	}
-	obj.NotCreatableMsg, err = core.UnmarshalString(m, "not_creatable_msg")
-	if err != nil {
-		return
-	}
-	obj.NotCreatableRobotMsg, err = core.UnmarshalString(m, "not_creatable__robot_msg")
-	if err != nil {
-		return
-	}
-	obj.DeprecationWarning, err = core.UnmarshalString(m, "deprecation_warning")
-	if err != nil {
-		return
-	}
-	obj.PopupWarningMessage, err = core.UnmarshalString(m, "popup_warning_message")
-	if err != nil {
-		return
-	}
-	obj.Instruction, err = core.UnmarshalString(m, "instruction")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalStringsSlice unmarshals a slice of Strings instances from the specified list of maps.
-func UnmarshalStringsSlice(s []interface{}) (slice []Strings, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'Strings'")
-			return
-		}
-		obj, e := UnmarshalStrings(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalStringsAsProperty unmarshals an instance of Strings that is stored as a property
-// within the specified map.
-func UnmarshalStringsAsProperty(m map[string]interface{}, propertyName string) (result *Strings, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'Strings'", propertyName)
-			return
-		}
-		result, err = UnmarshalStrings(objMap)
-	}
-	return
-}
-
-// UnmarshalStringsSliceAsProperty unmarshals a slice of Strings instances that are stored as a property
-// within the specified map.
-func UnmarshalStringsSliceAsProperty(m map[string]interface{}, propertyName string) (slice []Strings, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'Strings'", propertyName)
-			return
-		}
-		slice, err = UnmarshalStringsSlice(vSlice)
-	}
-	return
-}
-
-// UIMetaData : Information related to the UI presentation associated with a catalog entry.
-type UIMetaData struct {
-	// Language specific translation of translation properties, like label and description.
-	Strings *I18N `json:"strings,omitempty"`
-
-	// UI based URLs.
-	Urls *URLS `json:"urls,omitempty"`
-
-	// Describes how the embeddable dashboard is rendered.
-	EmbeddableDashboard *string `json:"embeddable_dashboard,omitempty"`
-
-	// Describes whether the embeddable dashboard is rendered at the full width.
-	EmbeddableDashboardFullWidth *bool `json:"embeddable_dashboard_full_width,omitempty"`
-
-	// Defines the order of information presented.
-	NavigationOrder []string `json:"navigation_order,omitempty"`
-
-	// Describes whether this entry is able to be created from the UI element or CLI.
-	NotCreatable *bool `json:"not_creatable,omitempty"`
-
-	// Describes whether a plan or flavor is reservable.
-	Reservable *bool `json:"reservable,omitempty"`
-
-	// ID of the primary offering for a group.
-	PrimaryOfferingID *string `json:"primary_offering_id,omitempty"`
-
-	// Alert to ACE to allow instance UI to be accessible while the provisioning state of instance is in progress.
-	AccessibleDuringProvision *bool `json:"accessible_during_provision,omitempty"`
-
-	// Specifies a side by side ordering weight to the UI.
-	SideBySideIndex *int64 `json:"side_by_side_index,omitempty"`
-
-	// Date and time the service will no longer be available.
-	EndOfServiceTime *strfmt.DateTime `json:"end_of_service_time,omitempty"`
-}
-
-
-// UnmarshalUIMetaData constructs an instance of UIMetaData from the specified map.
-func UnmarshalUIMetaData(m map[string]interface{}) (result *UIMetaData, err error) {
-	obj := new(UIMetaData)
-	obj.Strings, err = UnmarshalI18NAsProperty(m, "strings")
-	if err != nil {
-		return
-	}
-	obj.Urls, err = UnmarshalURLSAsProperty(m, "urls")
-	if err != nil {
-		return
-	}
-	obj.EmbeddableDashboard, err = core.UnmarshalString(m, "embeddable_dashboard")
-	if err != nil {
-		return
-	}
-	obj.EmbeddableDashboardFullWidth, err = core.UnmarshalBool(m, "embeddable_dashboard_full_width")
-	if err != nil {
-		return
-	}
-	obj.NavigationOrder, err = core.UnmarshalStringSlice(m, "navigation_order")
-	if err != nil {
-		return
-	}
-	obj.NotCreatable, err = core.UnmarshalBool(m, "not_creatable")
-	if err != nil {
-		return
-	}
-	obj.Reservable, err = core.UnmarshalBool(m, "reservable")
-	if err != nil {
-		return
-	}
-	obj.PrimaryOfferingID, err = core.UnmarshalString(m, "primary_offering_id")
-	if err != nil {
-		return
-	}
-	obj.AccessibleDuringProvision, err = core.UnmarshalBool(m, "accessible_during_provision")
-	if err != nil {
-		return
-	}
-	obj.SideBySideIndex, err = core.UnmarshalInt64(m, "side_by_side_index")
-	if err != nil {
-		return
-	}
-	obj.EndOfServiceTime, err = core.UnmarshalDateTime(m, "end_of_service_time")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalUIMetaDataSlice unmarshals a slice of UIMetaData instances from the specified list of maps.
-func UnmarshalUIMetaDataSlice(s []interface{}) (slice []UIMetaData, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'UIMetaData'")
-			return
-		}
-		obj, e := UnmarshalUIMetaData(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalUIMetaDataAsProperty unmarshals an instance of UIMetaData that is stored as a property
-// within the specified map.
-func UnmarshalUIMetaDataAsProperty(m map[string]interface{}, propertyName string) (result *UIMetaData, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'UIMetaData'", propertyName)
-			return
-		}
-		result, err = UnmarshalUIMetaData(objMap)
-	}
-	return
-}
-
-// UnmarshalUIMetaDataSliceAsProperty unmarshals a slice of UIMetaData instances that are stored as a property
-// within the specified map.
-func UnmarshalUIMetaDataSliceAsProperty(m map[string]interface{}, propertyName string) (slice []UIMetaData, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'UIMetaData'", propertyName)
-			return
-		}
-		slice, err = UnmarshalUIMetaDataSlice(vSlice)
-	}
-	return
-}
-
-// UIMetaMedia : Media-related metadata.
-type UIMetaMedia struct {
-	// Caption for an image.
-	Caption *string `json:"caption,omitempty"`
-
-	// URL for thumbnail image.
-	ThumbnailURL *string `json:"thumbnail_url,omitempty"`
-
-	// Type of media.
-	Type *string `json:"type,omitempty"`
-
-	// URL for media.
-	URL *string `json:"URL,omitempty"`
-
-	// Information related to list delimiters.
-	Source *Bullets `json:"source,omitempty"`
-}
-
-
-// UnmarshalUIMetaMedia constructs an instance of UIMetaMedia from the specified map.
-func UnmarshalUIMetaMedia(m map[string]interface{}) (result *UIMetaMedia, err error) {
-	obj := new(UIMetaMedia)
-	obj.Caption, err = core.UnmarshalString(m, "caption")
-	if err != nil {
-		return
-	}
-	obj.ThumbnailURL, err = core.UnmarshalString(m, "thumbnail_url")
-	if err != nil {
-		return
-	}
-	obj.Type, err = core.UnmarshalString(m, "type")
-	if err != nil {
-		return
-	}
-	obj.URL, err = core.UnmarshalString(m, "URL")
-	if err != nil {
-		return
-	}
-	obj.Source, err = UnmarshalBulletsAsProperty(m, "source")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalUIMetaMediaSlice unmarshals a slice of UIMetaMedia instances from the specified list of maps.
-func UnmarshalUIMetaMediaSlice(s []interface{}) (slice []UIMetaMedia, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'UIMetaMedia'")
-			return
-		}
-		obj, e := UnmarshalUIMetaMedia(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalUIMetaMediaAsProperty unmarshals an instance of UIMetaMedia that is stored as a property
-// within the specified map.
-func UnmarshalUIMetaMediaAsProperty(m map[string]interface{}, propertyName string) (result *UIMetaMedia, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'UIMetaMedia'", propertyName)
-			return
-		}
-		result, err = UnmarshalUIMetaMedia(objMap)
-	}
-	return
-}
-
-// UnmarshalUIMetaMediaSliceAsProperty unmarshals a slice of UIMetaMedia instances that are stored as a property
-// within the specified map.
-func UnmarshalUIMetaMediaSliceAsProperty(m map[string]interface{}, propertyName string) (slice []UIMetaMedia, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'UIMetaMedia'", propertyName)
-			return
-		}
-		slice, err = UnmarshalUIMetaMediaSlice(vSlice)
-	}
-	return
-}
-
-// URLS : UI based URLs.
-type URLS struct {
-	// URL for documentation.
-	DocURL *string `json:"doc_url,omitempty"`
-
-	// URL for usage instructions.
-	InstructionsURL *string `json:"instructions_url,omitempty"`
-
-	// API URL.
-	ApiURL *string `json:"api_url,omitempty"`
-
-	// URL Creation UI / API.
-	CreateURL *string `json:"create_url,omitempty"`
-
-	// URL to downlaod an SDK.
-	SdkDownloadURL *string `json:"sdk_download_url,omitempty"`
-
-	// URL to the terms of use for your service.
-	TermsURL *string `json:"terms_url,omitempty"`
-
-	// URL to the custom create page for your serivce.
-	CustomCreatePageURL *string `json:"custom_create_page_url,omitempty"`
-
-	// URL to the catalog details page for your serivce.
-	CatalogDetailsURL *string `json:"catalog_details_url,omitempty"`
-
-	// URL for deprecation documentation.
-	DeprecationDocURL *string `json:"deprecation_doc_url,omitempty"`
-}
-
-
-// UnmarshalURLS constructs an instance of URLS from the specified map.
-func UnmarshalURLS(m map[string]interface{}) (result *URLS, err error) {
-	obj := new(URLS)
-	obj.DocURL, err = core.UnmarshalString(m, "doc_url")
-	if err != nil {
-		return
-	}
-	obj.InstructionsURL, err = core.UnmarshalString(m, "instructions_url")
-	if err != nil {
-		return
-	}
-	obj.ApiURL, err = core.UnmarshalString(m, "api_url")
-	if err != nil {
-		return
-	}
-	obj.CreateURL, err = core.UnmarshalString(m, "create_url")
-	if err != nil {
-		return
-	}
-	obj.SdkDownloadURL, err = core.UnmarshalString(m, "sdk_download_url")
-	if err != nil {
-		return
-	}
-	obj.TermsURL, err = core.UnmarshalString(m, "terms_url")
-	if err != nil {
-		return
-	}
-	obj.CustomCreatePageURL, err = core.UnmarshalString(m, "custom_create_page_url")
-	if err != nil {
-		return
-	}
-	obj.CatalogDetailsURL, err = core.UnmarshalString(m, "catalog_details_url")
-	if err != nil {
-		return
-	}
-	obj.DeprecationDocURL, err = core.UnmarshalString(m, "deprecation_doc_url")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalURLSSlice unmarshals a slice of URLS instances from the specified list of maps.
-func UnmarshalURLSSlice(s []interface{}) (slice []URLS, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'URLS'")
-			return
-		}
-		obj, e := UnmarshalURLS(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalURLSAsProperty unmarshals an instance of URLS that is stored as a property
-// within the specified map.
-func UnmarshalURLSAsProperty(m map[string]interface{}, propertyName string) (result *URLS, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'URLS'", propertyName)
-			return
-		}
-		result, err = UnmarshalURLS(objMap)
-	}
-	return
-}
-
-// UnmarshalURLSSliceAsProperty unmarshals a slice of URLS instances that are stored as a property
-// within the specified map.
-func UnmarshalURLSSliceAsProperty(m map[string]interface{}, propertyName string) (slice []URLS, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'URLS'", propertyName)
-			return
-		}
-		slice, err = UnmarshalURLSSlice(vSlice)
-	}
-	return
-}
-
-// UpdateCatalogEntryOptions : The UpdateCatalogEntry options.
-type UpdateCatalogEntryOptions struct {
-	// The object's unique ID.
-	ID *string `json:"id" validate:"required"`
-
-	// Catalog entry's unique ID. It's the same across all catalog instances.
-	NewID *string `json:"new_id" validate:"required"`
-
-	// Programmatic name for this catalog entry, which must be formatted like a CRN segment. See the display name in
-	// OverviewUI for a user-readable name.
-	NewName *string `json:"new_name" validate:"required"`
-
-	// Overview is nested in the top level. The key value pair is `[_language_]overview_ui`.
-	NewOverviewUi *OverviewUI `json:"new_overview_ui" validate:"required"`
-
-	// The type of catalog entry, **service**, **template**, **dashboard**, which determines the type and shape of the
-	// object.
-	NewKind *string `json:"new_kind" validate:"required"`
-
-	// Image annotation for this catalog entry. The image is a URL.
-	NewImages *Image `json:"new_images" validate:"required"`
-
-	// Boolean value that determines the global visibility for the catalog entry, and its children. If it is not enabled,
-	// all plans are disabled.
-	NewDisabled *bool `json:"new_disabled" validate:"required"`
-
-	// A list of tags. For example, IBM, 3rd Party, Beta, GA, and Single Tenant.
-	NewTags []string `json:"new_tags" validate:"required"`
-
-	// A list of tags representing deployment locations, for example, `us-south`, `eu-gb`, `us-south-dal10`.
-	NewGeoTags []string `json:"new_geo_tags" validate:"required"`
-
-	// A list of tags representing pricing types, for example, free lite, subscription, paid only.
-	NewPricingTags []string `json:"new_pricing_tags" validate:"required"`
-
-	// Boolean value that determines whether the catalog entry is a group.
-	NewGroup *bool `json:"new_group" validate:"required"`
-
-	// Information related to the provider associated with a catalog entry.
-	NewProvider *Provider `json:"new_provider" validate:"required"`
-
-	// The cloud resource name of the catalog entry.
-	NewCatalogCrn *string `json:"new_catalog_crn,omitempty"`
-
-	// The catalog URL for the catalog entry.
-	NewURL *string `json:"new_url,omitempty"`
-
-	// The ID of the parent catalog entry if it exists.
-	NewParentID *string `json:"new_parent_id,omitempty"`
-
-	// The catalog URL of child elements for the catalog entry.
-	NewChildrenURL *string `json:"new_children_url,omitempty"`
-
-	// The catalog URL of the parent catalog entry.
-	NewParentURL *string `json:"new_parent_url,omitempty"`
-
-	// The date the catalog entry was created.
-	NewCreated *strfmt.DateTime `json:"new_created,omitempty"`
-
-	// The date the catalog entry was last updated.
-	NewUpdated *strfmt.DateTime `json:"new_updated,omitempty"`
-
-	// Metadata is not returned by default, and includes specific data depending on the object **kind**.
-	NewMetadata *ObjectMetaData `json:"new_metadata,omitempty"`
-
-	// Boolean value that describes whether the service is active.
-	NewActive *bool `json:"new_active,omitempty"`
-
-	// The children of this catalog entry. This is read-only and ignored on put or post. It is filled in when
-	// `?depth=_value_` is used.
-	NewChildren []CatalogEntry `json:"new_children,omitempty"`
-
-	// This changes the scope of the request regardless of the authorization header. Example scopes are `account` and
-	// `global`. `account=global` is reqired if operating with a service ID that has a global admin policy, for example
-	// `GET /?account=global`.
-	Account *string `json:"account,omitempty"`
-
-	// Reparenting object. In the body set the parent_id to a different parent. Or remove the parent_id field to reparent
-	// to the root of the catalog. If this is not set to 'true' then changing the parent_id in the body of the request will
-	// not be permitted. If this is 'true' and no change to parent_id then this is also error. This is to prevent
-	// accidental changing of parent.
-	Move *string `json:"move,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewUpdateCatalogEntryOptions : Instantiate UpdateCatalogEntryOptions
-func (*GlobalCatalogV1) NewUpdateCatalogEntryOptions(id string, newID string, newName string, newOverviewUi *OverviewUI, newKind string, newImages *Image, newDisabled bool, newTags []string, newGeoTags []string, newPricingTags []string, newGroup bool, newProvider *Provider) *UpdateCatalogEntryOptions {
-	return &UpdateCatalogEntryOptions{
-		ID: core.StringPtr(id),
-		NewID: core.StringPtr(newID),
-		NewName: core.StringPtr(newName),
-		NewOverviewUi: newOverviewUi,
-		NewKind: core.StringPtr(newKind),
-		NewImages: newImages,
-		NewDisabled: core.BoolPtr(newDisabled),
-		NewTags: newTags,
-		NewGeoTags: newGeoTags,
-		NewPricingTags: newPricingTags,
-		NewGroup: core.BoolPtr(newGroup),
-		NewProvider: newProvider,
-	}
-}
-
-// SetID : Allow user to set ID
-func (options *UpdateCatalogEntryOptions) SetID(id string) *UpdateCatalogEntryOptions {
-	options.ID = core.StringPtr(id)
-	return options
-}
-
-// SetNewID : Allow user to set NewID
-func (options *UpdateCatalogEntryOptions) SetNewID(newID string) *UpdateCatalogEntryOptions {
-	options.NewID = core.StringPtr(newID)
-	return options
-}
-
-// SetNewName : Allow user to set NewName
-func (options *UpdateCatalogEntryOptions) SetNewName(newName string) *UpdateCatalogEntryOptions {
-	options.NewName = core.StringPtr(newName)
-	return options
-}
-
-// SetNewOverviewUi : Allow user to set NewOverviewUi
-func (options *UpdateCatalogEntryOptions) SetNewOverviewUi(newOverviewUi *OverviewUI) *UpdateCatalogEntryOptions {
-	options.NewOverviewUi = newOverviewUi
-	return options
-}
-
-// SetNewKind : Allow user to set NewKind
-func (options *UpdateCatalogEntryOptions) SetNewKind(newKind string) *UpdateCatalogEntryOptions {
-	options.NewKind = core.StringPtr(newKind)
-	return options
-}
-
-// SetNewImages : Allow user to set NewImages
-func (options *UpdateCatalogEntryOptions) SetNewImages(newImages *Image) *UpdateCatalogEntryOptions {
-	options.NewImages = newImages
-	return options
-}
-
-// SetNewDisabled : Allow user to set NewDisabled
-func (options *UpdateCatalogEntryOptions) SetNewDisabled(newDisabled bool) *UpdateCatalogEntryOptions {
-	options.NewDisabled = core.BoolPtr(newDisabled)
-	return options
-}
-
-// SetNewTags : Allow user to set NewTags
-func (options *UpdateCatalogEntryOptions) SetNewTags(newTags []string) *UpdateCatalogEntryOptions {
-	options.NewTags = newTags
-	return options
-}
-
-// SetNewGeoTags : Allow user to set NewGeoTags
-func (options *UpdateCatalogEntryOptions) SetNewGeoTags(newGeoTags []string) *UpdateCatalogEntryOptions {
-	options.NewGeoTags = newGeoTags
-	return options
-}
-
-// SetNewPricingTags : Allow user to set NewPricingTags
-func (options *UpdateCatalogEntryOptions) SetNewPricingTags(newPricingTags []string) *UpdateCatalogEntryOptions {
-	options.NewPricingTags = newPricingTags
-	return options
-}
-
-// SetNewGroup : Allow user to set NewGroup
-func (options *UpdateCatalogEntryOptions) SetNewGroup(newGroup bool) *UpdateCatalogEntryOptions {
-	options.NewGroup = core.BoolPtr(newGroup)
-	return options
-}
-
-// SetNewProvider : Allow user to set NewProvider
-func (options *UpdateCatalogEntryOptions) SetNewProvider(newProvider *Provider) *UpdateCatalogEntryOptions {
-	options.NewProvider = newProvider
-	return options
-}
-
-// SetNewCatalogCrn : Allow user to set NewCatalogCrn
-func (options *UpdateCatalogEntryOptions) SetNewCatalogCrn(newCatalogCrn string) *UpdateCatalogEntryOptions {
-	options.NewCatalogCrn = core.StringPtr(newCatalogCrn)
-	return options
-}
-
-// SetNewURL : Allow user to set NewURL
-func (options *UpdateCatalogEntryOptions) SetNewURL(newURL string) *UpdateCatalogEntryOptions {
-	options.NewURL = core.StringPtr(newURL)
-	return options
-}
-
-// SetNewParentID : Allow user to set NewParentID
-func (options *UpdateCatalogEntryOptions) SetNewParentID(newParentID string) *UpdateCatalogEntryOptions {
-	options.NewParentID = core.StringPtr(newParentID)
-	return options
-}
-
-// SetNewChildrenURL : Allow user to set NewChildrenURL
-func (options *UpdateCatalogEntryOptions) SetNewChildrenURL(newChildrenURL string) *UpdateCatalogEntryOptions {
-	options.NewChildrenURL = core.StringPtr(newChildrenURL)
-	return options
-}
-
-// SetNewParentURL : Allow user to set NewParentURL
-func (options *UpdateCatalogEntryOptions) SetNewParentURL(newParentURL string) *UpdateCatalogEntryOptions {
-	options.NewParentURL = core.StringPtr(newParentURL)
-	return options
-}
-
-// SetNewCreated : Allow user to set NewCreated
-func (options *UpdateCatalogEntryOptions) SetNewCreated(newCreated *strfmt.DateTime) *UpdateCatalogEntryOptions {
-	options.NewCreated = newCreated
-	return options
-}
-
-// SetNewUpdated : Allow user to set NewUpdated
-func (options *UpdateCatalogEntryOptions) SetNewUpdated(newUpdated *strfmt.DateTime) *UpdateCatalogEntryOptions {
-	options.NewUpdated = newUpdated
-	return options
-}
-
-// SetNewMetadata : Allow user to set NewMetadata
-func (options *UpdateCatalogEntryOptions) SetNewMetadata(newMetadata *ObjectMetaData) *UpdateCatalogEntryOptions {
-	options.NewMetadata = newMetadata
-	return options
-}
-
-// SetNewActive : Allow user to set NewActive
-func (options *UpdateCatalogEntryOptions) SetNewActive(newActive bool) *UpdateCatalogEntryOptions {
-	options.NewActive = core.BoolPtr(newActive)
-	return options
-}
-
-// SetNewChildren : Allow user to set NewChildren
-func (options *UpdateCatalogEntryOptions) SetNewChildren(newChildren []CatalogEntry) *UpdateCatalogEntryOptions {
-	options.NewChildren = newChildren
-	return options
-}
-
-// SetAccount : Allow user to set Account
-func (options *UpdateCatalogEntryOptions) SetAccount(account string) *UpdateCatalogEntryOptions {
-	options.Account = core.StringPtr(account)
-	return options
-}
-
-// SetMove : Allow user to set Move
-func (options *UpdateCatalogEntryOptions) SetMove(move string) *UpdateCatalogEntryOptions {
-	options.Move = core.StringPtr(move)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *UpdateCatalogEntryOptions) SetHeaders(param map[string]string) *UpdateCatalogEntryOptions {
-	options.Headers = param
-	return options
-}
-
-// UpdateVisibilityOptions : The UpdateVisibility options.
-type UpdateVisibilityOptions struct {
-	// The object's unique ID.
-	ID *string `json:"id" validate:"required"`
-
-	// This controls the overall visibility. It is an enum of *public*, *ibm_only*, and *private*. public means it is
-	// visible to all. ibm_only means it is visible to all IBM unless their account is explicitly excluded. private means
-	// it is visible only to the included accounts.
-	Restrictions *string `json:"restrictions,omitempty"`
-
-	// IAM Scope-related information associated with a catalog entry.
-	Owner *Scope `json:"owner,omitempty"`
-
-	// Visibility details related to a catalog entry.
-	Include *VisibilityDetail `json:"include,omitempty"`
-
-	// Visibility details related to a catalog entry.
-	Exclude *VisibilityDetail `json:"exclude,omitempty"`
-
-	// Determines whether the owning account has full control over the visibility of the entry such as adding non-IBM
-	// accounts to the whitelist and making entries `private`, `ibm_only` or `public`.
-	Approved *bool `json:"approved,omitempty"`
-
-	// This changes the scope of the request regardless of the authorization header. Example scopes are `account` and
-	// `global`. `account=global` is reqired if operating with a service ID that has a global admin policy, for example
-	// `GET /?account=global`.
-	Account *string `json:"account,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewUpdateVisibilityOptions : Instantiate UpdateVisibilityOptions
-func (*GlobalCatalogV1) NewUpdateVisibilityOptions(id string) *UpdateVisibilityOptions {
-	return &UpdateVisibilityOptions{
-		ID: core.StringPtr(id),
-	}
-}
-
-// SetID : Allow user to set ID
-func (options *UpdateVisibilityOptions) SetID(id string) *UpdateVisibilityOptions {
-	options.ID = core.StringPtr(id)
-	return options
-}
-
-// SetRestrictions : Allow user to set Restrictions
-func (options *UpdateVisibilityOptions) SetRestrictions(restrictions string) *UpdateVisibilityOptions {
-	options.Restrictions = core.StringPtr(restrictions)
-	return options
-}
-
-// SetOwner : Allow user to set Owner
-func (options *UpdateVisibilityOptions) SetOwner(owner *Scope) *UpdateVisibilityOptions {
-	options.Owner = owner
-	return options
-}
-
-// SetInclude : Allow user to set Include
-func (options *UpdateVisibilityOptions) SetInclude(include *VisibilityDetail) *UpdateVisibilityOptions {
-	options.Include = include
-	return options
-}
-
-// SetExclude : Allow user to set Exclude
-func (options *UpdateVisibilityOptions) SetExclude(exclude *VisibilityDetail) *UpdateVisibilityOptions {
-	options.Exclude = exclude
-	return options
-}
-
-// SetApproved : Allow user to set Approved
-func (options *UpdateVisibilityOptions) SetApproved(approved bool) *UpdateVisibilityOptions {
-	options.Approved = core.BoolPtr(approved)
-	return options
-}
-
-// SetAccount : Allow user to set Account
-func (options *UpdateVisibilityOptions) SetAccount(account string) *UpdateVisibilityOptions {
-	options.Account = core.StringPtr(account)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *UpdateVisibilityOptions) SetHeaders(param map[string]string) *UpdateVisibilityOptions {
-	options.Headers = param
-	return options
-}
-
-// UploadArtifactOptions : The UploadArtifact options.
-type UploadArtifactOptions struct {
-	// The object's unique ID.
-	ObjectID *string `json:"object_id" validate:"required"`
-
-	// The artifact's ID.
-	ArtifactID *string `json:"artifact_id" validate:"required"`
-
-	// This changes the scope of the request regardless of the authorization header. Example scopes are `account` and
-	// `global`. `account=global` is reqired if operating with a service ID that has a global admin policy, for example
-	// `GET /?account=global`.
-	Account *string `json:"account,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewUploadArtifactOptions : Instantiate UploadArtifactOptions
-func (*GlobalCatalogV1) NewUploadArtifactOptions(objectID string, artifactID string) *UploadArtifactOptions {
-	return &UploadArtifactOptions{
-		ObjectID: core.StringPtr(objectID),
-		ArtifactID: core.StringPtr(artifactID),
-	}
-}
-
-// SetObjectID : Allow user to set ObjectID
-func (options *UploadArtifactOptions) SetObjectID(objectID string) *UploadArtifactOptions {
-	options.ObjectID = core.StringPtr(objectID)
-	return options
-}
-
-// SetArtifactID : Allow user to set ArtifactID
-func (options *UploadArtifactOptions) SetArtifactID(artifactID string) *UploadArtifactOptions {
-	options.ArtifactID = core.StringPtr(artifactID)
-	return options
-}
-
-// SetAccount : Allow user to set Account
-func (options *UploadArtifactOptions) SetAccount(account string) *UploadArtifactOptions {
-	options.Account = core.StringPtr(account)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *UploadArtifactOptions) SetHeaders(param map[string]string) *UploadArtifactOptions {
-	options.Headers = param
-	return options
-}
-
-// Visibility : Information related to the visibility of a catalog entry.
-type Visibility struct {
-	// This controls the overall visibility. It is an enum of *public*, *ibm_only*, and *private*. public means it is
-	// visible to all. ibm_only means it is visible to all IBM unless their account is explicitly excluded. private means
-	// it is visible only to the included accounts.
-	Restrictions *string `json:"restrictions,omitempty"`
-
-	// IAM Scope-related information associated with a catalog entry.
-	Owner *Scope `json:"owner,omitempty"`
-
-	// Visibility details related to a catalog entry.
-	Include *VisibilityDetail `json:"include,omitempty"`
-
-	// Visibility details related to a catalog entry.
-	Exclude *VisibilityDetail `json:"exclude,omitempty"`
-
-	// Determines whether the owning account has full control over the visibility of the entry such as adding non-IBM
-	// accounts to the whitelist and making entries `private`, `ibm_only` or `public`.
-	Approved *bool `json:"approved,omitempty"`
-}
-
-
-// UnmarshalVisibility constructs an instance of Visibility from the specified map.
-func UnmarshalVisibility(m map[string]interface{}) (result *Visibility, err error) {
-	obj := new(Visibility)
-	obj.Restrictions, err = core.UnmarshalString(m, "restrictions")
-	if err != nil {
-		return
-	}
-	obj.Owner, err = UnmarshalScopeAsProperty(m, "owner")
-	if err != nil {
-		return
-	}
-	obj.Include, err = UnmarshalVisibilityDetailAsProperty(m, "include")
-	if err != nil {
-		return
-	}
-	obj.Exclude, err = UnmarshalVisibilityDetailAsProperty(m, "exclude")
-	if err != nil {
-		return
-	}
-	obj.Approved, err = core.UnmarshalBool(m, "approved")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalVisibilitySlice unmarshals a slice of Visibility instances from the specified list of maps.
-func UnmarshalVisibilitySlice(s []interface{}) (slice []Visibility, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'Visibility'")
-			return
-		}
-		obj, e := UnmarshalVisibility(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalVisibilityAsProperty unmarshals an instance of Visibility that is stored as a property
-// within the specified map.
-func UnmarshalVisibilityAsProperty(m map[string]interface{}, propertyName string) (result *Visibility, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'Visibility'", propertyName)
-			return
-		}
-		result, err = UnmarshalVisibility(objMap)
-	}
-	return
-}
-
-// UnmarshalVisibilitySliceAsProperty unmarshals a slice of Visibility instances that are stored as a property
-// within the specified map.
-func UnmarshalVisibilitySliceAsProperty(m map[string]interface{}, propertyName string) (slice []Visibility, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'Visibility'", propertyName)
-			return
-		}
-		slice, err = UnmarshalVisibilitySlice(vSlice)
-	}
-	return
-}
-
-// VisibilityDetail : Visibility details related to a catalog entry.
-type VisibilityDetail struct {
-	// Information related to the accounts for which a catalog entry is visible.
-	Accounts *VisibilityDetailAccounts `json:"accounts" validate:"required"`
-}
-
-
-// NewVisibilityDetail : Instantiate VisibilityDetail (Generic Model Constructor)
-func (*GlobalCatalogV1) NewVisibilityDetail(accounts *VisibilityDetailAccounts) (model *VisibilityDetail, err error) {
-	model = &VisibilityDetail{
-		Accounts: accounts,
-	}
-	err = core.ValidateStruct(model, "required parameters")
-	return
-}
-
-// UnmarshalVisibilityDetail constructs an instance of VisibilityDetail from the specified map.
-func UnmarshalVisibilityDetail(m map[string]interface{}) (result *VisibilityDetail, err error) {
-	obj := new(VisibilityDetail)
-	obj.Accounts, err = UnmarshalVisibilityDetailAccountsAsProperty(m, "accounts")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalVisibilityDetailSlice unmarshals a slice of VisibilityDetail instances from the specified list of maps.
-func UnmarshalVisibilityDetailSlice(s []interface{}) (slice []VisibilityDetail, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'VisibilityDetail'")
-			return
-		}
-		obj, e := UnmarshalVisibilityDetail(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalVisibilityDetailAsProperty unmarshals an instance of VisibilityDetail that is stored as a property
-// within the specified map.
-func UnmarshalVisibilityDetailAsProperty(m map[string]interface{}, propertyName string) (result *VisibilityDetail, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'VisibilityDetail'", propertyName)
-			return
-		}
-		result, err = UnmarshalVisibilityDetail(objMap)
-	}
-	return
-}
-
-// UnmarshalVisibilityDetailSliceAsProperty unmarshals a slice of VisibilityDetail instances that are stored as a property
-// within the specified map.
-func UnmarshalVisibilityDetailSliceAsProperty(m map[string]interface{}, propertyName string) (slice []VisibilityDetail, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'VisibilityDetail'", propertyName)
-			return
-		}
-		slice, err = UnmarshalVisibilityDetailSlice(vSlice)
-	}
-	return
-}
-
-// VisibilityDetailAccounts : Information related to the accounts for which a catalog entry is visible.
-type VisibilityDetailAccounts struct {
-	// (_accountid_) is the GUID of the account and the value is the scope of who set it. For setting visibility use "" as
-	// the value. It is replaced with the owner scope when saved.
-	Accountid *string `json:"_accountid_,omitempty"`
-}
-
-
-// UnmarshalVisibilityDetailAccounts constructs an instance of VisibilityDetailAccounts from the specified map.
-func UnmarshalVisibilityDetailAccounts(m map[string]interface{}) (result *VisibilityDetailAccounts, err error) {
-	obj := new(VisibilityDetailAccounts)
-	obj.Accountid, err = core.UnmarshalString(m, "_accountid_")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalVisibilityDetailAccountsSlice unmarshals a slice of VisibilityDetailAccounts instances from the specified list of maps.
-func UnmarshalVisibilityDetailAccountsSlice(s []interface{}) (slice []VisibilityDetailAccounts, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'VisibilityDetailAccounts'")
-			return
-		}
-		obj, e := UnmarshalVisibilityDetailAccounts(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalVisibilityDetailAccountsAsProperty unmarshals an instance of VisibilityDetailAccounts that is stored as a property
-// within the specified map.
-func UnmarshalVisibilityDetailAccountsAsProperty(m map[string]interface{}, propertyName string) (result *VisibilityDetailAccounts, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'VisibilityDetailAccounts'", propertyName)
-			return
-		}
-		result, err = UnmarshalVisibilityDetailAccounts(objMap)
-	}
-	return
-}
-
-// UnmarshalVisibilityDetailAccountsSliceAsProperty unmarshals a slice of VisibilityDetailAccounts instances that are stored as a property
-// within the specified map.
-func UnmarshalVisibilityDetailAccountsSliceAsProperty(m map[string]interface{}, propertyName string) (slice []VisibilityDetailAccounts, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'VisibilityDetailAccounts'", propertyName)
-			return
-		}
-		slice, err = UnmarshalVisibilityDetailAccountsSlice(vSlice)
-	}
-	return
-}
diff --git a/globalcatalogv1/global_catalog_v1_suite_test.go b/globalcatalogv1/global_catalog_v1_suite_test.go
deleted file mode 100644
index 2294e413..00000000
--- a/globalcatalogv1/global_catalog_v1_suite_test.go
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * (C) Copyright IBM Corp. 2020.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package globalcatalogv1_test
-
-import (
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-	"testing"
-)
-
-func TestGlobalCatalogV1(t *testing.T) {
-	RegisterFailHandler(Fail)
-	RunSpecs(t, "GlobalCatalogV1 Suite")
-}
diff --git a/globalcatalogv1/global_catalog_v1_test.go b/globalcatalogv1/global_catalog_v1_test.go
deleted file mode 100644
index 4ae76489..00000000
--- a/globalcatalogv1/global_catalog_v1_test.go
+++ /dev/null
@@ -1,1413 +0,0 @@
-/**
- * (C) Copyright IBM Corp. 2020.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package globalcatalogv1_test
-
-import (
-	"bytes"
-	"fmt"
-	"github.com/IBM/go-sdk-core/v3/core"
-	"github.com/go-openapi/strfmt"
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-	"github.ibm.com/ibmcloud/platform-services-go-sdk/globalcatalogv1"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"net/http/httptest"
-	"time"
-)
-
-var _ = Describe(`GlobalCatalogV1`, func() {
-	Describe(`ListCatalogEntries(listCatalogEntriesOptions *ListCatalogEntriesOptions)`, func() {
-		listCatalogEntriesPath := "/"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(listCatalogEntriesPath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.URL.Query()["account"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["include"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["q"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["sort-by"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["descending"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["languages"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["complete"]).To(Equal([]string{"testString"}))
-
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"page": "Page", "results_per_page": "ResultsPerPage", "total_results": "TotalResults", "resources": [{"anyKey": "anyValue"}]}`)
-			}))
-			It(`Invoke ListCatalogEntries successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := globalcatalogv1.NewGlobalCatalogV1(&globalcatalogv1.GlobalCatalogV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.ListCatalogEntries(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the ListCatalogEntriesOptions model
-				listCatalogEntriesOptionsModel := new(globalcatalogv1.ListCatalogEntriesOptions)
-				listCatalogEntriesOptionsModel.Account = core.StringPtr("testString")
-				listCatalogEntriesOptionsModel.Include = core.StringPtr("testString")
-				listCatalogEntriesOptionsModel.Q = core.StringPtr("testString")
-				listCatalogEntriesOptionsModel.SortBy = core.StringPtr("testString")
-				listCatalogEntriesOptionsModel.Descending = core.StringPtr("testString")
-				listCatalogEntriesOptionsModel.Languages = core.StringPtr("testString")
-				listCatalogEntriesOptionsModel.Complete = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.ListCatalogEntries(listCatalogEntriesOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`CreateCatalogEntry(createCatalogEntryOptions *CreateCatalogEntryOptions)`, func() {
-		createCatalogEntryPath := "/"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(createCatalogEntryPath))
-				Expect(req.Method).To(Equal("POST"))
-				Expect(req.URL.Query()["account"]).To(Equal([]string{"testString"}))
-
-				res.WriteHeader(201)
-			}))
-			It(`Invoke CreateCatalogEntry successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := globalcatalogv1.NewGlobalCatalogV1(&globalcatalogv1.GlobalCatalogV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				response, operationErr := testService.CreateCatalogEntry(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-
-				// Construct an instance of the Bullets model
-				bulletsModel := new(globalcatalogv1.Bullets)
-				bulletsModel.Title = core.StringPtr("testString")
-				bulletsModel.Description = core.StringPtr("testString")
-				bulletsModel.Icon = core.StringPtr("testString")
-				bulletsModel.Quantity = core.StringPtr("testString")
-
-				// Construct an instance of the Price model
-				priceModel := new(globalcatalogv1.Price)
-				priceModel.QuantityTier = core.Int64Ptr(int64(38))
-				priceModel.Price = core.Float64Ptr(72.5)
-
-				// Construct an instance of the UIMetaMedia model
-				uiMetaMediaModel := new(globalcatalogv1.UIMetaMedia)
-				uiMetaMediaModel.Caption = core.StringPtr("testString")
-				uiMetaMediaModel.ThumbnailURL = core.StringPtr("testString")
-				uiMetaMediaModel.Type = core.StringPtr("testString")
-				uiMetaMediaModel.URL = core.StringPtr("testString")
-				uiMetaMediaModel.Source = bulletsModel
-
-				// Construct an instance of the Amount model
-				amountModel := new(globalcatalogv1.Amount)
-				amountModel.Counrty = core.StringPtr("testString")
-				amountModel.Currency = core.StringPtr("testString")
-				amountModel.Prices = []globalcatalogv1.Price{*priceModel}
-
-				// Construct an instance of the ObjectMetaDataDeploymentBrokerPassword model
-				objectMetaDataDeploymentBrokerPasswordModel := new(globalcatalogv1.ObjectMetaDataDeploymentBrokerPassword)
-				objectMetaDataDeploymentBrokerPasswordModel.Text = core.StringPtr("testString")
-				objectMetaDataDeploymentBrokerPasswordModel.Key = core.StringPtr("testString")
-				objectMetaDataDeploymentBrokerPasswordModel.Iv = core.StringPtr("testString")
-
-				// Construct an instance of the Strings model
-				stringsModel := new(globalcatalogv1.Strings)
-				stringsModel.Bullets = []globalcatalogv1.Bullets{*bulletsModel}
-				stringsModel.Media = []globalcatalogv1.UIMetaMedia{*uiMetaMediaModel}
-				stringsModel.NotCreatableMsg = core.StringPtr("testString")
-				stringsModel.NotCreatableRobotMsg = core.StringPtr("testString")
-				stringsModel.DeprecationWarning = core.StringPtr("testString")
-				stringsModel.PopupWarningMessage = core.StringPtr("testString")
-				stringsModel.Instruction = core.StringPtr("testString")
-
-				// Construct an instance of the I18N model
-				i18NModel := new(globalcatalogv1.I18N)
-				i18NModel.Language = stringsModel
-
-				// Construct an instance of the Metrics model
-				metricsModel := new(globalcatalogv1.Metrics)
-				metricsModel.MetricID = core.StringPtr("testString")
-				metricsModel.TierModel = core.StringPtr("testString")
-				metricsModel.ChargeUnitName = core.StringPtr("testString")
-				metricsModel.ChargeUnitQuantity = core.StringPtr("testString")
-				metricsModel.ResourceDisplayName = core.StringPtr("testString")
-				metricsModel.ChargeUnitDisplayName = core.StringPtr("testString")
-				metricsModel.UsageCapQty = core.Int64Ptr(int64(38))
-				metricsModel.Amounts = []globalcatalogv1.Amount{*amountModel}
-
-				// Construct an instance of the ObjectMetaDataDeploymentBroker model
-				objectMetaDataDeploymentBrokerModel := new(globalcatalogv1.ObjectMetaDataDeploymentBroker)
-				objectMetaDataDeploymentBrokerModel.Name = core.StringPtr("testString")
-				objectMetaDataDeploymentBrokerModel.Guid = core.StringPtr("testString")
-				objectMetaDataDeploymentBrokerModel.Password = objectMetaDataDeploymentBrokerPasswordModel
-
-				// Construct an instance of the ObjectMetaDataSlaDr model
-				objectMetaDataSlaDrModel := new(globalcatalogv1.ObjectMetaDataSlaDr)
-				objectMetaDataSlaDrModel.Dr = core.BoolPtr(true)
-				objectMetaDataSlaDrModel.Description = core.StringPtr("testString")
-
-				// Construct an instance of the ObjectMetaDataTemplateEnvironmentVariables model
-				objectMetaDataTemplateEnvironmentVariablesModel := new(globalcatalogv1.ObjectMetaDataTemplateEnvironmentVariables)
-				objectMetaDataTemplateEnvironmentVariablesModel.Key = core.StringPtr("testString")
-
-				// Construct an instance of the ObjectMetaDataTemplateSource model
-				objectMetaDataTemplateSourceModel := new(globalcatalogv1.ObjectMetaDataTemplateSource)
-				objectMetaDataTemplateSourceModel.Path = core.StringPtr("testString")
-				objectMetaDataTemplateSourceModel.Type = core.StringPtr("testString")
-				objectMetaDataTemplateSourceModel.URL = core.StringPtr("testString")
-
-				// Construct an instance of the StartingPrice model
-				startingPriceModel := new(globalcatalogv1.StartingPrice)
-				startingPriceModel.PlanID = core.StringPtr("testString")
-				startingPriceModel.DeploymentID = core.StringPtr("testString")
-				startingPriceModel.Amount = []globalcatalogv1.Amount{*amountModel}
-
-				// Construct an instance of the URLS model
-				urlsModel := new(globalcatalogv1.URLS)
-				urlsModel.DocURL = core.StringPtr("testString")
-				urlsModel.InstructionsURL = core.StringPtr("testString")
-				urlsModel.ApiURL = core.StringPtr("testString")
-				urlsModel.CreateURL = core.StringPtr("testString")
-				urlsModel.SdkDownloadURL = core.StringPtr("testString")
-				urlsModel.TermsURL = core.StringPtr("testString")
-				urlsModel.CustomCreatePageURL = core.StringPtr("testString")
-				urlsModel.CatalogDetailsURL = core.StringPtr("testString")
-				urlsModel.DeprecationDocURL = core.StringPtr("testString")
-
-				// Construct an instance of the Callbacks model
-				callbacksModel := new(globalcatalogv1.Callbacks)
-				callbacksModel.BrokerUtl = core.StringPtr("testString")
-				callbacksModel.BrokerProxyURL = core.StringPtr("testString")
-				callbacksModel.DashboardURL = core.StringPtr("testString")
-				callbacksModel.DashboardDataURL = core.StringPtr("testString")
-				callbacksModel.DashboardDetailTabURL = core.StringPtr("testString")
-				callbacksModel.DashboardDetailTabExtURL = core.StringPtr("testString")
-				callbacksModel.ServiceMonitorApi = core.StringPtr("testString")
-				callbacksModel.ServiceMonitorApp = core.StringPtr("testString")
-				callbacksModel.ServiceStagingURL = core.StringPtr("testString")
-				callbacksModel.ServiceProductionURL = core.StringPtr("testString")
-
-				// Construct an instance of the ObjectMetaDataAlias model
-				objectMetaDataAliasModel := new(globalcatalogv1.ObjectMetaDataAlias)
-				objectMetaDataAliasModel.Type = core.StringPtr("testString")
-				objectMetaDataAliasModel.PlanID = core.StringPtr("testString")
-
-				// Construct an instance of the ObjectMetaDataDeployment model
-				objectMetaDataDeploymentModel := new(globalcatalogv1.ObjectMetaDataDeployment)
-				objectMetaDataDeploymentModel.Location = core.StringPtr("testString")
-				objectMetaDataDeploymentModel.LocationURL = core.StringPtr("testString")
-				objectMetaDataDeploymentModel.TargetCrn = core.StringPtr("testString")
-				objectMetaDataDeploymentModel.Broker = objectMetaDataDeploymentBrokerModel
-				objectMetaDataDeploymentModel.SupportsRcMigration = core.BoolPtr(true)
-
-				// Construct an instance of the ObjectMetaDataPlan model
-				objectMetaDataPlanModel := new(globalcatalogv1.ObjectMetaDataPlan)
-				objectMetaDataPlanModel.Bindable = core.BoolPtr(true)
-				objectMetaDataPlanModel.Reservable = core.BoolPtr(true)
-				objectMetaDataPlanModel.AllowInternalUsers = core.BoolPtr(true)
-				objectMetaDataPlanModel.AsyncProvisioningSupported = core.BoolPtr(true)
-				objectMetaDataPlanModel.AsyncUnprovisioningSupported = core.BoolPtr(true)
-				objectMetaDataPlanModel.TestCheckInterval = core.Int64Ptr(int64(38))
-				objectMetaDataPlanModel.SingleScopeInstance = core.StringPtr("testString")
-				objectMetaDataPlanModel.ServiceCheckEnabled = core.BoolPtr(true)
-				objectMetaDataPlanModel.CfGuid = core.StringPtr("testString")
-
-				// Construct an instance of the ObjectMetaDataService model
-				objectMetaDataServiceModel := new(globalcatalogv1.ObjectMetaDataService)
-				objectMetaDataServiceModel.Type = core.StringPtr("testString")
-				objectMetaDataServiceModel.IamCompatible = core.BoolPtr(true)
-				objectMetaDataServiceModel.UniqueApiKey = core.BoolPtr(true)
-				objectMetaDataServiceModel.Provisionable = core.BoolPtr(true)
-				objectMetaDataServiceModel.AsyncProvisioningSupported = core.BoolPtr(true)
-				objectMetaDataServiceModel.AsyncUnprovisioningSupported = core.BoolPtr(true)
-				objectMetaDataServiceModel.CfGuid = core.StringPtr("testString")
-				objectMetaDataServiceModel.Bindable = core.BoolPtr(true)
-				objectMetaDataServiceModel.Requires = []string{"testString"}
-				objectMetaDataServiceModel.PlanUpdateable = core.BoolPtr(true)
-				objectMetaDataServiceModel.State = core.StringPtr("testString")
-				objectMetaDataServiceModel.ServiceCheckEnabled = core.BoolPtr(true)
-				objectMetaDataServiceModel.TestCheckInterval = core.Int64Ptr(int64(38))
-				objectMetaDataServiceModel.ServiceKeySupported = core.BoolPtr(true)
-
-				// Construct an instance of the ObjectMetaDataSla model
-				objectMetaDataSlaModel := new(globalcatalogv1.ObjectMetaDataSla)
-				objectMetaDataSlaModel.Terms = core.StringPtr("testString")
-				objectMetaDataSlaModel.Tenancy = core.StringPtr("testString")
-				objectMetaDataSlaModel.Provisioning = core.StringPtr("testString")
-				objectMetaDataSlaModel.Responsiveness = core.StringPtr("testString")
-				objectMetaDataSlaModel.Dr = objectMetaDataSlaDrModel
-
-				// Construct an instance of the ObjectMetaDataTemplate model
-				objectMetaDataTemplateModel := new(globalcatalogv1.ObjectMetaDataTemplate)
-				objectMetaDataTemplateModel.Services = []string{"testString"}
-				objectMetaDataTemplateModel.DefaultMemory = core.Int64Ptr(int64(38))
-				objectMetaDataTemplateModel.StartCmd = core.StringPtr("testString")
-				objectMetaDataTemplateModel.Source = objectMetaDataTemplateSourceModel
-				objectMetaDataTemplateModel.RuntimeCatalogID = core.StringPtr("testString")
-				objectMetaDataTemplateModel.CfRuntimeID = core.StringPtr("testString")
-				objectMetaDataTemplateModel.TemplateID = core.StringPtr("testString")
-				objectMetaDataTemplateModel.ExecutableFile = core.StringPtr("testString")
-				objectMetaDataTemplateModel.Buildpack = core.StringPtr("testString")
-				objectMetaDataTemplateModel.EnvironmentVariables = objectMetaDataTemplateEnvironmentVariablesModel
-
-				// Construct an instance of the Overview model
-				overviewModel := new(globalcatalogv1.Overview)
-				overviewModel.DisplayName = core.StringPtr("testString")
-				overviewModel.LongDescription = core.StringPtr("testString")
-				overviewModel.Description = core.StringPtr("testString")
-
-				// Construct an instance of the Pricing model
-				pricingModel := new(globalcatalogv1.Pricing)
-				pricingModel.Type = core.StringPtr("testString")
-				pricingModel.Origin = core.StringPtr("testString")
-				pricingModel.StartingPrice = startingPriceModel
-				pricingModel.Metrics = []globalcatalogv1.Metrics{*metricsModel}
-
-				// Construct an instance of the UIMetaData model
-				uiMetaDataModel := new(globalcatalogv1.UIMetaData)
-				uiMetaDataModel.Strings = i18NModel
-				uiMetaDataModel.Urls = urlsModel
-				uiMetaDataModel.EmbeddableDashboard = core.StringPtr("testString")
-				uiMetaDataModel.EmbeddableDashboardFullWidth = core.BoolPtr(true)
-				uiMetaDataModel.NavigationOrder = []string{"testString"}
-				uiMetaDataModel.NotCreatable = core.BoolPtr(true)
-				uiMetaDataModel.Reservable = core.BoolPtr(true)
-				uiMetaDataModel.PrimaryOfferingID = core.StringPtr("testString")
-				uiMetaDataModel.AccessibleDuringProvision = core.BoolPtr(true)
-				uiMetaDataModel.SideBySideIndex = core.Int64Ptr(int64(38))
-				uiMetaDataModel.EndOfServiceTime = CreateMockDateTime()
-
-				// Construct an instance of the Image model
-				imageModel := new(globalcatalogv1.Image)
-				imageModel.Image = core.StringPtr("testString")
-				imageModel.SmallImage = core.StringPtr("testString")
-				imageModel.MediumImage = core.StringPtr("testString")
-				imageModel.FeatureImage = core.StringPtr("testString")
-
-				// Construct an instance of the ObjectMetaData model
-				objectMetaDataModel := new(globalcatalogv1.ObjectMetaData)
-				objectMetaDataModel.RcCompatible = core.BoolPtr(true)
-				objectMetaDataModel.Ui = uiMetaDataModel
-				objectMetaDataModel.Pricing = pricingModel
-				objectMetaDataModel.Compliance = []string{"testString"}
-				objectMetaDataModel.Service = objectMetaDataServiceModel
-				objectMetaDataModel.Plan = objectMetaDataPlanModel
-				objectMetaDataModel.Template = objectMetaDataTemplateModel
-				objectMetaDataModel.Deployment = objectMetaDataDeploymentModel
-				objectMetaDataModel.Alias = objectMetaDataAliasModel
-				objectMetaDataModel.Sla = objectMetaDataSlaModel
-				objectMetaDataModel.Callbacks = callbacksModel
-				objectMetaDataModel.Version = core.StringPtr("testString")
-				objectMetaDataModel.OriginName = core.StringPtr("testString")
-				objectMetaDataModel.Other = CreateMockMap()
-
-				// Construct an instance of the OverviewUI model
-				overviewUiModel := new(globalcatalogv1.OverviewUI)
-				overviewUiModel.Language = overviewModel
-
-				// Construct an instance of the Provider model
-				providerModel := new(globalcatalogv1.Provider)
-				providerModel.Email = core.StringPtr("testString")
-				providerModel.Name = core.StringPtr("testString")
-				providerModel.Contact = core.StringPtr("testString")
-				providerModel.SupportEmail = core.StringPtr("testString")
-				providerModel.Phone = core.StringPtr("testString")
-
-				// Construct an instance of the CatalogEntry model
-				catalogEntryModel := new(globalcatalogv1.CatalogEntry)
-				catalogEntryModel.ID = core.StringPtr("testString")
-				catalogEntryModel.CatalogCrn = core.StringPtr("testString")
-				catalogEntryModel.URL = core.StringPtr("testString")
-				catalogEntryModel.Name = core.StringPtr("testString")
-				catalogEntryModel.OverviewUi = overviewUiModel
-				catalogEntryModel.Kind = core.StringPtr("testString")
-				catalogEntryModel.Images = imageModel
-				catalogEntryModel.ParentID = core.StringPtr("testString")
-				catalogEntryModel.ChildrenURL = core.StringPtr("testString")
-				catalogEntryModel.ParentURL = core.StringPtr("testString")
-				catalogEntryModel.Disabled = core.BoolPtr(true)
-				catalogEntryModel.Tags = []string{"testString"}
-				catalogEntryModel.GeoTags = []string{"testString"}
-				catalogEntryModel.PricingTags = []string{"testString"}
-				catalogEntryModel.Group = core.BoolPtr(true)
-				catalogEntryModel.Provider = providerModel
-				catalogEntryModel.Created = CreateMockDateTime()
-				catalogEntryModel.Updated = CreateMockDateTime()
-				catalogEntryModel.Metadata = objectMetaDataModel
-				catalogEntryModel.Active = core.BoolPtr(true)
-
-				// Construct an instance of the CreateCatalogEntryOptions model
-				createCatalogEntryOptionsModel := new(globalcatalogv1.CreateCatalogEntryOptions)
-				createCatalogEntryOptionsModel.ID = core.StringPtr("testString")
-				createCatalogEntryOptionsModel.Name = core.StringPtr("testString")
-				createCatalogEntryOptionsModel.OverviewUi = overviewUiModel
-				createCatalogEntryOptionsModel.Kind = core.StringPtr("testString")
-				createCatalogEntryOptionsModel.Images = imageModel
-				createCatalogEntryOptionsModel.Disabled = core.BoolPtr(true)
-				createCatalogEntryOptionsModel.Tags = []string{"testString"}
-				createCatalogEntryOptionsModel.GeoTags = []string{"testString"}
-				createCatalogEntryOptionsModel.PricingTags = []string{"testString"}
-				createCatalogEntryOptionsModel.Group = core.BoolPtr(true)
-				createCatalogEntryOptionsModel.Provider = providerModel
-				createCatalogEntryOptionsModel.CatalogCrn = core.StringPtr("testString")
-				createCatalogEntryOptionsModel.URL = core.StringPtr("testString")
-				createCatalogEntryOptionsModel.ParentID = core.StringPtr("testString")
-				createCatalogEntryOptionsModel.ChildrenURL = core.StringPtr("testString")
-				createCatalogEntryOptionsModel.ParentURL = core.StringPtr("testString")
-				createCatalogEntryOptionsModel.Created = CreateMockDateTime()
-				createCatalogEntryOptionsModel.Updated = CreateMockDateTime()
-				createCatalogEntryOptionsModel.Metadata = objectMetaDataModel
-				createCatalogEntryOptionsModel.Active = core.BoolPtr(true)
-				createCatalogEntryOptionsModel.Children = []globalcatalogv1.CatalogEntry{*catalogEntryModel}
-				createCatalogEntryOptionsModel.Account = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				response, operationErr = testService.CreateCatalogEntry(createCatalogEntryOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`GetCatalogEntry(getCatalogEntryOptions *GetCatalogEntryOptions)`, func() {
-		getCatalogEntryPath := "/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(getCatalogEntryPath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.URL.Query()["account"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["include"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["languages"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["complete"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["depth"]).To(Equal([]string{fmt.Sprint(int64(38))}))
-
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"id": "ID", "catalog_crn": "CatalogCrn", "url": "URL", "name": "Name", "overview_ui": {"_language_": {"display_name": "DisplayName", "long_description": "LongDescription", "description": "Description"}}, "kind": "Kind", "images": {"image": "Image", "small_image": "SmallImage", "medium_image": "MediumImage", "feature_image": "FeatureImage"}, "parent_id": "ParentID", "children_url": "ChildrenURL", "parent_url": "ParentURL", "disabled": true, "tags": ["Tags"], "geo_tags": ["GeoTags"], "pricing_tags": ["PricingTags"], "group": false, "provider": {"email": "Email", "name": "Name", "contact": "Contact", "support_email": "SupportEmail", "phone": "Phone"}, "created": "2019-01-01T12:00:00", "updated": "2019-01-01T12:00:00", "metadata": {"rc_compatible": true, "ui": {"strings": {"_language_": {"bullets": [{"title": "Title", "description": "Description", "icon": "Icon", "quantity": "Quantity"}], "media": [{"caption": "Caption", "thumbnail_url": "ThumbnailURL", "type": "Type", "URL": "URL", "source": {"title": "Title", "description": "Description", "icon": "Icon", "quantity": "Quantity"}}], "not_creatable_msg": "NotCreatableMsg", "not_creatable__robot_msg": "NotCreatableRobotMsg", "deprecation_warning": "DeprecationWarning", "popup_warning_message": "PopupWarningMessage", "instruction": "Instruction"}}, "urls": {"doc_url": "DocURL", "instructions_url": "InstructionsURL", "api_url": "ApiURL", "create_url": "CreateURL", "sdk_download_url": "SdkDownloadURL", "terms_url": "TermsURL", "custom_create_page_url": "CustomCreatePageURL", "catalog_details_url": "CatalogDetailsURL", "deprecation_doc_url": "DeprecationDocURL"}, "embeddable_dashboard": "EmbeddableDashboard", "embeddable_dashboard_full_width": true, "navigation_order": ["NavigationOrder"], "not_creatable": true, "reservable": true, "primary_offering_id": "PrimaryOfferingID", "accessible_during_provision": false, "side_by_side_index": 15, "end_of_service_time": "2019-01-01T12:00:00"}, "pricing": {"type": "Type", "origin": "Origin", "starting_price": {"plan_id": "PlanID", "deployment_id": "DeploymentID", "amount": [{"counrty": "Counrty", "currency": "Currency", "prices": [{"quantity_tier": 12, "Price": 5}]}]}, "metrics": [{"metric_id": "MetricID", "tier_model": "TierModel", "charge_unit_name": "ChargeUnitName", "charge_unit_quantity": "ChargeUnitQuantity", "resource_display_name": "ResourceDisplayName", "charge_unit_display_name": "ChargeUnitDisplayName", "usage_cap_qty": 11, "amounts": [{"counrty": "Counrty", "currency": "Currency", "prices": [{"quantity_tier": 12, "Price": 5}]}]}]}, "compliance": ["Compliance"], "service": {"type": "Type", "iam_compatible": false, "unique_api_key": true, "provisionable": false, "async_provisioning_supported": true, "async_unprovisioning_supported": true, "cf_guid": "CfGuid", "bindable": true, "requires": ["Requires"], "plan_updateable": true, "state": "State", "service_check_enabled": false, "test_check_interval": 17, "service_key_supported": false}, "plan": {"bindable": true, "reservable": true, "allow_internal_users": true, "async_provisioning_supported": true, "async_unprovisioning_supported": true, "test_check_interval": 17, "single_scope_instance": "SingleScopeInstance", "service_check_enabled": false, "cf_guid": "CfGuid"}, "template": {"services": ["Services"], "default_memory": 13, "start_cmd": "StartCmd", "source": {"path": "Path", "type": "Type", "url": "URL"}, "runtime_catalog_id": "RuntimeCatalogID", "cf_runtime_id": "CfRuntimeID", "template_id": "TemplateID", "executable_file": "ExecutableFile", "buildpack": "Buildpack", "environment_variables": {"_key_": "Key"}}, "deployment": {"location": "Location", "location_url": "LocationURL", "target_crn": "TargetCrn", "broker": {"name": "Name", "guid": "Guid", "password": {"text": "Text", "key": "Key", "iv": "Iv"}}, "supports_rc_migration": false}, "alias": {"type": "Type", "plan_id": "PlanID"}, "sla": {"terms": "Terms", "tenancy": "Tenancy", "provisioning": "Provisioning", "responsiveness": "Responsiveness", "dr": {"dr": true, "description": "Description"}}, "callbacks": {"broker_utl": "BrokerUtl", "broker_proxy_url": "BrokerProxyURL", "dashboard_url": "DashboardURL", "dashboard_data_url": "DashboardDataURL", "dashboard_detail_tab_url": "DashboardDetailTabURL", "dashboard_detail_tab_ext_url": "DashboardDetailTabExtURL", "service_monitor_api": "ServiceMonitorApi", "service_monitor_app": "ServiceMonitorApp", "service_staging_url": "ServiceStagingURL", "service_production_url": "ServiceProductionURL"}, "version": "Version", "origin_name": "OriginName", "other": {"anyKey": "anyValue"}}, "active": true, "children": [{"id": "ID", "catalog_crn": "CatalogCrn", "url": "URL", "name": "Name", "overview_ui": {"_language_": {"display_name": "DisplayName", "long_description": "LongDescription", "description": "Description"}}, "kind": "Kind", "images": {"image": "Image", "small_image": "SmallImage", "medium_image": "MediumImage", "feature_image": "FeatureImage"}, "parent_id": "ParentID", "children_url": "ChildrenURL", "parent_url": "ParentURL", "disabled": true, "tags": ["Tags"], "geo_tags": ["GeoTags"], "pricing_tags": ["PricingTags"], "group": false, "provider": {"email": "Email", "name": "Name", "contact": "Contact", "support_email": "SupportEmail", "phone": "Phone"}, "created": "2019-01-01T12:00:00", "updated": "2019-01-01T12:00:00", "metadata": {"rc_compatible": true, "ui": {"strings": {"_language_": {"bullets": [{"title": "Title", "description": "Description", "icon": "Icon", "quantity": "Quantity"}], "media": [{"caption": "Caption", "thumbnail_url": "ThumbnailURL", "type": "Type", "URL": "URL", "source": {"title": "Title", "description": "Description", "icon": "Icon", "quantity": "Quantity"}}], "not_creatable_msg": "NotCreatableMsg", "not_creatable__robot_msg": "NotCreatableRobotMsg", "deprecation_warning": "DeprecationWarning", "popup_warning_message": "PopupWarningMessage", "instruction": "Instruction"}}, "urls": {"doc_url": "DocURL", "instructions_url": "InstructionsURL", "api_url": "ApiURL", "create_url": "CreateURL", "sdk_download_url": "SdkDownloadURL", "terms_url": "TermsURL", "custom_create_page_url": "CustomCreatePageURL", "catalog_details_url": "CatalogDetailsURL", "deprecation_doc_url": "DeprecationDocURL"}, "embeddable_dashboard": "EmbeddableDashboard", "embeddable_dashboard_full_width": true, "navigation_order": ["NavigationOrder"], "not_creatable": true, "reservable": true, "primary_offering_id": "PrimaryOfferingID", "accessible_during_provision": false, "side_by_side_index": 15, "end_of_service_time": "2019-01-01T12:00:00"}, "pricing": {"type": "Type", "origin": "Origin", "starting_price": {"plan_id": "PlanID", "deployment_id": "DeploymentID", "amount": [{"counrty": "Counrty", "currency": "Currency", "prices": [{"quantity_tier": 12, "Price": 5}]}]}, "metrics": [{"metric_id": "MetricID", "tier_model": "TierModel", "charge_unit_name": "ChargeUnitName", "charge_unit_quantity": "ChargeUnitQuantity", "resource_display_name": "ResourceDisplayName", "charge_unit_display_name": "ChargeUnitDisplayName", "usage_cap_qty": 11, "amounts": [{"counrty": "Counrty", "currency": "Currency", "prices": [{"quantity_tier": 12, "Price": 5}]}]}]}, "compliance": ["Compliance"], "service": {"type": "Type", "iam_compatible": false, "unique_api_key": true, "provisionable": false, "async_provisioning_supported": true, "async_unprovisioning_supported": true, "cf_guid": "CfGuid", "bindable": true, "requires": ["Requires"], "plan_updateable": true, "state": "State", "service_check_enabled": false, "test_check_interval": 17, "service_key_supported": false}, "plan": {"bindable": true, "reservable": true, "allow_internal_users": true, "async_provisioning_supported": true, "async_unprovisioning_supported": true, "test_check_interval": 17, "single_scope_instance": "SingleScopeInstance", "service_check_enabled": false, "cf_guid": "CfGuid"}, "template": {"services": ["Services"], "default_memory": 13, "start_cmd": "StartCmd", "source": {"path": "Path", "type": "Type", "url": "URL"}, "runtime_catalog_id": "RuntimeCatalogID", "cf_runtime_id": "CfRuntimeID", "template_id": "TemplateID", "executable_file": "ExecutableFile", "buildpack": "Buildpack", "environment_variables": {"_key_": "Key"}}, "deployment": {"location": "Location", "location_url": "LocationURL", "target_crn": "TargetCrn", "broker": {"name": "Name", "guid": "Guid", "password": {"text": "Text", "key": "Key", "iv": "Iv"}}, "supports_rc_migration": false}, "alias": {"type": "Type", "plan_id": "PlanID"}, "sla": {"terms": "Terms", "tenancy": "Tenancy", "provisioning": "Provisioning", "responsiveness": "Responsiveness", "dr": {"dr": true, "description": "Description"}}, "callbacks": {"broker_utl": "BrokerUtl", "broker_proxy_url": "BrokerProxyURL", "dashboard_url": "DashboardURL", "dashboard_data_url": "DashboardDataURL", "dashboard_detail_tab_url": "DashboardDetailTabURL", "dashboard_detail_tab_ext_url": "DashboardDetailTabExtURL", "service_monitor_api": "ServiceMonitorApi", "service_monitor_app": "ServiceMonitorApp", "service_staging_url": "ServiceStagingURL", "service_production_url": "ServiceProductionURL"}, "version": "Version", "origin_name": "OriginName", "other": {"anyKey": "anyValue"}}, "active": true, "children": [{"id": "ID", "catalog_crn": "CatalogCrn", "url": "URL", "name": "Name", "overview_ui": {"_language_": {"display_name": "DisplayName", "long_description": "LongDescription", "description": "Description"}}, "kind": "Kind", "images": {"image": "Image", "small_image": "SmallImage", "medium_image": "MediumImage", "feature_image": "FeatureImage"}, "parent_id": "ParentID", "children_url": "ChildrenURL", "parent_url": "ParentURL", "disabled": true, "tags": ["Tags"], "geo_tags": ["GeoTags"], "pricing_tags": ["PricingTags"], "group": false, "provider": {"email": "Email", "name": "Name", "contact": "Contact", "support_email": "SupportEmail", "phone": "Phone"}, "created": "2019-01-01T12:00:00", "updated": "2019-01-01T12:00:00", "metadata": {"rc_compatible": true, "ui": {"strings": {"_language_": {"bullets": [{"title": "Title", "description": "Description", "icon": "Icon", "quantity": "Quantity"}], "media": [{"caption": "Caption", "thumbnail_url": "ThumbnailURL", "type": "Type", "URL": "URL", "source": {"title": "Title", "description": "Description", "icon": "Icon", "quantity": "Quantity"}}], "not_creatable_msg": "NotCreatableMsg", "not_creatable__robot_msg": "NotCreatableRobotMsg", "deprecation_warning": "DeprecationWarning", "popup_warning_message": "PopupWarningMessage", "instruction": "Instruction"}}, "urls": {"doc_url": "DocURL", "instructions_url": "InstructionsURL", "api_url": "ApiURL", "create_url": "CreateURL", "sdk_download_url": "SdkDownloadURL", "terms_url": "TermsURL", "custom_create_page_url": "CustomCreatePageURL", "catalog_details_url": "CatalogDetailsURL", "deprecation_doc_url": "DeprecationDocURL"}, "embeddable_dashboard": "EmbeddableDashboard", "embeddable_dashboard_full_width": true, "navigation_order": ["NavigationOrder"], "not_creatable": true, "reservable": true, "primary_offering_id": "PrimaryOfferingID", "accessible_during_provision": false, "side_by_side_index": 15, "end_of_service_time": "2019-01-01T12:00:00"}, "pricing": {"type": "Type", "origin": "Origin", "starting_price": {"plan_id": "PlanID", "deployment_id": "DeploymentID", "amount": [{"counrty": "Counrty", "currency": "Currency", "prices": [{"quantity_tier": 12, "Price": 5}]}]}, "metrics": [{"metric_id": "MetricID", "tier_model": "TierModel", "charge_unit_name": "ChargeUnitName", "charge_unit_quantity": "ChargeUnitQuantity", "resource_display_name": "ResourceDisplayName", "charge_unit_display_name": "ChargeUnitDisplayName", "usage_cap_qty": 11, "amounts": [{"counrty": "Counrty", "currency": "Currency", "prices": [{"quantity_tier": 12, "Price": 5}]}]}]}, "compliance": ["Compliance"], "service": {"type": "Type", "iam_compatible": false, "unique_api_key": true, "provisionable": false, "async_provisioning_supported": true, "async_unprovisioning_supported": true, "cf_guid": "CfGuid", "bindable": true, "requires": ["Requires"], "plan_updateable": true, "state": "State", "service_check_enabled": false, "test_check_interval": 17, "service_key_supported": false}, "plan": {"bindable": true, "reservable": true, "allow_internal_users": true, "async_provisioning_supported": true, "async_unprovisioning_supported": true, "test_check_interval": 17, "single_scope_instance": "SingleScopeInstance", "service_check_enabled": false, "cf_guid": "CfGuid"}, "template": {"services": ["Services"], "default_memory": 13, "start_cmd": "StartCmd", "source": {"path": "Path", "type": "Type", "url": "URL"}, "runtime_catalog_id": "RuntimeCatalogID", "cf_runtime_id": "CfRuntimeID", "template_id": "TemplateID", "executable_file": "ExecutableFile", "buildpack": "Buildpack", "environment_variables": {"_key_": "Key"}}, "deployment": {"location": "Location", "location_url": "LocationURL", "target_crn": "TargetCrn", "broker": {"name": "Name", "guid": "Guid", "password": {"text": "Text", "key": "Key", "iv": "Iv"}}, "supports_rc_migration": false}, "alias": {"type": "Type", "plan_id": "PlanID"}, "sla": {"terms": "Terms", "tenancy": "Tenancy", "provisioning": "Provisioning", "responsiveness": "Responsiveness", "dr": {"dr": true, "description": "Description"}}, "callbacks": {"broker_utl": "BrokerUtl", "broker_proxy_url": "BrokerProxyURL", "dashboard_url": "DashboardURL", "dashboard_data_url": "DashboardDataURL", "dashboard_detail_tab_url": "DashboardDetailTabURL", "dashboard_detail_tab_ext_url": "DashboardDetailTabExtURL", "service_monitor_api": "ServiceMonitorApi", "service_monitor_app": "ServiceMonitorApp", "service_staging_url": "ServiceStagingURL", "service_production_url": "ServiceProductionURL"}, "version": "Version", "origin_name": "OriginName", "other": {"anyKey": "anyValue"}}, "active": true, "children": [{"id": "ID", "catalog_crn": "CatalogCrn", "url": "URL", "name": "Name", "overview_ui": {"_language_": {"display_name": "DisplayName", "long_description": "LongDescription", "description": "Description"}}, "kind": "Kind", "images": {"image": "Image", "small_image": "SmallImage", "medium_image": "MediumImage", "feature_image": "FeatureImage"}, "parent_id": "ParentID", "children_url": "ChildrenURL", "parent_url": "ParentURL", "disabled": true, "tags": ["Tags"], "geo_tags": ["GeoTags"], "pricing_tags": ["PricingTags"], "group": false, "provider": {"email": "Email", "name": "Name", "contact": "Contact", "support_email": "SupportEmail", "phone": "Phone"}, "created": "2019-01-01T12:00:00", "updated": "2019-01-01T12:00:00", "metadata": {"rc_compatible": true, "ui": {"strings": {"_language_": {"bullets": [{"title": "Title", "description": "Description", "icon": "Icon", "quantity": "Quantity"}], "media": [{"caption": "Caption", "thumbnail_url": "ThumbnailURL", "type": "Type", "URL": "URL", "source": {"title": "Title", "description": "Description", "icon": "Icon", "quantity": "Quantity"}}], "not_creatable_msg": "NotCreatableMsg", "not_creatable__robot_msg": "NotCreatableRobotMsg", "deprecation_warning": "DeprecationWarning", "popup_warning_message": "PopupWarningMessage", "instruction": "Instruction"}}, "urls": {"doc_url": "DocURL", "instructions_url": "InstructionsURL", "api_url": "ApiURL", "create_url": "CreateURL", "sdk_download_url": "SdkDownloadURL", "terms_url": "TermsURL", "custom_create_page_url": "CustomCreatePageURL", "catalog_details_url": "CatalogDetailsURL", "deprecation_doc_url": "DeprecationDocURL"}, "embeddable_dashboard": "EmbeddableDashboard", "embeddable_dashboard_full_width": true, "navigation_order": ["NavigationOrder"], "not_creatable": true, "reservable": true, "primary_offering_id": "PrimaryOfferingID", "accessible_during_provision": false, "side_by_side_index": 15, "end_of_service_time": "2019-01-01T12:00:00"}, "pricing": {"type": "Type", "origin": "Origin", "starting_price": {"plan_id": "PlanID", "deployment_id": "DeploymentID", "amount": [{"counrty": "Counrty", "currency": "Currency", "prices": [{"quantity_tier": 12, "Price": 5}]}]}, "metrics": [{"metric_id": "MetricID", "tier_model": "TierModel", "charge_unit_name": "ChargeUnitName", "charge_unit_quantity": "ChargeUnitQuantity", "resource_display_name": "ResourceDisplayName", "charge_unit_display_name": "ChargeUnitDisplayName", "usage_cap_qty": 11, "amounts": [{"counrty": "Counrty", "currency": "Currency", "prices": [{"quantity_tier": 12, "Price": 5}]}]}]}, "compliance": ["Compliance"], "service": {"type": "Type", "iam_compatible": false, "unique_api_key": true, "provisionable": false, "async_provisioning_supported": true, "async_unprovisioning_supported": true, "cf_guid": "CfGuid", "bindable": true, "requires": ["Requires"], "plan_updateable": true, "state": "State", "service_check_enabled": false, "test_check_interval": 17, "service_key_supported": false}, "plan": {"bindable": true, "reservable": true, "allow_internal_users": true, "async_provisioning_supported": true, "async_unprovisioning_supported": true, "test_check_interval": 17, "single_scope_instance": "SingleScopeInstance", "service_check_enabled": false, "cf_guid": "CfGuid"}, "template": {"services": ["Services"], "default_memory": 13, "start_cmd": "StartCmd", "source": {"path": "Path", "type": "Type", "url": "URL"}, "runtime_catalog_id": "RuntimeCatalogID", "cf_runtime_id": "CfRuntimeID", "template_id": "TemplateID", "executable_file": "ExecutableFile", "buildpack": "Buildpack", "environment_variables": {"_key_": "Key"}}, "deployment": {"location": "Location", "location_url": "LocationURL", "target_crn": "TargetCrn", "broker": {"name": "Name", "guid": "Guid", "password": {"text": "Text", "key": "Key", "iv": "Iv"}}, "supports_rc_migration": false}, "alias": {"type": "Type", "plan_id": "PlanID"}, "sla": {"terms": "Terms", "tenancy": "Tenancy", "provisioning": "Provisioning", "responsiveness": "Responsiveness", "dr": {"dr": true, "description": "Description"}}, "callbacks": {"broker_utl": "BrokerUtl", "broker_proxy_url": "BrokerProxyURL", "dashboard_url": "DashboardURL", "dashboard_data_url": "DashboardDataURL", "dashboard_detail_tab_url": "DashboardDetailTabURL", "dashboard_detail_tab_ext_url": "DashboardDetailTabExtURL", "service_monitor_api": "ServiceMonitorApi", "service_monitor_app": "ServiceMonitorApp", "service_staging_url": "ServiceStagingURL", "service_production_url": "ServiceProductionURL"}, "version": "Version", "origin_name": "OriginName", "other": {"anyKey": "anyValue"}}, "active": true, "children": [{"id": "ID", "catalog_crn": "CatalogCrn", "url": "URL", "name": "Name", "overview_ui": {"_language_": {"display_name": "DisplayName", "long_description": "LongDescription", "description": "Description"}}, "kind": "Kind", "images": {"image": "Image", "small_image": "SmallImage", "medium_image": "MediumImage", "feature_image": "FeatureImage"}, "parent_id": "ParentID", "children_url": "ChildrenURL", "parent_url": "ParentURL", "disabled": true, "tags": ["Tags"], "geo_tags": ["GeoTags"], "pricing_tags": ["PricingTags"], "group": false, "provider": {"email": "Email", "name": "Name", "contact": "Contact", "support_email": "SupportEmail", "phone": "Phone"}, "created": "2019-01-01T12:00:00", "updated": "2019-01-01T12:00:00", "metadata": {"rc_compatible": true, "ui": {"strings": {"_language_": {"bullets": [{"title": "Title", "description": "Description", "icon": "Icon", "quantity": "Quantity"}], "media": [{"caption": "Caption", "thumbnail_url": "ThumbnailURL", "type": "Type", "URL": "URL"}], "not_creatable_msg": "NotCreatableMsg", "not_creatable__robot_msg": "NotCreatableRobotMsg", "deprecation_warning": "DeprecationWarning", "popup_warning_message": "PopupWarningMessage", "instruction": "Instruction"}}, "urls": {"doc_url": "DocURL", "instructions_url": "InstructionsURL", "api_url": "ApiURL", "create_url": "CreateURL", "sdk_download_url": "SdkDownloadURL", "terms_url": "TermsURL", "custom_create_page_url": "CustomCreatePageURL", "catalog_details_url": "CatalogDetailsURL", "deprecation_doc_url": "DeprecationDocURL"}, "embeddable_dashboard": "EmbeddableDashboard", "embeddable_dashboard_full_width": true, "navigation_order": ["NavigationOrder"], "not_creatable": true, "reservable": true, "primary_offering_id": "PrimaryOfferingID", "accessible_during_provision": false, "side_by_side_index": 15, "end_of_service_time": "2019-01-01T12:00:00"}, "pricing": {"type": "Type", "origin": "Origin", "starting_price": {"plan_id": "PlanID", "deployment_id": "DeploymentID", "amount": [{"counrty": "Counrty", "currency": "Currency", "prices": [{"quantity_tier": 12, "Price": 5}]}]}, "metrics": [{"metric_id": "MetricID", "tier_model": "TierModel", "charge_unit_name": "ChargeUnitName", "charge_unit_quantity": "ChargeUnitQuantity", "resource_display_name": "ResourceDisplayName", "charge_unit_display_name": "ChargeUnitDisplayName", "usage_cap_qty": 11, "amounts": [{"counrty": "Counrty", "currency": "Currency", "prices": [{"quantity_tier": 12, "Price": 5}]}]}]}, "compliance": ["Compliance"], "service": {"type": "Type", "iam_compatible": false, "unique_api_key": true, "provisionable": false, "async_provisioning_supported": true, "async_unprovisioning_supported": true, "cf_guid": "CfGuid", "bindable": true, "requires": ["Requires"], "plan_updateable": true, "state": "State", "service_check_enabled": false, "test_check_interval": 17, "service_key_supported": false}, "plan": {"bindable": true, "reservable": true, "allow_internal_users": true, "async_provisioning_supported": true, "async_unprovisioning_supported": true, "test_check_interval": 17, "single_scope_instance": "SingleScopeInstance", "service_check_enabled": false, "cf_guid": "CfGuid"}, "template": {"services": ["Services"], "default_memory": 13, "start_cmd": "StartCmd", "source": {"path": "Path", "type": "Type", "url": "URL"}, "runtime_catalog_id": "RuntimeCatalogID", "cf_runtime_id": "CfRuntimeID", "template_id": "TemplateID", "executable_file": "ExecutableFile", "buildpack": "Buildpack", "environment_variables": {"_key_": "Key"}}, "deployment": {"location": "Location", "location_url": "LocationURL", "target_crn": "TargetCrn", "broker": {"name": "Name", "guid": "Guid", "password": {"text": "Text", "key": "Key", "iv": "Iv"}}, "supports_rc_migration": false}, "alias": {"type": "Type", "plan_id": "PlanID"}, "sla": {"terms": "Terms", "tenancy": "Tenancy", "provisioning": "Provisioning", "responsiveness": "Responsiveness", "dr": {"dr": true, "description": "Description"}}, "callbacks": {"broker_utl": "BrokerUtl", "broker_proxy_url": "BrokerProxyURL", "dashboard_url": "DashboardURL", "dashboard_data_url": "DashboardDataURL", "dashboard_detail_tab_url": "DashboardDetailTabURL", "dashboard_detail_tab_ext_url": "DashboardDetailTabExtURL", "service_monitor_api": "ServiceMonitorApi", "service_monitor_app": "ServiceMonitorApp", "service_staging_url": "ServiceStagingURL", "service_production_url": "ServiceProductionURL"}, "version": "Version", "origin_name": "OriginName", "other": {"anyKey": "anyValue"}}, "active": true, "children": [{"id": "ID", "catalog_crn": "CatalogCrn", "url": "URL", "name": "Name", "overview_ui": {"_language_": {"display_name": "DisplayName", "long_description": "LongDescription", "description": "Description"}}, "kind": "Kind", "images": {"image": "Image", "small_image": "SmallImage", "medium_image": "MediumImage", "feature_image": "FeatureImage"}, "parent_id": "ParentID", "children_url": "ChildrenURL", "parent_url": "ParentURL", "disabled": true, "tags": ["Tags"], "geo_tags": ["GeoTags"], "pricing_tags": ["PricingTags"], "group": false, "provider": {"email": "Email", "name": "Name", "contact": "Contact", "support_email": "SupportEmail", "phone": "Phone"}, "created": "2019-01-01T12:00:00", "updated": "2019-01-01T12:00:00", "metadata": {"rc_compatible": true, "ui": {"strings": {"_language_": {"bullets": [], "media": [], "not_creatable_msg": "NotCreatableMsg", "not_creatable__robot_msg": "NotCreatableRobotMsg", "deprecation_warning": "DeprecationWarning", "popup_warning_message": "PopupWarningMessage", "instruction": "Instruction"}}, "urls": {"doc_url": "DocURL", "instructions_url": "InstructionsURL", "api_url": "ApiURL", "create_url": "CreateURL", "sdk_download_url": "SdkDownloadURL", "terms_url": "TermsURL", "custom_create_page_url": "CustomCreatePageURL", "catalog_details_url": "CatalogDetailsURL", "deprecation_doc_url": "DeprecationDocURL"}, "embeddable_dashboard": "EmbeddableDashboard", "embeddable_dashboard_full_width": true, "navigation_order": ["NavigationOrder"], "not_creatable": true, "reservable": true, "primary_offering_id": "PrimaryOfferingID", "accessible_during_provision": false, "side_by_side_index": 15, "end_of_service_time": "2019-01-01T12:00:00"}, "pricing": {"type": "Type", "origin": "Origin", "starting_price": {"plan_id": "PlanID", "deployment_id": "DeploymentID", "amount": [{"counrty": "Counrty", "currency": "Currency", "prices": []}]}, "metrics": [{"metric_id": "MetricID", "tier_model": "TierModel", "charge_unit_name": "ChargeUnitName", "charge_unit_quantity": "ChargeUnitQuantity", "resource_display_name": "ResourceDisplayName", "charge_unit_display_name": "ChargeUnitDisplayName", "usage_cap_qty": 11, "amounts": [{"counrty": "Counrty", "currency": "Currency", "prices": []}]}]}, "compliance": ["Compliance"], "service": {"type": "Type", "iam_compatible": false, "unique_api_key": true, "provisionable": false, "async_provisioning_supported": true, "async_unprovisioning_supported": true, "cf_guid": "CfGuid", "bindable": true, "requires": ["Requires"], "plan_updateable": true, "state": "State", "service_check_enabled": false, "test_check_interval": 17, "service_key_supported": false}, "plan": {"bindable": true, "reservable": true, "allow_internal_users": true, "async_provisioning_supported": true, "async_unprovisioning_supported": true, "test_check_interval": 17, "single_scope_instance": "SingleScopeInstance", "service_check_enabled": false, "cf_guid": "CfGuid"}, "template": {"services": ["Services"], "default_memory": 13, "start_cmd": "StartCmd", "source": {"path": "Path", "type": "Type", "url": "URL"}, "runtime_catalog_id": "RuntimeCatalogID", "cf_runtime_id": "CfRuntimeID", "template_id": "TemplateID", "executable_file": "ExecutableFile", "buildpack": "Buildpack", "environment_variables": {"_key_": "Key"}}, "deployment": {"location": "Location", "location_url": "LocationURL", "target_crn": "TargetCrn", "broker": {"name": "Name", "guid": "Guid", "password": {"text": "Text", "key": "Key", "iv": "Iv"}}, "supports_rc_migration": false}, "alias": {"type": "Type", "plan_id": "PlanID"}, "sla": {"terms": "Terms", "tenancy": "Tenancy", "provisioning": "Provisioning", "responsiveness": "Responsiveness", "dr": {"dr": true, "description": "Description"}}, "callbacks": {"broker_utl": "BrokerUtl", "broker_proxy_url": "BrokerProxyURL", "dashboard_url": "DashboardURL", "dashboard_data_url": "DashboardDataURL", "dashboard_detail_tab_url": "DashboardDetailTabURL", "dashboard_detail_tab_ext_url": "DashboardDetailTabExtURL", "service_monitor_api": "ServiceMonitorApi", "service_monitor_app": "ServiceMonitorApp", "service_staging_url": "ServiceStagingURL", "service_production_url": "ServiceProductionURL"}, "version": "Version", "origin_name": "OriginName", "other": {"anyKey": "anyValue"}}, "active": true, "children": [{"id": "ID", "catalog_crn": "CatalogCrn", "url": "URL", "name": "Name", "overview_ui": {"_language_": {"display_name": "DisplayName", "long_description": "LongDescription", "description": "Description"}}, "kind": "Kind", "images": {"image": "Image", "small_image": "SmallImage", "medium_image": "MediumImage", "feature_image": "FeatureImage"}, "parent_id": "ParentID", "children_url": "ChildrenURL", "parent_url": "ParentURL", "disabled": true, "tags": ["Tags"], "geo_tags": ["GeoTags"], "pricing_tags": ["PricingTags"], "group": false, "provider": {"email": "Email", "name": "Name", "contact": "Contact", "support_email": "SupportEmail", "phone": "Phone"}, "created": "2019-01-01T12:00:00", "updated": "2019-01-01T12:00:00", "metadata": {"rc_compatible": true, "ui": {"strings": {}, "urls": {"doc_url": "DocURL", "instructions_url": "InstructionsURL", "api_url": "ApiURL", "create_url": "CreateURL", "sdk_download_url": "SdkDownloadURL", "terms_url": "TermsURL", "custom_create_page_url": "CustomCreatePageURL", "catalog_details_url": "CatalogDetailsURL", "deprecation_doc_url": "DeprecationDocURL"}, "embeddable_dashboard": "EmbeddableDashboard", "embeddable_dashboard_full_width": true, "navigation_order": ["NavigationOrder"], "not_creatable": true, "reservable": true, "primary_offering_id": "PrimaryOfferingID", "accessible_during_provision": false, "side_by_side_index": 15, "end_of_service_time": "2019-01-01T12:00:00"}, "pricing": {"type": "Type", "origin": "Origin", "starting_price": {"plan_id": "PlanID", "deployment_id": "DeploymentID", "amount": []}, "metrics": [{"metric_id": "MetricID", "tier_model": "TierModel", "charge_unit_name": "ChargeUnitName", "charge_unit_quantity": "ChargeUnitQuantity", "resource_display_name": "ResourceDisplayName", "charge_unit_display_name": "ChargeUnitDisplayName", "usage_cap_qty": 11, "amounts": []}]}, "compliance": ["Compliance"], "service": {"type": "Type", "iam_compatible": false, "unique_api_key": true, "provisionable": false, "async_provisioning_supported": true, "async_unprovisioning_supported": true, "cf_guid": "CfGuid", "bindable": true, "requires": ["Requires"], "plan_updateable": true, "state": "State", "service_check_enabled": false, "test_check_interval": 17, "service_key_supported": false}, "plan": {"bindable": true, "reservable": true, "allow_internal_users": true, "async_provisioning_supported": true, "async_unprovisioning_supported": true, "test_check_interval": 17, "single_scope_instance": "SingleScopeInstance", "service_check_enabled": false, "cf_guid": "CfGuid"}, "template": {"services": ["Services"], "default_memory": 13, "start_cmd": "StartCmd", "source": {"path": "Path", "type": "Type", "url": "URL"}, "runtime_catalog_id": "RuntimeCatalogID", "cf_runtime_id": "CfRuntimeID", "template_id": "TemplateID", "executable_file": "ExecutableFile", "buildpack": "Buildpack", "environment_variables": {"_key_": "Key"}}, "deployment": {"location": "Location", "location_url": "LocationURL", "target_crn": "TargetCrn", "broker": {"name": "Name", "guid": "Guid"}, "supports_rc_migration": false}, "alias": {"type": "Type", "plan_id": "PlanID"}, "sla": {"terms": "Terms", "tenancy": "Tenancy", "provisioning": "Provisioning", "responsiveness": "Responsiveness", "dr": {"dr": true, "description": "Description"}}, "callbacks": {"broker_utl": "BrokerUtl", "broker_proxy_url": "BrokerProxyURL", "dashboard_url": "DashboardURL", "dashboard_data_url": "DashboardDataURL", "dashboard_detail_tab_url": "DashboardDetailTabURL", "dashboard_detail_tab_ext_url": "DashboardDetailTabExtURL", "service_monitor_api": "ServiceMonitorApi", "service_monitor_app": "ServiceMonitorApp", "service_staging_url": "ServiceStagingURL", "service_production_url": "ServiceProductionURL"}, "version": "Version", "origin_name": "OriginName", "other": {"anyKey": "anyValue"}}, "active": true, "children": [{"id": "ID", "catalog_crn": "CatalogCrn", "url": "URL", "name": "Name", "overview_ui": {"_language_": {"display_name": "DisplayName", "long_description": "LongDescription", "description": "Description"}}, "kind": "Kind", "images": {"image": "Image", "small_image": "SmallImage", "medium_image": "MediumImage", "feature_image": "FeatureImage"}, "parent_id": "ParentID", "children_url": "ChildrenURL", "parent_url": "ParentURL", "disabled": true, "tags": ["Tags"], "geo_tags": ["GeoTags"], "pricing_tags": ["PricingTags"], "group": false, "provider": {"email": "Email", "name": "Name", "contact": "Contact", "support_email": "SupportEmail", "phone": "Phone"}, "created": "2019-01-01T12:00:00", "updated": "2019-01-01T12:00:00", "metadata": {"rc_compatible": true, "ui": {"embeddable_dashboard": "EmbeddableDashboard", "embeddable_dashboard_full_width": true, "navigation_order": ["NavigationOrder"], "not_creatable": true, "reservable": true, "primary_offering_id": "PrimaryOfferingID", "accessible_during_provision": false, "side_by_side_index": 15, "end_of_service_time": "2019-01-01T12:00:00"}, "pricing": {"type": "Type", "origin": "Origin", "metrics": []}, "compliance": ["Compliance"], "service": {"type": "Type", "iam_compatible": false, "unique_api_key": true, "provisionable": false, "async_provisioning_supported": true, "async_unprovisioning_supported": true, "cf_guid": "CfGuid", "bindable": true, "requires": ["Requires"], "plan_updateable": true, "state": "State", "service_check_enabled": false, "test_check_interval": 17, "service_key_supported": false}, "plan": {"bindable": true, "reservable": true, "allow_internal_users": true, "async_provisioning_supported": true, "async_unprovisioning_supported": true, "test_check_interval": 17, "single_scope_instance": "SingleScopeInstance", "service_check_enabled": false, "cf_guid": "CfGuid"}, "template": {"services": ["Services"], "default_memory": 13, "start_cmd": "StartCmd", "runtime_catalog_id": "RuntimeCatalogID", "cf_runtime_id": "CfRuntimeID", "template_id": "TemplateID", "executable_file": "ExecutableFile", "buildpack": "Buildpack"}, "deployment": {"location": "Location", "location_url": "LocationURL", "target_crn": "TargetCrn", "supports_rc_migration": false}, "alias": {"type": "Type", "plan_id": "PlanID"}, "sla": {"terms": "Terms", "tenancy": "Tenancy", "provisioning": "Provisioning", "responsiveness": "Responsiveness"}, "callbacks": {"broker_utl": "BrokerUtl", "broker_proxy_url": "BrokerProxyURL", "dashboard_url": "DashboardURL", "dashboard_data_url": "DashboardDataURL", "dashboard_detail_tab_url": "DashboardDetailTabURL", "dashboard_detail_tab_ext_url": "DashboardDetailTabExtURL", "service_monitor_api": "ServiceMonitorApi", "service_monitor_app": "ServiceMonitorApp", "service_staging_url": "ServiceStagingURL", "service_production_url": "ServiceProductionURL"}, "version": "Version", "origin_name": "OriginName", "other": {"anyKey": "anyValue"}}, "active": true, "children": [{"id": "ID", "catalog_crn": "CatalogCrn", "url": "URL", "name": "Name", "overview_ui": {}, "kind": "Kind", "images": {"image": "Image", "small_image": "SmallImage", "medium_image": "MediumImage", "feature_image": "FeatureImage"}, "parent_id": "ParentID", "children_url": "ChildrenURL", "parent_url": "ParentURL", "disabled": true, "tags": ["Tags"], "geo_tags": ["GeoTags"], "pricing_tags": ["PricingTags"], "group": false, "provider": {"email": "Email", "name": "Name", "contact": "Contact", "support_email": "SupportEmail", "phone": "Phone"}, "created": "2019-01-01T12:00:00", "updated": "2019-01-01T12:00:00", "metadata": {"rc_compatible": true, "compliance": ["Compliance"], "version": "Version", "origin_name": "OriginName", "other": {"anyKey": "anyValue"}}, "active": true, "children": [{"id": "ID", "catalog_crn": "CatalogCrn", "url": "URL", "name": "Name", "kind": "Kind", "parent_id": "ParentID", "children_url": "ChildrenURL", "parent_url": "ParentURL", "disabled": true, "tags": ["Tags"], "geo_tags": ["GeoTags"], "pricing_tags": ["PricingTags"], "group": false, "created": "2019-01-01T12:00:00", "updated": "2019-01-01T12:00:00", "active": true, "children": []}]}]}]}]}]}]}]}]}]}`)
-			}))
-			It(`Invoke GetCatalogEntry successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := globalcatalogv1.NewGlobalCatalogV1(&globalcatalogv1.GlobalCatalogV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.GetCatalogEntry(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the GetCatalogEntryOptions model
-				getCatalogEntryOptionsModel := new(globalcatalogv1.GetCatalogEntryOptions)
-				getCatalogEntryOptionsModel.ID = core.StringPtr("testString")
-				getCatalogEntryOptionsModel.Account = core.StringPtr("testString")
-				getCatalogEntryOptionsModel.Include = core.StringPtr("testString")
-				getCatalogEntryOptionsModel.Languages = core.StringPtr("testString")
-				getCatalogEntryOptionsModel.Complete = core.StringPtr("testString")
-				getCatalogEntryOptionsModel.Depth = core.Int64Ptr(int64(38))
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.GetCatalogEntry(getCatalogEntryOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`UpdateCatalogEntry(updateCatalogEntryOptions *UpdateCatalogEntryOptions)`, func() {
-		updateCatalogEntryPath := "/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(updateCatalogEntryPath))
-				Expect(req.Method).To(Equal("PUT"))
-				Expect(req.URL.Query()["account"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["move"]).To(Equal([]string{"testString"}))
-
-				res.WriteHeader(200)
-			}))
-			It(`Invoke UpdateCatalogEntry successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := globalcatalogv1.NewGlobalCatalogV1(&globalcatalogv1.GlobalCatalogV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				response, operationErr := testService.UpdateCatalogEntry(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-
-				// Construct an instance of the Bullets model
-				bulletsModel := new(globalcatalogv1.Bullets)
-				bulletsModel.Title = core.StringPtr("testString")
-				bulletsModel.Description = core.StringPtr("testString")
-				bulletsModel.Icon = core.StringPtr("testString")
-				bulletsModel.Quantity = core.StringPtr("testString")
-
-				// Construct an instance of the Price model
-				priceModel := new(globalcatalogv1.Price)
-				priceModel.QuantityTier = core.Int64Ptr(int64(38))
-				priceModel.Price = core.Float64Ptr(72.5)
-
-				// Construct an instance of the UIMetaMedia model
-				uiMetaMediaModel := new(globalcatalogv1.UIMetaMedia)
-				uiMetaMediaModel.Caption = core.StringPtr("testString")
-				uiMetaMediaModel.ThumbnailURL = core.StringPtr("testString")
-				uiMetaMediaModel.Type = core.StringPtr("testString")
-				uiMetaMediaModel.URL = core.StringPtr("testString")
-				uiMetaMediaModel.Source = bulletsModel
-
-				// Construct an instance of the Amount model
-				amountModel := new(globalcatalogv1.Amount)
-				amountModel.Counrty = core.StringPtr("testString")
-				amountModel.Currency = core.StringPtr("testString")
-				amountModel.Prices = []globalcatalogv1.Price{*priceModel}
-
-				// Construct an instance of the ObjectMetaDataDeploymentBrokerPassword model
-				objectMetaDataDeploymentBrokerPasswordModel := new(globalcatalogv1.ObjectMetaDataDeploymentBrokerPassword)
-				objectMetaDataDeploymentBrokerPasswordModel.Text = core.StringPtr("testString")
-				objectMetaDataDeploymentBrokerPasswordModel.Key = core.StringPtr("testString")
-				objectMetaDataDeploymentBrokerPasswordModel.Iv = core.StringPtr("testString")
-
-				// Construct an instance of the Strings model
-				stringsModel := new(globalcatalogv1.Strings)
-				stringsModel.Bullets = []globalcatalogv1.Bullets{*bulletsModel}
-				stringsModel.Media = []globalcatalogv1.UIMetaMedia{*uiMetaMediaModel}
-				stringsModel.NotCreatableMsg = core.StringPtr("testString")
-				stringsModel.NotCreatableRobotMsg = core.StringPtr("testString")
-				stringsModel.DeprecationWarning = core.StringPtr("testString")
-				stringsModel.PopupWarningMessage = core.StringPtr("testString")
-				stringsModel.Instruction = core.StringPtr("testString")
-
-				// Construct an instance of the I18N model
-				i18NModel := new(globalcatalogv1.I18N)
-				i18NModel.Language = stringsModel
-
-				// Construct an instance of the Metrics model
-				metricsModel := new(globalcatalogv1.Metrics)
-				metricsModel.MetricID = core.StringPtr("testString")
-				metricsModel.TierModel = core.StringPtr("testString")
-				metricsModel.ChargeUnitName = core.StringPtr("testString")
-				metricsModel.ChargeUnitQuantity = core.StringPtr("testString")
-				metricsModel.ResourceDisplayName = core.StringPtr("testString")
-				metricsModel.ChargeUnitDisplayName = core.StringPtr("testString")
-				metricsModel.UsageCapQty = core.Int64Ptr(int64(38))
-				metricsModel.Amounts = []globalcatalogv1.Amount{*amountModel}
-
-				// Construct an instance of the ObjectMetaDataDeploymentBroker model
-				objectMetaDataDeploymentBrokerModel := new(globalcatalogv1.ObjectMetaDataDeploymentBroker)
-				objectMetaDataDeploymentBrokerModel.Name = core.StringPtr("testString")
-				objectMetaDataDeploymentBrokerModel.Guid = core.StringPtr("testString")
-				objectMetaDataDeploymentBrokerModel.Password = objectMetaDataDeploymentBrokerPasswordModel
-
-				// Construct an instance of the ObjectMetaDataSlaDr model
-				objectMetaDataSlaDrModel := new(globalcatalogv1.ObjectMetaDataSlaDr)
-				objectMetaDataSlaDrModel.Dr = core.BoolPtr(true)
-				objectMetaDataSlaDrModel.Description = core.StringPtr("testString")
-
-				// Construct an instance of the ObjectMetaDataTemplateEnvironmentVariables model
-				objectMetaDataTemplateEnvironmentVariablesModel := new(globalcatalogv1.ObjectMetaDataTemplateEnvironmentVariables)
-				objectMetaDataTemplateEnvironmentVariablesModel.Key = core.StringPtr("testString")
-
-				// Construct an instance of the ObjectMetaDataTemplateSource model
-				objectMetaDataTemplateSourceModel := new(globalcatalogv1.ObjectMetaDataTemplateSource)
-				objectMetaDataTemplateSourceModel.Path = core.StringPtr("testString")
-				objectMetaDataTemplateSourceModel.Type = core.StringPtr("testString")
-				objectMetaDataTemplateSourceModel.URL = core.StringPtr("testString")
-
-				// Construct an instance of the StartingPrice model
-				startingPriceModel := new(globalcatalogv1.StartingPrice)
-				startingPriceModel.PlanID = core.StringPtr("testString")
-				startingPriceModel.DeploymentID = core.StringPtr("testString")
-				startingPriceModel.Amount = []globalcatalogv1.Amount{*amountModel}
-
-				// Construct an instance of the URLS model
-				urlsModel := new(globalcatalogv1.URLS)
-				urlsModel.DocURL = core.StringPtr("testString")
-				urlsModel.InstructionsURL = core.StringPtr("testString")
-				urlsModel.ApiURL = core.StringPtr("testString")
-				urlsModel.CreateURL = core.StringPtr("testString")
-				urlsModel.SdkDownloadURL = core.StringPtr("testString")
-				urlsModel.TermsURL = core.StringPtr("testString")
-				urlsModel.CustomCreatePageURL = core.StringPtr("testString")
-				urlsModel.CatalogDetailsURL = core.StringPtr("testString")
-				urlsModel.DeprecationDocURL = core.StringPtr("testString")
-
-				// Construct an instance of the Callbacks model
-				callbacksModel := new(globalcatalogv1.Callbacks)
-				callbacksModel.BrokerUtl = core.StringPtr("testString")
-				callbacksModel.BrokerProxyURL = core.StringPtr("testString")
-				callbacksModel.DashboardURL = core.StringPtr("testString")
-				callbacksModel.DashboardDataURL = core.StringPtr("testString")
-				callbacksModel.DashboardDetailTabURL = core.StringPtr("testString")
-				callbacksModel.DashboardDetailTabExtURL = core.StringPtr("testString")
-				callbacksModel.ServiceMonitorApi = core.StringPtr("testString")
-				callbacksModel.ServiceMonitorApp = core.StringPtr("testString")
-				callbacksModel.ServiceStagingURL = core.StringPtr("testString")
-				callbacksModel.ServiceProductionURL = core.StringPtr("testString")
-
-				// Construct an instance of the ObjectMetaDataAlias model
-				objectMetaDataAliasModel := new(globalcatalogv1.ObjectMetaDataAlias)
-				objectMetaDataAliasModel.Type = core.StringPtr("testString")
-				objectMetaDataAliasModel.PlanID = core.StringPtr("testString")
-
-				// Construct an instance of the ObjectMetaDataDeployment model
-				objectMetaDataDeploymentModel := new(globalcatalogv1.ObjectMetaDataDeployment)
-				objectMetaDataDeploymentModel.Location = core.StringPtr("testString")
-				objectMetaDataDeploymentModel.LocationURL = core.StringPtr("testString")
-				objectMetaDataDeploymentModel.TargetCrn = core.StringPtr("testString")
-				objectMetaDataDeploymentModel.Broker = objectMetaDataDeploymentBrokerModel
-				objectMetaDataDeploymentModel.SupportsRcMigration = core.BoolPtr(true)
-
-				// Construct an instance of the ObjectMetaDataPlan model
-				objectMetaDataPlanModel := new(globalcatalogv1.ObjectMetaDataPlan)
-				objectMetaDataPlanModel.Bindable = core.BoolPtr(true)
-				objectMetaDataPlanModel.Reservable = core.BoolPtr(true)
-				objectMetaDataPlanModel.AllowInternalUsers = core.BoolPtr(true)
-				objectMetaDataPlanModel.AsyncProvisioningSupported = core.BoolPtr(true)
-				objectMetaDataPlanModel.AsyncUnprovisioningSupported = core.BoolPtr(true)
-				objectMetaDataPlanModel.TestCheckInterval = core.Int64Ptr(int64(38))
-				objectMetaDataPlanModel.SingleScopeInstance = core.StringPtr("testString")
-				objectMetaDataPlanModel.ServiceCheckEnabled = core.BoolPtr(true)
-				objectMetaDataPlanModel.CfGuid = core.StringPtr("testString")
-
-				// Construct an instance of the ObjectMetaDataService model
-				objectMetaDataServiceModel := new(globalcatalogv1.ObjectMetaDataService)
-				objectMetaDataServiceModel.Type = core.StringPtr("testString")
-				objectMetaDataServiceModel.IamCompatible = core.BoolPtr(true)
-				objectMetaDataServiceModel.UniqueApiKey = core.BoolPtr(true)
-				objectMetaDataServiceModel.Provisionable = core.BoolPtr(true)
-				objectMetaDataServiceModel.AsyncProvisioningSupported = core.BoolPtr(true)
-				objectMetaDataServiceModel.AsyncUnprovisioningSupported = core.BoolPtr(true)
-				objectMetaDataServiceModel.CfGuid = core.StringPtr("testString")
-				objectMetaDataServiceModel.Bindable = core.BoolPtr(true)
-				objectMetaDataServiceModel.Requires = []string{"testString"}
-				objectMetaDataServiceModel.PlanUpdateable = core.BoolPtr(true)
-				objectMetaDataServiceModel.State = core.StringPtr("testString")
-				objectMetaDataServiceModel.ServiceCheckEnabled = core.BoolPtr(true)
-				objectMetaDataServiceModel.TestCheckInterval = core.Int64Ptr(int64(38))
-				objectMetaDataServiceModel.ServiceKeySupported = core.BoolPtr(true)
-
-				// Construct an instance of the ObjectMetaDataSla model
-				objectMetaDataSlaModel := new(globalcatalogv1.ObjectMetaDataSla)
-				objectMetaDataSlaModel.Terms = core.StringPtr("testString")
-				objectMetaDataSlaModel.Tenancy = core.StringPtr("testString")
-				objectMetaDataSlaModel.Provisioning = core.StringPtr("testString")
-				objectMetaDataSlaModel.Responsiveness = core.StringPtr("testString")
-				objectMetaDataSlaModel.Dr = objectMetaDataSlaDrModel
-
-				// Construct an instance of the ObjectMetaDataTemplate model
-				objectMetaDataTemplateModel := new(globalcatalogv1.ObjectMetaDataTemplate)
-				objectMetaDataTemplateModel.Services = []string{"testString"}
-				objectMetaDataTemplateModel.DefaultMemory = core.Int64Ptr(int64(38))
-				objectMetaDataTemplateModel.StartCmd = core.StringPtr("testString")
-				objectMetaDataTemplateModel.Source = objectMetaDataTemplateSourceModel
-				objectMetaDataTemplateModel.RuntimeCatalogID = core.StringPtr("testString")
-				objectMetaDataTemplateModel.CfRuntimeID = core.StringPtr("testString")
-				objectMetaDataTemplateModel.TemplateID = core.StringPtr("testString")
-				objectMetaDataTemplateModel.ExecutableFile = core.StringPtr("testString")
-				objectMetaDataTemplateModel.Buildpack = core.StringPtr("testString")
-				objectMetaDataTemplateModel.EnvironmentVariables = objectMetaDataTemplateEnvironmentVariablesModel
-
-				// Construct an instance of the Overview model
-				overviewModel := new(globalcatalogv1.Overview)
-				overviewModel.DisplayName = core.StringPtr("testString")
-				overviewModel.LongDescription = core.StringPtr("testString")
-				overviewModel.Description = core.StringPtr("testString")
-
-				// Construct an instance of the Pricing model
-				pricingModel := new(globalcatalogv1.Pricing)
-				pricingModel.Type = core.StringPtr("testString")
-				pricingModel.Origin = core.StringPtr("testString")
-				pricingModel.StartingPrice = startingPriceModel
-				pricingModel.Metrics = []globalcatalogv1.Metrics{*metricsModel}
-
-				// Construct an instance of the UIMetaData model
-				uiMetaDataModel := new(globalcatalogv1.UIMetaData)
-				uiMetaDataModel.Strings = i18NModel
-				uiMetaDataModel.Urls = urlsModel
-				uiMetaDataModel.EmbeddableDashboard = core.StringPtr("testString")
-				uiMetaDataModel.EmbeddableDashboardFullWidth = core.BoolPtr(true)
-				uiMetaDataModel.NavigationOrder = []string{"testString"}
-				uiMetaDataModel.NotCreatable = core.BoolPtr(true)
-				uiMetaDataModel.Reservable = core.BoolPtr(true)
-				uiMetaDataModel.PrimaryOfferingID = core.StringPtr("testString")
-				uiMetaDataModel.AccessibleDuringProvision = core.BoolPtr(true)
-				uiMetaDataModel.SideBySideIndex = core.Int64Ptr(int64(38))
-				uiMetaDataModel.EndOfServiceTime = CreateMockDateTime()
-
-				// Construct an instance of the Image model
-				imageModel := new(globalcatalogv1.Image)
-				imageModel.Image = core.StringPtr("testString")
-				imageModel.SmallImage = core.StringPtr("testString")
-				imageModel.MediumImage = core.StringPtr("testString")
-				imageModel.FeatureImage = core.StringPtr("testString")
-
-				// Construct an instance of the ObjectMetaData model
-				objectMetaDataModel := new(globalcatalogv1.ObjectMetaData)
-				objectMetaDataModel.RcCompatible = core.BoolPtr(true)
-				objectMetaDataModel.Ui = uiMetaDataModel
-				objectMetaDataModel.Pricing = pricingModel
-				objectMetaDataModel.Compliance = []string{"testString"}
-				objectMetaDataModel.Service = objectMetaDataServiceModel
-				objectMetaDataModel.Plan = objectMetaDataPlanModel
-				objectMetaDataModel.Template = objectMetaDataTemplateModel
-				objectMetaDataModel.Deployment = objectMetaDataDeploymentModel
-				objectMetaDataModel.Alias = objectMetaDataAliasModel
-				objectMetaDataModel.Sla = objectMetaDataSlaModel
-				objectMetaDataModel.Callbacks = callbacksModel
-				objectMetaDataModel.Version = core.StringPtr("testString")
-				objectMetaDataModel.OriginName = core.StringPtr("testString")
-				objectMetaDataModel.Other = CreateMockMap()
-
-				// Construct an instance of the OverviewUI model
-				overviewUiModel := new(globalcatalogv1.OverviewUI)
-				overviewUiModel.Language = overviewModel
-
-				// Construct an instance of the Provider model
-				providerModel := new(globalcatalogv1.Provider)
-				providerModel.Email = core.StringPtr("testString")
-				providerModel.Name = core.StringPtr("testString")
-				providerModel.Contact = core.StringPtr("testString")
-				providerModel.SupportEmail = core.StringPtr("testString")
-				providerModel.Phone = core.StringPtr("testString")
-
-				// Construct an instance of the CatalogEntry model
-				catalogEntryModel := new(globalcatalogv1.CatalogEntry)
-				catalogEntryModel.ID = core.StringPtr("testString")
-				catalogEntryModel.CatalogCrn = core.StringPtr("testString")
-				catalogEntryModel.URL = core.StringPtr("testString")
-				catalogEntryModel.Name = core.StringPtr("testString")
-				catalogEntryModel.OverviewUi = overviewUiModel
-				catalogEntryModel.Kind = core.StringPtr("testString")
-				catalogEntryModel.Images = imageModel
-				catalogEntryModel.ParentID = core.StringPtr("testString")
-				catalogEntryModel.ChildrenURL = core.StringPtr("testString")
-				catalogEntryModel.ParentURL = core.StringPtr("testString")
-				catalogEntryModel.Disabled = core.BoolPtr(true)
-				catalogEntryModel.Tags = []string{"testString"}
-				catalogEntryModel.GeoTags = []string{"testString"}
-				catalogEntryModel.PricingTags = []string{"testString"}
-				catalogEntryModel.Group = core.BoolPtr(true)
-				catalogEntryModel.Provider = providerModel
-				catalogEntryModel.Created = CreateMockDateTime()
-				catalogEntryModel.Updated = CreateMockDateTime()
-				catalogEntryModel.Metadata = objectMetaDataModel
-				catalogEntryModel.Active = core.BoolPtr(true)
-
-				// Construct an instance of the UpdateCatalogEntryOptions model
-				updateCatalogEntryOptionsModel := new(globalcatalogv1.UpdateCatalogEntryOptions)
-				updateCatalogEntryOptionsModel.ID = core.StringPtr("testString")
-				updateCatalogEntryOptionsModel.NewID = core.StringPtr("testString")
-				updateCatalogEntryOptionsModel.NewName = core.StringPtr("testString")
-				updateCatalogEntryOptionsModel.NewOverviewUi = overviewUiModel
-				updateCatalogEntryOptionsModel.NewKind = core.StringPtr("testString")
-				updateCatalogEntryOptionsModel.NewImages = imageModel
-				updateCatalogEntryOptionsModel.NewDisabled = core.BoolPtr(true)
-				updateCatalogEntryOptionsModel.NewTags = []string{"testString"}
-				updateCatalogEntryOptionsModel.NewGeoTags = []string{"testString"}
-				updateCatalogEntryOptionsModel.NewPricingTags = []string{"testString"}
-				updateCatalogEntryOptionsModel.NewGroup = core.BoolPtr(true)
-				updateCatalogEntryOptionsModel.NewProvider = providerModel
-				updateCatalogEntryOptionsModel.NewCatalogCrn = core.StringPtr("testString")
-				updateCatalogEntryOptionsModel.NewURL = core.StringPtr("testString")
-				updateCatalogEntryOptionsModel.NewParentID = core.StringPtr("testString")
-				updateCatalogEntryOptionsModel.NewChildrenURL = core.StringPtr("testString")
-				updateCatalogEntryOptionsModel.NewParentURL = core.StringPtr("testString")
-				updateCatalogEntryOptionsModel.NewCreated = CreateMockDateTime()
-				updateCatalogEntryOptionsModel.NewUpdated = CreateMockDateTime()
-				updateCatalogEntryOptionsModel.NewMetadata = objectMetaDataModel
-				updateCatalogEntryOptionsModel.NewActive = core.BoolPtr(true)
-				updateCatalogEntryOptionsModel.NewChildren = []globalcatalogv1.CatalogEntry{*catalogEntryModel}
-				updateCatalogEntryOptionsModel.Account = core.StringPtr("testString")
-				updateCatalogEntryOptionsModel.Move = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				response, operationErr = testService.UpdateCatalogEntry(updateCatalogEntryOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`ArchiveCatalogEntry(archiveCatalogEntryOptions *ArchiveCatalogEntryOptions)`, func() {
-		archiveCatalogEntryPath := "/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(archiveCatalogEntryPath))
-				Expect(req.Method).To(Equal("DELETE"))
-				Expect(req.URL.Query()["account"]).To(Equal([]string{"testString"}))
-
-				res.WriteHeader(204)
-			}))
-			It(`Invoke ArchiveCatalogEntry successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := globalcatalogv1.NewGlobalCatalogV1(&globalcatalogv1.GlobalCatalogV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				response, operationErr := testService.ArchiveCatalogEntry(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-
-				// Construct an instance of the ArchiveCatalogEntryOptions model
-				archiveCatalogEntryOptionsModel := new(globalcatalogv1.ArchiveCatalogEntryOptions)
-				archiveCatalogEntryOptionsModel.ID = core.StringPtr("testString")
-				archiveCatalogEntryOptionsModel.Account = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				response, operationErr = testService.ArchiveCatalogEntry(archiveCatalogEntryOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`GetChildObjects(getChildObjectsOptions *GetChildObjectsOptions)`, func() {
-		getChildObjectsPath := "/testString/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(getChildObjectsPath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.URL.Query()["account"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["include"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["q"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["sort-by"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["descending"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["languages"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["complete"]).To(Equal([]string{"testString"}))
-
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `[{}]`)
-			}))
-			It(`Invoke GetChildObjects successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := globalcatalogv1.NewGlobalCatalogV1(&globalcatalogv1.GlobalCatalogV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.GetChildObjects(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the GetChildObjectsOptions model
-				getChildObjectsOptionsModel := new(globalcatalogv1.GetChildObjectsOptions)
-				getChildObjectsOptionsModel.ID = core.StringPtr("testString")
-				getChildObjectsOptionsModel.Kind = core.StringPtr("testString")
-				getChildObjectsOptionsModel.Account = core.StringPtr("testString")
-				getChildObjectsOptionsModel.Include = core.StringPtr("testString")
-				getChildObjectsOptionsModel.Q = core.StringPtr("testString")
-				getChildObjectsOptionsModel.SortBy = core.StringPtr("testString")
-				getChildObjectsOptionsModel.Descending = core.StringPtr("testString")
-				getChildObjectsOptionsModel.Languages = core.StringPtr("testString")
-				getChildObjectsOptionsModel.Complete = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.GetChildObjects(getChildObjectsOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`RestoreCatalogEntry(restoreCatalogEntryOptions *RestoreCatalogEntryOptions)`, func() {
-		restoreCatalogEntryPath := "/testString/restore"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(restoreCatalogEntryPath))
-				Expect(req.Method).To(Equal("PUT"))
-				Expect(req.URL.Query()["account"]).To(Equal([]string{"testString"}))
-
-				res.WriteHeader(204)
-			}))
-			It(`Invoke RestoreCatalogEntry successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := globalcatalogv1.NewGlobalCatalogV1(&globalcatalogv1.GlobalCatalogV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				response, operationErr := testService.RestoreCatalogEntry(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-
-				// Construct an instance of the RestoreCatalogEntryOptions model
-				restoreCatalogEntryOptionsModel := new(globalcatalogv1.RestoreCatalogEntryOptions)
-				restoreCatalogEntryOptionsModel.ID = core.StringPtr("testString")
-				restoreCatalogEntryOptionsModel.Account = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				response, operationErr = testService.RestoreCatalogEntry(restoreCatalogEntryOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`GetVisibility(getVisibilityOptions *GetVisibilityOptions)`, func() {
-		getVisibilityPath := "/testString/visibility"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(getVisibilityPath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.URL.Query()["account"]).To(Equal([]string{"testString"}))
-
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"restrictions": "Restrictions", "owner": {"type": "Type", "value": "Value"}, "include": {"accounts": {"_accountid_": "Accountid"}}, "exclude": {"accounts": {"_accountid_": "Accountid"}}, "approved": true}`)
-			}))
-			It(`Invoke GetVisibility successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := globalcatalogv1.NewGlobalCatalogV1(&globalcatalogv1.GlobalCatalogV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.GetVisibility(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the GetVisibilityOptions model
-				getVisibilityOptionsModel := new(globalcatalogv1.GetVisibilityOptions)
-				getVisibilityOptionsModel.ID = core.StringPtr("testString")
-				getVisibilityOptionsModel.Account = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.GetVisibility(getVisibilityOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`UpdateVisibility(updateVisibilityOptions *UpdateVisibilityOptions)`, func() {
-		updateVisibilityPath := "/testString/visibility"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(updateVisibilityPath))
-				Expect(req.Method).To(Equal("PUT"))
-				Expect(req.URL.Query()["account"]).To(Equal([]string{"testString"}))
-
-				res.WriteHeader(200)
-			}))
-			It(`Invoke UpdateVisibility successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := globalcatalogv1.NewGlobalCatalogV1(&globalcatalogv1.GlobalCatalogV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				response, operationErr := testService.UpdateVisibility(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-
-				// Construct an instance of the VisibilityDetailAccounts model
-				visibilityDetailAccountsModel := new(globalcatalogv1.VisibilityDetailAccounts)
-				visibilityDetailAccountsModel.Accountid = core.StringPtr("testString")
-
-				// Construct an instance of the Scope model
-				scopeModel := new(globalcatalogv1.Scope)
-				scopeModel.Type = core.StringPtr("testString")
-				scopeModel.Value = core.StringPtr("testString")
-
-				// Construct an instance of the VisibilityDetail model
-				visibilityDetailModel := new(globalcatalogv1.VisibilityDetail)
-				visibilityDetailModel.Accounts = visibilityDetailAccountsModel
-
-				// Construct an instance of the UpdateVisibilityOptions model
-				updateVisibilityOptionsModel := new(globalcatalogv1.UpdateVisibilityOptions)
-				updateVisibilityOptionsModel.ID = core.StringPtr("testString")
-				updateVisibilityOptionsModel.Restrictions = core.StringPtr("testString")
-				updateVisibilityOptionsModel.Owner = scopeModel
-				updateVisibilityOptionsModel.Include = visibilityDetailModel
-				updateVisibilityOptionsModel.Exclude = visibilityDetailModel
-				updateVisibilityOptionsModel.Approved = core.BoolPtr(true)
-				updateVisibilityOptionsModel.Account = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				response, operationErr = testService.UpdateVisibility(updateVisibilityOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`GetPricing(getPricingOptions *GetPricingOptions)`, func() {
-		getPricingPath := "/testString/pricing"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(getPricingPath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.URL.Query()["account"]).To(Equal([]string{"testString"}))
-
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"type": "Type", "origin": "Origin", "starting_price": {"plan_id": "PlanID", "deployment_id": "DeploymentID", "amount": [{"counrty": "Counrty", "currency": "Currency", "prices": [{"quantity_tier": 12, "Price": 5}]}]}, "metrics": [{"metric_id": "MetricID", "tier_model": "TierModel", "charge_unit_name": "ChargeUnitName", "charge_unit_quantity": "ChargeUnitQuantity", "resource_display_name": "ResourceDisplayName", "charge_unit_display_name": "ChargeUnitDisplayName", "usage_cap_qty": 11, "amounts": [{"counrty": "Counrty", "currency": "Currency", "prices": [{"quantity_tier": 12, "Price": 5}]}]}]}`)
-			}))
-			It(`Invoke GetPricing successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := globalcatalogv1.NewGlobalCatalogV1(&globalcatalogv1.GlobalCatalogV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.GetPricing(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the GetPricingOptions model
-				getPricingOptionsModel := new(globalcatalogv1.GetPricingOptions)
-				getPricingOptionsModel.ID = core.StringPtr("testString")
-				getPricingOptionsModel.Account = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.GetPricing(getPricingOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`GetAuditLogs(getAuditLogsOptions *GetAuditLogsOptions)`, func() {
-		getAuditLogsPath := "/testString/logs"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(getAuditLogsPath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.URL.Query()["account"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["ascending"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["startat"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["_offset"]).To(Equal([]string{fmt.Sprint(int64(38))}))
-
-				Expect(req.URL.Query()["_limit"]).To(Equal([]string{fmt.Sprint(int64(38))}))
-
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"page": "Page", "results_per_page": "ResultsPerPage", "total_results": "TotalResults", "resources": [{"anyKey": "anyValue"}]}`)
-			}))
-			It(`Invoke GetAuditLogs successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := globalcatalogv1.NewGlobalCatalogV1(&globalcatalogv1.GlobalCatalogV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.GetAuditLogs(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the GetAuditLogsOptions model
-				getAuditLogsOptionsModel := new(globalcatalogv1.GetAuditLogsOptions)
-				getAuditLogsOptionsModel.ID = core.StringPtr("testString")
-				getAuditLogsOptionsModel.Account = core.StringPtr("testString")
-				getAuditLogsOptionsModel.Ascending = core.StringPtr("testString")
-				getAuditLogsOptionsModel.Startat = core.StringPtr("testString")
-				getAuditLogsOptionsModel.Offset = core.Int64Ptr(int64(38))
-				getAuditLogsOptionsModel.Limit = core.Int64Ptr(int64(38))
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.GetAuditLogs(getAuditLogsOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`ListArtifacts(listArtifactsOptions *ListArtifactsOptions)`, func() {
-		listArtifactsPath := "/testString/artifacts"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(listArtifactsPath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.URL.Query()["account"]).To(Equal([]string{"testString"}))
-
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"count": 5, "resources": [{"name": "Name", "updated": "Updated", "url": "URL", "etag": "Etag", "size": 4}]}`)
-			}))
-			It(`Invoke ListArtifacts successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := globalcatalogv1.NewGlobalCatalogV1(&globalcatalogv1.GlobalCatalogV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.ListArtifacts(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the ListArtifactsOptions model
-				listArtifactsOptionsModel := new(globalcatalogv1.ListArtifactsOptions)
-				listArtifactsOptionsModel.ObjectID = core.StringPtr("testString")
-				listArtifactsOptionsModel.Account = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.ListArtifacts(listArtifactsOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`GetArtifact(getArtifactOptions *GetArtifactOptions)`, func() {
-		getArtifactPath := "/testString/artifacts/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(getArtifactPath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.URL.Query()["account"]).To(Equal([]string{"testString"}))
-
-				res.WriteHeader(200)
-			}))
-			It(`Invoke GetArtifact successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := globalcatalogv1.NewGlobalCatalogV1(&globalcatalogv1.GlobalCatalogV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				response, operationErr := testService.GetArtifact(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-
-				// Construct an instance of the GetArtifactOptions model
-				getArtifactOptionsModel := new(globalcatalogv1.GetArtifactOptions)
-				getArtifactOptionsModel.ObjectID = core.StringPtr("testString")
-				getArtifactOptionsModel.ArtifactID = core.StringPtr("testString")
-				getArtifactOptionsModel.Account = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				response, operationErr = testService.GetArtifact(getArtifactOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`UploadArtifact(uploadArtifactOptions *UploadArtifactOptions)`, func() {
-		uploadArtifactPath := "/testString/artifacts/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(uploadArtifactPath))
-				Expect(req.Method).To(Equal("PUT"))
-				Expect(req.URL.Query()["account"]).To(Equal([]string{"testString"}))
-
-				res.WriteHeader(200)
-			}))
-			It(`Invoke UploadArtifact successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := globalcatalogv1.NewGlobalCatalogV1(&globalcatalogv1.GlobalCatalogV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				response, operationErr := testService.UploadArtifact(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-
-				// Construct an instance of the UploadArtifactOptions model
-				uploadArtifactOptionsModel := new(globalcatalogv1.UploadArtifactOptions)
-				uploadArtifactOptionsModel.ObjectID = core.StringPtr("testString")
-				uploadArtifactOptionsModel.ArtifactID = core.StringPtr("testString")
-				uploadArtifactOptionsModel.Account = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				response, operationErr = testService.UploadArtifact(uploadArtifactOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`DeleteArtifact(deleteArtifactOptions *DeleteArtifactOptions)`, func() {
-		deleteArtifactPath := "/testString/artifacts/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(deleteArtifactPath))
-				Expect(req.Method).To(Equal("DELETE"))
-				Expect(req.URL.Query()["account"]).To(Equal([]string{"testString"}))
-
-				res.WriteHeader(200)
-			}))
-			It(`Invoke DeleteArtifact successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := globalcatalogv1.NewGlobalCatalogV1(&globalcatalogv1.GlobalCatalogV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				response, operationErr := testService.DeleteArtifact(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-
-				// Construct an instance of the DeleteArtifactOptions model
-				deleteArtifactOptionsModel := new(globalcatalogv1.DeleteArtifactOptions)
-				deleteArtifactOptionsModel.ObjectID = core.StringPtr("testString")
-				deleteArtifactOptionsModel.ArtifactID = core.StringPtr("testString")
-				deleteArtifactOptionsModel.Account = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				response, operationErr = testService.DeleteArtifact(deleteArtifactOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`Model constructor tests`, func() {
-		Context(`Using a sample service client instance`, func() {
-			testService, _ := globalcatalogv1.NewGlobalCatalogV1(&globalcatalogv1.GlobalCatalogV1Options{
-				URL:           "http://globalcatalogv1modelgenerator.com",
-				Authenticator: &core.NoAuthAuthenticator{},
-			})
-			It(`Invoke NewCatalogEntry successfully`, func() {
-				id := "testString"
-				name := "testString"
-				var overviewUi *globalcatalogv1.OverviewUI = nil
-				kind := "testString"
-				var images *globalcatalogv1.Image = nil
-				disabled := true
-				tags := []string{"testString"}
-				geoTags := []string{"testString"}
-				pricingTags := []string{"testString"}
-				group := true
-				var provider *globalcatalogv1.Provider = nil
-				_, err := testService.NewCatalogEntry(id, name, overviewUi, kind, images, disabled, tags, geoTags, pricingTags, group, provider)
-				Expect(err).ToNot(BeNil())
-			})
-			It(`Invoke NewImage successfully`, func() {
-				image := "testString"
-				model, err := testService.NewImage(image)
-				Expect(model).ToNot(BeNil())
-				Expect(err).To(BeNil())
-			})
-			It(`Invoke NewOverview successfully`, func() {
-				displayName := "testString"
-				longDescription := "testString"
-				description := "testString"
-				model, err := testService.NewOverview(displayName, longDescription, description)
-				Expect(model).ToNot(BeNil())
-				Expect(err).To(BeNil())
-			})
-			It(`Invoke NewProvider successfully`, func() {
-				email := "testString"
-				name := "testString"
-				model, err := testService.NewProvider(email, name)
-				Expect(model).ToNot(BeNil())
-				Expect(err).To(BeNil())
-			})
-			It(`Invoke NewVisibilityDetail successfully`, func() {
-				var accounts *globalcatalogv1.VisibilityDetailAccounts = nil
-				_, err := testService.NewVisibilityDetail(accounts)
-				Expect(err).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`Utility function tests`, func() {
-		It(`Invoke CreateMockMap() successfully`, func() {
-			mockMap := CreateMockMap()
-			Expect(mockMap).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockByteArray() successfully`, func() {
-			mockByteArray := CreateMockByteArray("This is a test")
-			Expect(mockByteArray).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockUUID() successfully`, func() {
-			mockUUID := CreateMockUUID("9fab83da-98cb-4f18-a7ba-b6f0435c9673")
-			Expect(mockUUID).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockReader() successfully`, func() {
-			mockReader := CreateMockReader("This is a test.")
-			Expect(mockReader).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockDate() successfully`, func() {
-			mockDate := CreateMockDate()
-			Expect(mockDate).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockDateTime() successfully`, func() {
-			mockDateTime := CreateMockDateTime()
-			Expect(mockDateTime).ToNot(BeNil())
-		})
-	})
-})
-
-//
-// Utility functions used by the generated test code
-//
-
-func CreateMockMap() map[string]interface{} {
-	m := make(map[string]interface{})
-	return m
-}
-
-func CreateMockByteArray(mockData string) *[]byte {
-	ba := make([]byte, len(mockData))
-	ba = append(ba, mockData...)
-	return &ba
-}
-
-func CreateMockUUID(mockData string) *strfmt.UUID {
-	uuid := strfmt.UUID(mockData)
-	return &uuid
-}
-
-func CreateMockReader(mockData string) io.ReadCloser {
-	return ioutil.NopCloser(bytes.NewReader([]byte(mockData)))
-}
-
-func CreateMockDate() *strfmt.Date {
-	d := strfmt.Date(time.Now())
-	return &d
-}
-
-func CreateMockDateTime() *strfmt.DateTime {
-	d := strfmt.DateTime(time.Now())
-	return &d
-}
diff --git a/globalsearchv2/global_search_v2.go b/globalsearchv2/global_search_v2.go
deleted file mode 100644
index 8938cc60..00000000
--- a/globalsearchv2/global_search_v2.go
+++ /dev/null
@@ -1,618 +0,0 @@
-/**
- * (C) Copyright IBM Corp. 2020.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// Package globalsearchv2 : Operations and models for the GlobalSearchV2 service
-package globalsearchv2
-
-import (
-	"encoding/json"
-	"fmt"
-	"github.com/IBM/go-sdk-core/v3/core"
-	common "github.ibm.com/ibmcloud/platform-services-go-sdk/common"
-	"strings"
-)
-
-// GlobalSearchV2 : Search for resources with the global and shared resource properties repository integrated in the IBM
-// Cloud Platform. The search repository stores and searches cloud resources attributes, which categorize or classify
-// resources. A resource is a physical or logical component that can be provisioned or reserved for an application or
-// service instance and is owned by resource providers, such as Cloud Foundry, IBM containers, or Resource Controller,
-// in the IBM Cloud platform. Resources are uniquely identified by a CRN (Cloud Resource Naming identifier) or by an IMS
-// ID. The properties of a resource include tags and system properties. Both properties are defined in an IBM Cloud
-// billing account, and span across many regions.
-//
-// Version: 2.0.1
-type GlobalSearchV2 struct {
-	Service *core.BaseService
-}
-
-// DefaultServiceURL is the default URL to make service requests to.
-const DefaultServiceURL = "https://api.global-search-tagging.cloud.ibm.com/"
-
-// DefaultServiceName is the default key used to find external configuration information.
-const DefaultServiceName = "global_search"
-
-// GlobalSearchV2Options : Service options
-type GlobalSearchV2Options struct {
-	ServiceName   string
-	URL           string
-	Authenticator core.Authenticator
-}
-
-// NewGlobalSearchV2UsingExternalConfig : constructs an instance of GlobalSearchV2 with passed in options and external configuration.
-func NewGlobalSearchV2UsingExternalConfig(options *GlobalSearchV2Options) (globalSearch *GlobalSearchV2, err error) {
-	if options.ServiceName == "" {
-		options.ServiceName = DefaultServiceName
-	}
-
-	if options.Authenticator == nil {
-		options.Authenticator, err = core.GetAuthenticatorFromEnvironment(options.ServiceName)
-		if err != nil {
-			return
-		}
-	}
-
-	globalSearch, err = NewGlobalSearchV2(options)
-	if err != nil {
-		return
-	}
-
-	err = globalSearch.Service.ConfigureService(options.ServiceName)
-	if err != nil {
-		return
-	}
-
-	if options.URL != "" {
-		err = globalSearch.Service.SetServiceURL(options.URL)
-	}
-	return
-}
-
-// NewGlobalSearchV2 : constructs an instance of GlobalSearchV2 with passed in options.
-func NewGlobalSearchV2(options *GlobalSearchV2Options) (service *GlobalSearchV2, err error) {
-	serviceOptions := &core.ServiceOptions{
-		URL:           DefaultServiceURL,
-		Authenticator: options.Authenticator,
-	}
-
-	baseService, err := core.NewBaseService(serviceOptions)
-	if err != nil {
-		return
-	}
-
-	if options.URL != "" {
-		err = baseService.SetServiceURL(options.URL)
-		if err != nil {
-			return
-		}
-	}
-
-	service = &GlobalSearchV2{
-		Service: baseService,
-	}
-
-	return
-}
-
-// SetServiceURL sets the service URL
-func (globalSearch *GlobalSearchV2) SetServiceURL(url string) error {
-	return globalSearch.Service.SetServiceURL(url)
-}
-
-// Search : Find instances of resources
-// 'Find cloud foundry resources, resource controlled enabled resources, or storage and network resources running on
-// classic infrastructure in a specific account ID. You can apply query strings if necessary. To filter results, you can
-// insert a string using the Lucene syntax and the query string is parsed into a series of terms and operators. A term
-// can be a single word or a phrase, in which case the search is performed for all the words, in the same order. To
-// filter for a specific value regardless of the property that contains it, use an asterisk as the key name. Only
-// resources that belong to the account ID and that are accessible by the client are returned. You must use this
-// operation when you need to fetch more than `10000` resource items. The `/v2/resources/search` prohibits paginating
-// through such a big number. On the first call, the operation returns a live cursor on the data that you must use on
-// all the subsequent calls to get the next batch of results until you get the empty result set. By default, the fields
-// returned for every resources are: "crn", "name", "family", "type", "account_id". You can specify the subset of the
-// fields you want in your request.''.
-func (globalSearch *GlobalSearchV2) Search(searchOptions *SearchOptions) (result *ScanResult, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(searchOptions, "searchOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(searchOptions, "searchOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v3/resources/search"}
-	pathParameters := []string{}
-
-	builder := core.NewRequestBuilder(core.POST)
-	_, err = builder.ConstructHTTPURL(globalSearch.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range searchOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("global_search", "V2", "Search")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-	builder.AddHeader("Content-Type", "application/json")
-	if searchOptions.TransactionID != nil {
-		builder.AddHeader("transaction-id", fmt.Sprint(*searchOptions.TransactionID))
-	}
-
-	if searchOptions.AccountID != nil {
-		builder.AddQuery("account_id", fmt.Sprint(*searchOptions.AccountID))
-	}
-	if searchOptions.Limit != nil {
-		builder.AddQuery("limit", fmt.Sprint(*searchOptions.Limit))
-	}
-	if searchOptions.Timeout != nil {
-		builder.AddQuery("timeout", fmt.Sprint(*searchOptions.Timeout))
-	}
-	if searchOptions.Sort != nil {
-		builder.AddQuery("sort", strings.Join(searchOptions.Sort, ","))
-	}
-
-	body := make(map[string]interface{})
-	if searchOptions.Query != nil {
-		body["query"] = searchOptions.Query
-	}
-	if searchOptions.Fields != nil {
-		body["fields"] = searchOptions.Fields
-	}
-	if searchOptions.SearchCursor != nil {
-		body["search_cursor"] = searchOptions.SearchCursor
-	}
-	_, err = builder.SetBodyContentJSON(body)
-	if err != nil {
-		return
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = globalSearch.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalScanResult(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// GetSupportedTypes : Get all supported resource types
-// Retrieves a list of all the resource types supported by GhoST.
-func (globalSearch *GlobalSearchV2) GetSupportedTypes(getSupportedTypesOptions *GetSupportedTypesOptions) (result *SupportedTypesList, response *core.DetailedResponse, err error) {
-	err = core.ValidateStruct(getSupportedTypesOptions, "getSupportedTypesOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v2/resources/supported_types"}
-	pathParameters := []string{}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(globalSearch.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range getSupportedTypesOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("global_search", "V2", "GetSupportedTypes")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = globalSearch.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalSupportedTypesList(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// GetSupportedTypesOptions : The GetSupportedTypes options.
-type GetSupportedTypesOptions struct {
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewGetSupportedTypesOptions : Instantiate GetSupportedTypesOptions
-func (*GlobalSearchV2) NewGetSupportedTypesOptions() *GetSupportedTypesOptions {
-	return &GetSupportedTypesOptions{}
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *GetSupportedTypesOptions) SetHeaders(param map[string]string) *GetSupportedTypesOptions {
-	options.Headers = param
-	return options
-}
-
-// ResultItem : A resource returned in a search result.
-type ResultItem struct {
-	// Resource identifier in CRN format.
-	Crn *string `json:"crn,omitempty"`
-
-	// Allows users to set arbitrary properties
-	additionalProperties map[string]interface{}
-}
-
-
-// SetProperty allows the user to set an arbitrary property on an instance of ResultItem
-func (o *ResultItem) SetProperty(key string, value interface{}) {
-	if o.additionalProperties == nil {
-		o.additionalProperties = make(map[string]interface{})
-	}
-	o.additionalProperties[key] = value
-}
-
-// GetProperty allows the user to retrieve an arbitrary property from an instance of ResultItem
-func (o *ResultItem) GetProperty(key string) interface{} {
-	return o.additionalProperties[key]
-}
-
-// GetProperties allows the user to retrieve the map of arbitrary properties from an instance of ResultItem
-func (o *ResultItem) GetProperties() map[string]interface{} {
-	return o.additionalProperties
-}
-
-// MarshalJSON performs custom serialization for instances of ResultItem
-func (o *ResultItem) MarshalJSON() (buffer []byte, err error) {
-	m := make(map[string]interface{})
-	if len(o.additionalProperties) > 0 {
-		for k, v := range o.additionalProperties {
-			m[k] = v
-		}
-	}
-	if o.Crn != nil {
-		m["crn"] = o.Crn
-	}
-	buffer, err = json.Marshal(m)	
-	return
-}
-
-// UnmarshalResultItem constructs an instance of ResultItem from the specified map.
-func UnmarshalResultItem(m map[string]interface{}) (result *ResultItem, err error) {
-	m = core.CopyMap(m)
-	obj := new(ResultItem)
-	obj.Crn, err = core.UnmarshalString(m, "crn")
-	if err != nil {
-		return
-	}
-	delete(m, "crn")
-	for k := range m {
-		v, e := core.UnmarshalAny(m, k)
-		if e != nil {
-			err = e
-			return
-		}
-		obj.SetProperty(k, v)
-	}
-	result = obj
-	return
-}
-
-// UnmarshalResultItemSlice unmarshals a slice of ResultItem instances from the specified list of maps.
-func UnmarshalResultItemSlice(s []interface{}) (slice []ResultItem, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'ResultItem'")
-			return
-		}
-		obj, e := UnmarshalResultItem(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalResultItemAsProperty unmarshals an instance of ResultItem that is stored as a property
-// within the specified map.
-func UnmarshalResultItemAsProperty(m map[string]interface{}, propertyName string) (result *ResultItem, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'ResultItem'", propertyName)
-			return
-		}
-		result, err = UnmarshalResultItem(objMap)
-	}
-	return
-}
-
-// UnmarshalResultItemSliceAsProperty unmarshals a slice of ResultItem instances that are stored as a property
-// within the specified map.
-func UnmarshalResultItemSliceAsProperty(m map[string]interface{}, propertyName string) (slice []ResultItem, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'ResultItem'", propertyName)
-			return
-		}
-		slice, err = UnmarshalResultItemSlice(vSlice)
-	}
-	return
-}
-
-// ScanResult : The search scan response.
-type ScanResult struct {
-	// The search cursor to use on all calls after the first one.
-	SearchCursor *string `json:"search_cursor" validate:"required"`
-
-	// Value of the limit parameter specified by the user.
-	Limit *float64 `json:"limit,omitempty"`
-
-	// The array of results. Each item represents a resource. An empty array signals the end of the result set, there are
-	// no more hits to fetch.
-	Items []ResultItem `json:"items" validate:"required"`
-}
-
-
-// UnmarshalScanResult constructs an instance of ScanResult from the specified map.
-func UnmarshalScanResult(m map[string]interface{}) (result *ScanResult, err error) {
-	obj := new(ScanResult)
-	obj.SearchCursor, err = core.UnmarshalString(m, "search_cursor")
-	if err != nil {
-		return
-	}
-	obj.Limit, err = core.UnmarshalFloat64(m, "limit")
-	if err != nil {
-		return
-	}
-	obj.Items, err = UnmarshalResultItemSliceAsProperty(m, "items")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalScanResultSlice unmarshals a slice of ScanResult instances from the specified list of maps.
-func UnmarshalScanResultSlice(s []interface{}) (slice []ScanResult, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'ScanResult'")
-			return
-		}
-		obj, e := UnmarshalScanResult(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalScanResultAsProperty unmarshals an instance of ScanResult that is stored as a property
-// within the specified map.
-func UnmarshalScanResultAsProperty(m map[string]interface{}, propertyName string) (result *ScanResult, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'ScanResult'", propertyName)
-			return
-		}
-		result, err = UnmarshalScanResult(objMap)
-	}
-	return
-}
-
-// UnmarshalScanResultSliceAsProperty unmarshals a slice of ScanResult instances that are stored as a property
-// within the specified map.
-func UnmarshalScanResultSliceAsProperty(m map[string]interface{}, propertyName string) (slice []ScanResult, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'ScanResult'", propertyName)
-			return
-		}
-		slice, err = UnmarshalScanResultSlice(vSlice)
-	}
-	return
-}
-
-// SearchOptions : The Search options.
-type SearchOptions struct {
-	// The Lucene-formatted query string. Default to '*' if not set.
-	Query *string `json:"query,omitempty"`
-
-	// The list of the fields returned by the search. Defaults to all. `crn` is always returned.
-	Fields []string `json:"fields,omitempty"`
-
-	// An opaque search cursor that is returned on each operation call and that must be set on next call.
-	SearchCursor *string `json:"search_cursor,omitempty"`
-
-	// An aplhanumeric string that can be used to trace a request across services. If not specified it will be
-	// automatically generated with the prefix "gst-".
-	TransactionID *string `json:"transaction-id,omitempty"`
-
-	// The account ID to filter resources.
-	AccountID *string `json:"account_id,omitempty"`
-
-	// The maximum number of hits to return. Defaults to 10.
-	Limit *int64 `json:"limit,omitempty"`
-
-	// A search timeout, bounding the search request to be executed within the specified time value and bail with the hits
-	// accumulated up to that point when expired. Defaults to the system defined timeout.
-	Timeout *int64 `json:"timeout,omitempty"`
-
-	// Comma separated properties names used for sorting.
-	Sort []string `json:"sort,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewSearchOptions : Instantiate SearchOptions
-func (*GlobalSearchV2) NewSearchOptions() *SearchOptions {
-	return &SearchOptions{}
-}
-
-// SetQuery : Allow user to set Query
-func (options *SearchOptions) SetQuery(query string) *SearchOptions {
-	options.Query = core.StringPtr(query)
-	return options
-}
-
-// SetFields : Allow user to set Fields
-func (options *SearchOptions) SetFields(fields []string) *SearchOptions {
-	options.Fields = fields
-	return options
-}
-
-// SetSearchCursor : Allow user to set SearchCursor
-func (options *SearchOptions) SetSearchCursor(searchCursor string) *SearchOptions {
-	options.SearchCursor = core.StringPtr(searchCursor)
-	return options
-}
-
-// SetTransactionID : Allow user to set TransactionID
-func (options *SearchOptions) SetTransactionID(transactionID string) *SearchOptions {
-	options.TransactionID = core.StringPtr(transactionID)
-	return options
-}
-
-// SetAccountID : Allow user to set AccountID
-func (options *SearchOptions) SetAccountID(accountID string) *SearchOptions {
-	options.AccountID = core.StringPtr(accountID)
-	return options
-}
-
-// SetLimit : Allow user to set Limit
-func (options *SearchOptions) SetLimit(limit int64) *SearchOptions {
-	options.Limit = core.Int64Ptr(limit)
-	return options
-}
-
-// SetTimeout : Allow user to set Timeout
-func (options *SearchOptions) SetTimeout(timeout int64) *SearchOptions {
-	options.Timeout = core.Int64Ptr(timeout)
-	return options
-}
-
-// SetSort : Allow user to set Sort
-func (options *SearchOptions) SetSort(sort []string) *SearchOptions {
-	options.Sort = sort
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *SearchOptions) SetHeaders(param map[string]string) *SearchOptions {
-	options.Headers = param
-	return options
-}
-
-// SupportedTypesList : A list of resource types supported by GhoST.
-type SupportedTypesList struct {
-	// A list of resource types supported by GhoST.
-	SupportedTypes []string `json:"supported_types,omitempty"`
-}
-
-
-// UnmarshalSupportedTypesList constructs an instance of SupportedTypesList from the specified map.
-func UnmarshalSupportedTypesList(m map[string]interface{}) (result *SupportedTypesList, err error) {
-	obj := new(SupportedTypesList)
-	obj.SupportedTypes, err = core.UnmarshalStringSlice(m, "supported_types")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalSupportedTypesListSlice unmarshals a slice of SupportedTypesList instances from the specified list of maps.
-func UnmarshalSupportedTypesListSlice(s []interface{}) (slice []SupportedTypesList, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'SupportedTypesList'")
-			return
-		}
-		obj, e := UnmarshalSupportedTypesList(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalSupportedTypesListAsProperty unmarshals an instance of SupportedTypesList that is stored as a property
-// within the specified map.
-func UnmarshalSupportedTypesListAsProperty(m map[string]interface{}, propertyName string) (result *SupportedTypesList, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'SupportedTypesList'", propertyName)
-			return
-		}
-		result, err = UnmarshalSupportedTypesList(objMap)
-	}
-	return
-}
-
-// UnmarshalSupportedTypesListSliceAsProperty unmarshals a slice of SupportedTypesList instances that are stored as a property
-// within the specified map.
-func UnmarshalSupportedTypesListSliceAsProperty(m map[string]interface{}, propertyName string) (slice []SupportedTypesList, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'SupportedTypesList'", propertyName)
-			return
-		}
-		slice, err = UnmarshalSupportedTypesListSlice(vSlice)
-	}
-	return
-}
diff --git a/globalsearchv2/global_search_v2_integration_test.go b/globalsearchv2/global_search_v2_integration_test.go
deleted file mode 100644
index 42bc3108..00000000
--- a/globalsearchv2/global_search_v2_integration_test.go
+++ /dev/null
@@ -1,135 +0,0 @@
-// +build integration
-
-package globalsearchv2_test
-
-/**
- * (C) Copyright IBM Corp. 2020.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import (
-	"github.com/IBM/go-sdk-core/v3/core"
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-	"github.ibm.com/ibmcloud/platform-services-go-sdk/globalsearchv2"
-	"github.com/joho/godotenv"
-	"log"
-	"os"
-)
-
-var _ = Describe("Global Search and Tagging - Search integration test", func() {
-
-	err := godotenv.Load("../.ghostenv")
-	if err != nil {
-		log.Fatal("Error loading .env file")
-	}
-
-	// Create the authenticator.
-	authenticator := &core.IamAuthenticator{
-		ApiKey: os.Getenv("GST_IINTERNA_APIKEY"),
-		URL: os.Getenv("GST_IAM_URL"),
-	}
-
-	options := &globalsearchv2.GlobalSearchV2Options{
-		Authenticator: authenticator,
-	}
-	service, err := globalsearchv2.NewGlobalSearchV2(options)
-	It(`Successfully created NewGlobalSearchV2 service instance`, func() {
-		Expect(err).To(BeNil())
-	})
-
-	err = service.SetServiceURL(os.Getenv("GST_API_URL"))
-	It(`Successfully change default service URL to point to` + os.Getenv("GST_API_URL"), func() {
-		Expect(err).To(BeNil())
-	})
-
-	Describe("Call Search v3 api with query 'name:gst-sdk*' all fields", func() {
-
-		// Construct an instance of the SearchOptions model
-		searchOptionsModel := service.NewSearchOptions()
-		searchOptionsModel.SetQuery(os.Getenv("GST_QUERY"));
-		searchOptionsModel.SetFields([]string{"*"})
-
-		It("Successfully list all resources", func() {
-		result, detailedResponse, err := service.Search(searchOptionsModel)
-		Expect(err).To(BeNil())
-		Expect(detailedResponse.StatusCode).To(Equal(200))
-		Expect(result.Items).To(HaveLen(2))
-		for _, elem := range result.Items {
-			Expect(elem.GetProperty("doc")).NotTo(BeNil())
-			Expect(elem.GetProperty("family")).NotTo(BeNil())
-			Expect(elem.GetProperty("type")).NotTo(BeNil())
-			Expect(*elem.Crn).NotTo(BeNil())
-		}
-		})
-	})
-
-	Describe("Call Search v3 api with query 'name:gst-sdk*' retrieving only the attributes crn and name", func() {
-
-		// Construct an instance of the SearchOptions model
-		searchOptionsModel := service.NewSearchOptions()
-		searchOptionsModel.SetQuery(os.Getenv("GST_QUERY"));
-		searchOptionsModel.SetLimit(1);
-		searchOptionsModel.SetFields([]string{"crn","name"})
-
-		It("Successfully list resource using cursor", func() {
-		result, detailedResponse, err := service.Search(searchOptionsModel)
-		Expect(err).To(BeNil())
-		Expect(detailedResponse.StatusCode).To(Equal(200))
-		Expect(result.Items).To(HaveLen(1))
-		for _, elem := range result.Items {
-			Expect(elem.GetProperty("doc")).To(BeNil())
-			Expect(elem.GetProperty("family")).To(BeNil())
-			Expect(elem.GetProperty("name")).NotTo(BeNil())
-			Expect(*elem.Crn).NotTo(BeNil())
-		}
-		firstCrn := *result.Items[0].Crn
-
-		search_cursor := *result.SearchCursor
-		searchOptionsModelCursor := service.NewSearchOptions()
-		searchOptionsModelCursor.SetQuery(os.Getenv("GST_QUERY"));
-		searchOptionsModelCursor.SetLimit(1);
-		searchOptionsModelCursor.SetFields([]string{"crn","name"})
-		searchOptionsModelCursor.SetSearchCursor(search_cursor)
-
-		resultCursor, detailedResponseCursor, errCursor := service.Search(searchOptionsModelCursor)
-		Expect(errCursor).To(BeNil())
-		Expect(detailedResponseCursor.StatusCode).To(Equal(200))
-		Expect(resultCursor.Items).To(HaveLen(1))
-		for _, elem := range resultCursor.Items {
-			Expect(elem.GetProperty("doc")).To(BeNil())
-			Expect(elem.GetProperty("family")).To(BeNil())
-			Expect(elem.GetProperty("name")).NotTo(BeNil())
-			Expect(*elem.Crn).NotTo(BeNil())
-		}
-		secondCrn := *resultCursor.Items[0].Crn
-
-		Expect(firstCrn).NotTo(BeIdenticalTo(secondCrn))
-		})
-	})
-
-	Describe("Call GetSupportedTypes", func() {
-
-		// Construct an instance of the SearchOptions model
-		supportedTypessModel := service.NewGetSupportedTypesOptions()
-
-		It("Successfully list all resources", func() {
-		result, detailedResponse, err := service.GetSupportedTypes(supportedTypessModel)
-		Expect(err).To(BeNil())
-		Expect(detailedResponse.StatusCode).To(Equal(200))
-		Expect(result.SupportedTypes).To(ContainElement("cf-space"))
-		Expect(result.SupportedTypes).NotTo(ContainElement("fake-resource!"))
-		})
-	})
-})
diff --git a/globalsearchv2/global_search_v2_suite_test.go b/globalsearchv2/global_search_v2_suite_test.go
deleted file mode 100644
index 95d26af6..00000000
--- a/globalsearchv2/global_search_v2_suite_test.go
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * (C) Copyright IBM Corp. 2020.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package globalsearchv2_test
-
-import (
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-	"testing"
-)
-
-func TestGlobalSearchV2(t *testing.T) {
-	RegisterFailHandler(Fail)
-	RunSpecs(t, "GlobalSearchV2 Suite")
-}
diff --git a/globalsearchv2/global_search_v2_test.go b/globalsearchv2/global_search_v2_test.go
deleted file mode 100644
index f1cd3605..00000000
--- a/globalsearchv2/global_search_v2_test.go
+++ /dev/null
@@ -1,201 +0,0 @@
-/**
- * (C) Copyright IBM Corp. 2020.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package globalsearchv2_test
-
-import (
-	"bytes"
-	"fmt"
-	"github.com/IBM/go-sdk-core/v3/core"
-	"github.com/go-openapi/strfmt"
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-	"github.ibm.com/ibmcloud/platform-services-go-sdk/globalsearchv2"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"net/http/httptest"
-	"time"
-)
-
-var _ = Describe(`GlobalSearchV2`, func() {
-	Describe(`Search(searchOptions *SearchOptions)`, func() {
-		bearerToken := "0ui9876453"
-		searchPath := "/v3/resources/search"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(searchPath))
-				Expect(req.Method).To(Equal("POST"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				Expect(req.Header["Transaction-Id"]).ToNot(BeNil())
-				Expect(req.Header["Transaction-Id"][0]).To(Equal(fmt.Sprintf("%v", "testString")))
-				Expect(req.URL.Query()["account_id"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["limit"]).To(Equal([]string{fmt.Sprint(int64(38))}))
-
-				Expect(req.URL.Query()["timeout"]).To(Equal([]string{fmt.Sprint(int64(38))}))
-
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"search_cursor": "SearchCursor", "limit": 5, "items": [{"crn": "Crn"}]}`)
-			}))
-			It(`Invoke Search successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := globalsearchv2.NewGlobalSearchV2(&globalsearchv2.GlobalSearchV2Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.Search(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the SearchOptions model
-				searchOptionsModel := new(globalsearchv2.SearchOptions)
-				searchOptionsModel.Query = core.StringPtr("testString")
-				searchOptionsModel.Fields = []string{"testString"}
-				searchOptionsModel.SearchCursor = core.StringPtr("testString")
-				searchOptionsModel.TransactionID = core.StringPtr("testString")
-				searchOptionsModel.AccountID = core.StringPtr("testString")
-				searchOptionsModel.Limit = core.Int64Ptr(int64(38))
-				searchOptionsModel.Timeout = core.Int64Ptr(int64(38))
-				searchOptionsModel.Sort = []string{"testString"}
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.Search(searchOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`GetSupportedTypes(getSupportedTypesOptions *GetSupportedTypesOptions)`, func() {
-		bearerToken := "0ui9876453"
-		getSupportedTypesPath := "/v2/resources/supported_types"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(getSupportedTypesPath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"supported_types": ["SupportedTypes"]}`)
-			}))
-			It(`Invoke GetSupportedTypes successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := globalsearchv2.NewGlobalSearchV2(&globalsearchv2.GlobalSearchV2Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.GetSupportedTypes(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the GetSupportedTypesOptions model
-				getSupportedTypesOptionsModel := new(globalsearchv2.GetSupportedTypesOptions)
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.GetSupportedTypes(getSupportedTypesOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`Utility function tests`, func() {
-		It(`Invoke CreateMockMap() successfully`, func() {
-			mockMap := CreateMockMap()
-			Expect(mockMap).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockByteArray() successfully`, func() {
-			mockByteArray := CreateMockByteArray("This is a test")
-			Expect(mockByteArray).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockUUID() successfully`, func() {
-			mockUUID := CreateMockUUID("9fab83da-98cb-4f18-a7ba-b6f0435c9673")
-			Expect(mockUUID).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockReader() successfully`, func() {
-			mockReader := CreateMockReader("This is a test.")
-			Expect(mockReader).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockDate() successfully`, func() {
-			mockDate := CreateMockDate()
-			Expect(mockDate).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockDateTime() successfully`, func() {
-			mockDateTime := CreateMockDateTime()
-			Expect(mockDateTime).ToNot(BeNil())
-		})
-	})
-})
-
-//
-// Utility functions used by the generated test code
-//
-
-func CreateMockMap() map[string]interface{} {
-	m := make(map[string]interface{})
-	return m
-}
-
-func CreateMockByteArray(mockData string) *[]byte {
-	ba := make([]byte, len(mockData))
-	ba = append(ba, mockData...)
-	return &ba
-}
-
-func CreateMockUUID(mockData string) *strfmt.UUID {
-	uuid := strfmt.UUID(mockData)
-	return &uuid
-}
-
-func CreateMockReader(mockData string) io.ReadCloser {
-	return ioutil.NopCloser(bytes.NewReader([]byte(mockData)))
-}
-
-func CreateMockDate() *strfmt.Date {
-	d := strfmt.Date(time.Now())
-	return &d
-}
-
-func CreateMockDateTime() *strfmt.DateTime {
-	d := strfmt.DateTime(time.Now())
-	return &d
-}
diff --git a/globaltaggingv1/global_tagging_v1.go b/globaltaggingv1/global_tagging_v1.go
deleted file mode 100644
index eb9bb7b5..00000000
--- a/globaltaggingv1/global_tagging_v1.go
+++ /dev/null
@@ -1,1420 +0,0 @@
-/**
- * (C) Copyright IBM Corp. 2020.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// Package globaltaggingv1 : Operations and models for the GlobalTaggingV1 service
-package globaltaggingv1
-
-import (
-	"encoding/json"
-	"fmt"
-	"github.com/IBM/go-sdk-core/v3/core"
-	common "github.ibm.com/ibmcloud/platform-services-go-sdk/common"
-	"strings"
-)
-
-// GlobalTaggingV1 : Manage your tags with the Tagging API in IBM Cloud. You can attach, detach, delete a tag or list
-// all tags in your billing account with the Tagging API. The tag name must be unique within a billing account. You can
-// create tags in two formats: `key:value` or `label`.
-//
-// Version: 1.0.3
-type GlobalTaggingV1 struct {
-	Service *core.BaseService
-}
-
-// DefaultServiceURL is the default URL to make service requests to.
-const DefaultServiceURL = "https://tags.global-search-tagging.cloud.ibm.com/"
-
-// DefaultServiceName is the default key used to find external configuration information.
-const DefaultServiceName = "global_tagging"
-
-// GlobalTaggingV1Options : Service options
-type GlobalTaggingV1Options struct {
-	ServiceName   string
-	URL           string
-	Authenticator core.Authenticator
-}
-
-// NewGlobalTaggingV1UsingExternalConfig : constructs an instance of GlobalTaggingV1 with passed in options and external configuration.
-func NewGlobalTaggingV1UsingExternalConfig(options *GlobalTaggingV1Options) (globalTagging *GlobalTaggingV1, err error) {
-	if options.ServiceName == "" {
-		options.ServiceName = DefaultServiceName
-	}
-
-	if options.Authenticator == nil {
-		options.Authenticator, err = core.GetAuthenticatorFromEnvironment(options.ServiceName)
-		if err != nil {
-			return
-		}
-	}
-
-	globalTagging, err = NewGlobalTaggingV1(options)
-	if err != nil {
-		return
-	}
-
-	err = globalTagging.Service.ConfigureService(options.ServiceName)
-	if err != nil {
-		return
-	}
-
-	if options.URL != "" {
-		err = globalTagging.Service.SetServiceURL(options.URL)
-	}
-	return
-}
-
-// NewGlobalTaggingV1 : constructs an instance of GlobalTaggingV1 with passed in options.
-func NewGlobalTaggingV1(options *GlobalTaggingV1Options) (service *GlobalTaggingV1, err error) {
-	serviceOptions := &core.ServiceOptions{
-		URL:           DefaultServiceURL,
-		Authenticator: options.Authenticator,
-	}
-
-	baseService, err := core.NewBaseService(serviceOptions)
-	if err != nil {
-		return
-	}
-
-	if options.URL != "" {
-		err = baseService.SetServiceURL(options.URL)
-		if err != nil {
-			return
-		}
-	}
-
-	service = &GlobalTaggingV1{
-		Service: baseService,
-	}
-
-	return
-}
-
-// SetServiceURL sets the service URL
-func (globalTagging *GlobalTaggingV1) SetServiceURL(url string) error {
-	return globalTagging.Service.SetServiceURL(url)
-}
-
-// ListTags : Get all tags
-// Lists all tags in a billing account. Use the `attached_to` parameter to return the list of tags attached to the
-// specified resource.
-func (globalTagging *GlobalTaggingV1) ListTags(listTagsOptions *ListTagsOptions) (result *TagList, response *core.DetailedResponse, err error) {
-	err = core.ValidateStruct(listTagsOptions, "listTagsOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v3/tags"}
-	pathParameters := []string{}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(globalTagging.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range listTagsOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("global_tagging", "V1", "ListTags")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	if listTagsOptions.Providers != nil {
-		builder.AddQuery("providers", strings.Join(listTagsOptions.Providers, ","))
-	}
-	if listTagsOptions.AttachedTo != nil {
-		builder.AddQuery("attached_to", fmt.Sprint(*listTagsOptions.AttachedTo))
-	}
-	if listTagsOptions.FullData != nil {
-		builder.AddQuery("full_data", fmt.Sprint(*listTagsOptions.FullData))
-	}
-	if listTagsOptions.Offset != nil {
-		builder.AddQuery("offset", fmt.Sprint(*listTagsOptions.Offset))
-	}
-	if listTagsOptions.Limit != nil {
-		builder.AddQuery("limit", fmt.Sprint(*listTagsOptions.Limit))
-	}
-	if listTagsOptions.OrderByName != nil {
-		builder.AddQuery("order_by_name", fmt.Sprint(*listTagsOptions.OrderByName))
-	}
-	if listTagsOptions.Timeout != nil {
-		builder.AddQuery("timeout", fmt.Sprint(*listTagsOptions.Timeout))
-	}
-	if listTagsOptions.AttachedOnly != nil {
-		builder.AddQuery("attached_only", fmt.Sprint(*listTagsOptions.AttachedOnly))
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = globalTagging.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalTagList(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// DeleteTagAll : Delete unused tags
-// Delete the tags that are not attatched to any resource.
-func (globalTagging *GlobalTaggingV1) DeleteTagAll(deleteTagAllOptions *DeleteTagAllOptions) (result *DeleteTagsResult, response *core.DetailedResponse, err error) {
-	err = core.ValidateStruct(deleteTagAllOptions, "deleteTagAllOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v3/tags"}
-	pathParameters := []string{}
-
-	builder := core.NewRequestBuilder(core.DELETE)
-	_, err = builder.ConstructHTTPURL(globalTagging.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range deleteTagAllOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("global_tagging", "V1", "DeleteTagAll")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	if deleteTagAllOptions.Providers != nil {
-		builder.AddQuery("providers", fmt.Sprint(*deleteTagAllOptions.Providers))
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = globalTagging.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalDeleteTagsResult(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// DeleteTag : Delete a tag
-// Delete an existing tag. A tag can be deleted only if it is not attached to any resource.
-func (globalTagging *GlobalTaggingV1) DeleteTag(deleteTagOptions *DeleteTagOptions) (result *DeleteTagResults, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(deleteTagOptions, "deleteTagOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(deleteTagOptions, "deleteTagOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v3/tags"}
-	pathParameters := []string{*deleteTagOptions.TagName}
-
-	builder := core.NewRequestBuilder(core.DELETE)
-	_, err = builder.ConstructHTTPURL(globalTagging.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range deleteTagOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("global_tagging", "V1", "DeleteTag")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	if deleteTagOptions.Providers != nil {
-		builder.AddQuery("providers", strings.Join(deleteTagOptions.Providers, ","))
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = globalTagging.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalDeleteTagResults(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// AttachTag : Attach one or more tags
-// Attaches one or more tags to one or more resources. To attach a tag to a resource managed by the Resource Controller,
-// you must be an editor on the resource. To attach a tag to a Cloud Foundry resource, you must have space developer
-// role. To attach a tag to IMS resources, depending on the resource, you need either `view hardware details`, `view
-// virtual server details` or `manage storage` permission.
-func (globalTagging *GlobalTaggingV1) AttachTag(attachTagOptions *AttachTagOptions) (result *TagResults, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(attachTagOptions, "attachTagOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(attachTagOptions, "attachTagOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v3/tags/attach"}
-	pathParameters := []string{}
-
-	builder := core.NewRequestBuilder(core.POST)
-	_, err = builder.ConstructHTTPURL(globalTagging.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range attachTagOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("global_tagging", "V1", "AttachTag")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-	builder.AddHeader("Content-Type", "application/json")
-
-	body := make(map[string]interface{})
-	if attachTagOptions.Resources != nil {
-		body["resources"] = attachTagOptions.Resources
-	}
-	if attachTagOptions.TagName != nil {
-		body["tag_name"] = attachTagOptions.TagName
-	}
-	if attachTagOptions.TagNames != nil {
-		body["tag_names"] = attachTagOptions.TagNames
-	}
-	_, err = builder.SetBodyContentJSON(body)
-	if err != nil {
-		return
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = globalTagging.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalTagResults(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// DetachTag : Detach one or more tags
-// Detach one or more tags from one or more resources. To detach a tag from a Resource Controller managed resource, you
-// must be an editor on the resource. To detach a tag to a Cloud Foundry resource, you must have `space developer` role.
-//   To detach a tag to IMS resources, depending on the resource, you need either `view hardware details`, `view virtual
-// server details` or `storage manage` permission.
-func (globalTagging *GlobalTaggingV1) DetachTag(detachTagOptions *DetachTagOptions) (result *TagResults, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(detachTagOptions, "detachTagOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(detachTagOptions, "detachTagOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v3/tags/detach"}
-	pathParameters := []string{}
-
-	builder := core.NewRequestBuilder(core.POST)
-	_, err = builder.ConstructHTTPURL(globalTagging.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range detachTagOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("global_tagging", "V1", "DetachTag")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-	builder.AddHeader("Content-Type", "application/json")
-
-	body := make(map[string]interface{})
-	if detachTagOptions.Resources != nil {
-		body["resources"] = detachTagOptions.Resources
-	}
-	if detachTagOptions.TagName != nil {
-		body["tag_name"] = detachTagOptions.TagName
-	}
-	if detachTagOptions.TagNames != nil {
-		body["tag_names"] = detachTagOptions.TagNames
-	}
-	_, err = builder.SetBodyContentJSON(body)
-	if err != nil {
-		return
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = globalTagging.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalTagResults(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// AttachTagOptions : The AttachTag options.
-type AttachTagOptions struct {
-	// List of resources on which the tag or tags should be attached.
-	Resources []Resource `json:"resources" validate:"required"`
-
-	// The name of the tag to attach.
-	TagName *string `json:"tag_name,omitempty"`
-
-	// An array of tag names to attach.
-	TagNames []string `json:"tag_names,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewAttachTagOptions : Instantiate AttachTagOptions
-func (*GlobalTaggingV1) NewAttachTagOptions(resources []Resource) *AttachTagOptions {
-	return &AttachTagOptions{
-		Resources: resources,
-	}
-}
-
-// SetResources : Allow user to set Resources
-func (options *AttachTagOptions) SetResources(resources []Resource) *AttachTagOptions {
-	options.Resources = resources
-	return options
-}
-
-// SetTagName : Allow user to set TagName
-func (options *AttachTagOptions) SetTagName(tagName string) *AttachTagOptions {
-	options.TagName = core.StringPtr(tagName)
-	return options
-}
-
-// SetTagNames : Allow user to set TagNames
-func (options *AttachTagOptions) SetTagNames(tagNames []string) *AttachTagOptions {
-	options.TagNames = tagNames
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *AttachTagOptions) SetHeaders(param map[string]string) *AttachTagOptions {
-	options.Headers = param
-	return options
-}
-
-// DeleteTagAllOptions : The DeleteTagAll options.
-type DeleteTagAllOptions struct {
-	// Select a provider. Supported values are `ghost` and `ims`.
-	Providers *string `json:"providers,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// Constants associated with the DeleteTagAllOptions.Providers property.
-// Select a provider. Supported values are `ghost` and `ims`.
-const (
-	DeleteTagAllOptions_Providers_Ghost = "ghost"
-	DeleteTagAllOptions_Providers_Ims = "ims"
-)
-
-// NewDeleteTagAllOptions : Instantiate DeleteTagAllOptions
-func (*GlobalTaggingV1) NewDeleteTagAllOptions() *DeleteTagAllOptions {
-	return &DeleteTagAllOptions{}
-}
-
-// SetProviders : Allow user to set Providers
-func (options *DeleteTagAllOptions) SetProviders(providers string) *DeleteTagAllOptions {
-	options.Providers = core.StringPtr(providers)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *DeleteTagAllOptions) SetHeaders(param map[string]string) *DeleteTagAllOptions {
-	options.Headers = param
-	return options
-}
-
-// DeleteTagOptions : The DeleteTag options.
-type DeleteTagOptions struct {
-	// The name of tag to be deleted.
-	TagName *string `json:"tag_name" validate:"required"`
-
-	// Select a provider. Supported values are `ghost` and `ims`. To delete tag both in GhoST in IMS, use `ghost,ims`.
-	Providers []string `json:"providers,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// Constants associated with the DeleteTagOptions.Providers property.
-const (
-	DeleteTagOptions_Providers_Ghost = "ghost"
-	DeleteTagOptions_Providers_Ims = "ims"
-)
-
-// NewDeleteTagOptions : Instantiate DeleteTagOptions
-func (*GlobalTaggingV1) NewDeleteTagOptions(tagName string) *DeleteTagOptions {
-	return &DeleteTagOptions{
-		TagName: core.StringPtr(tagName),
-	}
-}
-
-// SetTagName : Allow user to set TagName
-func (options *DeleteTagOptions) SetTagName(tagName string) *DeleteTagOptions {
-	options.TagName = core.StringPtr(tagName)
-	return options
-}
-
-// SetProviders : Allow user to set Providers
-func (options *DeleteTagOptions) SetProviders(providers []string) *DeleteTagOptions {
-	options.Providers = providers
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *DeleteTagOptions) SetHeaders(param map[string]string) *DeleteTagOptions {
-	options.Headers = param
-	return options
-}
-
-// DeleteTagResults : Results of a delete_tag request.
-type DeleteTagResults struct {
-	// Array of results of a delete_tag request.
-	Results []DeleteTagResultsItem `json:"results,omitempty"`
-}
-
-
-// UnmarshalDeleteTagResults constructs an instance of DeleteTagResults from the specified map.
-func UnmarshalDeleteTagResults(m map[string]interface{}) (result *DeleteTagResults, err error) {
-	obj := new(DeleteTagResults)
-	obj.Results, err = UnmarshalDeleteTagResultsItemSliceAsProperty(m, "results")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalDeleteTagResultsSlice unmarshals a slice of DeleteTagResults instances from the specified list of maps.
-func UnmarshalDeleteTagResultsSlice(s []interface{}) (slice []DeleteTagResults, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'DeleteTagResults'")
-			return
-		}
-		obj, e := UnmarshalDeleteTagResults(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalDeleteTagResultsAsProperty unmarshals an instance of DeleteTagResults that is stored as a property
-// within the specified map.
-func UnmarshalDeleteTagResultsAsProperty(m map[string]interface{}, propertyName string) (result *DeleteTagResults, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'DeleteTagResults'", propertyName)
-			return
-		}
-		result, err = UnmarshalDeleteTagResults(objMap)
-	}
-	return
-}
-
-// UnmarshalDeleteTagResultsSliceAsProperty unmarshals a slice of DeleteTagResults instances that are stored as a property
-// within the specified map.
-func UnmarshalDeleteTagResultsSliceAsProperty(m map[string]interface{}, propertyName string) (slice []DeleteTagResults, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'DeleteTagResults'", propertyName)
-			return
-		}
-		slice, err = UnmarshalDeleteTagResultsSlice(vSlice)
-	}
-	return
-}
-
-// DeleteTagResultsItem : Result of a delete_tag request.
-type DeleteTagResultsItem struct {
-	// The provider of the tag.
-	Provider *string `json:"provider,omitempty"`
-
-	// It is `true` if the operation exits with an error.
-	IsError *bool `json:"is_error,omitempty"`
-
-	// Allows users to set arbitrary properties
-	additionalProperties map[string]interface{}
-}
-
-// Constants associated with the DeleteTagResultsItem.Provider property.
-// The provider of the tag.
-const (
-	DeleteTagResultsItem_Provider_Ghost = "ghost"
-	DeleteTagResultsItem_Provider_Ims = "ims"
-)
-
-
-// SetProperty allows the user to set an arbitrary property on an instance of DeleteTagResultsItem
-func (o *DeleteTagResultsItem) SetProperty(key string, value interface{}) {
-	if o.additionalProperties == nil {
-		o.additionalProperties = make(map[string]interface{})
-	}
-	o.additionalProperties[key] = value
-}
-
-// GetProperty allows the user to retrieve an arbitrary property from an instance of DeleteTagResultsItem
-func (o *DeleteTagResultsItem) GetProperty(key string) interface{} {
-	return o.additionalProperties[key]
-}
-
-// GetProperties allows the user to retrieve the map of arbitrary properties from an instance of DeleteTagResultsItem
-func (o *DeleteTagResultsItem) GetProperties() map[string]interface{} {
-	return o.additionalProperties
-}
-
-// MarshalJSON performs custom serialization for instances of DeleteTagResultsItem
-func (o *DeleteTagResultsItem) MarshalJSON() (buffer []byte, err error) {
-	m := make(map[string]interface{})
-	if len(o.additionalProperties) > 0 {
-		for k, v := range o.additionalProperties {
-			m[k] = v
-		}
-	}
-	if o.Provider != nil {
-		m["provider"] = o.Provider
-	}
-	if o.IsError != nil {
-		m["is_error"] = o.IsError
-	}
-	buffer, err = json.Marshal(m)	
-	return
-}
-
-// UnmarshalDeleteTagResultsItem constructs an instance of DeleteTagResultsItem from the specified map.
-func UnmarshalDeleteTagResultsItem(m map[string]interface{}) (result *DeleteTagResultsItem, err error) {
-	m = core.CopyMap(m)
-	obj := new(DeleteTagResultsItem)
-	obj.Provider, err = core.UnmarshalString(m, "provider")
-	if err != nil {
-		return
-	}
-	delete(m, "provider")
-	obj.IsError, err = core.UnmarshalBool(m, "is_error")
-	if err != nil {
-		return
-	}
-	delete(m, "is_error")
-	for k := range m {
-		v, e := core.UnmarshalAny(m, k)
-		if e != nil {
-			err = e
-			return
-		}
-		obj.SetProperty(k, v)
-	}
-	result = obj
-	return
-}
-
-// UnmarshalDeleteTagResultsItemSlice unmarshals a slice of DeleteTagResultsItem instances from the specified list of maps.
-func UnmarshalDeleteTagResultsItemSlice(s []interface{}) (slice []DeleteTagResultsItem, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'DeleteTagResultsItem'")
-			return
-		}
-		obj, e := UnmarshalDeleteTagResultsItem(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalDeleteTagResultsItemAsProperty unmarshals an instance of DeleteTagResultsItem that is stored as a property
-// within the specified map.
-func UnmarshalDeleteTagResultsItemAsProperty(m map[string]interface{}, propertyName string) (result *DeleteTagResultsItem, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'DeleteTagResultsItem'", propertyName)
-			return
-		}
-		result, err = UnmarshalDeleteTagResultsItem(objMap)
-	}
-	return
-}
-
-// UnmarshalDeleteTagResultsItemSliceAsProperty unmarshals a slice of DeleteTagResultsItem instances that are stored as a property
-// within the specified map.
-func UnmarshalDeleteTagResultsItemSliceAsProperty(m map[string]interface{}, propertyName string) (slice []DeleteTagResultsItem, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'DeleteTagResultsItem'", propertyName)
-			return
-		}
-		slice, err = UnmarshalDeleteTagResultsItemSlice(vSlice)
-	}
-	return
-}
-
-// DeleteTagsResult : The results of a deleting unattatched tags.
-type DeleteTagsResult struct {
-	// The number of tags deleted in the account.
-	TotalCount *int64 `json:"total_count,omitempty"`
-
-	// An indicator that is set to true if there was an error deleting some of the tags.
-	Errors *bool `json:"errors,omitempty"`
-
-	Items []DeleteTagsResultItem `json:"items,omitempty"`
-}
-
-
-// UnmarshalDeleteTagsResult constructs an instance of DeleteTagsResult from the specified map.
-func UnmarshalDeleteTagsResult(m map[string]interface{}) (result *DeleteTagsResult, err error) {
-	obj := new(DeleteTagsResult)
-	obj.TotalCount, err = core.UnmarshalInt64(m, "total_count")
-	if err != nil {
-		return
-	}
-	obj.Errors, err = core.UnmarshalBool(m, "errors")
-	if err != nil {
-		return
-	}
-	obj.Items, err = UnmarshalDeleteTagsResultItemSliceAsProperty(m, "items")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalDeleteTagsResultSlice unmarshals a slice of DeleteTagsResult instances from the specified list of maps.
-func UnmarshalDeleteTagsResultSlice(s []interface{}) (slice []DeleteTagsResult, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'DeleteTagsResult'")
-			return
-		}
-		obj, e := UnmarshalDeleteTagsResult(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalDeleteTagsResultAsProperty unmarshals an instance of DeleteTagsResult that is stored as a property
-// within the specified map.
-func UnmarshalDeleteTagsResultAsProperty(m map[string]interface{}, propertyName string) (result *DeleteTagsResult, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'DeleteTagsResult'", propertyName)
-			return
-		}
-		result, err = UnmarshalDeleteTagsResult(objMap)
-	}
-	return
-}
-
-// UnmarshalDeleteTagsResultSliceAsProperty unmarshals a slice of DeleteTagsResult instances that are stored as a property
-// within the specified map.
-func UnmarshalDeleteTagsResultSliceAsProperty(m map[string]interface{}, propertyName string) (slice []DeleteTagsResult, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'DeleteTagsResult'", propertyName)
-			return
-		}
-		slice, err = UnmarshalDeleteTagsResultSlice(vSlice)
-	}
-	return
-}
-
-// DeleteTagsResultItem : Result of deleting one unattached tag.
-type DeleteTagsResultItem struct {
-	// The name of the tag that was deleted.
-	TagName *string `json:"tag_name,omitempty"`
-
-	// An indicator that is set to true if there was an error deleting the tag.
-	IsError *bool `json:"is_error,omitempty"`
-}
-
-
-// UnmarshalDeleteTagsResultItem constructs an instance of DeleteTagsResultItem from the specified map.
-func UnmarshalDeleteTagsResultItem(m map[string]interface{}) (result *DeleteTagsResultItem, err error) {
-	obj := new(DeleteTagsResultItem)
-	obj.TagName, err = core.UnmarshalString(m, "tag_name")
-	if err != nil {
-		return
-	}
-	obj.IsError, err = core.UnmarshalBool(m, "is_error")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalDeleteTagsResultItemSlice unmarshals a slice of DeleteTagsResultItem instances from the specified list of maps.
-func UnmarshalDeleteTagsResultItemSlice(s []interface{}) (slice []DeleteTagsResultItem, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'DeleteTagsResultItem'")
-			return
-		}
-		obj, e := UnmarshalDeleteTagsResultItem(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalDeleteTagsResultItemAsProperty unmarshals an instance of DeleteTagsResultItem that is stored as a property
-// within the specified map.
-func UnmarshalDeleteTagsResultItemAsProperty(m map[string]interface{}, propertyName string) (result *DeleteTagsResultItem, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'DeleteTagsResultItem'", propertyName)
-			return
-		}
-		result, err = UnmarshalDeleteTagsResultItem(objMap)
-	}
-	return
-}
-
-// UnmarshalDeleteTagsResultItemSliceAsProperty unmarshals a slice of DeleteTagsResultItem instances that are stored as a property
-// within the specified map.
-func UnmarshalDeleteTagsResultItemSliceAsProperty(m map[string]interface{}, propertyName string) (slice []DeleteTagsResultItem, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'DeleteTagsResultItem'", propertyName)
-			return
-		}
-		slice, err = UnmarshalDeleteTagsResultItemSlice(vSlice)
-	}
-	return
-}
-
-// DetachTagOptions : The DetachTag options.
-type DetachTagOptions struct {
-	// List of resources on which the tag or tags should be detached.
-	Resources []Resource `json:"resources" validate:"required"`
-
-	// The name of the tag to detach.
-	TagName *string `json:"tag_name,omitempty"`
-
-	// An array of tag names to detach.
-	TagNames []string `json:"tag_names,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewDetachTagOptions : Instantiate DetachTagOptions
-func (*GlobalTaggingV1) NewDetachTagOptions(resources []Resource) *DetachTagOptions {
-	return &DetachTagOptions{
-		Resources: resources,
-	}
-}
-
-// SetResources : Allow user to set Resources
-func (options *DetachTagOptions) SetResources(resources []Resource) *DetachTagOptions {
-	options.Resources = resources
-	return options
-}
-
-// SetTagName : Allow user to set TagName
-func (options *DetachTagOptions) SetTagName(tagName string) *DetachTagOptions {
-	options.TagName = core.StringPtr(tagName)
-	return options
-}
-
-// SetTagNames : Allow user to set TagNames
-func (options *DetachTagOptions) SetTagNames(tagNames []string) *DetachTagOptions {
-	options.TagNames = tagNames
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *DetachTagOptions) SetHeaders(param map[string]string) *DetachTagOptions {
-	options.Headers = param
-	return options
-}
-
-// ListTagsOptions : The ListTags options.
-type ListTagsOptions struct {
-	// Select a provider. Supported values are `ghost` and `ims`. To list GhoST tags and infrastructure tags use
-	// `ghost,ims`.
-	Providers []string `json:"providers,omitempty"`
-
-	// If you want to return only the list of tags attached to a specified resource, pass here the ID of the resource. For
-	// GhoST onboarded resources, the resource ID is the CRN; for IMS resources, it is the IMS ID. When using this
-	// parameter it is mandatory to specify the appropriate provider (`ims` or `ghost`).
-	AttachedTo *string `json:"attached_to,omitempty"`
-
-	// If set to `true`, this query returns the provider, `ghost`, `ims` or `ghost,ims`, where the tag exists and the
-	// number of attached resources.
-	FullData *bool `json:"full_data,omitempty"`
-
-	// The offset is the index of the item from which you want to start returning data from.
-	Offset *int64 `json:"offset,omitempty"`
-
-	// The number of tags to return.
-	Limit *int64 `json:"limit,omitempty"`
-
-	// Order the output by tag name.
-	OrderByName *string `json:"order_by_name,omitempty"`
-
-	// The search timeout bounds the search request to be executed within the specified time value. It returns the hits
-	// accumulated until time runs out.
-	Timeout *int64 `json:"timeout,omitempty"`
-
-	// Filter on attached tags. If true, returns only tags that are attached to one or more resources. If false returns all
-	// tags.
-	AttachedOnly *bool `json:"attached_only,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// Constants associated with the ListTagsOptions.Providers property.
-const (
-	ListTagsOptions_Providers_Ghost = "ghost"
-	ListTagsOptions_Providers_Ims = "ims"
-)
-
-// Constants associated with the ListTagsOptions.OrderByName property.
-// Order the output by tag name.
-const (
-	ListTagsOptions_OrderByName_Asc = "asc"
-	ListTagsOptions_OrderByName_Desc = "desc"
-)
-
-// NewListTagsOptions : Instantiate ListTagsOptions
-func (*GlobalTaggingV1) NewListTagsOptions() *ListTagsOptions {
-	return &ListTagsOptions{}
-}
-
-// SetProviders : Allow user to set Providers
-func (options *ListTagsOptions) SetProviders(providers []string) *ListTagsOptions {
-	options.Providers = providers
-	return options
-}
-
-// SetAttachedTo : Allow user to set AttachedTo
-func (options *ListTagsOptions) SetAttachedTo(attachedTo string) *ListTagsOptions {
-	options.AttachedTo = core.StringPtr(attachedTo)
-	return options
-}
-
-// SetFullData : Allow user to set FullData
-func (options *ListTagsOptions) SetFullData(fullData bool) *ListTagsOptions {
-	options.FullData = core.BoolPtr(fullData)
-	return options
-}
-
-// SetOffset : Allow user to set Offset
-func (options *ListTagsOptions) SetOffset(offset int64) *ListTagsOptions {
-	options.Offset = core.Int64Ptr(offset)
-	return options
-}
-
-// SetLimit : Allow user to set Limit
-func (options *ListTagsOptions) SetLimit(limit int64) *ListTagsOptions {
-	options.Limit = core.Int64Ptr(limit)
-	return options
-}
-
-// SetOrderByName : Allow user to set OrderByName
-func (options *ListTagsOptions) SetOrderByName(orderByName string) *ListTagsOptions {
-	options.OrderByName = core.StringPtr(orderByName)
-	return options
-}
-
-// SetTimeout : Allow user to set Timeout
-func (options *ListTagsOptions) SetTimeout(timeout int64) *ListTagsOptions {
-	options.Timeout = core.Int64Ptr(timeout)
-	return options
-}
-
-// SetAttachedOnly : Allow user to set AttachedOnly
-func (options *ListTagsOptions) SetAttachedOnly(attachedOnly bool) *ListTagsOptions {
-	options.AttachedOnly = core.BoolPtr(attachedOnly)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *ListTagsOptions) SetHeaders(param map[string]string) *ListTagsOptions {
-	options.Headers = param
-	return options
-}
-
-// Resource : A resource that may have attached tags.
-type Resource struct {
-	// The CRN or IMS ID of the resource.
-	ResourceID *string `json:"resource_id" validate:"required"`
-
-	// The IMS resource type of the resource.
-	ResourceType *string `json:"resource_type,omitempty"`
-}
-
-
-// NewResource : Instantiate Resource (Generic Model Constructor)
-func (*GlobalTaggingV1) NewResource(resourceID string) (model *Resource, err error) {
-	model = &Resource{
-		ResourceID: core.StringPtr(resourceID),
-	}
-	err = core.ValidateStruct(model, "required parameters")
-	return
-}
-
-// UnmarshalResource constructs an instance of Resource from the specified map.
-func UnmarshalResource(m map[string]interface{}) (result *Resource, err error) {
-	obj := new(Resource)
-	obj.ResourceID, err = core.UnmarshalString(m, "resource_id")
-	if err != nil {
-		return
-	}
-	obj.ResourceType, err = core.UnmarshalString(m, "resource_type")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalResourceSlice unmarshals a slice of Resource instances from the specified list of maps.
-func UnmarshalResourceSlice(s []interface{}) (slice []Resource, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'Resource'")
-			return
-		}
-		obj, e := UnmarshalResource(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalResourceAsProperty unmarshals an instance of Resource that is stored as a property
-// within the specified map.
-func UnmarshalResourceAsProperty(m map[string]interface{}, propertyName string) (result *Resource, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'Resource'", propertyName)
-			return
-		}
-		result, err = UnmarshalResource(objMap)
-	}
-	return
-}
-
-// UnmarshalResourceSliceAsProperty unmarshals a slice of Resource instances that are stored as a property
-// within the specified map.
-func UnmarshalResourceSliceAsProperty(m map[string]interface{}, propertyName string) (slice []Resource, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'Resource'", propertyName)
-			return
-		}
-		slice, err = UnmarshalResourceSlice(vSlice)
-	}
-	return
-}
-
-// Tag : A tag.
-type Tag struct {
-	// This is the name of the tag.
-	Name *string `json:"name" validate:"required"`
-}
-
-
-// UnmarshalTag constructs an instance of Tag from the specified map.
-func UnmarshalTag(m map[string]interface{}) (result *Tag, err error) {
-	obj := new(Tag)
-	obj.Name, err = core.UnmarshalString(m, "name")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalTagSlice unmarshals a slice of Tag instances from the specified list of maps.
-func UnmarshalTagSlice(s []interface{}) (slice []Tag, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'Tag'")
-			return
-		}
-		obj, e := UnmarshalTag(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalTagAsProperty unmarshals an instance of Tag that is stored as a property
-// within the specified map.
-func UnmarshalTagAsProperty(m map[string]interface{}, propertyName string) (result *Tag, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'Tag'", propertyName)
-			return
-		}
-		result, err = UnmarshalTag(objMap)
-	}
-	return
-}
-
-// UnmarshalTagSliceAsProperty unmarshals a slice of Tag instances that are stored as a property
-// within the specified map.
-func UnmarshalTagSliceAsProperty(m map[string]interface{}, propertyName string) (slice []Tag, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'Tag'", propertyName)
-			return
-		}
-		slice, err = UnmarshalTagSlice(vSlice)
-	}
-	return
-}
-
-// TagList : A list of tags.
-type TagList struct {
-	// The number of tags defined in the account.
-	TotalCount *int64 `json:"total_count,omitempty"`
-
-	// The offset specific at input time.
-	Offset *int64 `json:"offset,omitempty"`
-
-	// The limit specified at input time.
-	Limit *int64 `json:"limit,omitempty"`
-
-	// This is an array of output results.
-	Items []Tag `json:"items,omitempty"`
-}
-
-
-// UnmarshalTagList constructs an instance of TagList from the specified map.
-func UnmarshalTagList(m map[string]interface{}) (result *TagList, err error) {
-	obj := new(TagList)
-	obj.TotalCount, err = core.UnmarshalInt64(m, "total_count")
-	if err != nil {
-		return
-	}
-	obj.Offset, err = core.UnmarshalInt64(m, "offset")
-	if err != nil {
-		return
-	}
-	obj.Limit, err = core.UnmarshalInt64(m, "limit")
-	if err != nil {
-		return
-	}
-	obj.Items, err = UnmarshalTagSliceAsProperty(m, "items")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalTagListSlice unmarshals a slice of TagList instances from the specified list of maps.
-func UnmarshalTagListSlice(s []interface{}) (slice []TagList, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'TagList'")
-			return
-		}
-		obj, e := UnmarshalTagList(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalTagListAsProperty unmarshals an instance of TagList that is stored as a property
-// within the specified map.
-func UnmarshalTagListAsProperty(m map[string]interface{}, propertyName string) (result *TagList, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'TagList'", propertyName)
-			return
-		}
-		result, err = UnmarshalTagList(objMap)
-	}
-	return
-}
-
-// UnmarshalTagListSliceAsProperty unmarshals a slice of TagList instances that are stored as a property
-// within the specified map.
-func UnmarshalTagListSliceAsProperty(m map[string]interface{}, propertyName string) (slice []TagList, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'TagList'", propertyName)
-			return
-		}
-		slice, err = UnmarshalTagListSlice(vSlice)
-	}
-	return
-}
-
-// TagResults : Results of an attach_tag or detach_tag request.
-type TagResults struct {
-	// Array of results of an attach_tag or detach_tag request.
-	Results []TagResultsItem `json:"results,omitempty"`
-}
-
-
-// UnmarshalTagResults constructs an instance of TagResults from the specified map.
-func UnmarshalTagResults(m map[string]interface{}) (result *TagResults, err error) {
-	obj := new(TagResults)
-	obj.Results, err = UnmarshalTagResultsItemSliceAsProperty(m, "results")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalTagResultsSlice unmarshals a slice of TagResults instances from the specified list of maps.
-func UnmarshalTagResultsSlice(s []interface{}) (slice []TagResults, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'TagResults'")
-			return
-		}
-		obj, e := UnmarshalTagResults(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalTagResultsAsProperty unmarshals an instance of TagResults that is stored as a property
-// within the specified map.
-func UnmarshalTagResultsAsProperty(m map[string]interface{}, propertyName string) (result *TagResults, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'TagResults'", propertyName)
-			return
-		}
-		result, err = UnmarshalTagResults(objMap)
-	}
-	return
-}
-
-// UnmarshalTagResultsSliceAsProperty unmarshals a slice of TagResults instances that are stored as a property
-// within the specified map.
-func UnmarshalTagResultsSliceAsProperty(m map[string]interface{}, propertyName string) (slice []TagResults, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'TagResults'", propertyName)
-			return
-		}
-		slice, err = UnmarshalTagResultsSlice(vSlice)
-	}
-	return
-}
-
-// TagResultsItem : Result of an attach_tag or detach_tag request for a tagged resource.
-type TagResultsItem struct {
-	// The CRN or IMS ID of the resource.
-	ResourceID *string `json:"resource_id" validate:"required"`
-
-	// It is `true` if the operation exits with an error.
-	IsError *bool `json:"is_error,omitempty"`
-}
-
-
-// UnmarshalTagResultsItem constructs an instance of TagResultsItem from the specified map.
-func UnmarshalTagResultsItem(m map[string]interface{}) (result *TagResultsItem, err error) {
-	obj := new(TagResultsItem)
-	obj.ResourceID, err = core.UnmarshalString(m, "resource_id")
-	if err != nil {
-		return
-	}
-	obj.IsError, err = core.UnmarshalBool(m, "is_error")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalTagResultsItemSlice unmarshals a slice of TagResultsItem instances from the specified list of maps.
-func UnmarshalTagResultsItemSlice(s []interface{}) (slice []TagResultsItem, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'TagResultsItem'")
-			return
-		}
-		obj, e := UnmarshalTagResultsItem(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalTagResultsItemAsProperty unmarshals an instance of TagResultsItem that is stored as a property
-// within the specified map.
-func UnmarshalTagResultsItemAsProperty(m map[string]interface{}, propertyName string) (result *TagResultsItem, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'TagResultsItem'", propertyName)
-			return
-		}
-		result, err = UnmarshalTagResultsItem(objMap)
-	}
-	return
-}
-
-// UnmarshalTagResultsItemSliceAsProperty unmarshals a slice of TagResultsItem instances that are stored as a property
-// within the specified map.
-func UnmarshalTagResultsItemSliceAsProperty(m map[string]interface{}, propertyName string) (slice []TagResultsItem, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'TagResultsItem'", propertyName)
-			return
-		}
-		slice, err = UnmarshalTagResultsItemSlice(vSlice)
-	}
-	return
-}
diff --git a/globaltaggingv1/global_tagging_v1_integration_test.go b/globaltaggingv1/global_tagging_v1_integration_test.go
deleted file mode 100644
index 69ea91a5..00000000
--- a/globaltaggingv1/global_tagging_v1_integration_test.go
+++ /dev/null
@@ -1,150 +0,0 @@
-// +build integration
-
-package globaltaggingv1_test
-
-/**
- * (C) Copyright IBM Corp. 2020.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import (
-	"github.com/IBM/go-sdk-core/v3/core"
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-	"github.ibm.com/ibmcloud/platform-services-go-sdk/globaltaggingv1"
-	"time"
-	"fmt"
-	"github.com/joho/godotenv"
-	"log"
-	"os"
-)
-
-type Resource = globaltaggingv1.Resource
-type Tag = globaltaggingv1.Tag
-
-var _ = Describe("Global Search and Tagging - Search integration test", func() {
-
-	err := godotenv.Load("../.ghostenv")
-	if err != nil {
-		log.Fatal("Error loading .env file")
-	}
-
-	crn := os.Getenv("GST_RESOURCE_CRN")
-	tagName := fmt.Sprint("go-sdk-", time.Now().Unix())
-	tagElem := Tag{
-					Name: core.StringPtr(tagName),
-				}
-
-	// Create the authenticator.
-	authenticator := &core.IamAuthenticator{
-		ApiKey: os.Getenv("GST_IINTERNA_APIKEY"),
-		URL: os.Getenv("GST_IAM_URL"),
-	}
-
-	options := &globaltaggingv1.GlobalTaggingV1Options {
-		Authenticator: authenticator,
-	}
-	service, err := globaltaggingv1.NewGlobalTaggingV1(options)
-	It(`Successfully created NewGlobalTaggingV1 service instance`, func() {
-		Expect(err).To(BeNil())
-	})
-
-	err = service.SetServiceURL(os.Getenv("GST_TAGS_URL"))
-	It(`Successfully change default service URL to point to` + os.Getenv("GST_TAGS_URL"), func() {
-		Expect(err).To(BeNil())
-	})
-
-	Describe("Call GetAllTags", func() {
-
-		// Construct an instance of the ListTags model
-		listTagsModel := service.NewListTagsOptions()
-
-			It("Successfully get all tags", func() {
-			result, detailedResponse, err := service.ListTags(listTagsModel)
-			Expect(err).To(BeNil())
-			Expect(detailedResponse.StatusCode).To(Equal(200))
-			Expect(result.Items).NotTo(BeEmpty())
-		})
-	})
-
-	Describe("Attach a tag", func() {
-
-		// Construct an instance of the AttachTag model
-		resource, _ := service.NewResource(crn)
-		array := []Resource{*resource}
-		attachTagOptions := service.NewAttachTagOptions(array)
-		attachTagOptions.SetTagNames([]string{tagName})
-
-		It("Successfully attach a tag", func() {
-			result, detailedResponse, err := service.AttachTag(attachTagOptions)
-			Expect(err).To(BeNil())
-			Expect(detailedResponse.StatusCode).To(Equal(200))
-			for _, elem := range result.Results {
-				Expect(*elem.IsError).To(Equal(false))
-			}
-
-			// checking that tag is attached
-			listTagsModel := service.NewListTagsOptions()
-			listTagsModel.SetAttachedTo(crn)
-			resultCheck, detailedResponseCheck, errCheck := service.ListTags(listTagsModel)
-			Expect(errCheck).To(BeNil())
-			Expect(detailedResponseCheck.StatusCode).To(Equal(200))
-			Expect(resultCheck.Items).NotTo(BeEmpty())
-			Expect(resultCheck.Items).To(ContainElement(tagElem))
-		})
-	})
-
-	Describe("Detach a tag", func() {
-
-		// Construct an instance of the DetachTag model
-		resource, _ := service.NewResource(crn)
-		array := []Resource{*resource}
-		detachTagOptions := service.NewDetachTagOptions(array)
-		detachTagOptions.SetTagNames([]string{tagName})
-
-
-		It("Successfully detached a tag", func() {
-			result, detailedResponse, err := service.DetachTag(detachTagOptions)
-			Expect(err).To(BeNil())
-			Expect(detailedResponse.StatusCode).To(Equal(200))
-			for _, elem := range result.Results {
-				Expect(*elem.IsError).To(Equal(false))
-			}
-
-			// checking that tag is detached
-			listTagsModel := service.NewListTagsOptions()
-			listTagsModel.SetAttachedTo(crn)
-			resultCheck, detailedResponseCheck, errCheck := service.ListTags(listTagsModel)
-			Expect(errCheck).To(BeNil())
-			Expect(detailedResponseCheck.StatusCode).To(Equal(200))
-			Expect(resultCheck.Items).NotTo(ContainElement(tagElem))
-		})
-	})
-
-	Describe("Delete a tag", func() {
-
-		// Construct an instance of the DeleteTag model
-		deleteTagOptions := service.NewDeleteTagOptions(tagName)
-
-		It("Successfully delete a tag", func() {
-			result, detailedResponse, err := service.DeleteTag(deleteTagOptions)
-			Expect(err).To(BeNil())
-			Expect(detailedResponse.StatusCode).To(Equal(200))
-			for _, elem := range result.Results {
-				Expect(*elem.IsError).To(Equal(false))
-			}
-		})
-	})
-
-})
\ No newline at end of file
diff --git a/globaltaggingv1/global_tagging_v1_suite_test.go b/globaltaggingv1/global_tagging_v1_suite_test.go
deleted file mode 100644
index a0787f1b..00000000
--- a/globaltaggingv1/global_tagging_v1_suite_test.go
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * (C) Copyright IBM Corp. 2020.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package globaltaggingv1_test
-
-import (
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-	"testing"
-)
-
-func TestGlobalTaggingV1(t *testing.T) {
-	RegisterFailHandler(Fail)
-	RunSpecs(t, "GlobalTaggingV1 Suite")
-}
diff --git a/globaltaggingv1/global_tagging_v1_test.go b/globaltaggingv1/global_tagging_v1_test.go
deleted file mode 100644
index ab405d87..00000000
--- a/globaltaggingv1/global_tagging_v1_test.go
+++ /dev/null
@@ -1,379 +0,0 @@
-/**
- * (C) Copyright IBM Corp. 2020.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package globaltaggingv1_test
-
-import (
-	"bytes"
-	"fmt"
-	"github.com/IBM/go-sdk-core/v3/core"
-	"github.com/go-openapi/strfmt"
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-	"github.ibm.com/ibmcloud/platform-services-go-sdk/globaltaggingv1"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"net/http/httptest"
-	"time"
-)
-
-var _ = Describe(`GlobalTaggingV1`, func() {
-	Describe(`ListTags(listTagsOptions *ListTagsOptions)`, func() {
-		bearerToken := "0ui9876453"
-		listTagsPath := "/v3/tags"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(listTagsPath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				Expect(req.URL.Query()["attached_to"]).To(Equal([]string{"testString"}))
-
-
-				// TODO: Add check for full_data query parameter
-
-				Expect(req.URL.Query()["offset"]).To(Equal([]string{fmt.Sprint(int64(38))}))
-
-				Expect(req.URL.Query()["limit"]).To(Equal([]string{fmt.Sprint(int64(38))}))
-
-				Expect(req.URL.Query()["order_by_name"]).To(Equal([]string{"asc"}))
-
-				Expect(req.URL.Query()["timeout"]).To(Equal([]string{fmt.Sprint(int64(38))}))
-
-
-				// TODO: Add check for attached_only query parameter
-
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"total_count": 10, "offset": 6, "limit": 5, "items": [{"name": "Name"}]}`)
-			}))
-			It(`Invoke ListTags successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := globaltaggingv1.NewGlobalTaggingV1(&globaltaggingv1.GlobalTaggingV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.ListTags(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the ListTagsOptions model
-				listTagsOptionsModel := new(globaltaggingv1.ListTagsOptions)
-				listTagsOptionsModel.Providers = []string{"ghost"}
-				listTagsOptionsModel.AttachedTo = core.StringPtr("testString")
-				listTagsOptionsModel.FullData = core.BoolPtr(true)
-				listTagsOptionsModel.Offset = core.Int64Ptr(int64(38))
-				listTagsOptionsModel.Limit = core.Int64Ptr(int64(38))
-				listTagsOptionsModel.OrderByName = core.StringPtr("asc")
-				listTagsOptionsModel.Timeout = core.Int64Ptr(int64(38))
-				listTagsOptionsModel.AttachedOnly = core.BoolPtr(true)
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.ListTags(listTagsOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`DeleteTagAll(deleteTagAllOptions *DeleteTagAllOptions)`, func() {
-		bearerToken := "0ui9876453"
-		deleteTagAllPath := "/v3/tags"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(deleteTagAllPath))
-				Expect(req.Method).To(Equal("DELETE"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				Expect(req.URL.Query()["providers"]).To(Equal([]string{"ghost"}))
-
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"total_count": 10, "errors": true, "items": [{"tag_name": "TagName", "is_error": false}]}`)
-			}))
-			It(`Invoke DeleteTagAll successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := globaltaggingv1.NewGlobalTaggingV1(&globaltaggingv1.GlobalTaggingV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.DeleteTagAll(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the DeleteTagAllOptions model
-				deleteTagAllOptionsModel := new(globaltaggingv1.DeleteTagAllOptions)
-				deleteTagAllOptionsModel.Providers = core.StringPtr("ghost")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.DeleteTagAll(deleteTagAllOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`DeleteTag(deleteTagOptions *DeleteTagOptions)`, func() {
-		bearerToken := "0ui9876453"
-		deleteTagPath := "/v3/tags/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(deleteTagPath))
-				Expect(req.Method).To(Equal("DELETE"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"results": [{"provider": "ghost", "is_error": false}]}`)
-			}))
-			It(`Invoke DeleteTag successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := globaltaggingv1.NewGlobalTaggingV1(&globaltaggingv1.GlobalTaggingV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.DeleteTag(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the DeleteTagOptions model
-				deleteTagOptionsModel := new(globaltaggingv1.DeleteTagOptions)
-				deleteTagOptionsModel.TagName = core.StringPtr("testString")
-				deleteTagOptionsModel.Providers = []string{"ghost"}
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.DeleteTag(deleteTagOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`AttachTag(attachTagOptions *AttachTagOptions)`, func() {
-		bearerToken := "0ui9876453"
-		attachTagPath := "/v3/tags/attach"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(attachTagPath))
-				Expect(req.Method).To(Equal("POST"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"results": [{"resource_id": "ResourceID", "is_error": false}]}`)
-			}))
-			It(`Invoke AttachTag successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := globaltaggingv1.NewGlobalTaggingV1(&globaltaggingv1.GlobalTaggingV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.AttachTag(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the Resource model
-				resourceModel := new(globaltaggingv1.Resource)
-				resourceModel.ResourceID = core.StringPtr("testString")
-				resourceModel.ResourceType = core.StringPtr("testString")
-
-				// Construct an instance of the AttachTagOptions model
-				attachTagOptionsModel := new(globaltaggingv1.AttachTagOptions)
-				attachTagOptionsModel.Resources = []globaltaggingv1.Resource{*resourceModel}
-				attachTagOptionsModel.TagName = core.StringPtr("testString")
-				attachTagOptionsModel.TagNames = []string{"testString"}
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.AttachTag(attachTagOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`DetachTag(detachTagOptions *DetachTagOptions)`, func() {
-		bearerToken := "0ui9876453"
-		detachTagPath := "/v3/tags/detach"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(detachTagPath))
-				Expect(req.Method).To(Equal("POST"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"results": [{"resource_id": "ResourceID", "is_error": false}]}`)
-			}))
-			It(`Invoke DetachTag successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := globaltaggingv1.NewGlobalTaggingV1(&globaltaggingv1.GlobalTaggingV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.DetachTag(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the Resource model
-				resourceModel := new(globaltaggingv1.Resource)
-				resourceModel.ResourceID = core.StringPtr("testString")
-				resourceModel.ResourceType = core.StringPtr("testString")
-
-				// Construct an instance of the DetachTagOptions model
-				detachTagOptionsModel := new(globaltaggingv1.DetachTagOptions)
-				detachTagOptionsModel.Resources = []globaltaggingv1.Resource{*resourceModel}
-				detachTagOptionsModel.TagName = core.StringPtr("testString")
-				detachTagOptionsModel.TagNames = []string{"testString"}
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.DetachTag(detachTagOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`Model constructor tests`, func() {
-		Context(`Using a sample service client instance`, func() {
-			testService, _ := globaltaggingv1.NewGlobalTaggingV1(&globaltaggingv1.GlobalTaggingV1Options{
-				URL:           "http://globaltaggingv1modelgenerator.com",
-				Authenticator: &core.NoAuthAuthenticator{},
-			})
-			It(`Invoke NewResource successfully`, func() {
-				resourceID := "testString"
-				model, err := testService.NewResource(resourceID)
-				Expect(model).ToNot(BeNil())
-				Expect(err).To(BeNil())
-			})
-		})
-	})
-	Describe(`Utility function tests`, func() {
-		It(`Invoke CreateMockMap() successfully`, func() {
-			mockMap := CreateMockMap()
-			Expect(mockMap).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockByteArray() successfully`, func() {
-			mockByteArray := CreateMockByteArray("This is a test")
-			Expect(mockByteArray).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockUUID() successfully`, func() {
-			mockUUID := CreateMockUUID("9fab83da-98cb-4f18-a7ba-b6f0435c9673")
-			Expect(mockUUID).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockReader() successfully`, func() {
-			mockReader := CreateMockReader("This is a test.")
-			Expect(mockReader).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockDate() successfully`, func() {
-			mockDate := CreateMockDate()
-			Expect(mockDate).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockDateTime() successfully`, func() {
-			mockDateTime := CreateMockDateTime()
-			Expect(mockDateTime).ToNot(BeNil())
-		})
-	})
-})
-
-//
-// Utility functions used by the generated test code
-//
-
-func CreateMockMap() map[string]interface{} {
-	m := make(map[string]interface{})
-	return m
-}
-
-func CreateMockByteArray(mockData string) *[]byte {
-	ba := make([]byte, len(mockData))
-	ba = append(ba, mockData...)
-	return &ba
-}
-
-func CreateMockUUID(mockData string) *strfmt.UUID {
-	uuid := strfmt.UUID(mockData)
-	return &uuid
-}
-
-func CreateMockReader(mockData string) io.ReadCloser {
-	return ioutil.NopCloser(bytes.NewReader([]byte(mockData)))
-}
-
-func CreateMockDate() *strfmt.Date {
-	d := strfmt.Date(time.Now())
-	return &d
-}
-
-func CreateMockDateTime() *strfmt.DateTime {
-	d := strfmt.DateTime(time.Now())
-	return &d
-}
diff --git a/go.mod b/go.mod
index d0301eec..6bedb2f7 100644
--- a/go.mod
+++ b/go.mod
@@ -1,12 +1,5 @@
-module github.ibm.com/ibmcloud/platform-services-go-sdk
+module github.com/IBM/platform-services-go-sdk
 
-go 1.13
+go 1.12
 
-require (
-	github.com/IBM/go-sdk-core/v3 v3.2.4
-	github.com/go-openapi/strfmt v0.19.4
-	github.com/joho/godotenv v1.3.0
-	github.com/onsi/ginkgo v1.10.3
-	github.com/onsi/gomega v1.7.1
-	github.com/stretchr/testify v1.4.0
-)
+require github.com/stretchr/testify v1.5.1
diff --git a/go.sum b/go.sum
index 0f83defd..a80206ab 100644
--- a/go.sum
+++ b/go.sum
@@ -1,75 +1,10 @@
-github.com/IBM/go-sdk-core/v3 v3.2.4 h1:WKYJYYKlZnw1y/gM+Qbf5EQVAL9xaoD54+ooJZz/iBQ=
-github.com/IBM/go-sdk-core/v3 v3.2.4/go.mod h1:lk9eOzNbNltPf3CBpcg1Ewkhw4qC3u2QCCKDRsUA2M0=
-github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a h1:idn718Q4B6AGu/h5Sxe66HYVdqdGu2l9Iebqhi/AEoA=
-github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
+github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
-github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
-github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
-github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/go-openapi/errors v0.19.2 h1:a2kIyV3w+OS3S97zxUndRVD46+FhGOUBDFY7nmu4CsY=
-github.com/go-openapi/errors v0.19.2/go.mod h1:qX0BLWsyaKfvhluLejVpVNwNRdXZhEbTA4kxxpKBC94=
-github.com/go-openapi/strfmt v0.19.4 h1:eRvaqAhpL0IL6Trh5fDsGnGhiXndzHFuA05w6sXH6/g=
-github.com/go-openapi/strfmt v0.19.4/go.mod h1:eftuHTlB/dI8Uq8JJOyRlieZf+WkkxUuk0dgdHXr2Qk=
-github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q=
-github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
-github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no=
-github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
-github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
-github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
-github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
-github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY=
-github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
-github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
-github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc=
-github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
-github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y=
-github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
-github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=
-github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
-github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.10.3 h1:OoxbjfXVZyod1fmWYhI7SEyaD8B00ynP3T+D5GiyHOY=
-github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/gomega v1.7.1 h1:K0jcRCwNQM3vFGh1ppMtDh/+7ApJrjldlX8fA0jDTLQ=
-github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
-github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4=
-github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
-go.mongodb.org/mongo-driver v1.0.3 h1:GKoji1ld3tw2aC+GX1wbr/J2fX13yNacEYoJ8Nhr0yU=
-go.mongodb.org/mongo-driver v1.0.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
-golang.org/x/net v0.0.0-20180906233101-161cd47e91fd h1:nTDtHvHSdCn1m6ITfMRqtOd/9+7a3s8RBNOZ3eYZzJA=
-golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f h1:wMNYb4v58l5UBM7MYRLPG6ZhfOqbKu7X5eyFl8ZhKvA=
-golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e h1:o3PsSEY8E4eXWkXrIP9YJALUkVZqzHJT5DOasTyn8Vs=
-golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
-golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
+github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
-gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
-gopkg.in/go-playground/assert.v1 v1.2.1 h1:xoYuJVE7KT85PYWrN730RguIQO0ePzVRfFMXadIrXTM=
-gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE=
-gopkg.in/go-playground/validator.v9 v9.31.0 h1:bmXmP2RSNtFES+bn4uYuHT7iJFJv7Vj+an+ZQdDaD1M=
-gopkg.in/go-playground/validator.v9 v9.31.0/go.mod h1:+c9/zcJMFNgbLvly1L1V+PpxWdVbfP1avr/N00E2vyQ=
-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
+gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/iamaccessgroupsv2/iam_access_groups_v2.go b/iamaccessgroupsv2/iam_access_groups_v2.go
deleted file mode 100644
index c4929a55..00000000
--- a/iamaccessgroupsv2/iam_access_groups_v2.go
+++ /dev/null
@@ -1,4082 +0,0 @@
-/**
- * (C) Copyright IBM Corp. 2020.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// Package iamaccessgroupsv2 : Operations and models for the IamAccessGroupsV2 service
-package iamaccessgroupsv2
-
-import (
-	"fmt"
-	"github.com/IBM/go-sdk-core/v3/core"
-	common "github.ibm.com/ibmcloud/platform-services-go-sdk/common"
-)
-
-// IamAccessGroupsV2 : The IAM Access Groups API allows for the management of Access Groups (Create, Read, Update,
-// Delete) as well as the management of memberships and rules within the group container.
-//
-// Version: 1.0
-type IamAccessGroupsV2 struct {
-	Service *core.BaseService
-}
-
-// DefaultServiceURL is the default URL to make service requests to.
-const DefaultServiceURL = "https://iam.cloud.ibm.com/v2"
-
-// DefaultServiceName is the default key used to find external configuration information.
-const DefaultServiceName = "iam_access_groups"
-
-// IamAccessGroupsV2Options : Service options
-type IamAccessGroupsV2Options struct {
-	ServiceName   string
-	URL           string
-	Authenticator core.Authenticator
-}
-
-// NewIamAccessGroupsV2UsingExternalConfig : constructs an instance of IamAccessGroupsV2 with passed in options and external configuration.
-func NewIamAccessGroupsV2UsingExternalConfig(options *IamAccessGroupsV2Options) (iamAccessGroups *IamAccessGroupsV2, err error) {
-	if options.ServiceName == "" {
-		options.ServiceName = DefaultServiceName
-	}
-
-	if options.Authenticator == nil {
-		options.Authenticator, err = core.GetAuthenticatorFromEnvironment(options.ServiceName)
-		if err != nil {
-			return
-		}
-	}
-
-	iamAccessGroups, err = NewIamAccessGroupsV2(options)
-	if err != nil {
-		return
-	}
-
-	err = iamAccessGroups.Service.ConfigureService(options.ServiceName)
-	if err != nil {
-		return
-	}
-
-	if options.URL != "" {
-		err = iamAccessGroups.Service.SetServiceURL(options.URL)
-	}
-	return
-}
-
-// NewIamAccessGroupsV2 : constructs an instance of IamAccessGroupsV2 with passed in options.
-func NewIamAccessGroupsV2(options *IamAccessGroupsV2Options) (service *IamAccessGroupsV2, err error) {
-	serviceOptions := &core.ServiceOptions{
-		URL:           DefaultServiceURL,
-		Authenticator: options.Authenticator,
-	}
-
-	baseService, err := core.NewBaseService(serviceOptions)
-	if err != nil {
-		return
-	}
-
-	if options.URL != "" {
-		err = baseService.SetServiceURL(options.URL)
-		if err != nil {
-			return
-		}
-	}
-
-	service = &IamAccessGroupsV2{
-		Service: baseService,
-	}
-
-	return
-}
-
-// SetServiceURL sets the service URL
-func (iamAccessGroups *IamAccessGroupsV2) SetServiceURL(url string) error {
-	return iamAccessGroups.Service.SetServiceURL(url)
-}
-
-// CreateAccessGroup : Create an Access Group
-// Create a new Access Group to assign multiple users and service ids to multiple policies. The group will be created in
-// the account specified by the `account_id` parameter. The group name is a required field, but a description is
-// optional. Because the group's name does not have to be unique, it is possible to create multiple groups with the same
-// name.
-func (iamAccessGroups *IamAccessGroupsV2) CreateAccessGroup(createAccessGroupOptions *CreateAccessGroupOptions) (result *Group, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(createAccessGroupOptions, "createAccessGroupOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(createAccessGroupOptions, "createAccessGroupOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"groups"}
-	pathParameters := []string{}
-
-	builder := core.NewRequestBuilder(core.POST)
-	_, err = builder.ConstructHTTPURL(iamAccessGroups.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range createAccessGroupOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("iam_access_groups", "V2", "CreateAccessGroup")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-	builder.AddHeader("Content-Type", "application/json")
-	if createAccessGroupOptions.TransactionID != nil {
-		builder.AddHeader("Transaction-Id", fmt.Sprint(*createAccessGroupOptions.TransactionID))
-	}
-
-	builder.AddQuery("account_id", fmt.Sprint(*createAccessGroupOptions.AccountID))
-
-	body := make(map[string]interface{})
-	if createAccessGroupOptions.Name != nil {
-		body["name"] = createAccessGroupOptions.Name
-	}
-	if createAccessGroupOptions.Description != nil {
-		body["description"] = createAccessGroupOptions.Description
-	}
-	_, err = builder.SetBodyContentJSON(body)
-	if err != nil {
-		return
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = iamAccessGroups.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalGroup(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// ListAccessGroups : List Access Groups
-// This API lists Access Groups within an account. Parameters for pagination and sorting can be used to filter the
-// results. The `account_id` query parameter determines which account to retrieve groups from. Only the groups you have
-// access to are returned (either because of a policy on a specific group or account level access (admin, editor, or
-// viewer)). There may be more groups in the account that aren't shown if you lack the aforementioned permissions.
-func (iamAccessGroups *IamAccessGroupsV2) ListAccessGroups(listAccessGroupsOptions *ListAccessGroupsOptions) (result *GroupsList, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(listAccessGroupsOptions, "listAccessGroupsOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(listAccessGroupsOptions, "listAccessGroupsOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"groups"}
-	pathParameters := []string{}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(iamAccessGroups.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range listAccessGroupsOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("iam_access_groups", "V2", "ListAccessGroups")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-	if listAccessGroupsOptions.TransactionID != nil {
-		builder.AddHeader("Transaction-Id", fmt.Sprint(*listAccessGroupsOptions.TransactionID))
-	}
-
-	builder.AddQuery("account_id", fmt.Sprint(*listAccessGroupsOptions.AccountID))
-	if listAccessGroupsOptions.IamID != nil {
-		builder.AddQuery("iam_id", fmt.Sprint(*listAccessGroupsOptions.IamID))
-	}
-	if listAccessGroupsOptions.Limit != nil {
-		builder.AddQuery("limit", fmt.Sprint(*listAccessGroupsOptions.Limit))
-	}
-	if listAccessGroupsOptions.Offset != nil {
-		builder.AddQuery("offset", fmt.Sprint(*listAccessGroupsOptions.Offset))
-	}
-	if listAccessGroupsOptions.Sort != nil {
-		builder.AddQuery("sort", fmt.Sprint(*listAccessGroupsOptions.Sort))
-	}
-	if listAccessGroupsOptions.ShowFederated != nil {
-		builder.AddQuery("show_federated", fmt.Sprint(*listAccessGroupsOptions.ShowFederated))
-	}
-	if listAccessGroupsOptions.HidePublicAccess != nil {
-		builder.AddQuery("hide_public_access", fmt.Sprint(*listAccessGroupsOptions.HidePublicAccess))
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = iamAccessGroups.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalGroupsList(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// GetAccessGroup : Get an Access Group
-// Retrieve an Access Group by its `access_group_id`. Only the groups data is returned (group name, description,
-// account_id, ...), not membership or rule information. A revision number is returned in the `Etag` header, which is
-// needed when updating the Access Group.
-func (iamAccessGroups *IamAccessGroupsV2) GetAccessGroup(getAccessGroupOptions *GetAccessGroupOptions) (result *Group, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(getAccessGroupOptions, "getAccessGroupOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(getAccessGroupOptions, "getAccessGroupOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"groups"}
-	pathParameters := []string{*getAccessGroupOptions.AccessGroupID}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(iamAccessGroups.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range getAccessGroupOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("iam_access_groups", "V2", "GetAccessGroup")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-	if getAccessGroupOptions.TransactionID != nil {
-		builder.AddHeader("Transaction-Id", fmt.Sprint(*getAccessGroupOptions.TransactionID))
-	}
-
-	if getAccessGroupOptions.ShowFederated != nil {
-		builder.AddQuery("show_federated", fmt.Sprint(*getAccessGroupOptions.ShowFederated))
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = iamAccessGroups.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalGroup(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// UpdateAccessGroup : Update an Access Group
-// Update the group name or description of an existing Access Group using this API. An `If-Match` header must be
-// populated with the group's most recent revision number (which can be acquired in the `Get an Access Group` API).
-func (iamAccessGroups *IamAccessGroupsV2) UpdateAccessGroup(updateAccessGroupOptions *UpdateAccessGroupOptions) (result *Group, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(updateAccessGroupOptions, "updateAccessGroupOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(updateAccessGroupOptions, "updateAccessGroupOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"groups"}
-	pathParameters := []string{*updateAccessGroupOptions.AccessGroupID}
-
-	builder := core.NewRequestBuilder(core.PATCH)
-	_, err = builder.ConstructHTTPURL(iamAccessGroups.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range updateAccessGroupOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("iam_access_groups", "V2", "UpdateAccessGroup")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-	builder.AddHeader("Content-Type", "application/json")
-	if updateAccessGroupOptions.IfMatch != nil {
-		builder.AddHeader("If-Match", fmt.Sprint(*updateAccessGroupOptions.IfMatch))
-	}
-	if updateAccessGroupOptions.TransactionID != nil {
-		builder.AddHeader("Transaction-Id", fmt.Sprint(*updateAccessGroupOptions.TransactionID))
-	}
-
-	body := make(map[string]interface{})
-	if updateAccessGroupOptions.Name != nil {
-		body["name"] = updateAccessGroupOptions.Name
-	}
-	if updateAccessGroupOptions.Description != nil {
-		body["description"] = updateAccessGroupOptions.Description
-	}
-	_, err = builder.SetBodyContentJSON(body)
-	if err != nil {
-		return
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = iamAccessGroups.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalGroup(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// DeleteAccessGroup : Delete an Access Group
-// This API is used for deleting an Access Group. If the Access Group has no members or rules associated with it, the
-// group and its policies will be deleted. However, if rules or members do exist, set the `force` parameter to true to
-// delete the group as well as its associated members, rules, and policies.
-func (iamAccessGroups *IamAccessGroupsV2) DeleteAccessGroup(deleteAccessGroupOptions *DeleteAccessGroupOptions) (response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(deleteAccessGroupOptions, "deleteAccessGroupOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(deleteAccessGroupOptions, "deleteAccessGroupOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"groups"}
-	pathParameters := []string{*deleteAccessGroupOptions.AccessGroupID}
-
-	builder := core.NewRequestBuilder(core.DELETE)
-	_, err = builder.ConstructHTTPURL(iamAccessGroups.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range deleteAccessGroupOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("iam_access_groups", "V2", "DeleteAccessGroup")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	if deleteAccessGroupOptions.TransactionID != nil {
-		builder.AddHeader("Transaction-Id", fmt.Sprint(*deleteAccessGroupOptions.TransactionID))
-	}
-
-	if deleteAccessGroupOptions.Force != nil {
-		builder.AddQuery("force", fmt.Sprint(*deleteAccessGroupOptions.Force))
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = iamAccessGroups.Service.Request(request, nil)
-
-	return
-}
-
-// GetAccountSettings : Get Account Settings
-// Retrieve the Access Groups settings for a specific account.
-func (iamAccessGroups *IamAccessGroupsV2) GetAccountSettings(getAccountSettingsOptions *GetAccountSettingsOptions) (result *AccountSettings, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(getAccountSettingsOptions, "getAccountSettingsOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(getAccountSettingsOptions, "getAccountSettingsOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"groups/settings"}
-	pathParameters := []string{}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(iamAccessGroups.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range getAccountSettingsOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("iam_access_groups", "V2", "GetAccountSettings")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-	if getAccountSettingsOptions.TransactionID != nil {
-		builder.AddHeader("Transaction-Id", fmt.Sprint(*getAccountSettingsOptions.TransactionID))
-	}
-
-	builder.AddQuery("account_id", fmt.Sprint(*getAccountSettingsOptions.AccountID))
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = iamAccessGroups.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalAccountSettings(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// UpdateAccountSettings : Update Account Settings
-// Update the Access Groups settings for a specific account. Note: When the `public_access_enabled` setting is set to
-// false, all policies within the account attached to the Public Access group will be deleted. Only set
-// `public_access_enabled` to false if you are sure that you want those policies to be removed.
-func (iamAccessGroups *IamAccessGroupsV2) UpdateAccountSettings(updateAccountSettingsOptions *UpdateAccountSettingsOptions) (result *AccountSettings, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(updateAccountSettingsOptions, "updateAccountSettingsOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(updateAccountSettingsOptions, "updateAccountSettingsOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"groups/settings"}
-	pathParameters := []string{}
-
-	builder := core.NewRequestBuilder(core.PATCH)
-	_, err = builder.ConstructHTTPURL(iamAccessGroups.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range updateAccountSettingsOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("iam_access_groups", "V2", "UpdateAccountSettings")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-	builder.AddHeader("Content-Type", "application/json")
-	if updateAccountSettingsOptions.TransactionID != nil {
-		builder.AddHeader("Transaction-Id", fmt.Sprint(*updateAccountSettingsOptions.TransactionID))
-	}
-
-	builder.AddQuery("account_id", fmt.Sprint(*updateAccountSettingsOptions.AccountID))
-
-	body := make(map[string]interface{})
-	if updateAccountSettingsOptions.PublicAccessEnabled != nil {
-		body["public_access_enabled"] = updateAccountSettingsOptions.PublicAccessEnabled
-	}
-	_, err = builder.SetBodyContentJSON(body)
-	if err != nil {
-		return
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = iamAccessGroups.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalAccountSettings(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// IsMemberOfAccessGroup : Check membership in an Access Group
-// This HEAD operation determines if a given `iam_id` is present in a group. No response body is returned with this
-// request. If the membership exists, a `204 - No Content` status code is returned. If the membership or the group does
-// not exist, a `404 - Not Found` status code is returned.
-func (iamAccessGroups *IamAccessGroupsV2) IsMemberOfAccessGroup(isMemberOfAccessGroupOptions *IsMemberOfAccessGroupOptions) (response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(isMemberOfAccessGroupOptions, "isMemberOfAccessGroupOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(isMemberOfAccessGroupOptions, "isMemberOfAccessGroupOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"groups", "members"}
-	pathParameters := []string{*isMemberOfAccessGroupOptions.AccessGroupID, *isMemberOfAccessGroupOptions.IamID}
-
-	builder := core.NewRequestBuilder(core.HEAD)
-	_, err = builder.ConstructHTTPURL(iamAccessGroups.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range isMemberOfAccessGroupOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("iam_access_groups", "V2", "IsMemberOfAccessGroup")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	if isMemberOfAccessGroupOptions.TransactionID != nil {
-		builder.AddHeader("Transaction-Id", fmt.Sprint(*isMemberOfAccessGroupOptions.TransactionID))
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = iamAccessGroups.Service.Request(request, nil)
-
-	return
-}
-
-// AddMembersToAccessGroup : Add members to an Access Group
-// Use this API to add users (`IBMid-...`) or service IDs (`iam-ServiceId-...`) to an Access Group. Any member added
-// gains access to resources defined in the group's policies. To revoke a given user's access, simply remove them from
-// the group. There is no limit to the number of members one group can have, but each `iam_id` can only be added to 50
-// groups. Additionally, this API request payload can add up to 50 members per call.
-func (iamAccessGroups *IamAccessGroupsV2) AddMembersToAccessGroup(addMembersToAccessGroupOptions *AddMembersToAccessGroupOptions) (result *AddGroupMembersResponse, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(addMembersToAccessGroupOptions, "addMembersToAccessGroupOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(addMembersToAccessGroupOptions, "addMembersToAccessGroupOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"groups", "members"}
-	pathParameters := []string{*addMembersToAccessGroupOptions.AccessGroupID}
-
-	builder := core.NewRequestBuilder(core.PUT)
-	_, err = builder.ConstructHTTPURL(iamAccessGroups.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range addMembersToAccessGroupOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("iam_access_groups", "V2", "AddMembersToAccessGroup")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-	builder.AddHeader("Content-Type", "application/json")
-	if addMembersToAccessGroupOptions.TransactionID != nil {
-		builder.AddHeader("Transaction-Id", fmt.Sprint(*addMembersToAccessGroupOptions.TransactionID))
-	}
-
-	body := make(map[string]interface{})
-	if addMembersToAccessGroupOptions.Members != nil {
-		body["members"] = addMembersToAccessGroupOptions.Members
-	}
-	_, err = builder.SetBodyContentJSON(body)
-	if err != nil {
-		return
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = iamAccessGroups.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalAddGroupMembersResponse(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// ListAccessGroupMembers : List Access Group members
-// List all members of a given group using this API. Parameters for pagination and sorting can be used to filter the
-// results. The most useful query parameter may be the `verbose` flag. If `verbose=true`, user and service ID names will
-// be retrieved for each `iam_id`. If performance is a concern, leave the `verbose` parameter off so that name
-// information does not get retrieved.
-func (iamAccessGroups *IamAccessGroupsV2) ListAccessGroupMembers(listAccessGroupMembersOptions *ListAccessGroupMembersOptions) (result *GroupMembersList, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(listAccessGroupMembersOptions, "listAccessGroupMembersOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(listAccessGroupMembersOptions, "listAccessGroupMembersOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"groups", "members"}
-	pathParameters := []string{*listAccessGroupMembersOptions.AccessGroupID}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(iamAccessGroups.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range listAccessGroupMembersOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("iam_access_groups", "V2", "ListAccessGroupMembers")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-	if listAccessGroupMembersOptions.TransactionID != nil {
-		builder.AddHeader("Transaction-Id", fmt.Sprint(*listAccessGroupMembersOptions.TransactionID))
-	}
-
-	if listAccessGroupMembersOptions.Limit != nil {
-		builder.AddQuery("limit", fmt.Sprint(*listAccessGroupMembersOptions.Limit))
-	}
-	if listAccessGroupMembersOptions.Offset != nil {
-		builder.AddQuery("offset", fmt.Sprint(*listAccessGroupMembersOptions.Offset))
-	}
-	if listAccessGroupMembersOptions.Type != nil {
-		builder.AddQuery("type", fmt.Sprint(*listAccessGroupMembersOptions.Type))
-	}
-	if listAccessGroupMembersOptions.Verbose != nil {
-		builder.AddQuery("verbose", fmt.Sprint(*listAccessGroupMembersOptions.Verbose))
-	}
-	if listAccessGroupMembersOptions.Sort != nil {
-		builder.AddQuery("sort", fmt.Sprint(*listAccessGroupMembersOptions.Sort))
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = iamAccessGroups.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalGroupMembersList(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// RemoveMemberFromAccessGroup : Delete member from an Access Group
-// Remove one member from a group using this API. If the operation is successful, only a `204 - No Content` response
-// with no body is returned. However, if any error occurs, the standard error format will be returned.
-func (iamAccessGroups *IamAccessGroupsV2) RemoveMemberFromAccessGroup(removeMemberFromAccessGroupOptions *RemoveMemberFromAccessGroupOptions) (response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(removeMemberFromAccessGroupOptions, "removeMemberFromAccessGroupOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(removeMemberFromAccessGroupOptions, "removeMemberFromAccessGroupOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"groups", "members"}
-	pathParameters := []string{*removeMemberFromAccessGroupOptions.AccessGroupID, *removeMemberFromAccessGroupOptions.IamID}
-
-	builder := core.NewRequestBuilder(core.DELETE)
-	_, err = builder.ConstructHTTPURL(iamAccessGroups.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range removeMemberFromAccessGroupOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("iam_access_groups", "V2", "RemoveMemberFromAccessGroup")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	if removeMemberFromAccessGroupOptions.TransactionID != nil {
-		builder.AddHeader("Transaction-Id", fmt.Sprint(*removeMemberFromAccessGroupOptions.TransactionID))
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = iamAccessGroups.Service.Request(request, nil)
-
-	return
-}
-
-// RemoveMembersFromAccessGroup : Delete members from an Access Group
-// Remove multiple members from a group using this API. On a successful call, this API will always return 207. It is the
-// caller's responsibility to iterate across the body to determine successful deletion of each member. This API request
-// payload can delete up to 50 members per call.
-func (iamAccessGroups *IamAccessGroupsV2) RemoveMembersFromAccessGroup(removeMembersFromAccessGroupOptions *RemoveMembersFromAccessGroupOptions) (result *DeleteGroupBulkMembersResponse, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(removeMembersFromAccessGroupOptions, "removeMembersFromAccessGroupOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(removeMembersFromAccessGroupOptions, "removeMembersFromAccessGroupOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"groups", "members/delete"}
-	pathParameters := []string{*removeMembersFromAccessGroupOptions.AccessGroupID}
-
-	builder := core.NewRequestBuilder(core.POST)
-	_, err = builder.ConstructHTTPURL(iamAccessGroups.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range removeMembersFromAccessGroupOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("iam_access_groups", "V2", "RemoveMembersFromAccessGroup")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-	builder.AddHeader("Content-Type", "application/json")
-	if removeMembersFromAccessGroupOptions.TransactionID != nil {
-		builder.AddHeader("Transaction-Id", fmt.Sprint(*removeMembersFromAccessGroupOptions.TransactionID))
-	}
-
-	body := make(map[string]interface{})
-	if removeMembersFromAccessGroupOptions.Members != nil {
-		body["members"] = removeMembersFromAccessGroupOptions.Members
-	}
-	_, err = builder.SetBodyContentJSON(body)
-	if err != nil {
-		return
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = iamAccessGroups.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalDeleteGroupBulkMembersResponse(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// RemoveMemberFromAllAccessGroups : Delete member from all Access Groups
-// This API removes a given member from every group they are a member of within the specified account. By using one
-// operation, you can revoke one member's access to all Access Groups in the account. If a partial failure occurs on
-// deletion, the response will be shown in the body.
-func (iamAccessGroups *IamAccessGroupsV2) RemoveMemberFromAllAccessGroups(removeMemberFromAllAccessGroupsOptions *RemoveMemberFromAllAccessGroupsOptions) (result *DeleteFromAllGroupsResponse, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(removeMemberFromAllAccessGroupsOptions, "removeMemberFromAllAccessGroupsOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(removeMemberFromAllAccessGroupsOptions, "removeMemberFromAllAccessGroupsOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"groups/_allgroups/members"}
-	pathParameters := []string{*removeMemberFromAllAccessGroupsOptions.IamID}
-
-	builder := core.NewRequestBuilder(core.DELETE)
-	_, err = builder.ConstructHTTPURL(iamAccessGroups.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range removeMemberFromAllAccessGroupsOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("iam_access_groups", "V2", "RemoveMemberFromAllAccessGroups")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-	if removeMemberFromAllAccessGroupsOptions.TransactionID != nil {
-		builder.AddHeader("Transaction-Id", fmt.Sprint(*removeMemberFromAllAccessGroupsOptions.TransactionID))
-	}
-
-	builder.AddQuery("account_id", fmt.Sprint(*removeMemberFromAllAccessGroupsOptions.AccountID))
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = iamAccessGroups.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalDeleteFromAllGroupsResponse(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// AddMemberToMultipleAccessGroups : Add member to multiple Access Groups
-// This API will add a member to multiple Access Groups in an account. The limit of how many groups that can be in the
-// request is 50. The response is a list of results that show if adding the member to each group was successful or not.
-func (iamAccessGroups *IamAccessGroupsV2) AddMemberToMultipleAccessGroups(addMemberToMultipleAccessGroupsOptions *AddMemberToMultipleAccessGroupsOptions) (result *AddMembershipMultipleGroupsResponse, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(addMemberToMultipleAccessGroupsOptions, "addMemberToMultipleAccessGroupsOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(addMemberToMultipleAccessGroupsOptions, "addMemberToMultipleAccessGroupsOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"groups/_allgroups/members"}
-	pathParameters := []string{*addMemberToMultipleAccessGroupsOptions.IamID}
-
-	builder := core.NewRequestBuilder(core.PUT)
-	_, err = builder.ConstructHTTPURL(iamAccessGroups.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range addMemberToMultipleAccessGroupsOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("iam_access_groups", "V2", "AddMemberToMultipleAccessGroups")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-	builder.AddHeader("Content-Type", "application/json")
-	if addMemberToMultipleAccessGroupsOptions.TransactionID != nil {
-		builder.AddHeader("Transaction-Id", fmt.Sprint(*addMemberToMultipleAccessGroupsOptions.TransactionID))
-	}
-
-	builder.AddQuery("account_id", fmt.Sprint(*addMemberToMultipleAccessGroupsOptions.AccountID))
-
-	body := make(map[string]interface{})
-	if addMemberToMultipleAccessGroupsOptions.Type != nil {
-		body["type"] = addMemberToMultipleAccessGroupsOptions.Type
-	}
-	if addMemberToMultipleAccessGroupsOptions.Groups != nil {
-		body["groups"] = addMemberToMultipleAccessGroupsOptions.Groups
-	}
-	_, err = builder.SetBodyContentJSON(body)
-	if err != nil {
-		return
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = iamAccessGroups.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalAddMembershipMultipleGroupsResponse(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// AddAccessGroupRule : Create rule for an Access Group
-// Rules can be used to dynamically add users to an Access Group. If a user's SAML assertions match the rule's
-// conditions during login, the user will be dynamically added to the group. The duration of the user's access to the
-// group is determined by the `expiration` field. After access expires, the user will need to log in again to regain
-// access. Note that the condition's value field must be a stringified JSON value. [Consult this documentation for
-// further explanation of dynamic rules.](/docs/iam/accessgroup_rules.html#rules).
-func (iamAccessGroups *IamAccessGroupsV2) AddAccessGroupRule(addAccessGroupRuleOptions *AddAccessGroupRuleOptions) (result *Rule, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(addAccessGroupRuleOptions, "addAccessGroupRuleOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(addAccessGroupRuleOptions, "addAccessGroupRuleOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"groups", "rules"}
-	pathParameters := []string{*addAccessGroupRuleOptions.AccessGroupID}
-
-	builder := core.NewRequestBuilder(core.POST)
-	_, err = builder.ConstructHTTPURL(iamAccessGroups.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range addAccessGroupRuleOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("iam_access_groups", "V2", "AddAccessGroupRule")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-	builder.AddHeader("Content-Type", "application/json")
-	if addAccessGroupRuleOptions.TransactionID != nil {
-		builder.AddHeader("Transaction-Id", fmt.Sprint(*addAccessGroupRuleOptions.TransactionID))
-	}
-
-	body := make(map[string]interface{})
-	if addAccessGroupRuleOptions.Expiration != nil {
-		body["expiration"] = addAccessGroupRuleOptions.Expiration
-	}
-	if addAccessGroupRuleOptions.RealmName != nil {
-		body["realm_name"] = addAccessGroupRuleOptions.RealmName
-	}
-	if addAccessGroupRuleOptions.Conditions != nil {
-		body["conditions"] = addAccessGroupRuleOptions.Conditions
-	}
-	if addAccessGroupRuleOptions.Name != nil {
-		body["name"] = addAccessGroupRuleOptions.Name
-	}
-	_, err = builder.SetBodyContentJSON(body)
-	if err != nil {
-		return
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = iamAccessGroups.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalRule(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// ListAccessGroupRules : List Access Group rules
-// This API lists all rules in a given Access Group. Because only a few rules are created on each group, there is no
-// pagination or sorting support on this API.
-func (iamAccessGroups *IamAccessGroupsV2) ListAccessGroupRules(listAccessGroupRulesOptions *ListAccessGroupRulesOptions) (result *RulesList, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(listAccessGroupRulesOptions, "listAccessGroupRulesOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(listAccessGroupRulesOptions, "listAccessGroupRulesOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"groups", "rules"}
-	pathParameters := []string{*listAccessGroupRulesOptions.AccessGroupID}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(iamAccessGroups.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range listAccessGroupRulesOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("iam_access_groups", "V2", "ListAccessGroupRules")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-	if listAccessGroupRulesOptions.TransactionID != nil {
-		builder.AddHeader("Transaction-Id", fmt.Sprint(*listAccessGroupRulesOptions.TransactionID))
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = iamAccessGroups.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalRulesList(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// GetAccessGroupRule : Get an Access Group rule
-// Retrieve a rule from an Access Group. A revision number is returned in the `Etag` header, which is needed when
-// updating the rule.
-func (iamAccessGroups *IamAccessGroupsV2) GetAccessGroupRule(getAccessGroupRuleOptions *GetAccessGroupRuleOptions) (result *Rule, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(getAccessGroupRuleOptions, "getAccessGroupRuleOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(getAccessGroupRuleOptions, "getAccessGroupRuleOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"groups", "rules"}
-	pathParameters := []string{*getAccessGroupRuleOptions.AccessGroupID, *getAccessGroupRuleOptions.RuleID}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(iamAccessGroups.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range getAccessGroupRuleOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("iam_access_groups", "V2", "GetAccessGroupRule")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-	if getAccessGroupRuleOptions.TransactionID != nil {
-		builder.AddHeader("Transaction-Id", fmt.Sprint(*getAccessGroupRuleOptions.TransactionID))
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = iamAccessGroups.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalRule(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// ReplaceAccessGroupRule : Replace an Access Group rule
-// Update the body of an existing rule using this API. An `If-Match` header must be populated with the rule's most
-// recent revision number (which can be acquired in the `Get an Access Group rule` API).
-func (iamAccessGroups *IamAccessGroupsV2) ReplaceAccessGroupRule(replaceAccessGroupRuleOptions *ReplaceAccessGroupRuleOptions) (result *Rule, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(replaceAccessGroupRuleOptions, "replaceAccessGroupRuleOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(replaceAccessGroupRuleOptions, "replaceAccessGroupRuleOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"groups", "rules"}
-	pathParameters := []string{*replaceAccessGroupRuleOptions.AccessGroupID, *replaceAccessGroupRuleOptions.RuleID}
-
-	builder := core.NewRequestBuilder(core.PUT)
-	_, err = builder.ConstructHTTPURL(iamAccessGroups.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range replaceAccessGroupRuleOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("iam_access_groups", "V2", "ReplaceAccessGroupRule")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-	builder.AddHeader("Content-Type", "application/json")
-	if replaceAccessGroupRuleOptions.IfMatch != nil {
-		builder.AddHeader("If-Match", fmt.Sprint(*replaceAccessGroupRuleOptions.IfMatch))
-	}
-	if replaceAccessGroupRuleOptions.TransactionID != nil {
-		builder.AddHeader("Transaction-Id", fmt.Sprint(*replaceAccessGroupRuleOptions.TransactionID))
-	}
-
-	body := make(map[string]interface{})
-	if replaceAccessGroupRuleOptions.Expiration != nil {
-		body["expiration"] = replaceAccessGroupRuleOptions.Expiration
-	}
-	if replaceAccessGroupRuleOptions.RealmName != nil {
-		body["realm_name"] = replaceAccessGroupRuleOptions.RealmName
-	}
-	if replaceAccessGroupRuleOptions.Conditions != nil {
-		body["conditions"] = replaceAccessGroupRuleOptions.Conditions
-	}
-	if replaceAccessGroupRuleOptions.Name != nil {
-		body["name"] = replaceAccessGroupRuleOptions.Name
-	}
-	_, err = builder.SetBodyContentJSON(body)
-	if err != nil {
-		return
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = iamAccessGroups.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalRule(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// RemoveAccessGroupRule : Delete an Access Group rule
-// Remove one rule from a group using this API. If the operation is successful, only a `204 - No Content` response with
-// no body is returned. However, if any error occurs, the standard error format will be returned.
-func (iamAccessGroups *IamAccessGroupsV2) RemoveAccessGroupRule(removeAccessGroupRuleOptions *RemoveAccessGroupRuleOptions) (response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(removeAccessGroupRuleOptions, "removeAccessGroupRuleOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(removeAccessGroupRuleOptions, "removeAccessGroupRuleOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"groups", "rules"}
-	pathParameters := []string{*removeAccessGroupRuleOptions.AccessGroupID, *removeAccessGroupRuleOptions.RuleID}
-
-	builder := core.NewRequestBuilder(core.DELETE)
-	_, err = builder.ConstructHTTPURL(iamAccessGroups.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range removeAccessGroupRuleOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("iam_access_groups", "V2", "RemoveAccessGroupRule")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	if removeAccessGroupRuleOptions.TransactionID != nil {
-		builder.AddHeader("Transaction-Id", fmt.Sprint(*removeAccessGroupRuleOptions.TransactionID))
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = iamAccessGroups.Service.Request(request, nil)
-
-	return
-}
-
-// AccountSettings : The Access Groups settings for a specific account.
-type AccountSettings struct {
-	// The account id of the settings being shown.
-	AccountID *string `json:"account_id,omitempty"`
-
-	// The timestamp the settings were last edited at.
-	LastModifiedAt *string `json:"last_modified_at,omitempty"`
-
-	// The `iam_id` of the entity that last modified the settings.
-	LastModifiedByID *string `json:"last_modified_by_id,omitempty"`
-
-	// This flag controls the public access feature within the account. It is set to true by default. Note: When this flag
-	// is set to false, all policies within the account attached to the Public Access group will be deleted.
-	PublicAccessEnabled *bool `json:"public_access_enabled,omitempty"`
-}
-
-
-// UnmarshalAccountSettings constructs an instance of AccountSettings from the specified map.
-func UnmarshalAccountSettings(m map[string]interface{}) (result *AccountSettings, err error) {
-	obj := new(AccountSettings)
-	obj.AccountID, err = core.UnmarshalString(m, "account_id")
-	if err != nil {
-		return
-	}
-	obj.LastModifiedAt, err = core.UnmarshalString(m, "last_modified_at")
-	if err != nil {
-		return
-	}
-	obj.LastModifiedByID, err = core.UnmarshalString(m, "last_modified_by_id")
-	if err != nil {
-		return
-	}
-	obj.PublicAccessEnabled, err = core.UnmarshalBool(m, "public_access_enabled")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalAccountSettingsSlice unmarshals a slice of AccountSettings instances from the specified list of maps.
-func UnmarshalAccountSettingsSlice(s []interface{}) (slice []AccountSettings, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'AccountSettings'")
-			return
-		}
-		obj, e := UnmarshalAccountSettings(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalAccountSettingsAsProperty unmarshals an instance of AccountSettings that is stored as a property
-// within the specified map.
-func UnmarshalAccountSettingsAsProperty(m map[string]interface{}, propertyName string) (result *AccountSettings, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'AccountSettings'", propertyName)
-			return
-		}
-		result, err = UnmarshalAccountSettings(objMap)
-	}
-	return
-}
-
-// UnmarshalAccountSettingsSliceAsProperty unmarshals a slice of AccountSettings instances that are stored as a property
-// within the specified map.
-func UnmarshalAccountSettingsSliceAsProperty(m map[string]interface{}, propertyName string) (slice []AccountSettings, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'AccountSettings'", propertyName)
-			return
-		}
-		slice, err = UnmarshalAccountSettingsSlice(vSlice)
-	}
-	return
-}
-
-// AddAccessGroupRuleOptions : The AddAccessGroupRule options.
-type AddAccessGroupRuleOptions struct {
-	// The id of the group that the rule will be added to.
-	AccessGroupID *string `json:"access_group_id" validate:"required"`
-
-	// The number of hours that the rule lives for (Must be between 1 and 24).
-	Expiration *int64 `json:"expiration" validate:"required"`
-
-	// The url of the identity provider.
-	RealmName *string `json:"realm_name" validate:"required"`
-
-	// A list of conditions the rule must satisfy.
-	Conditions []RuleConditions `json:"conditions" validate:"required"`
-
-	// The name of the rule.
-	Name *string `json:"name,omitempty"`
-
-	// An optional transaction id for the request.
-	TransactionID *string `json:"Transaction-Id,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewAddAccessGroupRuleOptions : Instantiate AddAccessGroupRuleOptions
-func (*IamAccessGroupsV2) NewAddAccessGroupRuleOptions(accessGroupID string, expiration int64, realmName string, conditions []RuleConditions) *AddAccessGroupRuleOptions {
-	return &AddAccessGroupRuleOptions{
-		AccessGroupID: core.StringPtr(accessGroupID),
-		Expiration: core.Int64Ptr(expiration),
-		RealmName: core.StringPtr(realmName),
-		Conditions: conditions,
-	}
-}
-
-// SetAccessGroupID : Allow user to set AccessGroupID
-func (options *AddAccessGroupRuleOptions) SetAccessGroupID(accessGroupID string) *AddAccessGroupRuleOptions {
-	options.AccessGroupID = core.StringPtr(accessGroupID)
-	return options
-}
-
-// SetExpiration : Allow user to set Expiration
-func (options *AddAccessGroupRuleOptions) SetExpiration(expiration int64) *AddAccessGroupRuleOptions {
-	options.Expiration = core.Int64Ptr(expiration)
-	return options
-}
-
-// SetRealmName : Allow user to set RealmName
-func (options *AddAccessGroupRuleOptions) SetRealmName(realmName string) *AddAccessGroupRuleOptions {
-	options.RealmName = core.StringPtr(realmName)
-	return options
-}
-
-// SetConditions : Allow user to set Conditions
-func (options *AddAccessGroupRuleOptions) SetConditions(conditions []RuleConditions) *AddAccessGroupRuleOptions {
-	options.Conditions = conditions
-	return options
-}
-
-// SetName : Allow user to set Name
-func (options *AddAccessGroupRuleOptions) SetName(name string) *AddAccessGroupRuleOptions {
-	options.Name = core.StringPtr(name)
-	return options
-}
-
-// SetTransactionID : Allow user to set TransactionID
-func (options *AddAccessGroupRuleOptions) SetTransactionID(transactionID string) *AddAccessGroupRuleOptions {
-	options.TransactionID = core.StringPtr(transactionID)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *AddAccessGroupRuleOptions) SetHeaders(param map[string]string) *AddAccessGroupRuleOptions {
-	options.Headers = param
-	return options
-}
-
-// AddGroupMembersRequestMembersItem : AddGroupMembersRequestMembersItem struct
-type AddGroupMembersRequestMembersItem struct {
-	// The IBMid or Service Id of the member.
-	IamID *string `json:"iam_id" validate:"required"`
-
-	// The type of the member, must be either "user" or "service".
-	Type *string `json:"type" validate:"required"`
-}
-
-
-// NewAddGroupMembersRequestMembersItem : Instantiate AddGroupMembersRequestMembersItem (Generic Model Constructor)
-func (*IamAccessGroupsV2) NewAddGroupMembersRequestMembersItem(iamID string, typeVar string) (model *AddGroupMembersRequestMembersItem, err error) {
-	model = &AddGroupMembersRequestMembersItem{
-		IamID: core.StringPtr(iamID),
-		Type: core.StringPtr(typeVar),
-	}
-	err = core.ValidateStruct(model, "required parameters")
-	return
-}
-
-// UnmarshalAddGroupMembersRequestMembersItem constructs an instance of AddGroupMembersRequestMembersItem from the specified map.
-func UnmarshalAddGroupMembersRequestMembersItem(m map[string]interface{}) (result *AddGroupMembersRequestMembersItem, err error) {
-	obj := new(AddGroupMembersRequestMembersItem)
-	obj.IamID, err = core.UnmarshalString(m, "iam_id")
-	if err != nil {
-		return
-	}
-	obj.Type, err = core.UnmarshalString(m, "type")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalAddGroupMembersRequestMembersItemSlice unmarshals a slice of AddGroupMembersRequestMembersItem instances from the specified list of maps.
-func UnmarshalAddGroupMembersRequestMembersItemSlice(s []interface{}) (slice []AddGroupMembersRequestMembersItem, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'AddGroupMembersRequestMembersItem'")
-			return
-		}
-		obj, e := UnmarshalAddGroupMembersRequestMembersItem(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalAddGroupMembersRequestMembersItemAsProperty unmarshals an instance of AddGroupMembersRequestMembersItem that is stored as a property
-// within the specified map.
-func UnmarshalAddGroupMembersRequestMembersItemAsProperty(m map[string]interface{}, propertyName string) (result *AddGroupMembersRequestMembersItem, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'AddGroupMembersRequestMembersItem'", propertyName)
-			return
-		}
-		result, err = UnmarshalAddGroupMembersRequestMembersItem(objMap)
-	}
-	return
-}
-
-// UnmarshalAddGroupMembersRequestMembersItemSliceAsProperty unmarshals a slice of AddGroupMembersRequestMembersItem instances that are stored as a property
-// within the specified map.
-func UnmarshalAddGroupMembersRequestMembersItemSliceAsProperty(m map[string]interface{}, propertyName string) (slice []AddGroupMembersRequestMembersItem, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'AddGroupMembersRequestMembersItem'", propertyName)
-			return
-		}
-		slice, err = UnmarshalAddGroupMembersRequestMembersItemSlice(vSlice)
-	}
-	return
-}
-
-// AddGroupMembersResponse : The members added to an access group.
-type AddGroupMembersResponse struct {
-	// The members added to an access group.
-	Members []AddGroupMembersResponseMembersItem `json:"members,omitempty"`
-}
-
-
-// UnmarshalAddGroupMembersResponse constructs an instance of AddGroupMembersResponse from the specified map.
-func UnmarshalAddGroupMembersResponse(m map[string]interface{}) (result *AddGroupMembersResponse, err error) {
-	obj := new(AddGroupMembersResponse)
-	obj.Members, err = UnmarshalAddGroupMembersResponseMembersItemSliceAsProperty(m, "members")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalAddGroupMembersResponseSlice unmarshals a slice of AddGroupMembersResponse instances from the specified list of maps.
-func UnmarshalAddGroupMembersResponseSlice(s []interface{}) (slice []AddGroupMembersResponse, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'AddGroupMembersResponse'")
-			return
-		}
-		obj, e := UnmarshalAddGroupMembersResponse(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalAddGroupMembersResponseAsProperty unmarshals an instance of AddGroupMembersResponse that is stored as a property
-// within the specified map.
-func UnmarshalAddGroupMembersResponseAsProperty(m map[string]interface{}, propertyName string) (result *AddGroupMembersResponse, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'AddGroupMembersResponse'", propertyName)
-			return
-		}
-		result, err = UnmarshalAddGroupMembersResponse(objMap)
-	}
-	return
-}
-
-// UnmarshalAddGroupMembersResponseSliceAsProperty unmarshals a slice of AddGroupMembersResponse instances that are stored as a property
-// within the specified map.
-func UnmarshalAddGroupMembersResponseSliceAsProperty(m map[string]interface{}, propertyName string) (slice []AddGroupMembersResponse, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'AddGroupMembersResponse'", propertyName)
-			return
-		}
-		slice, err = UnmarshalAddGroupMembersResponseSlice(vSlice)
-	}
-	return
-}
-
-// AddGroupMembersResponseMembersItem : AddGroupMembersResponseMembersItem struct
-type AddGroupMembersResponseMembersItem struct {
-	// The IBMid or Service Id of the member.
-	IamID *string `json:"iam_id,omitempty"`
-
-	// The member type - either `user` or `service`.
-	Type *string `json:"type,omitempty"`
-
-	// The timestamp the membership was created at.
-	CreatedAt *string `json:"created_at,omitempty"`
-
-	// The `iam_id` of the entity that created the membership.
-	CreatedByID *string `json:"created_by_id,omitempty"`
-
-	// The outcome of the operation on this `iam_id`.
-	StatusCode *int64 `json:"status_code,omitempty"`
-
-	// A transaction-id that can be used for debugging purposes.
-	Trace *string `json:"trace,omitempty"`
-
-	// A list of errors that occurred when trying to add members to a group.
-	Errors []Error `json:"errors,omitempty"`
-}
-
-
-// UnmarshalAddGroupMembersResponseMembersItem constructs an instance of AddGroupMembersResponseMembersItem from the specified map.
-func UnmarshalAddGroupMembersResponseMembersItem(m map[string]interface{}) (result *AddGroupMembersResponseMembersItem, err error) {
-	obj := new(AddGroupMembersResponseMembersItem)
-	obj.IamID, err = core.UnmarshalString(m, "iam_id")
-	if err != nil {
-		return
-	}
-	obj.Type, err = core.UnmarshalString(m, "type")
-	if err != nil {
-		return
-	}
-	obj.CreatedAt, err = core.UnmarshalString(m, "created_at")
-	if err != nil {
-		return
-	}
-	obj.CreatedByID, err = core.UnmarshalString(m, "created_by_id")
-	if err != nil {
-		return
-	}
-	obj.StatusCode, err = core.UnmarshalInt64(m, "status_code")
-	if err != nil {
-		return
-	}
-	obj.Trace, err = core.UnmarshalString(m, "trace")
-	if err != nil {
-		return
-	}
-	obj.Errors, err = UnmarshalErrorSliceAsProperty(m, "errors")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalAddGroupMembersResponseMembersItemSlice unmarshals a slice of AddGroupMembersResponseMembersItem instances from the specified list of maps.
-func UnmarshalAddGroupMembersResponseMembersItemSlice(s []interface{}) (slice []AddGroupMembersResponseMembersItem, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'AddGroupMembersResponseMembersItem'")
-			return
-		}
-		obj, e := UnmarshalAddGroupMembersResponseMembersItem(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalAddGroupMembersResponseMembersItemAsProperty unmarshals an instance of AddGroupMembersResponseMembersItem that is stored as a property
-// within the specified map.
-func UnmarshalAddGroupMembersResponseMembersItemAsProperty(m map[string]interface{}, propertyName string) (result *AddGroupMembersResponseMembersItem, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'AddGroupMembersResponseMembersItem'", propertyName)
-			return
-		}
-		result, err = UnmarshalAddGroupMembersResponseMembersItem(objMap)
-	}
-	return
-}
-
-// UnmarshalAddGroupMembersResponseMembersItemSliceAsProperty unmarshals a slice of AddGroupMembersResponseMembersItem instances that are stored as a property
-// within the specified map.
-func UnmarshalAddGroupMembersResponseMembersItemSliceAsProperty(m map[string]interface{}, propertyName string) (slice []AddGroupMembersResponseMembersItem, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'AddGroupMembersResponseMembersItem'", propertyName)
-			return
-		}
-		slice, err = UnmarshalAddGroupMembersResponseMembersItemSlice(vSlice)
-	}
-	return
-}
-
-// AddMemberToMultipleAccessGroupsOptions : The AddMemberToMultipleAccessGroups options.
-type AddMemberToMultipleAccessGroupsOptions struct {
-	// IBM Cloud account id of the groups that the member will be added to.
-	AccountID *string `json:"account_id" validate:"required"`
-
-	// The iam_id to be added to the groups.
-	IamID *string `json:"iam_id" validate:"required"`
-
-	// The type of the member, must be either "user" or "service".
-	Type *string `json:"type,omitempty"`
-
-	// The ids of the access groups a given member is to be added to.
-	Groups []string `json:"groups,omitempty"`
-
-	// An optional transaction id for the request.
-	TransactionID *string `json:"Transaction-Id,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewAddMemberToMultipleAccessGroupsOptions : Instantiate AddMemberToMultipleAccessGroupsOptions
-func (*IamAccessGroupsV2) NewAddMemberToMultipleAccessGroupsOptions(accountID string, iamID string) *AddMemberToMultipleAccessGroupsOptions {
-	return &AddMemberToMultipleAccessGroupsOptions{
-		AccountID: core.StringPtr(accountID),
-		IamID: core.StringPtr(iamID),
-	}
-}
-
-// SetAccountID : Allow user to set AccountID
-func (options *AddMemberToMultipleAccessGroupsOptions) SetAccountID(accountID string) *AddMemberToMultipleAccessGroupsOptions {
-	options.AccountID = core.StringPtr(accountID)
-	return options
-}
-
-// SetIamID : Allow user to set IamID
-func (options *AddMemberToMultipleAccessGroupsOptions) SetIamID(iamID string) *AddMemberToMultipleAccessGroupsOptions {
-	options.IamID = core.StringPtr(iamID)
-	return options
-}
-
-// SetType : Allow user to set Type
-func (options *AddMemberToMultipleAccessGroupsOptions) SetType(typeVar string) *AddMemberToMultipleAccessGroupsOptions {
-	options.Type = core.StringPtr(typeVar)
-	return options
-}
-
-// SetGroups : Allow user to set Groups
-func (options *AddMemberToMultipleAccessGroupsOptions) SetGroups(groups []string) *AddMemberToMultipleAccessGroupsOptions {
-	options.Groups = groups
-	return options
-}
-
-// SetTransactionID : Allow user to set TransactionID
-func (options *AddMemberToMultipleAccessGroupsOptions) SetTransactionID(transactionID string) *AddMemberToMultipleAccessGroupsOptions {
-	options.TransactionID = core.StringPtr(transactionID)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *AddMemberToMultipleAccessGroupsOptions) SetHeaders(param map[string]string) *AddMemberToMultipleAccessGroupsOptions {
-	options.Headers = param
-	return options
-}
-
-// AddMembersToAccessGroupOptions : The AddMembersToAccessGroup options.
-type AddMembersToAccessGroupOptions struct {
-	// The Access Group to add the members to.
-	AccessGroupID *string `json:"access_group_id" validate:"required"`
-
-	// An array of member objects to add to an access group.
-	Members []AddGroupMembersRequestMembersItem `json:"members,omitempty"`
-
-	// An optional transaction id for the request.
-	TransactionID *string `json:"Transaction-Id,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewAddMembersToAccessGroupOptions : Instantiate AddMembersToAccessGroupOptions
-func (*IamAccessGroupsV2) NewAddMembersToAccessGroupOptions(accessGroupID string) *AddMembersToAccessGroupOptions {
-	return &AddMembersToAccessGroupOptions{
-		AccessGroupID: core.StringPtr(accessGroupID),
-	}
-}
-
-// SetAccessGroupID : Allow user to set AccessGroupID
-func (options *AddMembersToAccessGroupOptions) SetAccessGroupID(accessGroupID string) *AddMembersToAccessGroupOptions {
-	options.AccessGroupID = core.StringPtr(accessGroupID)
-	return options
-}
-
-// SetMembers : Allow user to set Members
-func (options *AddMembersToAccessGroupOptions) SetMembers(members []AddGroupMembersRequestMembersItem) *AddMembersToAccessGroupOptions {
-	options.Members = members
-	return options
-}
-
-// SetTransactionID : Allow user to set TransactionID
-func (options *AddMembersToAccessGroupOptions) SetTransactionID(transactionID string) *AddMembersToAccessGroupOptions {
-	options.TransactionID = core.StringPtr(transactionID)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *AddMembersToAccessGroupOptions) SetHeaders(param map[string]string) *AddMembersToAccessGroupOptions {
-	options.Headers = param
-	return options
-}
-
-// AddMembershipMultipleGroupsResponse : The response from the add member to multiple access groups request.
-type AddMembershipMultipleGroupsResponse struct {
-	// The iam_id of a member.
-	IamID *string `json:"iam_id,omitempty"`
-
-	// The list of access groups a member was added to.
-	Groups []AddMembershipMultipleGroupsResponseGroupsItem `json:"groups,omitempty"`
-}
-
-
-// UnmarshalAddMembershipMultipleGroupsResponse constructs an instance of AddMembershipMultipleGroupsResponse from the specified map.
-func UnmarshalAddMembershipMultipleGroupsResponse(m map[string]interface{}) (result *AddMembershipMultipleGroupsResponse, err error) {
-	obj := new(AddMembershipMultipleGroupsResponse)
-	obj.IamID, err = core.UnmarshalString(m, "iam_id")
-	if err != nil {
-		return
-	}
-	obj.Groups, err = UnmarshalAddMembershipMultipleGroupsResponseGroupsItemSliceAsProperty(m, "groups")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalAddMembershipMultipleGroupsResponseSlice unmarshals a slice of AddMembershipMultipleGroupsResponse instances from the specified list of maps.
-func UnmarshalAddMembershipMultipleGroupsResponseSlice(s []interface{}) (slice []AddMembershipMultipleGroupsResponse, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'AddMembershipMultipleGroupsResponse'")
-			return
-		}
-		obj, e := UnmarshalAddMembershipMultipleGroupsResponse(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalAddMembershipMultipleGroupsResponseAsProperty unmarshals an instance of AddMembershipMultipleGroupsResponse that is stored as a property
-// within the specified map.
-func UnmarshalAddMembershipMultipleGroupsResponseAsProperty(m map[string]interface{}, propertyName string) (result *AddMembershipMultipleGroupsResponse, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'AddMembershipMultipleGroupsResponse'", propertyName)
-			return
-		}
-		result, err = UnmarshalAddMembershipMultipleGroupsResponse(objMap)
-	}
-	return
-}
-
-// UnmarshalAddMembershipMultipleGroupsResponseSliceAsProperty unmarshals a slice of AddMembershipMultipleGroupsResponse instances that are stored as a property
-// within the specified map.
-func UnmarshalAddMembershipMultipleGroupsResponseSliceAsProperty(m map[string]interface{}, propertyName string) (slice []AddMembershipMultipleGroupsResponse, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'AddMembershipMultipleGroupsResponse'", propertyName)
-			return
-		}
-		slice, err = UnmarshalAddMembershipMultipleGroupsResponseSlice(vSlice)
-	}
-	return
-}
-
-// AddMembershipMultipleGroupsResponseGroupsItem : AddMembershipMultipleGroupsResponseGroupsItem struct
-type AddMembershipMultipleGroupsResponseGroupsItem struct {
-	// The Access Group that the member is to be added to.
-	AccessGroupID *string `json:"access_group_id,omitempty"`
-
-	// The outcome of the add membership operation on this `access_group_id`.
-	StatusCode *int64 `json:"status_code,omitempty"`
-
-	// A transaction-id that can be used for debugging purposes.
-	Trace *string `json:"trace,omitempty"`
-
-	// List of errors encountered when adding member to access group.
-	Errors []Error `json:"errors,omitempty"`
-}
-
-
-// UnmarshalAddMembershipMultipleGroupsResponseGroupsItem constructs an instance of AddMembershipMultipleGroupsResponseGroupsItem from the specified map.
-func UnmarshalAddMembershipMultipleGroupsResponseGroupsItem(m map[string]interface{}) (result *AddMembershipMultipleGroupsResponseGroupsItem, err error) {
-	obj := new(AddMembershipMultipleGroupsResponseGroupsItem)
-	obj.AccessGroupID, err = core.UnmarshalString(m, "access_group_id")
-	if err != nil {
-		return
-	}
-	obj.StatusCode, err = core.UnmarshalInt64(m, "status_code")
-	if err != nil {
-		return
-	}
-	obj.Trace, err = core.UnmarshalString(m, "trace")
-	if err != nil {
-		return
-	}
-	obj.Errors, err = UnmarshalErrorSliceAsProperty(m, "errors")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalAddMembershipMultipleGroupsResponseGroupsItemSlice unmarshals a slice of AddMembershipMultipleGroupsResponseGroupsItem instances from the specified list of maps.
-func UnmarshalAddMembershipMultipleGroupsResponseGroupsItemSlice(s []interface{}) (slice []AddMembershipMultipleGroupsResponseGroupsItem, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'AddMembershipMultipleGroupsResponseGroupsItem'")
-			return
-		}
-		obj, e := UnmarshalAddMembershipMultipleGroupsResponseGroupsItem(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalAddMembershipMultipleGroupsResponseGroupsItemAsProperty unmarshals an instance of AddMembershipMultipleGroupsResponseGroupsItem that is stored as a property
-// within the specified map.
-func UnmarshalAddMembershipMultipleGroupsResponseGroupsItemAsProperty(m map[string]interface{}, propertyName string) (result *AddMembershipMultipleGroupsResponseGroupsItem, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'AddMembershipMultipleGroupsResponseGroupsItem'", propertyName)
-			return
-		}
-		result, err = UnmarshalAddMembershipMultipleGroupsResponseGroupsItem(objMap)
-	}
-	return
-}
-
-// UnmarshalAddMembershipMultipleGroupsResponseGroupsItemSliceAsProperty unmarshals a slice of AddMembershipMultipleGroupsResponseGroupsItem instances that are stored as a property
-// within the specified map.
-func UnmarshalAddMembershipMultipleGroupsResponseGroupsItemSliceAsProperty(m map[string]interface{}, propertyName string) (slice []AddMembershipMultipleGroupsResponseGroupsItem, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'AddMembershipMultipleGroupsResponseGroupsItem'", propertyName)
-			return
-		}
-		slice, err = UnmarshalAddMembershipMultipleGroupsResponseGroupsItemSlice(vSlice)
-	}
-	return
-}
-
-// CreateAccessGroupOptions : The CreateAccessGroup options.
-type CreateAccessGroupOptions struct {
-	// IBM Cloud account id under which the group is created.
-	AccountID *string `json:"account_id" validate:"required"`
-
-	// Assign the specified name to the Access Group. This field has a limit of 100 characters.
-	Name *string `json:"name" validate:"required"`
-
-	// Assign a description for the Access Group. This field has a limit of 250 characters.
-	Description *string `json:"description,omitempty"`
-
-	// An optional transaction id for the request.
-	TransactionID *string `json:"Transaction-Id,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewCreateAccessGroupOptions : Instantiate CreateAccessGroupOptions
-func (*IamAccessGroupsV2) NewCreateAccessGroupOptions(accountID string, name string) *CreateAccessGroupOptions {
-	return &CreateAccessGroupOptions{
-		AccountID: core.StringPtr(accountID),
-		Name: core.StringPtr(name),
-	}
-}
-
-// SetAccountID : Allow user to set AccountID
-func (options *CreateAccessGroupOptions) SetAccountID(accountID string) *CreateAccessGroupOptions {
-	options.AccountID = core.StringPtr(accountID)
-	return options
-}
-
-// SetName : Allow user to set Name
-func (options *CreateAccessGroupOptions) SetName(name string) *CreateAccessGroupOptions {
-	options.Name = core.StringPtr(name)
-	return options
-}
-
-// SetDescription : Allow user to set Description
-func (options *CreateAccessGroupOptions) SetDescription(description string) *CreateAccessGroupOptions {
-	options.Description = core.StringPtr(description)
-	return options
-}
-
-// SetTransactionID : Allow user to set TransactionID
-func (options *CreateAccessGroupOptions) SetTransactionID(transactionID string) *CreateAccessGroupOptions {
-	options.TransactionID = core.StringPtr(transactionID)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *CreateAccessGroupOptions) SetHeaders(param map[string]string) *CreateAccessGroupOptions {
-	options.Headers = param
-	return options
-}
-
-// DeleteAccessGroupOptions : The DeleteAccessGroup options.
-type DeleteAccessGroupOptions struct {
-	// The Access group to delete.
-	AccessGroupID *string `json:"access_group_id" validate:"required"`
-
-	// An optional transaction id for the request.
-	TransactionID *string `json:"Transaction-Id,omitempty"`
-
-	// If force is true, delete the group as well as its associated members and rules.
-	Force *bool `json:"force,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewDeleteAccessGroupOptions : Instantiate DeleteAccessGroupOptions
-func (*IamAccessGroupsV2) NewDeleteAccessGroupOptions(accessGroupID string) *DeleteAccessGroupOptions {
-	return &DeleteAccessGroupOptions{
-		AccessGroupID: core.StringPtr(accessGroupID),
-	}
-}
-
-// SetAccessGroupID : Allow user to set AccessGroupID
-func (options *DeleteAccessGroupOptions) SetAccessGroupID(accessGroupID string) *DeleteAccessGroupOptions {
-	options.AccessGroupID = core.StringPtr(accessGroupID)
-	return options
-}
-
-// SetTransactionID : Allow user to set TransactionID
-func (options *DeleteAccessGroupOptions) SetTransactionID(transactionID string) *DeleteAccessGroupOptions {
-	options.TransactionID = core.StringPtr(transactionID)
-	return options
-}
-
-// SetForce : Allow user to set Force
-func (options *DeleteAccessGroupOptions) SetForce(force bool) *DeleteAccessGroupOptions {
-	options.Force = core.BoolPtr(force)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *DeleteAccessGroupOptions) SetHeaders(param map[string]string) *DeleteAccessGroupOptions {
-	options.Headers = param
-	return options
-}
-
-// DeleteFromAllGroupsResponse : The response from the delete member from access groups request.
-type DeleteFromAllGroupsResponse struct {
-	// The `iam_id` of the member to removed from groups.
-	IamID *string `json:"iam_id,omitempty"`
-
-	// The groups the member was removed from.
-	Groups []DeleteFromAllGroupsResponseGroupsItem `json:"groups,omitempty"`
-}
-
-
-// UnmarshalDeleteFromAllGroupsResponse constructs an instance of DeleteFromAllGroupsResponse from the specified map.
-func UnmarshalDeleteFromAllGroupsResponse(m map[string]interface{}) (result *DeleteFromAllGroupsResponse, err error) {
-	obj := new(DeleteFromAllGroupsResponse)
-	obj.IamID, err = core.UnmarshalString(m, "iam_id")
-	if err != nil {
-		return
-	}
-	obj.Groups, err = UnmarshalDeleteFromAllGroupsResponseGroupsItemSliceAsProperty(m, "groups")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalDeleteFromAllGroupsResponseSlice unmarshals a slice of DeleteFromAllGroupsResponse instances from the specified list of maps.
-func UnmarshalDeleteFromAllGroupsResponseSlice(s []interface{}) (slice []DeleteFromAllGroupsResponse, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'DeleteFromAllGroupsResponse'")
-			return
-		}
-		obj, e := UnmarshalDeleteFromAllGroupsResponse(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalDeleteFromAllGroupsResponseAsProperty unmarshals an instance of DeleteFromAllGroupsResponse that is stored as a property
-// within the specified map.
-func UnmarshalDeleteFromAllGroupsResponseAsProperty(m map[string]interface{}, propertyName string) (result *DeleteFromAllGroupsResponse, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'DeleteFromAllGroupsResponse'", propertyName)
-			return
-		}
-		result, err = UnmarshalDeleteFromAllGroupsResponse(objMap)
-	}
-	return
-}
-
-// UnmarshalDeleteFromAllGroupsResponseSliceAsProperty unmarshals a slice of DeleteFromAllGroupsResponse instances that are stored as a property
-// within the specified map.
-func UnmarshalDeleteFromAllGroupsResponseSliceAsProperty(m map[string]interface{}, propertyName string) (slice []DeleteFromAllGroupsResponse, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'DeleteFromAllGroupsResponse'", propertyName)
-			return
-		}
-		slice, err = UnmarshalDeleteFromAllGroupsResponseSlice(vSlice)
-	}
-	return
-}
-
-// DeleteFromAllGroupsResponseGroupsItem : DeleteFromAllGroupsResponseGroupsItem struct
-type DeleteFromAllGroupsResponseGroupsItem struct {
-	// The Access Group that the member is to be deleted from.
-	AccessGroupID *string `json:"access_group_id,omitempty"`
-
-	// The outcome of the delete operation on this `access_group_id`.
-	StatusCode *int64 `json:"status_code,omitempty"`
-
-	// A transaction-id that can be used for debugging purposes.
-	Trace *string `json:"trace,omitempty"`
-
-	// A list of errors that occurred when trying to remove a member from groups.
-	Errors []Error `json:"errors,omitempty"`
-}
-
-
-// UnmarshalDeleteFromAllGroupsResponseGroupsItem constructs an instance of DeleteFromAllGroupsResponseGroupsItem from the specified map.
-func UnmarshalDeleteFromAllGroupsResponseGroupsItem(m map[string]interface{}) (result *DeleteFromAllGroupsResponseGroupsItem, err error) {
-	obj := new(DeleteFromAllGroupsResponseGroupsItem)
-	obj.AccessGroupID, err = core.UnmarshalString(m, "access_group_id")
-	if err != nil {
-		return
-	}
-	obj.StatusCode, err = core.UnmarshalInt64(m, "status_code")
-	if err != nil {
-		return
-	}
-	obj.Trace, err = core.UnmarshalString(m, "trace")
-	if err != nil {
-		return
-	}
-	obj.Errors, err = UnmarshalErrorSliceAsProperty(m, "errors")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalDeleteFromAllGroupsResponseGroupsItemSlice unmarshals a slice of DeleteFromAllGroupsResponseGroupsItem instances from the specified list of maps.
-func UnmarshalDeleteFromAllGroupsResponseGroupsItemSlice(s []interface{}) (slice []DeleteFromAllGroupsResponseGroupsItem, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'DeleteFromAllGroupsResponseGroupsItem'")
-			return
-		}
-		obj, e := UnmarshalDeleteFromAllGroupsResponseGroupsItem(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalDeleteFromAllGroupsResponseGroupsItemAsProperty unmarshals an instance of DeleteFromAllGroupsResponseGroupsItem that is stored as a property
-// within the specified map.
-func UnmarshalDeleteFromAllGroupsResponseGroupsItemAsProperty(m map[string]interface{}, propertyName string) (result *DeleteFromAllGroupsResponseGroupsItem, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'DeleteFromAllGroupsResponseGroupsItem'", propertyName)
-			return
-		}
-		result, err = UnmarshalDeleteFromAllGroupsResponseGroupsItem(objMap)
-	}
-	return
-}
-
-// UnmarshalDeleteFromAllGroupsResponseGroupsItemSliceAsProperty unmarshals a slice of DeleteFromAllGroupsResponseGroupsItem instances that are stored as a property
-// within the specified map.
-func UnmarshalDeleteFromAllGroupsResponseGroupsItemSliceAsProperty(m map[string]interface{}, propertyName string) (slice []DeleteFromAllGroupsResponseGroupsItem, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'DeleteFromAllGroupsResponseGroupsItem'", propertyName)
-			return
-		}
-		slice, err = UnmarshalDeleteFromAllGroupsResponseGroupsItemSlice(vSlice)
-	}
-	return
-}
-
-// DeleteGroupBulkMembersResponse : The access group id and the members removed from it.
-type DeleteGroupBulkMembersResponse struct {
-	// The access group id.
-	AccessGroupID *string `json:"access_group_id,omitempty"`
-
-	// The `iam_id`s removed from the access group.
-	Members []DeleteGroupBulkMembersResponseMembersItem `json:"members,omitempty"`
-}
-
-
-// UnmarshalDeleteGroupBulkMembersResponse constructs an instance of DeleteGroupBulkMembersResponse from the specified map.
-func UnmarshalDeleteGroupBulkMembersResponse(m map[string]interface{}) (result *DeleteGroupBulkMembersResponse, err error) {
-	obj := new(DeleteGroupBulkMembersResponse)
-	obj.AccessGroupID, err = core.UnmarshalString(m, "access_group_id")
-	if err != nil {
-		return
-	}
-	obj.Members, err = UnmarshalDeleteGroupBulkMembersResponseMembersItemSliceAsProperty(m, "members")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalDeleteGroupBulkMembersResponseSlice unmarshals a slice of DeleteGroupBulkMembersResponse instances from the specified list of maps.
-func UnmarshalDeleteGroupBulkMembersResponseSlice(s []interface{}) (slice []DeleteGroupBulkMembersResponse, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'DeleteGroupBulkMembersResponse'")
-			return
-		}
-		obj, e := UnmarshalDeleteGroupBulkMembersResponse(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalDeleteGroupBulkMembersResponseAsProperty unmarshals an instance of DeleteGroupBulkMembersResponse that is stored as a property
-// within the specified map.
-func UnmarshalDeleteGroupBulkMembersResponseAsProperty(m map[string]interface{}, propertyName string) (result *DeleteGroupBulkMembersResponse, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'DeleteGroupBulkMembersResponse'", propertyName)
-			return
-		}
-		result, err = UnmarshalDeleteGroupBulkMembersResponse(objMap)
-	}
-	return
-}
-
-// UnmarshalDeleteGroupBulkMembersResponseSliceAsProperty unmarshals a slice of DeleteGroupBulkMembersResponse instances that are stored as a property
-// within the specified map.
-func UnmarshalDeleteGroupBulkMembersResponseSliceAsProperty(m map[string]interface{}, propertyName string) (slice []DeleteGroupBulkMembersResponse, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'DeleteGroupBulkMembersResponse'", propertyName)
-			return
-		}
-		slice, err = UnmarshalDeleteGroupBulkMembersResponseSlice(vSlice)
-	}
-	return
-}
-
-// DeleteGroupBulkMembersResponseMembersItem : DeleteGroupBulkMembersResponseMembersItem struct
-type DeleteGroupBulkMembersResponseMembersItem struct {
-	// The `iam_id` to be deleted.
-	IamID *string `json:"iam_id,omitempty"`
-
-	// A transaction-id that can be used for debugging purposes.
-	Trace *string `json:"trace,omitempty"`
-
-	// The outcome of the delete membership operation on this `access_group_id`.
-	StatusCode *int64 `json:"status_code,omitempty"`
-
-	// A list of errors that occurred when trying to remove a member from groups.
-	Errors []Error `json:"errors,omitempty"`
-}
-
-
-// UnmarshalDeleteGroupBulkMembersResponseMembersItem constructs an instance of DeleteGroupBulkMembersResponseMembersItem from the specified map.
-func UnmarshalDeleteGroupBulkMembersResponseMembersItem(m map[string]interface{}) (result *DeleteGroupBulkMembersResponseMembersItem, err error) {
-	obj := new(DeleteGroupBulkMembersResponseMembersItem)
-	obj.IamID, err = core.UnmarshalString(m, "iam_id")
-	if err != nil {
-		return
-	}
-	obj.Trace, err = core.UnmarshalString(m, "trace")
-	if err != nil {
-		return
-	}
-	obj.StatusCode, err = core.UnmarshalInt64(m, "status_code")
-	if err != nil {
-		return
-	}
-	obj.Errors, err = UnmarshalErrorSliceAsProperty(m, "errors")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalDeleteGroupBulkMembersResponseMembersItemSlice unmarshals a slice of DeleteGroupBulkMembersResponseMembersItem instances from the specified list of maps.
-func UnmarshalDeleteGroupBulkMembersResponseMembersItemSlice(s []interface{}) (slice []DeleteGroupBulkMembersResponseMembersItem, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'DeleteGroupBulkMembersResponseMembersItem'")
-			return
-		}
-		obj, e := UnmarshalDeleteGroupBulkMembersResponseMembersItem(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalDeleteGroupBulkMembersResponseMembersItemAsProperty unmarshals an instance of DeleteGroupBulkMembersResponseMembersItem that is stored as a property
-// within the specified map.
-func UnmarshalDeleteGroupBulkMembersResponseMembersItemAsProperty(m map[string]interface{}, propertyName string) (result *DeleteGroupBulkMembersResponseMembersItem, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'DeleteGroupBulkMembersResponseMembersItem'", propertyName)
-			return
-		}
-		result, err = UnmarshalDeleteGroupBulkMembersResponseMembersItem(objMap)
-	}
-	return
-}
-
-// UnmarshalDeleteGroupBulkMembersResponseMembersItemSliceAsProperty unmarshals a slice of DeleteGroupBulkMembersResponseMembersItem instances that are stored as a property
-// within the specified map.
-func UnmarshalDeleteGroupBulkMembersResponseMembersItemSliceAsProperty(m map[string]interface{}, propertyName string) (slice []DeleteGroupBulkMembersResponseMembersItem, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'DeleteGroupBulkMembersResponseMembersItem'", propertyName)
-			return
-		}
-		slice, err = UnmarshalDeleteGroupBulkMembersResponseMembersItemSlice(vSlice)
-	}
-	return
-}
-
-// Error : Error contains the code and message for an error returned to the user code is a string identifying the problem,
-// examples "missing_field", "reserved_value" message is a string explaining the solution to the problem that was
-// encountered.
-type Error struct {
-	// A human-readable error code represented by a snake case string.
-	Code *string `json:"code,omitempty"`
-
-	// A specific error message that details the issue or an action to take.
-	Message *string `json:"message,omitempty"`
-}
-
-
-// UnmarshalError constructs an instance of Error from the specified map.
-func UnmarshalError(m map[string]interface{}) (result *Error, err error) {
-	obj := new(Error)
-	obj.Code, err = core.UnmarshalString(m, "code")
-	if err != nil {
-		return
-	}
-	obj.Message, err = core.UnmarshalString(m, "message")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalErrorSlice unmarshals a slice of Error instances from the specified list of maps.
-func UnmarshalErrorSlice(s []interface{}) (slice []Error, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'Error'")
-			return
-		}
-		obj, e := UnmarshalError(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalErrorAsProperty unmarshals an instance of Error that is stored as a property
-// within the specified map.
-func UnmarshalErrorAsProperty(m map[string]interface{}, propertyName string) (result *Error, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'Error'", propertyName)
-			return
-		}
-		result, err = UnmarshalError(objMap)
-	}
-	return
-}
-
-// UnmarshalErrorSliceAsProperty unmarshals a slice of Error instances that are stored as a property
-// within the specified map.
-func UnmarshalErrorSliceAsProperty(m map[string]interface{}, propertyName string) (slice []Error, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'Error'", propertyName)
-			return
-		}
-		slice, err = UnmarshalErrorSlice(vSlice)
-	}
-	return
-}
-
-// GetAccessGroupOptions : The GetAccessGroup options.
-type GetAccessGroupOptions struct {
-	// The Access Group to get.
-	AccessGroupID *string `json:"access_group_id" validate:"required"`
-
-	// An optional transaction id for the request.
-	TransactionID *string `json:"Transaction-Id,omitempty"`
-
-	// If show_federated is true, the group will return an is_federated value that is set to true if rules exist for the
-	// group.
-	ShowFederated *bool `json:"show_federated,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewGetAccessGroupOptions : Instantiate GetAccessGroupOptions
-func (*IamAccessGroupsV2) NewGetAccessGroupOptions(accessGroupID string) *GetAccessGroupOptions {
-	return &GetAccessGroupOptions{
-		AccessGroupID: core.StringPtr(accessGroupID),
-	}
-}
-
-// SetAccessGroupID : Allow user to set AccessGroupID
-func (options *GetAccessGroupOptions) SetAccessGroupID(accessGroupID string) *GetAccessGroupOptions {
-	options.AccessGroupID = core.StringPtr(accessGroupID)
-	return options
-}
-
-// SetTransactionID : Allow user to set TransactionID
-func (options *GetAccessGroupOptions) SetTransactionID(transactionID string) *GetAccessGroupOptions {
-	options.TransactionID = core.StringPtr(transactionID)
-	return options
-}
-
-// SetShowFederated : Allow user to set ShowFederated
-func (options *GetAccessGroupOptions) SetShowFederated(showFederated bool) *GetAccessGroupOptions {
-	options.ShowFederated = core.BoolPtr(showFederated)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *GetAccessGroupOptions) SetHeaders(param map[string]string) *GetAccessGroupOptions {
-	options.Headers = param
-	return options
-}
-
-// GetAccessGroupRuleOptions : The GetAccessGroupRule options.
-type GetAccessGroupRuleOptions struct {
-	// The group id that the rule is bound to.
-	AccessGroupID *string `json:"access_group_id" validate:"required"`
-
-	// The rule to get.
-	RuleID *string `json:"rule_id" validate:"required"`
-
-	// An optional transaction id for the request.
-	TransactionID *string `json:"Transaction-Id,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewGetAccessGroupRuleOptions : Instantiate GetAccessGroupRuleOptions
-func (*IamAccessGroupsV2) NewGetAccessGroupRuleOptions(accessGroupID string, ruleID string) *GetAccessGroupRuleOptions {
-	return &GetAccessGroupRuleOptions{
-		AccessGroupID: core.StringPtr(accessGroupID),
-		RuleID: core.StringPtr(ruleID),
-	}
-}
-
-// SetAccessGroupID : Allow user to set AccessGroupID
-func (options *GetAccessGroupRuleOptions) SetAccessGroupID(accessGroupID string) *GetAccessGroupRuleOptions {
-	options.AccessGroupID = core.StringPtr(accessGroupID)
-	return options
-}
-
-// SetRuleID : Allow user to set RuleID
-func (options *GetAccessGroupRuleOptions) SetRuleID(ruleID string) *GetAccessGroupRuleOptions {
-	options.RuleID = core.StringPtr(ruleID)
-	return options
-}
-
-// SetTransactionID : Allow user to set TransactionID
-func (options *GetAccessGroupRuleOptions) SetTransactionID(transactionID string) *GetAccessGroupRuleOptions {
-	options.TransactionID = core.StringPtr(transactionID)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *GetAccessGroupRuleOptions) SetHeaders(param map[string]string) *GetAccessGroupRuleOptions {
-	options.Headers = param
-	return options
-}
-
-// GetAccountSettingsOptions : The GetAccountSettings options.
-type GetAccountSettingsOptions struct {
-	// The account id of the settings being retrieved.
-	AccountID *string `json:"account_id" validate:"required"`
-
-	// An optional transaction id for the request.
-	TransactionID *string `json:"Transaction-Id,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewGetAccountSettingsOptions : Instantiate GetAccountSettingsOptions
-func (*IamAccessGroupsV2) NewGetAccountSettingsOptions(accountID string) *GetAccountSettingsOptions {
-	return &GetAccountSettingsOptions{
-		AccountID: core.StringPtr(accountID),
-	}
-}
-
-// SetAccountID : Allow user to set AccountID
-func (options *GetAccountSettingsOptions) SetAccountID(accountID string) *GetAccountSettingsOptions {
-	options.AccountID = core.StringPtr(accountID)
-	return options
-}
-
-// SetTransactionID : Allow user to set TransactionID
-func (options *GetAccountSettingsOptions) SetTransactionID(transactionID string) *GetAccountSettingsOptions {
-	options.TransactionID = core.StringPtr(transactionID)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *GetAccountSettingsOptions) SetHeaders(param map[string]string) *GetAccountSettingsOptions {
-	options.Headers = param
-	return options
-}
-
-// Group : An IAM access group.
-type Group struct {
-	// The group's Access Group ID.
-	ID *string `json:"id,omitempty"`
-
-	// The group's name.
-	Name *string `json:"name,omitempty"`
-
-	// The group's description - if defined.
-	Description *string `json:"description,omitempty"`
-
-	// The account id where the group was created.
-	AccountID *string `json:"account_id,omitempty"`
-
-	// The timestamp the group was created at.
-	CreatedAt *string `json:"created_at,omitempty"`
-
-	// The `iam_id` of the entity that created the group.
-	CreatedByID *string `json:"created_by_id,omitempty"`
-
-	// The timestamp the group was last edited at.
-	LastModifiedAt *string `json:"last_modified_at,omitempty"`
-
-	// The `iam_id` of the entity that last modified the group name or description.
-	LastModifiedByID *string `json:"last_modified_by_id,omitempty"`
-
-	// A url to the given group resource.
-	Href *string `json:"href,omitempty"`
-
-	// This is set to true if rules exist for the group.
-	IsFederated *bool `json:"is_federated,omitempty"`
-}
-
-
-// UnmarshalGroup constructs an instance of Group from the specified map.
-func UnmarshalGroup(m map[string]interface{}) (result *Group, err error) {
-	obj := new(Group)
-	obj.ID, err = core.UnmarshalString(m, "id")
-	if err != nil {
-		return
-	}
-	obj.Name, err = core.UnmarshalString(m, "name")
-	if err != nil {
-		return
-	}
-	obj.Description, err = core.UnmarshalString(m, "description")
-	if err != nil {
-		return
-	}
-	obj.AccountID, err = core.UnmarshalString(m, "account_id")
-	if err != nil {
-		return
-	}
-	obj.CreatedAt, err = core.UnmarshalString(m, "created_at")
-	if err != nil {
-		return
-	}
-	obj.CreatedByID, err = core.UnmarshalString(m, "created_by_id")
-	if err != nil {
-		return
-	}
-	obj.LastModifiedAt, err = core.UnmarshalString(m, "last_modified_at")
-	if err != nil {
-		return
-	}
-	obj.LastModifiedByID, err = core.UnmarshalString(m, "last_modified_by_id")
-	if err != nil {
-		return
-	}
-	obj.Href, err = core.UnmarshalString(m, "href")
-	if err != nil {
-		return
-	}
-	obj.IsFederated, err = core.UnmarshalBool(m, "is_federated")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalGroupSlice unmarshals a slice of Group instances from the specified list of maps.
-func UnmarshalGroupSlice(s []interface{}) (slice []Group, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'Group'")
-			return
-		}
-		obj, e := UnmarshalGroup(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalGroupAsProperty unmarshals an instance of Group that is stored as a property
-// within the specified map.
-func UnmarshalGroupAsProperty(m map[string]interface{}, propertyName string) (result *Group, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'Group'", propertyName)
-			return
-		}
-		result, err = UnmarshalGroup(objMap)
-	}
-	return
-}
-
-// UnmarshalGroupSliceAsProperty unmarshals a slice of Group instances that are stored as a property
-// within the specified map.
-func UnmarshalGroupSliceAsProperty(m map[string]interface{}, propertyName string) (slice []Group, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'Group'", propertyName)
-			return
-		}
-		slice, err = UnmarshalGroupSlice(vSlice)
-	}
-	return
-}
-
-// GroupMembersList : The members of a group.
-type GroupMembersList struct {
-	// Limit on how many items can be returned.
-	Limit *int64 `json:"limit,omitempty"`
-
-	// The number of items to skip over in the result set.
-	Offset *int64 `json:"offset,omitempty"`
-
-	// The total number of items that match the query.
-	TotalCount *int64 `json:"total_count,omitempty"`
-
-	// A link object.
-	First *HrefStruct `json:"first,omitempty"`
-
-	// A link object.
-	Previous *HrefStruct `json:"previous,omitempty"`
-
-	// A link object.
-	Next *HrefStruct `json:"next,omitempty"`
-
-	// A link object.
-	Last *HrefStruct `json:"last,omitempty"`
-
-	// The members of an access group.
-	Members []ListGroupMembersResponseMember `json:"members,omitempty"`
-}
-
-
-// UnmarshalGroupMembersList constructs an instance of GroupMembersList from the specified map.
-func UnmarshalGroupMembersList(m map[string]interface{}) (result *GroupMembersList, err error) {
-	obj := new(GroupMembersList)
-	obj.Limit, err = core.UnmarshalInt64(m, "limit")
-	if err != nil {
-		return
-	}
-	obj.Offset, err = core.UnmarshalInt64(m, "offset")
-	if err != nil {
-		return
-	}
-	obj.TotalCount, err = core.UnmarshalInt64(m, "total_count")
-	if err != nil {
-		return
-	}
-	obj.First, err = UnmarshalHrefStructAsProperty(m, "first")
-	if err != nil {
-		return
-	}
-	obj.Previous, err = UnmarshalHrefStructAsProperty(m, "previous")
-	if err != nil {
-		return
-	}
-	obj.Next, err = UnmarshalHrefStructAsProperty(m, "next")
-	if err != nil {
-		return
-	}
-	obj.Last, err = UnmarshalHrefStructAsProperty(m, "last")
-	if err != nil {
-		return
-	}
-	obj.Members, err = UnmarshalListGroupMembersResponseMemberSliceAsProperty(m, "members")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalGroupMembersListSlice unmarshals a slice of GroupMembersList instances from the specified list of maps.
-func UnmarshalGroupMembersListSlice(s []interface{}) (slice []GroupMembersList, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'GroupMembersList'")
-			return
-		}
-		obj, e := UnmarshalGroupMembersList(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalGroupMembersListAsProperty unmarshals an instance of GroupMembersList that is stored as a property
-// within the specified map.
-func UnmarshalGroupMembersListAsProperty(m map[string]interface{}, propertyName string) (result *GroupMembersList, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'GroupMembersList'", propertyName)
-			return
-		}
-		result, err = UnmarshalGroupMembersList(objMap)
-	}
-	return
-}
-
-// UnmarshalGroupMembersListSliceAsProperty unmarshals a slice of GroupMembersList instances that are stored as a property
-// within the specified map.
-func UnmarshalGroupMembersListSliceAsProperty(m map[string]interface{}, propertyName string) (slice []GroupMembersList, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'GroupMembersList'", propertyName)
-			return
-		}
-		slice, err = UnmarshalGroupMembersListSlice(vSlice)
-	}
-	return
-}
-
-// GroupsList : The list of access groups returned as part of a response.
-type GroupsList struct {
-	// Limit on how many items can be returned.
-	Limit *int64 `json:"limit,omitempty"`
-
-	// The number of items to skip over in the result set.
-	Offset *int64 `json:"offset,omitempty"`
-
-	// The total number of items that match the query.
-	TotalCount *int64 `json:"total_count,omitempty"`
-
-	// A link object.
-	First *HrefStruct `json:"first,omitempty"`
-
-	// A link object.
-	Previous *HrefStruct `json:"previous,omitempty"`
-
-	// A link object.
-	Next *HrefStruct `json:"next,omitempty"`
-
-	// A link object.
-	Last *HrefStruct `json:"last,omitempty"`
-
-	// An array of access groups.
-	Groups []Group `json:"groups,omitempty"`
-}
-
-
-// UnmarshalGroupsList constructs an instance of GroupsList from the specified map.
-func UnmarshalGroupsList(m map[string]interface{}) (result *GroupsList, err error) {
-	obj := new(GroupsList)
-	obj.Limit, err = core.UnmarshalInt64(m, "limit")
-	if err != nil {
-		return
-	}
-	obj.Offset, err = core.UnmarshalInt64(m, "offset")
-	if err != nil {
-		return
-	}
-	obj.TotalCount, err = core.UnmarshalInt64(m, "total_count")
-	if err != nil {
-		return
-	}
-	obj.First, err = UnmarshalHrefStructAsProperty(m, "first")
-	if err != nil {
-		return
-	}
-	obj.Previous, err = UnmarshalHrefStructAsProperty(m, "previous")
-	if err != nil {
-		return
-	}
-	obj.Next, err = UnmarshalHrefStructAsProperty(m, "next")
-	if err != nil {
-		return
-	}
-	obj.Last, err = UnmarshalHrefStructAsProperty(m, "last")
-	if err != nil {
-		return
-	}
-	obj.Groups, err = UnmarshalGroupSliceAsProperty(m, "groups")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalGroupsListSlice unmarshals a slice of GroupsList instances from the specified list of maps.
-func UnmarshalGroupsListSlice(s []interface{}) (slice []GroupsList, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'GroupsList'")
-			return
-		}
-		obj, e := UnmarshalGroupsList(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalGroupsListAsProperty unmarshals an instance of GroupsList that is stored as a property
-// within the specified map.
-func UnmarshalGroupsListAsProperty(m map[string]interface{}, propertyName string) (result *GroupsList, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'GroupsList'", propertyName)
-			return
-		}
-		result, err = UnmarshalGroupsList(objMap)
-	}
-	return
-}
-
-// UnmarshalGroupsListSliceAsProperty unmarshals a slice of GroupsList instances that are stored as a property
-// within the specified map.
-func UnmarshalGroupsListSliceAsProperty(m map[string]interface{}, propertyName string) (slice []GroupsList, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'GroupsList'", propertyName)
-			return
-		}
-		slice, err = UnmarshalGroupsListSlice(vSlice)
-	}
-	return
-}
-
-// HrefStruct : A link object.
-type HrefStruct struct {
-	// A string containing the link’s URL.
-	Href *string `json:"href,omitempty"`
-}
-
-
-// UnmarshalHrefStruct constructs an instance of HrefStruct from the specified map.
-func UnmarshalHrefStruct(m map[string]interface{}) (result *HrefStruct, err error) {
-	obj := new(HrefStruct)
-	obj.Href, err = core.UnmarshalString(m, "href")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalHrefStructSlice unmarshals a slice of HrefStruct instances from the specified list of maps.
-func UnmarshalHrefStructSlice(s []interface{}) (slice []HrefStruct, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'HrefStruct'")
-			return
-		}
-		obj, e := UnmarshalHrefStruct(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalHrefStructAsProperty unmarshals an instance of HrefStruct that is stored as a property
-// within the specified map.
-func UnmarshalHrefStructAsProperty(m map[string]interface{}, propertyName string) (result *HrefStruct, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'HrefStruct'", propertyName)
-			return
-		}
-		result, err = UnmarshalHrefStruct(objMap)
-	}
-	return
-}
-
-// UnmarshalHrefStructSliceAsProperty unmarshals a slice of HrefStruct instances that are stored as a property
-// within the specified map.
-func UnmarshalHrefStructSliceAsProperty(m map[string]interface{}, propertyName string) (slice []HrefStruct, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'HrefStruct'", propertyName)
-			return
-		}
-		slice, err = UnmarshalHrefStructSlice(vSlice)
-	}
-	return
-}
-
-// IsMemberOfAccessGroupOptions : The IsMemberOfAccessGroup options.
-type IsMemberOfAccessGroupOptions struct {
-	// The access_group_id to check for membership in.
-	AccessGroupID *string `json:"access_group_id" validate:"required"`
-
-	// The iam_id to look for within the group.
-	IamID *string `json:"iam_id" validate:"required"`
-
-	// An optional transaction id for the request.
-	TransactionID *string `json:"Transaction-Id,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewIsMemberOfAccessGroupOptions : Instantiate IsMemberOfAccessGroupOptions
-func (*IamAccessGroupsV2) NewIsMemberOfAccessGroupOptions(accessGroupID string, iamID string) *IsMemberOfAccessGroupOptions {
-	return &IsMemberOfAccessGroupOptions{
-		AccessGroupID: core.StringPtr(accessGroupID),
-		IamID: core.StringPtr(iamID),
-	}
-}
-
-// SetAccessGroupID : Allow user to set AccessGroupID
-func (options *IsMemberOfAccessGroupOptions) SetAccessGroupID(accessGroupID string) *IsMemberOfAccessGroupOptions {
-	options.AccessGroupID = core.StringPtr(accessGroupID)
-	return options
-}
-
-// SetIamID : Allow user to set IamID
-func (options *IsMemberOfAccessGroupOptions) SetIamID(iamID string) *IsMemberOfAccessGroupOptions {
-	options.IamID = core.StringPtr(iamID)
-	return options
-}
-
-// SetTransactionID : Allow user to set TransactionID
-func (options *IsMemberOfAccessGroupOptions) SetTransactionID(transactionID string) *IsMemberOfAccessGroupOptions {
-	options.TransactionID = core.StringPtr(transactionID)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *IsMemberOfAccessGroupOptions) SetHeaders(param map[string]string) *IsMemberOfAccessGroupOptions {
-	options.Headers = param
-	return options
-}
-
-// ListAccessGroupMembersOptions : The ListAccessGroupMembers options.
-type ListAccessGroupMembersOptions struct {
-	// The access_group_id to list members of.
-	AccessGroupID *string `json:"access_group_id" validate:"required"`
-
-	// An optional transaction id for the request.
-	TransactionID *string `json:"Transaction-Id,omitempty"`
-
-	// Return up to this limit of results where limit is between 0 and 100.
-	Limit *float64 `json:"limit,omitempty"`
-
-	// Offset the results using this query parameter.
-	Offset *float64 `json:"offset,omitempty"`
-
-	// Filter the results by member type.
-	Type *string `json:"type,omitempty"`
-
-	// Return user's email and name for each user id or the name for each service id.
-	Verbose *bool `json:"verbose,omitempty"`
-
-	// If verbose is true, sort the results by id, name, or email.
-	Sort *string `json:"sort,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewListAccessGroupMembersOptions : Instantiate ListAccessGroupMembersOptions
-func (*IamAccessGroupsV2) NewListAccessGroupMembersOptions(accessGroupID string) *ListAccessGroupMembersOptions {
-	return &ListAccessGroupMembersOptions{
-		AccessGroupID: core.StringPtr(accessGroupID),
-	}
-}
-
-// SetAccessGroupID : Allow user to set AccessGroupID
-func (options *ListAccessGroupMembersOptions) SetAccessGroupID(accessGroupID string) *ListAccessGroupMembersOptions {
-	options.AccessGroupID = core.StringPtr(accessGroupID)
-	return options
-}
-
-// SetTransactionID : Allow user to set TransactionID
-func (options *ListAccessGroupMembersOptions) SetTransactionID(transactionID string) *ListAccessGroupMembersOptions {
-	options.TransactionID = core.StringPtr(transactionID)
-	return options
-}
-
-// SetLimit : Allow user to set Limit
-func (options *ListAccessGroupMembersOptions) SetLimit(limit float64) *ListAccessGroupMembersOptions {
-	options.Limit = core.Float64Ptr(limit)
-	return options
-}
-
-// SetOffset : Allow user to set Offset
-func (options *ListAccessGroupMembersOptions) SetOffset(offset float64) *ListAccessGroupMembersOptions {
-	options.Offset = core.Float64Ptr(offset)
-	return options
-}
-
-// SetType : Allow user to set Type
-func (options *ListAccessGroupMembersOptions) SetType(typeVar string) *ListAccessGroupMembersOptions {
-	options.Type = core.StringPtr(typeVar)
-	return options
-}
-
-// SetVerbose : Allow user to set Verbose
-func (options *ListAccessGroupMembersOptions) SetVerbose(verbose bool) *ListAccessGroupMembersOptions {
-	options.Verbose = core.BoolPtr(verbose)
-	return options
-}
-
-// SetSort : Allow user to set Sort
-func (options *ListAccessGroupMembersOptions) SetSort(sort string) *ListAccessGroupMembersOptions {
-	options.Sort = core.StringPtr(sort)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *ListAccessGroupMembersOptions) SetHeaders(param map[string]string) *ListAccessGroupMembersOptions {
-	options.Headers = param
-	return options
-}
-
-// ListAccessGroupRulesOptions : The ListAccessGroupRules options.
-type ListAccessGroupRulesOptions struct {
-	// The group id that the rules are bound to.
-	AccessGroupID *string `json:"access_group_id" validate:"required"`
-
-	// An optional transaction id for the request.
-	TransactionID *string `json:"Transaction-Id,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewListAccessGroupRulesOptions : Instantiate ListAccessGroupRulesOptions
-func (*IamAccessGroupsV2) NewListAccessGroupRulesOptions(accessGroupID string) *ListAccessGroupRulesOptions {
-	return &ListAccessGroupRulesOptions{
-		AccessGroupID: core.StringPtr(accessGroupID),
-	}
-}
-
-// SetAccessGroupID : Allow user to set AccessGroupID
-func (options *ListAccessGroupRulesOptions) SetAccessGroupID(accessGroupID string) *ListAccessGroupRulesOptions {
-	options.AccessGroupID = core.StringPtr(accessGroupID)
-	return options
-}
-
-// SetTransactionID : Allow user to set TransactionID
-func (options *ListAccessGroupRulesOptions) SetTransactionID(transactionID string) *ListAccessGroupRulesOptions {
-	options.TransactionID = core.StringPtr(transactionID)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *ListAccessGroupRulesOptions) SetHeaders(param map[string]string) *ListAccessGroupRulesOptions {
-	options.Headers = param
-	return options
-}
-
-// ListAccessGroupsOptions : The ListAccessGroups options.
-type ListAccessGroupsOptions struct {
-	// IBM Cloud account id under which the groups are listed.
-	AccountID *string `json:"account_id" validate:"required"`
-
-	// An optional transaction id for the request.
-	TransactionID *string `json:"Transaction-Id,omitempty"`
-
-	// Return groups for member id (IBMid or Service Id).
-	IamID *string `json:"iam_id,omitempty"`
-
-	// Return up to this limit of results where limit is between 0 and 100.
-	Limit *int64 `json:"limit,omitempty"`
-
-	// Offset the results using this query parameter.
-	Offset *int64 `json:"offset,omitempty"`
-
-	// Sort the results by id, name, description, or is_federated flag.
-	Sort *string `json:"sort,omitempty"`
-
-	// If show_federated is true, each group listed will return an is_federated value that is set to true if rules exist
-	// for the group.
-	ShowFederated *bool `json:"show_federated,omitempty"`
-
-	// If hide_public_access is true, do not include the Public Access Group in the results.
-	HidePublicAccess *bool `json:"hide_public_access,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewListAccessGroupsOptions : Instantiate ListAccessGroupsOptions
-func (*IamAccessGroupsV2) NewListAccessGroupsOptions(accountID string) *ListAccessGroupsOptions {
-	return &ListAccessGroupsOptions{
-		AccountID: core.StringPtr(accountID),
-	}
-}
-
-// SetAccountID : Allow user to set AccountID
-func (options *ListAccessGroupsOptions) SetAccountID(accountID string) *ListAccessGroupsOptions {
-	options.AccountID = core.StringPtr(accountID)
-	return options
-}
-
-// SetTransactionID : Allow user to set TransactionID
-func (options *ListAccessGroupsOptions) SetTransactionID(transactionID string) *ListAccessGroupsOptions {
-	options.TransactionID = core.StringPtr(transactionID)
-	return options
-}
-
-// SetIamID : Allow user to set IamID
-func (options *ListAccessGroupsOptions) SetIamID(iamID string) *ListAccessGroupsOptions {
-	options.IamID = core.StringPtr(iamID)
-	return options
-}
-
-// SetLimit : Allow user to set Limit
-func (options *ListAccessGroupsOptions) SetLimit(limit int64) *ListAccessGroupsOptions {
-	options.Limit = core.Int64Ptr(limit)
-	return options
-}
-
-// SetOffset : Allow user to set Offset
-func (options *ListAccessGroupsOptions) SetOffset(offset int64) *ListAccessGroupsOptions {
-	options.Offset = core.Int64Ptr(offset)
-	return options
-}
-
-// SetSort : Allow user to set Sort
-func (options *ListAccessGroupsOptions) SetSort(sort string) *ListAccessGroupsOptions {
-	options.Sort = core.StringPtr(sort)
-	return options
-}
-
-// SetShowFederated : Allow user to set ShowFederated
-func (options *ListAccessGroupsOptions) SetShowFederated(showFederated bool) *ListAccessGroupsOptions {
-	options.ShowFederated = core.BoolPtr(showFederated)
-	return options
-}
-
-// SetHidePublicAccess : Allow user to set HidePublicAccess
-func (options *ListAccessGroupsOptions) SetHidePublicAccess(hidePublicAccess bool) *ListAccessGroupsOptions {
-	options.HidePublicAccess = core.BoolPtr(hidePublicAccess)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *ListAccessGroupsOptions) SetHeaders(param map[string]string) *ListAccessGroupsOptions {
-	options.Headers = param
-	return options
-}
-
-// ListGroupMembersResponseMember : A single member of an access group in a list.
-type ListGroupMembersResponseMember struct {
-	// The IBMid or Service Id of the member.
-	IamID *string `json:"iam_id,omitempty"`
-
-	// The member type - either `user` or `service`.
-	Type *string `json:"type,omitempty"`
-
-	// The user's or service id's name.
-	Name *string `json:"name,omitempty"`
-
-	// If the member type is user, this is the user's email.
-	Email *string `json:"email,omitempty"`
-
-	// If the member type is service, this is the service id's description.
-	Description *string `json:"description,omitempty"`
-
-	// A url to the given member resource.
-	Href *string `json:"href,omitempty"`
-
-	// The timestamp the membership was created at.
-	CreatedAt *string `json:"created_at,omitempty"`
-
-	// The `iam_id` of the entity that created the membership.
-	CreatedByID *string `json:"created_by_id,omitempty"`
-}
-
-
-// UnmarshalListGroupMembersResponseMember constructs an instance of ListGroupMembersResponseMember from the specified map.
-func UnmarshalListGroupMembersResponseMember(m map[string]interface{}) (result *ListGroupMembersResponseMember, err error) {
-	obj := new(ListGroupMembersResponseMember)
-	obj.IamID, err = core.UnmarshalString(m, "iam_id")
-	if err != nil {
-		return
-	}
-	obj.Type, err = core.UnmarshalString(m, "type")
-	if err != nil {
-		return
-	}
-	obj.Name, err = core.UnmarshalString(m, "name")
-	if err != nil {
-		return
-	}
-	obj.Email, err = core.UnmarshalString(m, "email")
-	if err != nil {
-		return
-	}
-	obj.Description, err = core.UnmarshalString(m, "description")
-	if err != nil {
-		return
-	}
-	obj.Href, err = core.UnmarshalString(m, "href")
-	if err != nil {
-		return
-	}
-	obj.CreatedAt, err = core.UnmarshalString(m, "created_at")
-	if err != nil {
-		return
-	}
-	obj.CreatedByID, err = core.UnmarshalString(m, "created_by_id")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalListGroupMembersResponseMemberSlice unmarshals a slice of ListGroupMembersResponseMember instances from the specified list of maps.
-func UnmarshalListGroupMembersResponseMemberSlice(s []interface{}) (slice []ListGroupMembersResponseMember, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'ListGroupMembersResponseMember'")
-			return
-		}
-		obj, e := UnmarshalListGroupMembersResponseMember(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalListGroupMembersResponseMemberAsProperty unmarshals an instance of ListGroupMembersResponseMember that is stored as a property
-// within the specified map.
-func UnmarshalListGroupMembersResponseMemberAsProperty(m map[string]interface{}, propertyName string) (result *ListGroupMembersResponseMember, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'ListGroupMembersResponseMember'", propertyName)
-			return
-		}
-		result, err = UnmarshalListGroupMembersResponseMember(objMap)
-	}
-	return
-}
-
-// UnmarshalListGroupMembersResponseMemberSliceAsProperty unmarshals a slice of ListGroupMembersResponseMember instances that are stored as a property
-// within the specified map.
-func UnmarshalListGroupMembersResponseMemberSliceAsProperty(m map[string]interface{}, propertyName string) (slice []ListGroupMembersResponseMember, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'ListGroupMembersResponseMember'", propertyName)
-			return
-		}
-		slice, err = UnmarshalListGroupMembersResponseMemberSlice(vSlice)
-	}
-	return
-}
-
-// RemoveAccessGroupRuleOptions : The RemoveAccessGroupRule options.
-type RemoveAccessGroupRuleOptions struct {
-	// The group id that the rule is bound to.
-	AccessGroupID *string `json:"access_group_id" validate:"required"`
-
-	// The rule to delete.
-	RuleID *string `json:"rule_id" validate:"required"`
-
-	// An optional transaction id for the request.
-	TransactionID *string `json:"Transaction-Id,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewRemoveAccessGroupRuleOptions : Instantiate RemoveAccessGroupRuleOptions
-func (*IamAccessGroupsV2) NewRemoveAccessGroupRuleOptions(accessGroupID string, ruleID string) *RemoveAccessGroupRuleOptions {
-	return &RemoveAccessGroupRuleOptions{
-		AccessGroupID: core.StringPtr(accessGroupID),
-		RuleID: core.StringPtr(ruleID),
-	}
-}
-
-// SetAccessGroupID : Allow user to set AccessGroupID
-func (options *RemoveAccessGroupRuleOptions) SetAccessGroupID(accessGroupID string) *RemoveAccessGroupRuleOptions {
-	options.AccessGroupID = core.StringPtr(accessGroupID)
-	return options
-}
-
-// SetRuleID : Allow user to set RuleID
-func (options *RemoveAccessGroupRuleOptions) SetRuleID(ruleID string) *RemoveAccessGroupRuleOptions {
-	options.RuleID = core.StringPtr(ruleID)
-	return options
-}
-
-// SetTransactionID : Allow user to set TransactionID
-func (options *RemoveAccessGroupRuleOptions) SetTransactionID(transactionID string) *RemoveAccessGroupRuleOptions {
-	options.TransactionID = core.StringPtr(transactionID)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *RemoveAccessGroupRuleOptions) SetHeaders(param map[string]string) *RemoveAccessGroupRuleOptions {
-	options.Headers = param
-	return options
-}
-
-// RemoveMemberFromAccessGroupOptions : The RemoveMemberFromAccessGroup options.
-type RemoveMemberFromAccessGroupOptions struct {
-	// The access_group_id to find the membership in.
-	AccessGroupID *string `json:"access_group_id" validate:"required"`
-
-	// The iam_id to remove from the group.
-	IamID *string `json:"iam_id" validate:"required"`
-
-	// An optional transaction id for the request.
-	TransactionID *string `json:"Transaction-Id,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewRemoveMemberFromAccessGroupOptions : Instantiate RemoveMemberFromAccessGroupOptions
-func (*IamAccessGroupsV2) NewRemoveMemberFromAccessGroupOptions(accessGroupID string, iamID string) *RemoveMemberFromAccessGroupOptions {
-	return &RemoveMemberFromAccessGroupOptions{
-		AccessGroupID: core.StringPtr(accessGroupID),
-		IamID: core.StringPtr(iamID),
-	}
-}
-
-// SetAccessGroupID : Allow user to set AccessGroupID
-func (options *RemoveMemberFromAccessGroupOptions) SetAccessGroupID(accessGroupID string) *RemoveMemberFromAccessGroupOptions {
-	options.AccessGroupID = core.StringPtr(accessGroupID)
-	return options
-}
-
-// SetIamID : Allow user to set IamID
-func (options *RemoveMemberFromAccessGroupOptions) SetIamID(iamID string) *RemoveMemberFromAccessGroupOptions {
-	options.IamID = core.StringPtr(iamID)
-	return options
-}
-
-// SetTransactionID : Allow user to set TransactionID
-func (options *RemoveMemberFromAccessGroupOptions) SetTransactionID(transactionID string) *RemoveMemberFromAccessGroupOptions {
-	options.TransactionID = core.StringPtr(transactionID)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *RemoveMemberFromAccessGroupOptions) SetHeaders(param map[string]string) *RemoveMemberFromAccessGroupOptions {
-	options.Headers = param
-	return options
-}
-
-// RemoveMemberFromAllAccessGroupsOptions : The RemoveMemberFromAllAccessGroups options.
-type RemoveMemberFromAllAccessGroupsOptions struct {
-	// IBM Cloud account id for the group membership deletion.
-	AccountID *string `json:"account_id" validate:"required"`
-
-	// The iam_id to remove from all groups.
-	IamID *string `json:"iam_id" validate:"required"`
-
-	// An optional transaction id for the request.
-	TransactionID *string `json:"Transaction-Id,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewRemoveMemberFromAllAccessGroupsOptions : Instantiate RemoveMemberFromAllAccessGroupsOptions
-func (*IamAccessGroupsV2) NewRemoveMemberFromAllAccessGroupsOptions(accountID string, iamID string) *RemoveMemberFromAllAccessGroupsOptions {
-	return &RemoveMemberFromAllAccessGroupsOptions{
-		AccountID: core.StringPtr(accountID),
-		IamID: core.StringPtr(iamID),
-	}
-}
-
-// SetAccountID : Allow user to set AccountID
-func (options *RemoveMemberFromAllAccessGroupsOptions) SetAccountID(accountID string) *RemoveMemberFromAllAccessGroupsOptions {
-	options.AccountID = core.StringPtr(accountID)
-	return options
-}
-
-// SetIamID : Allow user to set IamID
-func (options *RemoveMemberFromAllAccessGroupsOptions) SetIamID(iamID string) *RemoveMemberFromAllAccessGroupsOptions {
-	options.IamID = core.StringPtr(iamID)
-	return options
-}
-
-// SetTransactionID : Allow user to set TransactionID
-func (options *RemoveMemberFromAllAccessGroupsOptions) SetTransactionID(transactionID string) *RemoveMemberFromAllAccessGroupsOptions {
-	options.TransactionID = core.StringPtr(transactionID)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *RemoveMemberFromAllAccessGroupsOptions) SetHeaders(param map[string]string) *RemoveMemberFromAllAccessGroupsOptions {
-	options.Headers = param
-	return options
-}
-
-// RemoveMembersFromAccessGroupOptions : The RemoveMembersFromAccessGroup options.
-type RemoveMembersFromAccessGroupOptions struct {
-	// The access_group_id to find the memberships in.
-	AccessGroupID *string `json:"access_group_id" validate:"required"`
-
-	// The `iam_id`s to remove from the access group. This field has a limit of 50 `iam_id`s.
-	Members []string `json:"members,omitempty"`
-
-	// An optional transaction id for the request.
-	TransactionID *string `json:"Transaction-Id,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewRemoveMembersFromAccessGroupOptions : Instantiate RemoveMembersFromAccessGroupOptions
-func (*IamAccessGroupsV2) NewRemoveMembersFromAccessGroupOptions(accessGroupID string) *RemoveMembersFromAccessGroupOptions {
-	return &RemoveMembersFromAccessGroupOptions{
-		AccessGroupID: core.StringPtr(accessGroupID),
-	}
-}
-
-// SetAccessGroupID : Allow user to set AccessGroupID
-func (options *RemoveMembersFromAccessGroupOptions) SetAccessGroupID(accessGroupID string) *RemoveMembersFromAccessGroupOptions {
-	options.AccessGroupID = core.StringPtr(accessGroupID)
-	return options
-}
-
-// SetMembers : Allow user to set Members
-func (options *RemoveMembersFromAccessGroupOptions) SetMembers(members []string) *RemoveMembersFromAccessGroupOptions {
-	options.Members = members
-	return options
-}
-
-// SetTransactionID : Allow user to set TransactionID
-func (options *RemoveMembersFromAccessGroupOptions) SetTransactionID(transactionID string) *RemoveMembersFromAccessGroupOptions {
-	options.TransactionID = core.StringPtr(transactionID)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *RemoveMembersFromAccessGroupOptions) SetHeaders(param map[string]string) *RemoveMembersFromAccessGroupOptions {
-	options.Headers = param
-	return options
-}
-
-// ReplaceAccessGroupRuleOptions : The ReplaceAccessGroupRule options.
-type ReplaceAccessGroupRuleOptions struct {
-	// The group id that the rule is bound to.
-	AccessGroupID *string `json:"access_group_id" validate:"required"`
-
-	// The rule to update.
-	RuleID *string `json:"rule_id" validate:"required"`
-
-	// The current revision number of the rule being updated. This can be found in the Get Rule response Etag header.
-	IfMatch *string `json:"If-Match" validate:"required"`
-
-	// The number of hours that the rule lives for (Must be between 1 and 24).
-	Expiration *int64 `json:"expiration" validate:"required"`
-
-	// The url of the identity provider.
-	RealmName *string `json:"realm_name" validate:"required"`
-
-	// A list of conditions the rule must satisfy.
-	Conditions []RuleConditions `json:"conditions" validate:"required"`
-
-	// The name of the rule.
-	Name *string `json:"name,omitempty"`
-
-	// An optional transaction id for the request.
-	TransactionID *string `json:"Transaction-Id,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewReplaceAccessGroupRuleOptions : Instantiate ReplaceAccessGroupRuleOptions
-func (*IamAccessGroupsV2) NewReplaceAccessGroupRuleOptions(accessGroupID string, ruleID string, ifMatch string, expiration int64, realmName string, conditions []RuleConditions) *ReplaceAccessGroupRuleOptions {
-	return &ReplaceAccessGroupRuleOptions{
-		AccessGroupID: core.StringPtr(accessGroupID),
-		RuleID: core.StringPtr(ruleID),
-		IfMatch: core.StringPtr(ifMatch),
-		Expiration: core.Int64Ptr(expiration),
-		RealmName: core.StringPtr(realmName),
-		Conditions: conditions,
-	}
-}
-
-// SetAccessGroupID : Allow user to set AccessGroupID
-func (options *ReplaceAccessGroupRuleOptions) SetAccessGroupID(accessGroupID string) *ReplaceAccessGroupRuleOptions {
-	options.AccessGroupID = core.StringPtr(accessGroupID)
-	return options
-}
-
-// SetRuleID : Allow user to set RuleID
-func (options *ReplaceAccessGroupRuleOptions) SetRuleID(ruleID string) *ReplaceAccessGroupRuleOptions {
-	options.RuleID = core.StringPtr(ruleID)
-	return options
-}
-
-// SetIfMatch : Allow user to set IfMatch
-func (options *ReplaceAccessGroupRuleOptions) SetIfMatch(ifMatch string) *ReplaceAccessGroupRuleOptions {
-	options.IfMatch = core.StringPtr(ifMatch)
-	return options
-}
-
-// SetExpiration : Allow user to set Expiration
-func (options *ReplaceAccessGroupRuleOptions) SetExpiration(expiration int64) *ReplaceAccessGroupRuleOptions {
-	options.Expiration = core.Int64Ptr(expiration)
-	return options
-}
-
-// SetRealmName : Allow user to set RealmName
-func (options *ReplaceAccessGroupRuleOptions) SetRealmName(realmName string) *ReplaceAccessGroupRuleOptions {
-	options.RealmName = core.StringPtr(realmName)
-	return options
-}
-
-// SetConditions : Allow user to set Conditions
-func (options *ReplaceAccessGroupRuleOptions) SetConditions(conditions []RuleConditions) *ReplaceAccessGroupRuleOptions {
-	options.Conditions = conditions
-	return options
-}
-
-// SetName : Allow user to set Name
-func (options *ReplaceAccessGroupRuleOptions) SetName(name string) *ReplaceAccessGroupRuleOptions {
-	options.Name = core.StringPtr(name)
-	return options
-}
-
-// SetTransactionID : Allow user to set TransactionID
-func (options *ReplaceAccessGroupRuleOptions) SetTransactionID(transactionID string) *ReplaceAccessGroupRuleOptions {
-	options.TransactionID = core.StringPtr(transactionID)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *ReplaceAccessGroupRuleOptions) SetHeaders(param map[string]string) *ReplaceAccessGroupRuleOptions {
-	options.Headers = param
-	return options
-}
-
-// Rule : A rule of an access group.
-type Rule struct {
-	// The rule id.
-	ID *string `json:"id,omitempty"`
-
-	// The name of the rule.
-	Name *string `json:"name,omitempty"`
-
-	// The number of hours that the rule lives for (Must be between 1 and 24).
-	Expiration *int64 `json:"expiration,omitempty"`
-
-	// The url of the identity provider.
-	RealmName *string `json:"realm_name,omitempty"`
-
-	// The group id that the rule is assigned to.
-	AccessGroupID *string `json:"access_group_id,omitempty"`
-
-	// The account id that the group is in.
-	AccountID *string `json:"account_id,omitempty"`
-
-	// A list of conditions the rule must satisfy.
-	Conditions []RuleConditions `json:"conditions,omitempty"`
-
-	// The timestamp the rule was created at.
-	CreatedAt *string `json:"created_at,omitempty"`
-
-	// The `iam_id` of the entity that created the rule.
-	CreatedByID *string `json:"created_by_id,omitempty"`
-
-	// The timestamp the rule was last edited at.
-	LastModifiedAt *string `json:"last_modified_at,omitempty"`
-
-	// The IAM id that last modified the rule.
-	LastModifiedByID *string `json:"last_modified_by_id,omitempty"`
-}
-
-
-// UnmarshalRule constructs an instance of Rule from the specified map.
-func UnmarshalRule(m map[string]interface{}) (result *Rule, err error) {
-	obj := new(Rule)
-	obj.ID, err = core.UnmarshalString(m, "id")
-	if err != nil {
-		return
-	}
-	obj.Name, err = core.UnmarshalString(m, "name")
-	if err != nil {
-		return
-	}
-	obj.Expiration, err = core.UnmarshalInt64(m, "expiration")
-	if err != nil {
-		return
-	}
-	obj.RealmName, err = core.UnmarshalString(m, "realm_name")
-	if err != nil {
-		return
-	}
-	obj.AccessGroupID, err = core.UnmarshalString(m, "access_group_id")
-	if err != nil {
-		return
-	}
-	obj.AccountID, err = core.UnmarshalString(m, "account_id")
-	if err != nil {
-		return
-	}
-	obj.Conditions, err = UnmarshalRuleConditionsSliceAsProperty(m, "conditions")
-	if err != nil {
-		return
-	}
-	obj.CreatedAt, err = core.UnmarshalString(m, "created_at")
-	if err != nil {
-		return
-	}
-	obj.CreatedByID, err = core.UnmarshalString(m, "created_by_id")
-	if err != nil {
-		return
-	}
-	obj.LastModifiedAt, err = core.UnmarshalString(m, "last_modified_at")
-	if err != nil {
-		return
-	}
-	obj.LastModifiedByID, err = core.UnmarshalString(m, "last_modified_by_id")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalRuleSlice unmarshals a slice of Rule instances from the specified list of maps.
-func UnmarshalRuleSlice(s []interface{}) (slice []Rule, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'Rule'")
-			return
-		}
-		obj, e := UnmarshalRule(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalRuleAsProperty unmarshals an instance of Rule that is stored as a property
-// within the specified map.
-func UnmarshalRuleAsProperty(m map[string]interface{}, propertyName string) (result *Rule, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'Rule'", propertyName)
-			return
-		}
-		result, err = UnmarshalRule(objMap)
-	}
-	return
-}
-
-// UnmarshalRuleSliceAsProperty unmarshals a slice of Rule instances that are stored as a property
-// within the specified map.
-func UnmarshalRuleSliceAsProperty(m map[string]interface{}, propertyName string) (slice []Rule, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'Rule'", propertyName)
-			return
-		}
-		slice, err = UnmarshalRuleSlice(vSlice)
-	}
-	return
-}
-
-// RuleConditions : The conditions of a rule.
-type RuleConditions struct {
-	// The claim to evaluate against. This will be found in the `ext` claims of a user's login request.
-	Claim *string `json:"claim" validate:"required"`
-
-	// The operation to perform on the claim. Valid operators are EQUALS, EQUALS_IGNORE_CASE, IN, NOT_EQUALS_IGNORE_CASE,
-	// NOT_EQUALS, and CONTAINS.
-	Operator *string `json:"operator" validate:"required"`
-
-	// The stringified JSON value that the claim is compared to using the operator.
-	Value *string `json:"value" validate:"required"`
-}
-
-
-// NewRuleConditions : Instantiate RuleConditions (Generic Model Constructor)
-func (*IamAccessGroupsV2) NewRuleConditions(claim string, operator string, value string) (model *RuleConditions, err error) {
-	model = &RuleConditions{
-		Claim: core.StringPtr(claim),
-		Operator: core.StringPtr(operator),
-		Value: core.StringPtr(value),
-	}
-	err = core.ValidateStruct(model, "required parameters")
-	return
-}
-
-// UnmarshalRuleConditions constructs an instance of RuleConditions from the specified map.
-func UnmarshalRuleConditions(m map[string]interface{}) (result *RuleConditions, err error) {
-	obj := new(RuleConditions)
-	obj.Claim, err = core.UnmarshalString(m, "claim")
-	if err != nil {
-		return
-	}
-	obj.Operator, err = core.UnmarshalString(m, "operator")
-	if err != nil {
-		return
-	}
-	obj.Value, err = core.UnmarshalString(m, "value")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalRuleConditionsSlice unmarshals a slice of RuleConditions instances from the specified list of maps.
-func UnmarshalRuleConditionsSlice(s []interface{}) (slice []RuleConditions, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'RuleConditions'")
-			return
-		}
-		obj, e := UnmarshalRuleConditions(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalRuleConditionsAsProperty unmarshals an instance of RuleConditions that is stored as a property
-// within the specified map.
-func UnmarshalRuleConditionsAsProperty(m map[string]interface{}, propertyName string) (result *RuleConditions, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'RuleConditions'", propertyName)
-			return
-		}
-		result, err = UnmarshalRuleConditions(objMap)
-	}
-	return
-}
-
-// UnmarshalRuleConditionsSliceAsProperty unmarshals a slice of RuleConditions instances that are stored as a property
-// within the specified map.
-func UnmarshalRuleConditionsSliceAsProperty(m map[string]interface{}, propertyName string) (slice []RuleConditions, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'RuleConditions'", propertyName)
-			return
-		}
-		slice, err = UnmarshalRuleConditionsSlice(vSlice)
-	}
-	return
-}
-
-// RulesList : A list of rules attached to the access group.
-type RulesList struct {
-	// A list of rules.
-	Rules []Rule `json:"rules,omitempty"`
-}
-
-
-// UnmarshalRulesList constructs an instance of RulesList from the specified map.
-func UnmarshalRulesList(m map[string]interface{}) (result *RulesList, err error) {
-	obj := new(RulesList)
-	obj.Rules, err = UnmarshalRuleSliceAsProperty(m, "rules")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalRulesListSlice unmarshals a slice of RulesList instances from the specified list of maps.
-func UnmarshalRulesListSlice(s []interface{}) (slice []RulesList, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'RulesList'")
-			return
-		}
-		obj, e := UnmarshalRulesList(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalRulesListAsProperty unmarshals an instance of RulesList that is stored as a property
-// within the specified map.
-func UnmarshalRulesListAsProperty(m map[string]interface{}, propertyName string) (result *RulesList, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'RulesList'", propertyName)
-			return
-		}
-		result, err = UnmarshalRulesList(objMap)
-	}
-	return
-}
-
-// UnmarshalRulesListSliceAsProperty unmarshals a slice of RulesList instances that are stored as a property
-// within the specified map.
-func UnmarshalRulesListSliceAsProperty(m map[string]interface{}, propertyName string) (slice []RulesList, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'RulesList'", propertyName)
-			return
-		}
-		slice, err = UnmarshalRulesListSlice(vSlice)
-	}
-	return
-}
-
-// UpdateAccessGroupOptions : The UpdateAccessGroup options.
-type UpdateAccessGroupOptions struct {
-	// The Access group to update.
-	AccessGroupID *string `json:"access_group_id" validate:"required"`
-
-	// The current revision number of the group being updated. This can be found in the Create/Get Access Group response
-	// Etag header.
-	IfMatch *string `json:"If-Match" validate:"required"`
-
-	// Assign the specified name to the Access Group. This field has a limit of 100 characters.
-	Name *string `json:"name,omitempty"`
-
-	// Assign a description for the Access Group. This field has a limit of 250 characters.
-	Description *string `json:"description,omitempty"`
-
-	// An optional transaction id for the request.
-	TransactionID *string `json:"Transaction-Id,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewUpdateAccessGroupOptions : Instantiate UpdateAccessGroupOptions
-func (*IamAccessGroupsV2) NewUpdateAccessGroupOptions(accessGroupID string, ifMatch string) *UpdateAccessGroupOptions {
-	return &UpdateAccessGroupOptions{
-		AccessGroupID: core.StringPtr(accessGroupID),
-		IfMatch: core.StringPtr(ifMatch),
-	}
-}
-
-// SetAccessGroupID : Allow user to set AccessGroupID
-func (options *UpdateAccessGroupOptions) SetAccessGroupID(accessGroupID string) *UpdateAccessGroupOptions {
-	options.AccessGroupID = core.StringPtr(accessGroupID)
-	return options
-}
-
-// SetIfMatch : Allow user to set IfMatch
-func (options *UpdateAccessGroupOptions) SetIfMatch(ifMatch string) *UpdateAccessGroupOptions {
-	options.IfMatch = core.StringPtr(ifMatch)
-	return options
-}
-
-// SetName : Allow user to set Name
-func (options *UpdateAccessGroupOptions) SetName(name string) *UpdateAccessGroupOptions {
-	options.Name = core.StringPtr(name)
-	return options
-}
-
-// SetDescription : Allow user to set Description
-func (options *UpdateAccessGroupOptions) SetDescription(description string) *UpdateAccessGroupOptions {
-	options.Description = core.StringPtr(description)
-	return options
-}
-
-// SetTransactionID : Allow user to set TransactionID
-func (options *UpdateAccessGroupOptions) SetTransactionID(transactionID string) *UpdateAccessGroupOptions {
-	options.TransactionID = core.StringPtr(transactionID)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *UpdateAccessGroupOptions) SetHeaders(param map[string]string) *UpdateAccessGroupOptions {
-	options.Headers = param
-	return options
-}
-
-// UpdateAccountSettingsOptions : The UpdateAccountSettings options.
-type UpdateAccountSettingsOptions struct {
-	// The account id of the settings being updated.
-	AccountID *string `json:"account_id" validate:"required"`
-
-	// This flag controls the public access feature within the account. It is set to true by default. Note: When this flag
-	// is set to false, all policies within the account attached to the Public Access group will be deleted.
-	PublicAccessEnabled *bool `json:"public_access_enabled,omitempty"`
-
-	// An optional transaction id for the request.
-	TransactionID *string `json:"Transaction-Id,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewUpdateAccountSettingsOptions : Instantiate UpdateAccountSettingsOptions
-func (*IamAccessGroupsV2) NewUpdateAccountSettingsOptions(accountID string) *UpdateAccountSettingsOptions {
-	return &UpdateAccountSettingsOptions{
-		AccountID: core.StringPtr(accountID),
-	}
-}
-
-// SetAccountID : Allow user to set AccountID
-func (options *UpdateAccountSettingsOptions) SetAccountID(accountID string) *UpdateAccountSettingsOptions {
-	options.AccountID = core.StringPtr(accountID)
-	return options
-}
-
-// SetPublicAccessEnabled : Allow user to set PublicAccessEnabled
-func (options *UpdateAccountSettingsOptions) SetPublicAccessEnabled(publicAccessEnabled bool) *UpdateAccountSettingsOptions {
-	options.PublicAccessEnabled = core.BoolPtr(publicAccessEnabled)
-	return options
-}
-
-// SetTransactionID : Allow user to set TransactionID
-func (options *UpdateAccountSettingsOptions) SetTransactionID(transactionID string) *UpdateAccountSettingsOptions {
-	options.TransactionID = core.StringPtr(transactionID)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *UpdateAccountSettingsOptions) SetHeaders(param map[string]string) *UpdateAccountSettingsOptions {
-	options.Headers = param
-	return options
-}
diff --git a/iamaccessgroupsv2/iam_access_groups_v2_integration_test.go b/iamaccessgroupsv2/iam_access_groups_v2_integration_test.go
deleted file mode 100644
index 925ecf69..00000000
--- a/iamaccessgroupsv2/iam_access_groups_v2_integration_test.go
+++ /dev/null
@@ -1,373 +0,0 @@
-// +build integration
-
-/**
- * (C) Copyright IBM Corp. 2020.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package iamaccessgroupsv2_test
-
-import (
-	"github.com/joho/godotenv"
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-	"github.ibm.com/ibmcloud/platform-services-go-sdk/iamaccessgroupsv2"
-	"log"
-	"os"
-)
-
-var (
-	service *iamaccessgroupsv2.IamAccessGroupsV2
-
-	testAccountID        string
-	testGroupName        string = "SDK Test Group - Golang"
-	testGroupDescription string = "This group is used for integration test purposes. It can be deleted at any time."
-	testGroupEtag        string
-	testGroupID          string
-	testUserID           string = "IBMid-1234"
-	testClaimRuleID      string
-	testClaimRuleEtag    string
-	testAccountSettings  *iamaccessgroupsv2.AccountSettings
-
-	userType   string = "user"
-	etagHeader string = "Etag"
-)
-
-var _ = Describe("IAM Access Groups - Integration Tests", func() {
-	err := godotenv.Load("../.iam_access_groups_env")
-	if err != nil {
-		log.Fatal("Error loading .env file")
-	}
-
-	testAccountID = os.Getenv("IAM_ACCESS_GROUPS_TEST_ACCOUNT_ID")
-
-	It(`Successfully created NewIamAccessGroupsV2 service instance`, func() {
-		service, err = iamaccessgroupsv2.NewIamAccessGroupsV2UsingExternalConfig(
-			&iamaccessgroupsv2.IamAccessGroupsV2Options{},
-		)
-
-		Expect(err).To(BeNil())
-	})
-
-	Describe("Create an access group", func() {
-
-		It("Successfully created an access group", func() {
-			options := service.NewCreateAccessGroupOptions(testAccountID, testGroupName)
-			result, detailedResponse, err := service.CreateAccessGroup(options)
-			Expect(err).To(BeNil())
-			Expect(detailedResponse.StatusCode).To(Equal(201))
-			Expect(*result.AccountID).To(Equal(testAccountID))
-			Expect(*result.Name).To(Equal(testGroupName))
-
-			testGroupID = *result.ID
-		})
-	})
-
-	Describe("Get an access group", func() {
-
-		It("Successfully retrieved an access group", func() {
-			options := service.NewGetAccessGroupOptions(testGroupID)
-			result, detailedResponse, err := service.GetAccessGroup(options)
-			Expect(err).To(BeNil())
-			Expect(detailedResponse.StatusCode).To(Equal(200))
-			Expect(*result.AccountID).To(Equal(testAccountID))
-			Expect(*result.ID).To(Equal(testGroupID))
-			Expect(*result.Name).To(Equal(testGroupName))
-			Expect(*result.Description).To(Equal(""))
-
-			testGroupEtag = detailedResponse.GetHeaders().Get(etagHeader)
-		})
-	})
-
-	Describe("Update an access group description", func() {
-
-		It("Successfully updated an access group description", func() {
-			options := service.NewUpdateAccessGroupOptions(testGroupID, testGroupEtag)
-			options.SetDescription(testGroupDescription)
-			result, detailedResponse, err := service.UpdateAccessGroup(options)
-			Expect(err).To(BeNil())
-			Expect(detailedResponse.StatusCode).To(Equal(200))
-			Expect(*result.AccountID).To(Equal(testAccountID))
-			Expect(*result.Name).To(Equal(testGroupName))
-			Expect(*result.ID).To(Equal(testGroupID))
-			Expect(*result.Description).To(Equal(testGroupDescription))
-		})
-	})
-
-	Describe("List access groups", func() {
-
-		It("Successfully listed the account's access groups", func() {
-			options := service.NewListAccessGroupsOptions(testAccountID)
-			options.SetHidePublicAccess(true)
-			result, detailedResponse, err := service.ListAccessGroups(options)
-			Expect(err).To(BeNil())
-			Expect(detailedResponse.StatusCode).To(Equal(200))
-
-			// confirm the test group is present
-			testGroupPresent := false
-			for _, group := range result.Groups {
-				if *group.ID == testGroupID {
-					testGroupPresent = true
-				}
-			}
-			Expect(testGroupPresent).To(BeTrue())
-		})
-	})
-
-	Describe("Add members to an access group", func() {
-
-		It("Successfully added members to an access group", func() {
-
-			addMemberItem, err := service.NewAddGroupMembersRequestMembersItem(testUserID, userType)
-			Expect(err).To(BeNil())
-
-			options := service.NewAddMembersToAccessGroupOptions(testGroupID)
-			options.Members = append(options.Members, *addMemberItem)
-			result, detailedResponse, err := service.AddMembersToAccessGroup(options)
-			Expect(err).To(BeNil())
-			Expect(detailedResponse.StatusCode).To(Equal(207))
-
-			// confirm the test user is present
-			testUserPresent := false
-			for _, member := range result.Members {
-				if *member.IamID == testUserID {
-					testUserPresent = true
-					Expect(*member.Type).To(Equal(userType))
-					Expect(*member.StatusCode).To(Equal(int64(200)))
-				}
-			}
-			Expect(testUserPresent).To(BeTrue())
-
-		})
-
-		It("Successfully added member to multiple access groups", func() {
-
-			options := service.NewAddMemberToMultipleAccessGroupsOptions(testAccountID, testUserID)
-			options.SetType(userType)
-			options.Groups = append(options.Groups, testGroupID)
-			result, detailedResponse, err := service.AddMemberToMultipleAccessGroups(options)
-			Expect(err).To(BeNil())
-			Expect(detailedResponse.StatusCode).To(Equal(207))
-
-			// confirm the test user is present
-			testGroupPresent := false
-			for _, group := range result.Groups {
-				if *group.AccessGroupID == testGroupID {
-					testGroupPresent = true
-					Expect(*group.StatusCode).To(Equal(int64(200)))
-				}
-			}
-			Expect(testGroupPresent).To(BeTrue())
-
-		})
-	})
-
-	Describe("Check access group membership", func() {
-
-		It("Successfully checked the membership", func() {
-			options := service.NewIsMemberOfAccessGroupOptions(testGroupID, testUserID)
-			detailedResponse, err := service.IsMemberOfAccessGroup(options)
-			Expect(err).To(BeNil())
-			Expect(detailedResponse.StatusCode).To(Equal(204))
-		})
-	})
-
-	Describe("List access group memberships", func() {
-
-		It("Successfully listed the memberships", func() {
-			options := service.NewListAccessGroupMembersOptions(testGroupID)
-			result, detailedResponse, err := service.ListAccessGroupMembers(options)
-			Expect(err).To(BeNil())
-			Expect(detailedResponse.StatusCode).To(Equal(200))
-
-			// confirm the test user is present
-			testUserPresent := false
-			for _, member := range result.Members {
-				if *member.IamID == testUserID {
-					testUserPresent = true
-				}
-			}
-			Expect(testUserPresent).To(BeTrue())
-		})
-	})
-
-	Describe("Delete access group membership", func() {
-
-		It("Successfully deleted the membership", func() {
-			options := service.NewRemoveMemberFromAccessGroupOptions(testGroupID, testUserID)
-			detailedResponse, err := service.RemoveMemberFromAccessGroup(options)
-			Expect(err).To(BeNil())
-			Expect(detailedResponse.StatusCode).To(Equal(204))
-		})
-	})
-
-	Describe("Delete member from all groups", func() {
-
-		It("Returned that the membership was not found", func() {
-			options := service.NewRemoveMemberFromAllAccessGroupsOptions(testAccountID, testUserID)
-			result, detailedResponse, err := service.RemoveMemberFromAllAccessGroups(options)
-			Expect(err).To(Not(BeNil()))
-			Expect(result).To(BeNil())
-			Expect(detailedResponse.StatusCode).To(Equal(404))
-		})
-	})
-
-	Describe("Delete multiple members from access group", func() {
-
-		It("Returned that the membership was not found", func() {
-			options := service.NewRemoveMembersFromAccessGroupOptions(testGroupID)
-			options.Members = append(options.Members, testUserID)
-			result, detailedResponse, err := service.RemoveMembersFromAccessGroup(options)
-			Expect(err).To(Not(BeNil()))
-			Expect(result).To(BeNil())
-			Expect(detailedResponse.StatusCode).To(Equal(404))
-		})
-	})
-
-	Describe("Create an access group rule", func() {
-
-		It("Successfully created an access group rule", func() {
-
-			testExpiration := int64(24)
-			condition, err := service.NewRuleConditions("test claim", "EQUALS", "1")
-			Expect(err).To(BeNil())
-
-			options := service.NewAddAccessGroupRuleOptions(testGroupID, testExpiration, "test realm name", []iamaccessgroupsv2.RuleConditions{*condition})
-
-			result, detailedResponse, err := service.AddAccessGroupRule(options)
-			Expect(err).To(BeNil())
-			Expect(detailedResponse.StatusCode).To(Equal(201))
-			Expect(*result.AccessGroupID).To(Equal(testGroupID))
-			Expect(*result.AccountID).To(Equal(testAccountID))
-			Expect(*result.Expiration).To(Equal(testExpiration))
-
-			testClaimRuleID = *result.ID
-		})
-	})
-
-	Describe("Get an access group rule", func() {
-
-		It("Successfully retrieved the rule", func() {
-			options := service.NewGetAccessGroupRuleOptions(testGroupID, testClaimRuleID)
-			result, detailedResponse, err := service.GetAccessGroupRule(options)
-			Expect(err).To(BeNil())
-			Expect(detailedResponse.StatusCode).To(Equal(200))
-			Expect(*result.ID).To(Equal(testClaimRuleID))
-			Expect(*result.AccessGroupID).To(Equal(testGroupID))
-			Expect(*result.AccountID).To(Equal(testAccountID))
-
-			testClaimRuleEtag = detailedResponse.GetHeaders().Get(etagHeader)
-		})
-	})
-
-	Describe("List access group rules", func() {
-
-		It("Successfully listed the rules", func() {
-			options := service.NewListAccessGroupRulesOptions(testGroupID)
-			result, detailedResponse, err := service.ListAccessGroupRules(options)
-			Expect(err).To(BeNil())
-			Expect(detailedResponse.StatusCode).To(Equal(200))
-
-			// confirm the test user is present
-			testClaimRulePresent := false
-			for _, claimRule := range result.Rules {
-				if *claimRule.ID == testClaimRuleID {
-					testClaimRulePresent = true
-				}
-			}
-			Expect(testClaimRulePresent).To(BeTrue())
-		})
-	})
-
-	Describe("Update an access group rule", func() {
-
-		It("Successfully updated the rule", func() {
-
-			testExpiration := int64(24)
-			condition, err := service.NewRuleConditions("test claim", "EQUALS", "1")
-			Expect(err).To(BeNil())
-
-			options := service.NewReplaceAccessGroupRuleOptions(testGroupID, testClaimRuleID, testClaimRuleEtag, testExpiration, "updated test realm name", []iamaccessgroupsv2.RuleConditions{*condition})
-
-			result, detailedResponse, err := service.ReplaceAccessGroupRule(options)
-			Expect(err).To(BeNil())
-			Expect(detailedResponse.StatusCode).To(Equal(200))
-			Expect(*result.ID).To(Equal(testClaimRuleID))
-			Expect(*result.AccessGroupID).To(Equal(testGroupID))
-			Expect(*result.AccountID).To(Equal(testAccountID))
-		})
-	})
-
-	Describe("Delete access group rule", func() {
-
-		It("Successfully deleted the rule", func() {
-			options := service.NewRemoveAccessGroupRuleOptions(testGroupID, testClaimRuleID)
-			detailedResponse, err := service.RemoveAccessGroupRule(options)
-			Expect(err).To(BeNil())
-			Expect(detailedResponse.StatusCode).To(Equal(204))
-		})
-	})
-
-	Describe("Get account settings", func() {
-
-		It("Successfully retrieved the settings", func() {
-			options := service.NewGetAccountSettingsOptions(testAccountID)
-			result, detailedResponse, err := service.GetAccountSettings(options)
-			Expect(err).To(BeNil())
-			Expect(detailedResponse.StatusCode).To(Equal(200))
-			Expect(*result.AccountID).To(Equal(testAccountID))
-
-			testAccountSettings = result
-		})
-	})
-
-	Describe("Update account settings", func() {
-
-		It("Successfully updated the settings", func() {
-			options := service.NewUpdateAccountSettingsOptions(testAccountID)
-			options.SetPublicAccessEnabled(*testAccountSettings.PublicAccessEnabled)
-			result, detailedResponse, err := service.UpdateAccountSettings(options)
-			Expect(err).To(BeNil())
-			Expect(detailedResponse.StatusCode).To(Equal(200))
-			Expect(*result.AccountID).To(Equal(testAccountID))
-			Expect(*result.PublicAccessEnabled).To(Equal(*options.PublicAccessEnabled))
-		})
-	})
-
-})
-
-// clean up all test groups
-var _ = AfterSuite(func() {
-
-	// list all groups in the account (minus the public access group)
-	options := service.NewListAccessGroupsOptions(testAccountID)
-	options.SetHidePublicAccess(true)
-	result, detailedResponse, err := service.ListAccessGroups(options)
-	Expect(err).To(BeNil())
-	Expect(detailedResponse.StatusCode).To(Equal(200))
-
-	// iterate across the groups
-	for _, group := range result.Groups {
-
-		// force delete each test group
-		if *group.Name == testGroupName {
-			options := service.NewDeleteAccessGroupOptions(*group.ID)
-			options.SetForce(true)
-			detailedResponse, err := service.DeleteAccessGroup(options)
-			Expect(err).To(BeNil())
-			Expect(detailedResponse.StatusCode).To(Equal(204))
-		}
-	}
-
-})
diff --git a/iamaccessgroupsv2/iam_access_groups_v2_suite_test.go b/iamaccessgroupsv2/iam_access_groups_v2_suite_test.go
deleted file mode 100644
index ea34d3d8..00000000
--- a/iamaccessgroupsv2/iam_access_groups_v2_suite_test.go
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * (C) Copyright IBM Corp. 2020.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package iamaccessgroupsv2_test
-
-import (
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-	"testing"
-)
-
-func TestIamAccessGroupsV2(t *testing.T) {
-	RegisterFailHandler(Fail)
-	RunSpecs(t, "IamAccessGroupsV2 Suite")
-}
diff --git a/iamaccessgroupsv2/iam_access_groups_v2_test.go b/iamaccessgroupsv2/iam_access_groups_v2_test.go
deleted file mode 100644
index d9c82206..00000000
--- a/iamaccessgroupsv2/iam_access_groups_v2_test.go
+++ /dev/null
@@ -1,1043 +0,0 @@
-/**
- * (C) Copyright IBM Corp. 2020.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package iamaccessgroupsv2_test
-
-import (
-	"bytes"
-	"fmt"
-	"github.com/IBM/go-sdk-core/v3/core"
-	"github.com/go-openapi/strfmt"
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-	"github.ibm.com/ibmcloud/platform-services-go-sdk/iamaccessgroupsv2"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"net/http/httptest"
-	"time"
-)
-
-var _ = Describe(`IamAccessGroupsV2`, func() {
-	Describe(`CreateAccessGroup(createAccessGroupOptions *CreateAccessGroupOptions)`, func() {
-		createAccessGroupPath := "/groups"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(createAccessGroupPath))
-				Expect(req.Method).To(Equal("POST"))
-				Expect(req.Header["Transaction-Id"]).ToNot(BeNil())
-				Expect(req.Header["Transaction-Id"][0]).To(Equal(fmt.Sprintf("%v", "testString")))
-				Expect(req.URL.Query()["account_id"]).To(Equal([]string{"testString"}))
-
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(201)
-				fmt.Fprintf(res, `{"id": "ID", "name": "Name", "description": "Description", "account_id": "AccountID", "created_at": "CreatedAt", "created_by_id": "CreatedByID", "last_modified_at": "LastModifiedAt", "last_modified_by_id": "LastModifiedByID", "href": "Href", "is_federated": false}`)
-			}))
-			It(`Invoke CreateAccessGroup successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := iamaccessgroupsv2.NewIamAccessGroupsV2(&iamaccessgroupsv2.IamAccessGroupsV2Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.CreateAccessGroup(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the CreateAccessGroupOptions model
-				createAccessGroupOptionsModel := new(iamaccessgroupsv2.CreateAccessGroupOptions)
-				createAccessGroupOptionsModel.AccountID = core.StringPtr("testString")
-				createAccessGroupOptionsModel.Name = core.StringPtr("testString")
-				createAccessGroupOptionsModel.Description = core.StringPtr("testString")
-				createAccessGroupOptionsModel.TransactionID = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.CreateAccessGroup(createAccessGroupOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`ListAccessGroups(listAccessGroupsOptions *ListAccessGroupsOptions)`, func() {
-		listAccessGroupsPath := "/groups"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(listAccessGroupsPath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.Header["Transaction-Id"]).ToNot(BeNil())
-				Expect(req.Header["Transaction-Id"][0]).To(Equal(fmt.Sprintf("%v", "testString")))
-				Expect(req.URL.Query()["account_id"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["iam_id"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["limit"]).To(Equal([]string{fmt.Sprint(int64(38))}))
-
-				Expect(req.URL.Query()["offset"]).To(Equal([]string{fmt.Sprint(int64(38))}))
-
-				Expect(req.URL.Query()["sort"]).To(Equal([]string{"testString"}))
-
-
-				// TODO: Add check for show_federated query parameter
-
-
-				// TODO: Add check for hide_public_access query parameter
-
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"limit": 5, "offset": 6, "total_count": 10, "first": {"href": "Href"}, "previous": {"href": "Href"}, "next": {"href": "Href"}, "last": {"href": "Href"}, "groups": [{"id": "ID", "name": "Name", "description": "Description", "account_id": "AccountID", "created_at": "CreatedAt", "created_by_id": "CreatedByID", "last_modified_at": "LastModifiedAt", "last_modified_by_id": "LastModifiedByID", "href": "Href", "is_federated": false}]}`)
-			}))
-			It(`Invoke ListAccessGroups successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := iamaccessgroupsv2.NewIamAccessGroupsV2(&iamaccessgroupsv2.IamAccessGroupsV2Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.ListAccessGroups(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the ListAccessGroupsOptions model
-				listAccessGroupsOptionsModel := new(iamaccessgroupsv2.ListAccessGroupsOptions)
-				listAccessGroupsOptionsModel.AccountID = core.StringPtr("testString")
-				listAccessGroupsOptionsModel.TransactionID = core.StringPtr("testString")
-				listAccessGroupsOptionsModel.IamID = core.StringPtr("testString")
-				listAccessGroupsOptionsModel.Limit = core.Int64Ptr(int64(38))
-				listAccessGroupsOptionsModel.Offset = core.Int64Ptr(int64(38))
-				listAccessGroupsOptionsModel.Sort = core.StringPtr("testString")
-				listAccessGroupsOptionsModel.ShowFederated = core.BoolPtr(true)
-				listAccessGroupsOptionsModel.HidePublicAccess = core.BoolPtr(true)
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.ListAccessGroups(listAccessGroupsOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`GetAccessGroup(getAccessGroupOptions *GetAccessGroupOptions)`, func() {
-		getAccessGroupPath := "/groups/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(getAccessGroupPath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.Header["Transaction-Id"]).ToNot(BeNil())
-				Expect(req.Header["Transaction-Id"][0]).To(Equal(fmt.Sprintf("%v", "testString")))
-
-				// TODO: Add check for show_federated query parameter
-
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"id": "ID", "name": "Name", "description": "Description", "account_id": "AccountID", "created_at": "CreatedAt", "created_by_id": "CreatedByID", "last_modified_at": "LastModifiedAt", "last_modified_by_id": "LastModifiedByID", "href": "Href", "is_federated": false}`)
-			}))
-			It(`Invoke GetAccessGroup successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := iamaccessgroupsv2.NewIamAccessGroupsV2(&iamaccessgroupsv2.IamAccessGroupsV2Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.GetAccessGroup(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the GetAccessGroupOptions model
-				getAccessGroupOptionsModel := new(iamaccessgroupsv2.GetAccessGroupOptions)
-				getAccessGroupOptionsModel.AccessGroupID = core.StringPtr("testString")
-				getAccessGroupOptionsModel.TransactionID = core.StringPtr("testString")
-				getAccessGroupOptionsModel.ShowFederated = core.BoolPtr(true)
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.GetAccessGroup(getAccessGroupOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`UpdateAccessGroup(updateAccessGroupOptions *UpdateAccessGroupOptions)`, func() {
-		updateAccessGroupPath := "/groups/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(updateAccessGroupPath))
-				Expect(req.Method).To(Equal("PATCH"))
-				Expect(req.Header["If-Match"]).ToNot(BeNil())
-				Expect(req.Header["If-Match"][0]).To(Equal(fmt.Sprintf("%v", "testString")))
-				Expect(req.Header["Transaction-Id"]).ToNot(BeNil())
-				Expect(req.Header["Transaction-Id"][0]).To(Equal(fmt.Sprintf("%v", "testString")))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"id": "ID", "name": "Name", "description": "Description", "account_id": "AccountID", "created_at": "CreatedAt", "created_by_id": "CreatedByID", "last_modified_at": "LastModifiedAt", "last_modified_by_id": "LastModifiedByID", "href": "Href", "is_federated": false}`)
-			}))
-			It(`Invoke UpdateAccessGroup successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := iamaccessgroupsv2.NewIamAccessGroupsV2(&iamaccessgroupsv2.IamAccessGroupsV2Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.UpdateAccessGroup(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the UpdateAccessGroupOptions model
-				updateAccessGroupOptionsModel := new(iamaccessgroupsv2.UpdateAccessGroupOptions)
-				updateAccessGroupOptionsModel.AccessGroupID = core.StringPtr("testString")
-				updateAccessGroupOptionsModel.IfMatch = core.StringPtr("testString")
-				updateAccessGroupOptionsModel.Name = core.StringPtr("testString")
-				updateAccessGroupOptionsModel.Description = core.StringPtr("testString")
-				updateAccessGroupOptionsModel.TransactionID = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.UpdateAccessGroup(updateAccessGroupOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`DeleteAccessGroup(deleteAccessGroupOptions *DeleteAccessGroupOptions)`, func() {
-		deleteAccessGroupPath := "/groups/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(deleteAccessGroupPath))
-				Expect(req.Method).To(Equal("DELETE"))
-				Expect(req.Header["Transaction-Id"]).ToNot(BeNil())
-				Expect(req.Header["Transaction-Id"][0]).To(Equal(fmt.Sprintf("%v", "testString")))
-
-				// TODO: Add check for force query parameter
-
-				res.WriteHeader(204)
-			}))
-			It(`Invoke DeleteAccessGroup successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := iamaccessgroupsv2.NewIamAccessGroupsV2(&iamaccessgroupsv2.IamAccessGroupsV2Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				response, operationErr := testService.DeleteAccessGroup(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-
-				// Construct an instance of the DeleteAccessGroupOptions model
-				deleteAccessGroupOptionsModel := new(iamaccessgroupsv2.DeleteAccessGroupOptions)
-				deleteAccessGroupOptionsModel.AccessGroupID = core.StringPtr("testString")
-				deleteAccessGroupOptionsModel.TransactionID = core.StringPtr("testString")
-				deleteAccessGroupOptionsModel.Force = core.BoolPtr(true)
-
-				// Invoke operation with valid options model (positive test)
-				response, operationErr = testService.DeleteAccessGroup(deleteAccessGroupOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`GetAccountSettings(getAccountSettingsOptions *GetAccountSettingsOptions)`, func() {
-		getAccountSettingsPath := "/groups/settings"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(getAccountSettingsPath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.Header["Transaction-Id"]).ToNot(BeNil())
-				Expect(req.Header["Transaction-Id"][0]).To(Equal(fmt.Sprintf("%v", "testString")))
-				Expect(req.URL.Query()["account_id"]).To(Equal([]string{"testString"}))
-
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"account_id": "AccountID", "last_modified_at": "LastModifiedAt", "last_modified_by_id": "LastModifiedByID", "public_access_enabled": false}`)
-			}))
-			It(`Invoke GetAccountSettings successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := iamaccessgroupsv2.NewIamAccessGroupsV2(&iamaccessgroupsv2.IamAccessGroupsV2Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.GetAccountSettings(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the GetAccountSettingsOptions model
-				getAccountSettingsOptionsModel := new(iamaccessgroupsv2.GetAccountSettingsOptions)
-				getAccountSettingsOptionsModel.AccountID = core.StringPtr("testString")
-				getAccountSettingsOptionsModel.TransactionID = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.GetAccountSettings(getAccountSettingsOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`UpdateAccountSettings(updateAccountSettingsOptions *UpdateAccountSettingsOptions)`, func() {
-		updateAccountSettingsPath := "/groups/settings"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(updateAccountSettingsPath))
-				Expect(req.Method).To(Equal("PATCH"))
-				Expect(req.Header["Transaction-Id"]).ToNot(BeNil())
-				Expect(req.Header["Transaction-Id"][0]).To(Equal(fmt.Sprintf("%v", "testString")))
-				Expect(req.URL.Query()["account_id"]).To(Equal([]string{"testString"}))
-
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"account_id": "AccountID", "last_modified_at": "LastModifiedAt", "last_modified_by_id": "LastModifiedByID", "public_access_enabled": false}`)
-			}))
-			It(`Invoke UpdateAccountSettings successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := iamaccessgroupsv2.NewIamAccessGroupsV2(&iamaccessgroupsv2.IamAccessGroupsV2Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.UpdateAccountSettings(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the UpdateAccountSettingsOptions model
-				updateAccountSettingsOptionsModel := new(iamaccessgroupsv2.UpdateAccountSettingsOptions)
-				updateAccountSettingsOptionsModel.AccountID = core.StringPtr("testString")
-				updateAccountSettingsOptionsModel.PublicAccessEnabled = core.BoolPtr(true)
-				updateAccountSettingsOptionsModel.TransactionID = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.UpdateAccountSettings(updateAccountSettingsOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`IsMemberOfAccessGroup(isMemberOfAccessGroupOptions *IsMemberOfAccessGroupOptions)`, func() {
-		isMemberOfAccessGroupPath := "/groups/testString/members/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(isMemberOfAccessGroupPath))
-				Expect(req.Method).To(Equal("HEAD"))
-				Expect(req.Header["Transaction-Id"]).ToNot(BeNil())
-				Expect(req.Header["Transaction-Id"][0]).To(Equal(fmt.Sprintf("%v", "testString")))
-				res.WriteHeader(204)
-			}))
-			It(`Invoke IsMemberOfAccessGroup successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := iamaccessgroupsv2.NewIamAccessGroupsV2(&iamaccessgroupsv2.IamAccessGroupsV2Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				response, operationErr := testService.IsMemberOfAccessGroup(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-
-				// Construct an instance of the IsMemberOfAccessGroupOptions model
-				isMemberOfAccessGroupOptionsModel := new(iamaccessgroupsv2.IsMemberOfAccessGroupOptions)
-				isMemberOfAccessGroupOptionsModel.AccessGroupID = core.StringPtr("testString")
-				isMemberOfAccessGroupOptionsModel.IamID = core.StringPtr("testString")
-				isMemberOfAccessGroupOptionsModel.TransactionID = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				response, operationErr = testService.IsMemberOfAccessGroup(isMemberOfAccessGroupOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`AddMembersToAccessGroup(addMembersToAccessGroupOptions *AddMembersToAccessGroupOptions)`, func() {
-		addMembersToAccessGroupPath := "/groups/testString/members"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(addMembersToAccessGroupPath))
-				Expect(req.Method).To(Equal("PUT"))
-				Expect(req.Header["Transaction-Id"]).ToNot(BeNil())
-				Expect(req.Header["Transaction-Id"][0]).To(Equal(fmt.Sprintf("%v", "testString")))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(207)
-				fmt.Fprintf(res, `{"members": [{"iam_id": "IamID", "type": "Type", "created_at": "CreatedAt", "created_by_id": "CreatedByID", "status_code": 10, "trace": "Trace", "errors": [{"code": "Code", "message": "Message"}]}]}`)
-			}))
-			It(`Invoke AddMembersToAccessGroup successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := iamaccessgroupsv2.NewIamAccessGroupsV2(&iamaccessgroupsv2.IamAccessGroupsV2Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.AddMembersToAccessGroup(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the AddGroupMembersRequestMembersItem model
-				addGroupMembersRequestMembersItemModel := new(iamaccessgroupsv2.AddGroupMembersRequestMembersItem)
-				addGroupMembersRequestMembersItemModel.IamID = core.StringPtr("testString")
-				addGroupMembersRequestMembersItemModel.Type = core.StringPtr("testString")
-
-				// Construct an instance of the AddMembersToAccessGroupOptions model
-				addMembersToAccessGroupOptionsModel := new(iamaccessgroupsv2.AddMembersToAccessGroupOptions)
-				addMembersToAccessGroupOptionsModel.AccessGroupID = core.StringPtr("testString")
-				addMembersToAccessGroupOptionsModel.Members = []iamaccessgroupsv2.AddGroupMembersRequestMembersItem{*addGroupMembersRequestMembersItemModel}
-				addMembersToAccessGroupOptionsModel.TransactionID = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.AddMembersToAccessGroup(addMembersToAccessGroupOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`ListAccessGroupMembers(listAccessGroupMembersOptions *ListAccessGroupMembersOptions)`, func() {
-		listAccessGroupMembersPath := "/groups/testString/members"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(listAccessGroupMembersPath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.Header["Transaction-Id"]).ToNot(BeNil())
-				Expect(req.Header["Transaction-Id"][0]).To(Equal(fmt.Sprintf("%v", "testString")))
-
-				// TODO: Add check for limit query parameter
-
-
-				// TODO: Add check for offset query parameter
-
-				Expect(req.URL.Query()["type"]).To(Equal([]string{"testString"}))
-
-
-				// TODO: Add check for verbose query parameter
-
-				Expect(req.URL.Query()["sort"]).To(Equal([]string{"testString"}))
-
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"limit": 5, "offset": 6, "total_count": 10, "first": {"href": "Href"}, "previous": {"href": "Href"}, "next": {"href": "Href"}, "last": {"href": "Href"}, "members": [{"iam_id": "IamID", "type": "Type", "name": "Name", "email": "Email", "description": "Description", "href": "Href", "created_at": "CreatedAt", "created_by_id": "CreatedByID"}]}`)
-			}))
-			It(`Invoke ListAccessGroupMembers successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := iamaccessgroupsv2.NewIamAccessGroupsV2(&iamaccessgroupsv2.IamAccessGroupsV2Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.ListAccessGroupMembers(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the ListAccessGroupMembersOptions model
-				listAccessGroupMembersOptionsModel := new(iamaccessgroupsv2.ListAccessGroupMembersOptions)
-				listAccessGroupMembersOptionsModel.AccessGroupID = core.StringPtr("testString")
-				listAccessGroupMembersOptionsModel.TransactionID = core.StringPtr("testString")
-				listAccessGroupMembersOptionsModel.Limit = core.Float64Ptr(72.5)
-				listAccessGroupMembersOptionsModel.Offset = core.Float64Ptr(72.5)
-				listAccessGroupMembersOptionsModel.Type = core.StringPtr("testString")
-				listAccessGroupMembersOptionsModel.Verbose = core.BoolPtr(true)
-				listAccessGroupMembersOptionsModel.Sort = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.ListAccessGroupMembers(listAccessGroupMembersOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`RemoveMemberFromAccessGroup(removeMemberFromAccessGroupOptions *RemoveMemberFromAccessGroupOptions)`, func() {
-		removeMemberFromAccessGroupPath := "/groups/testString/members/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(removeMemberFromAccessGroupPath))
-				Expect(req.Method).To(Equal("DELETE"))
-				Expect(req.Header["Transaction-Id"]).ToNot(BeNil())
-				Expect(req.Header["Transaction-Id"][0]).To(Equal(fmt.Sprintf("%v", "testString")))
-				res.WriteHeader(204)
-			}))
-			It(`Invoke RemoveMemberFromAccessGroup successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := iamaccessgroupsv2.NewIamAccessGroupsV2(&iamaccessgroupsv2.IamAccessGroupsV2Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				response, operationErr := testService.RemoveMemberFromAccessGroup(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-
-				// Construct an instance of the RemoveMemberFromAccessGroupOptions model
-				removeMemberFromAccessGroupOptionsModel := new(iamaccessgroupsv2.RemoveMemberFromAccessGroupOptions)
-				removeMemberFromAccessGroupOptionsModel.AccessGroupID = core.StringPtr("testString")
-				removeMemberFromAccessGroupOptionsModel.IamID = core.StringPtr("testString")
-				removeMemberFromAccessGroupOptionsModel.TransactionID = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				response, operationErr = testService.RemoveMemberFromAccessGroup(removeMemberFromAccessGroupOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`RemoveMembersFromAccessGroup(removeMembersFromAccessGroupOptions *RemoveMembersFromAccessGroupOptions)`, func() {
-		removeMembersFromAccessGroupPath := "/groups/testString/members/delete"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(removeMembersFromAccessGroupPath))
-				Expect(req.Method).To(Equal("POST"))
-				Expect(req.Header["Transaction-Id"]).ToNot(BeNil())
-				Expect(req.Header["Transaction-Id"][0]).To(Equal(fmt.Sprintf("%v", "testString")))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(207)
-				fmt.Fprintf(res, `{"access_group_id": "AccessGroupID", "members": [{"iam_id": "IamID", "trace": "Trace", "status_code": 10, "errors": [{"code": "Code", "message": "Message"}]}]}`)
-			}))
-			It(`Invoke RemoveMembersFromAccessGroup successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := iamaccessgroupsv2.NewIamAccessGroupsV2(&iamaccessgroupsv2.IamAccessGroupsV2Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.RemoveMembersFromAccessGroup(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the RemoveMembersFromAccessGroupOptions model
-				removeMembersFromAccessGroupOptionsModel := new(iamaccessgroupsv2.RemoveMembersFromAccessGroupOptions)
-				removeMembersFromAccessGroupOptionsModel.AccessGroupID = core.StringPtr("testString")
-				removeMembersFromAccessGroupOptionsModel.Members = []string{"testString"}
-				removeMembersFromAccessGroupOptionsModel.TransactionID = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.RemoveMembersFromAccessGroup(removeMembersFromAccessGroupOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`RemoveMemberFromAllAccessGroups(removeMemberFromAllAccessGroupsOptions *RemoveMemberFromAllAccessGroupsOptions)`, func() {
-		removeMemberFromAllAccessGroupsPath := "/groups/_allgroups/members/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(removeMemberFromAllAccessGroupsPath))
-				Expect(req.Method).To(Equal("DELETE"))
-				Expect(req.Header["Transaction-Id"]).ToNot(BeNil())
-				Expect(req.Header["Transaction-Id"][0]).To(Equal(fmt.Sprintf("%v", "testString")))
-				Expect(req.URL.Query()["account_id"]).To(Equal([]string{"testString"}))
-
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(207)
-				fmt.Fprintf(res, `{"iam_id": "IamID", "groups": [{"access_group_id": "AccessGroupID", "status_code": 10, "trace": "Trace", "errors": [{"code": "Code", "message": "Message"}]}]}`)
-			}))
-			It(`Invoke RemoveMemberFromAllAccessGroups successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := iamaccessgroupsv2.NewIamAccessGroupsV2(&iamaccessgroupsv2.IamAccessGroupsV2Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.RemoveMemberFromAllAccessGroups(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the RemoveMemberFromAllAccessGroupsOptions model
-				removeMemberFromAllAccessGroupsOptionsModel := new(iamaccessgroupsv2.RemoveMemberFromAllAccessGroupsOptions)
-				removeMemberFromAllAccessGroupsOptionsModel.AccountID = core.StringPtr("testString")
-				removeMemberFromAllAccessGroupsOptionsModel.IamID = core.StringPtr("testString")
-				removeMemberFromAllAccessGroupsOptionsModel.TransactionID = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.RemoveMemberFromAllAccessGroups(removeMemberFromAllAccessGroupsOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`AddMemberToMultipleAccessGroups(addMemberToMultipleAccessGroupsOptions *AddMemberToMultipleAccessGroupsOptions)`, func() {
-		addMemberToMultipleAccessGroupsPath := "/groups/_allgroups/members/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(addMemberToMultipleAccessGroupsPath))
-				Expect(req.Method).To(Equal("PUT"))
-				Expect(req.Header["Transaction-Id"]).ToNot(BeNil())
-				Expect(req.Header["Transaction-Id"][0]).To(Equal(fmt.Sprintf("%v", "testString")))
-				Expect(req.URL.Query()["account_id"]).To(Equal([]string{"testString"}))
-
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(207)
-				fmt.Fprintf(res, `{"iam_id": "IamID", "groups": [{"access_group_id": "AccessGroupID", "status_code": 10, "trace": "Trace", "errors": [{"code": "Code", "message": "Message"}]}]}`)
-			}))
-			It(`Invoke AddMemberToMultipleAccessGroups successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := iamaccessgroupsv2.NewIamAccessGroupsV2(&iamaccessgroupsv2.IamAccessGroupsV2Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.AddMemberToMultipleAccessGroups(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the AddMemberToMultipleAccessGroupsOptions model
-				addMemberToMultipleAccessGroupsOptionsModel := new(iamaccessgroupsv2.AddMemberToMultipleAccessGroupsOptions)
-				addMemberToMultipleAccessGroupsOptionsModel.AccountID = core.StringPtr("testString")
-				addMemberToMultipleAccessGroupsOptionsModel.IamID = core.StringPtr("testString")
-				addMemberToMultipleAccessGroupsOptionsModel.Type = core.StringPtr("testString")
-				addMemberToMultipleAccessGroupsOptionsModel.Groups = []string{"testString"}
-				addMemberToMultipleAccessGroupsOptionsModel.TransactionID = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.AddMemberToMultipleAccessGroups(addMemberToMultipleAccessGroupsOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`AddAccessGroupRule(addAccessGroupRuleOptions *AddAccessGroupRuleOptions)`, func() {
-		addAccessGroupRulePath := "/groups/testString/rules"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(addAccessGroupRulePath))
-				Expect(req.Method).To(Equal("POST"))
-				Expect(req.Header["Transaction-Id"]).ToNot(BeNil())
-				Expect(req.Header["Transaction-Id"][0]).To(Equal(fmt.Sprintf("%v", "testString")))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(201)
-				fmt.Fprintf(res, `{"id": "ID", "name": "Name", "expiration": 10, "realm_name": "RealmName", "access_group_id": "AccessGroupID", "account_id": "AccountID", "conditions": [{"claim": "Claim", "operator": "Operator", "value": "Value"}], "created_at": "CreatedAt", "created_by_id": "CreatedByID", "last_modified_at": "LastModifiedAt", "last_modified_by_id": "LastModifiedByID"}`)
-			}))
-			It(`Invoke AddAccessGroupRule successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := iamaccessgroupsv2.NewIamAccessGroupsV2(&iamaccessgroupsv2.IamAccessGroupsV2Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.AddAccessGroupRule(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the RuleConditions model
-				ruleConditionsModel := new(iamaccessgroupsv2.RuleConditions)
-				ruleConditionsModel.Claim = core.StringPtr("testString")
-				ruleConditionsModel.Operator = core.StringPtr("testString")
-				ruleConditionsModel.Value = core.StringPtr("testString")
-
-				// Construct an instance of the AddAccessGroupRuleOptions model
-				addAccessGroupRuleOptionsModel := new(iamaccessgroupsv2.AddAccessGroupRuleOptions)
-				addAccessGroupRuleOptionsModel.AccessGroupID = core.StringPtr("testString")
-				addAccessGroupRuleOptionsModel.Expiration = core.Int64Ptr(int64(38))
-				addAccessGroupRuleOptionsModel.RealmName = core.StringPtr("testString")
-				addAccessGroupRuleOptionsModel.Conditions = []iamaccessgroupsv2.RuleConditions{*ruleConditionsModel}
-				addAccessGroupRuleOptionsModel.Name = core.StringPtr("testString")
-				addAccessGroupRuleOptionsModel.TransactionID = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.AddAccessGroupRule(addAccessGroupRuleOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`ListAccessGroupRules(listAccessGroupRulesOptions *ListAccessGroupRulesOptions)`, func() {
-		listAccessGroupRulesPath := "/groups/testString/rules"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(listAccessGroupRulesPath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.Header["Transaction-Id"]).ToNot(BeNil())
-				Expect(req.Header["Transaction-Id"][0]).To(Equal(fmt.Sprintf("%v", "testString")))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"rules": [{"id": "ID", "name": "Name", "expiration": 10, "realm_name": "RealmName", "access_group_id": "AccessGroupID", "account_id": "AccountID", "conditions": [{"claim": "Claim", "operator": "Operator", "value": "Value"}], "created_at": "CreatedAt", "created_by_id": "CreatedByID", "last_modified_at": "LastModifiedAt", "last_modified_by_id": "LastModifiedByID"}]}`)
-			}))
-			It(`Invoke ListAccessGroupRules successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := iamaccessgroupsv2.NewIamAccessGroupsV2(&iamaccessgroupsv2.IamAccessGroupsV2Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.ListAccessGroupRules(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the ListAccessGroupRulesOptions model
-				listAccessGroupRulesOptionsModel := new(iamaccessgroupsv2.ListAccessGroupRulesOptions)
-				listAccessGroupRulesOptionsModel.AccessGroupID = core.StringPtr("testString")
-				listAccessGroupRulesOptionsModel.TransactionID = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.ListAccessGroupRules(listAccessGroupRulesOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`GetAccessGroupRule(getAccessGroupRuleOptions *GetAccessGroupRuleOptions)`, func() {
-		getAccessGroupRulePath := "/groups/testString/rules/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(getAccessGroupRulePath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.Header["Transaction-Id"]).ToNot(BeNil())
-				Expect(req.Header["Transaction-Id"][0]).To(Equal(fmt.Sprintf("%v", "testString")))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"id": "ID", "name": "Name", "expiration": 10, "realm_name": "RealmName", "access_group_id": "AccessGroupID", "account_id": "AccountID", "conditions": [{"claim": "Claim", "operator": "Operator", "value": "Value"}], "created_at": "CreatedAt", "created_by_id": "CreatedByID", "last_modified_at": "LastModifiedAt", "last_modified_by_id": "LastModifiedByID"}`)
-			}))
-			It(`Invoke GetAccessGroupRule successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := iamaccessgroupsv2.NewIamAccessGroupsV2(&iamaccessgroupsv2.IamAccessGroupsV2Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.GetAccessGroupRule(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the GetAccessGroupRuleOptions model
-				getAccessGroupRuleOptionsModel := new(iamaccessgroupsv2.GetAccessGroupRuleOptions)
-				getAccessGroupRuleOptionsModel.AccessGroupID = core.StringPtr("testString")
-				getAccessGroupRuleOptionsModel.RuleID = core.StringPtr("testString")
-				getAccessGroupRuleOptionsModel.TransactionID = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.GetAccessGroupRule(getAccessGroupRuleOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`ReplaceAccessGroupRule(replaceAccessGroupRuleOptions *ReplaceAccessGroupRuleOptions)`, func() {
-		replaceAccessGroupRulePath := "/groups/testString/rules/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(replaceAccessGroupRulePath))
-				Expect(req.Method).To(Equal("PUT"))
-				Expect(req.Header["If-Match"]).ToNot(BeNil())
-				Expect(req.Header["If-Match"][0]).To(Equal(fmt.Sprintf("%v", "testString")))
-				Expect(req.Header["Transaction-Id"]).ToNot(BeNil())
-				Expect(req.Header["Transaction-Id"][0]).To(Equal(fmt.Sprintf("%v", "testString")))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"id": "ID", "name": "Name", "expiration": 10, "realm_name": "RealmName", "access_group_id": "AccessGroupID", "account_id": "AccountID", "conditions": [{"claim": "Claim", "operator": "Operator", "value": "Value"}], "created_at": "CreatedAt", "created_by_id": "CreatedByID", "last_modified_at": "LastModifiedAt", "last_modified_by_id": "LastModifiedByID"}`)
-			}))
-			It(`Invoke ReplaceAccessGroupRule successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := iamaccessgroupsv2.NewIamAccessGroupsV2(&iamaccessgroupsv2.IamAccessGroupsV2Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.ReplaceAccessGroupRule(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the RuleConditions model
-				ruleConditionsModel := new(iamaccessgroupsv2.RuleConditions)
-				ruleConditionsModel.Claim = core.StringPtr("testString")
-				ruleConditionsModel.Operator = core.StringPtr("testString")
-				ruleConditionsModel.Value = core.StringPtr("testString")
-
-				// Construct an instance of the ReplaceAccessGroupRuleOptions model
-				replaceAccessGroupRuleOptionsModel := new(iamaccessgroupsv2.ReplaceAccessGroupRuleOptions)
-				replaceAccessGroupRuleOptionsModel.AccessGroupID = core.StringPtr("testString")
-				replaceAccessGroupRuleOptionsModel.RuleID = core.StringPtr("testString")
-				replaceAccessGroupRuleOptionsModel.IfMatch = core.StringPtr("testString")
-				replaceAccessGroupRuleOptionsModel.Expiration = core.Int64Ptr(int64(38))
-				replaceAccessGroupRuleOptionsModel.RealmName = core.StringPtr("testString")
-				replaceAccessGroupRuleOptionsModel.Conditions = []iamaccessgroupsv2.RuleConditions{*ruleConditionsModel}
-				replaceAccessGroupRuleOptionsModel.Name = core.StringPtr("testString")
-				replaceAccessGroupRuleOptionsModel.TransactionID = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.ReplaceAccessGroupRule(replaceAccessGroupRuleOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`RemoveAccessGroupRule(removeAccessGroupRuleOptions *RemoveAccessGroupRuleOptions)`, func() {
-		removeAccessGroupRulePath := "/groups/testString/rules/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(removeAccessGroupRulePath))
-				Expect(req.Method).To(Equal("DELETE"))
-				Expect(req.Header["Transaction-Id"]).ToNot(BeNil())
-				Expect(req.Header["Transaction-Id"][0]).To(Equal(fmt.Sprintf("%v", "testString")))
-				res.WriteHeader(204)
-			}))
-			It(`Invoke RemoveAccessGroupRule successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := iamaccessgroupsv2.NewIamAccessGroupsV2(&iamaccessgroupsv2.IamAccessGroupsV2Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				response, operationErr := testService.RemoveAccessGroupRule(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-
-				// Construct an instance of the RemoveAccessGroupRuleOptions model
-				removeAccessGroupRuleOptionsModel := new(iamaccessgroupsv2.RemoveAccessGroupRuleOptions)
-				removeAccessGroupRuleOptionsModel.AccessGroupID = core.StringPtr("testString")
-				removeAccessGroupRuleOptionsModel.RuleID = core.StringPtr("testString")
-				removeAccessGroupRuleOptionsModel.TransactionID = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				response, operationErr = testService.RemoveAccessGroupRule(removeAccessGroupRuleOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`Model constructor tests`, func() {
-		Context(`Using a sample service client instance`, func() {
-			testService, _ := iamaccessgroupsv2.NewIamAccessGroupsV2(&iamaccessgroupsv2.IamAccessGroupsV2Options{
-				URL:           "http://iamaccessgroupsv2modelgenerator.com",
-				Authenticator: &core.NoAuthAuthenticator{},
-			})
-			It(`Invoke NewAddGroupMembersRequestMembersItem successfully`, func() {
-				iamID := "testString"
-				typeVar := "testString"
-				model, err := testService.NewAddGroupMembersRequestMembersItem(iamID, typeVar)
-				Expect(model).ToNot(BeNil())
-				Expect(err).To(BeNil())
-			})
-			It(`Invoke NewRuleConditions successfully`, func() {
-				claim := "testString"
-				operator := "testString"
-				value := "testString"
-				model, err := testService.NewRuleConditions(claim, operator, value)
-				Expect(model).ToNot(BeNil())
-				Expect(err).To(BeNil())
-			})
-		})
-	})
-	Describe(`Utility function tests`, func() {
-		It(`Invoke CreateMockMap() successfully`, func() {
-			mockMap := CreateMockMap()
-			Expect(mockMap).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockByteArray() successfully`, func() {
-			mockByteArray := CreateMockByteArray("This is a test")
-			Expect(mockByteArray).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockUUID() successfully`, func() {
-			mockUUID := CreateMockUUID("9fab83da-98cb-4f18-a7ba-b6f0435c9673")
-			Expect(mockUUID).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockReader() successfully`, func() {
-			mockReader := CreateMockReader("This is a test.")
-			Expect(mockReader).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockDate() successfully`, func() {
-			mockDate := CreateMockDate()
-			Expect(mockDate).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockDateTime() successfully`, func() {
-			mockDateTime := CreateMockDateTime()
-			Expect(mockDateTime).ToNot(BeNil())
-		})
-	})
-})
-
-//
-// Utility functions used by the generated test code
-//
-
-func CreateMockMap() map[string]interface{} {
-	m := make(map[string]interface{})
-	return m
-}
-
-func CreateMockByteArray(mockData string) *[]byte {
-	ba := make([]byte, len(mockData))
-	ba = append(ba, mockData...)
-	return &ba
-}
-
-func CreateMockUUID(mockData string) *strfmt.UUID {
-	uuid := strfmt.UUID(mockData)
-	return &uuid
-}
-
-func CreateMockReader(mockData string) io.ReadCloser {
-	return ioutil.NopCloser(bytes.NewReader([]byte(mockData)))
-}
-
-func CreateMockDate() *strfmt.Date {
-	d := strfmt.Date(time.Now())
-	return &d
-}
-
-func CreateMockDateTime() *strfmt.DateTime {
-	d := strfmt.DateTime(time.Now())
-	return &d
-}
diff --git a/iamidentityservicesv1/iam_identity_services_v1.go b/iamidentityservicesv1/iam_identity_services_v1.go
deleted file mode 100644
index 4e034451..00000000
--- a/iamidentityservicesv1/iam_identity_services_v1.go
+++ /dev/null
@@ -1,2532 +0,0 @@
-/**
- * (C) Copyright IBM Corp. 2020.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// Package iamidentityservicesv1 : Operations and models for the IamIdentityServicesV1 service
-package iamidentityservicesv1
-
-import (
-	"fmt"
-	"github.com/IBM/go-sdk-core/v3/core"
-	"github.com/go-openapi/strfmt"
-	common "github.ibm.com/ibmcloud/platform-services-go-sdk/common"
-)
-
-// IamIdentityServicesV1 : The IAM Identity Service API allows for the management of Identities (Service IDs, ApiKeys).
-//
-// Version: 1.0
-type IamIdentityServicesV1 struct {
-	Service *core.BaseService
-}
-
-// DefaultServiceURL is the default URL to make service requests to.
-const DefaultServiceURL = "https://iam.test.cloud.ibm.com"
-
-// DefaultServiceName is the default key used to find external configuration information.
-const DefaultServiceName = "iam_identity_services"
-
-// IamIdentityServicesV1Options : Service options
-type IamIdentityServicesV1Options struct {
-	ServiceName   string
-	URL           string
-	Authenticator core.Authenticator
-}
-
-// NewIamIdentityServicesV1UsingExternalConfig : constructs an instance of IamIdentityServicesV1 with passed in options and external configuration.
-func NewIamIdentityServicesV1UsingExternalConfig(options *IamIdentityServicesV1Options) (iamIdentityServices *IamIdentityServicesV1, err error) {
-	if options.ServiceName == "" {
-		options.ServiceName = DefaultServiceName
-	}
-
-	if options.Authenticator == nil {
-		options.Authenticator, err = core.GetAuthenticatorFromEnvironment(options.ServiceName)
-		if err != nil {
-			return
-		}
-	}
-
-	iamIdentityServices, err = NewIamIdentityServicesV1(options)
-	if err != nil {
-		return
-	}
-
-	err = iamIdentityServices.Service.ConfigureService(options.ServiceName)
-	if err != nil {
-		return
-	}
-
-	if options.URL != "" {
-		err = iamIdentityServices.Service.SetServiceURL(options.URL)
-	}
-	return
-}
-
-// NewIamIdentityServicesV1 : constructs an instance of IamIdentityServicesV1 with passed in options.
-func NewIamIdentityServicesV1(options *IamIdentityServicesV1Options) (service *IamIdentityServicesV1, err error) {
-	serviceOptions := &core.ServiceOptions{
-		URL:           DefaultServiceURL,
-		Authenticator: options.Authenticator,
-	}
-
-	baseService, err := core.NewBaseService(serviceOptions)
-	if err != nil {
-		return
-	}
-
-	if options.URL != "" {
-		err = baseService.SetServiceURL(options.URL)
-		if err != nil {
-			return
-		}
-	}
-
-	service = &IamIdentityServicesV1{
-		Service: baseService,
-	}
-
-	return
-}
-
-// SetServiceURL sets the service URL
-func (iamIdentityServices *IamIdentityServicesV1) SetServiceURL(url string) error {
-	return iamIdentityServices.Service.SetServiceURL(url)
-}
-
-// ListApiKeys : Get API keys for a given a service or user IAM ID and account ID
-// Returns the list of API key details for a given service or user IAM ID and account ID. Users can manage user API keys
-// for themself, or service ID API keys for service IDs that are bound to an entity they have access to.
-func (iamIdentityServices *IamIdentityServicesV1) ListApiKeys(listApiKeysOptions *ListApiKeysOptions) (result *ListApiKeysResponse, response *core.DetailedResponse, err error) {
-	err = core.ValidateStruct(listApiKeysOptions, "listApiKeysOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v1/apikeys"}
-	pathParameters := []string{}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(iamIdentityServices.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range listApiKeysOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("iam_identity_services", "V1", "ListApiKeys")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	if listApiKeysOptions.AccountID != nil {
-		builder.AddQuery("account_id", fmt.Sprint(*listApiKeysOptions.AccountID))
-	}
-	if listApiKeysOptions.IamID != nil {
-		builder.AddQuery("iam_id", fmt.Sprint(*listApiKeysOptions.IamID))
-	}
-	if listApiKeysOptions.Pagesize != nil {
-		builder.AddQuery("pagesize", fmt.Sprint(*listApiKeysOptions.Pagesize))
-	}
-	if listApiKeysOptions.Pagetoken != nil {
-		builder.AddQuery("pagetoken", fmt.Sprint(*listApiKeysOptions.Pagetoken))
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = iamIdentityServices.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalListApiKeysResponse(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// CreateApiKey : Create an ApiKey
-// Creates an API key for a UserID or service ID. Users can manage user API keys for themself, or service ID API keys
-// for service IDs that are bound to an entity they have access to.
-func (iamIdentityServices *IamIdentityServicesV1) CreateApiKey(createApiKeyOptions *CreateApiKeyOptions) (result *ApiKeyDetails, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(createApiKeyOptions, "createApiKeyOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(createApiKeyOptions, "createApiKeyOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v1/apikeys"}
-	pathParameters := []string{}
-
-	builder := core.NewRequestBuilder(core.POST)
-	_, err = builder.ConstructHTTPURL(iamIdentityServices.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range createApiKeyOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("iam_identity_services", "V1", "CreateApiKey")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-	builder.AddHeader("Content-Type", "application/json")
-	if createApiKeyOptions.EntityLock != nil {
-		builder.AddHeader("Entity-Lock", fmt.Sprint(*createApiKeyOptions.EntityLock))
-	}
-
-	body := make(map[string]interface{})
-	if createApiKeyOptions.Name != nil {
-		body["name"] = createApiKeyOptions.Name
-	}
-	if createApiKeyOptions.IamID != nil {
-		body["iam_id"] = createApiKeyOptions.IamID
-	}
-	if createApiKeyOptions.Description != nil {
-		body["description"] = createApiKeyOptions.Description
-	}
-	if createApiKeyOptions.AccountID != nil {
-		body["account_id"] = createApiKeyOptions.AccountID
-	}
-	if createApiKeyOptions.Apikey != nil {
-		body["apikey"] = createApiKeyOptions.Apikey
-	}
-	_, err = builder.SetBodyContentJSON(body)
-	if err != nil {
-		return
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = iamIdentityServices.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalApiKeyDetails(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// GetApiKeyDetails : Get details of an API key by its value
-// Returns the details of an API key by its value. Users can manage user API keys for themself, or service ID API keys
-// for service IDs that are bound to an entity they have access to.
-func (iamIdentityServices *IamIdentityServicesV1) GetApiKeyDetails(getApiKeyDetailsOptions *GetApiKeyDetailsOptions) (result *ApiKeyDetails, response *core.DetailedResponse, err error) {
-	err = core.ValidateStruct(getApiKeyDetailsOptions, "getApiKeyDetailsOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v1/apikeys/details"}
-	pathParameters := []string{}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(iamIdentityServices.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range getApiKeyDetailsOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("iam_identity_services", "V1", "GetApiKeyDetails")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-	if getApiKeyDetailsOptions.IAMApiKey != nil {
-		builder.AddHeader("IAM-ApiKey", fmt.Sprint(*getApiKeyDetailsOptions.IAMApiKey))
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = iamIdentityServices.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalApiKeyDetails(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// GetApiKey : Get details of an API key
-// Returns the details of an API key. Users can manage user API keys for themself, or service ID API keys for service
-// IDs that are bound to an entity they have access to.
-func (iamIdentityServices *IamIdentityServicesV1) GetApiKey(getApiKeyOptions *GetApiKeyOptions) (result *ApiKeyDetails, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(getApiKeyOptions, "getApiKeyOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(getApiKeyOptions, "getApiKeyOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v1/apikeys"}
-	pathParameters := []string{*getApiKeyOptions.ID}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(iamIdentityServices.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range getApiKeyOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("iam_identity_services", "V1", "GetApiKey")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = iamIdentityServices.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalApiKeyDetails(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// UpdateApiKey : Updates an ApiKey
-// Updates properties of an API key. This does NOT affect existing access tokens. Their token content will stay
-// unchanged until the access token is refreshed. To update an API key, pass the property to be modified. To delete one
-// property's value, pass the property with an empty value "".Users can manage user API keys for themself, or service ID
-// API keys for service IDs that are bound to an entity they have access to.
-func (iamIdentityServices *IamIdentityServicesV1) UpdateApiKey(updateApiKeyOptions *UpdateApiKeyOptions) (result *ApiKeyDetails, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(updateApiKeyOptions, "updateApiKeyOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(updateApiKeyOptions, "updateApiKeyOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v1/apikeys"}
-	pathParameters := []string{*updateApiKeyOptions.ID}
-
-	builder := core.NewRequestBuilder(core.PUT)
-	_, err = builder.ConstructHTTPURL(iamIdentityServices.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range updateApiKeyOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("iam_identity_services", "V1", "UpdateApiKey")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-	builder.AddHeader("Content-Type", "application/json")
-	if updateApiKeyOptions.IfMatch != nil {
-		builder.AddHeader("If-Match", fmt.Sprint(*updateApiKeyOptions.IfMatch))
-	}
-
-	body := make(map[string]interface{})
-	if updateApiKeyOptions.Name != nil {
-		body["name"] = updateApiKeyOptions.Name
-	}
-	if updateApiKeyOptions.Description != nil {
-		body["description"] = updateApiKeyOptions.Description
-	}
-	_, err = builder.SetBodyContentJSON(body)
-	if err != nil {
-		return
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = iamIdentityServices.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalApiKeyDetails(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// DeleteApiKey : Deletes an ApiKey
-// Deletes an API key. Existing tokens will remain valid until expired. Refresh tokens will not work any more for this
-// API key. Users can manage user API keys for themself, or service ID API keys for service IDs that are bound to an
-// entity they have access to.
-func (iamIdentityServices *IamIdentityServicesV1) DeleteApiKey(deleteApiKeyOptions *DeleteApiKeyOptions) (response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(deleteApiKeyOptions, "deleteApiKeyOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(deleteApiKeyOptions, "deleteApiKeyOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v1/apikeys"}
-	pathParameters := []string{*deleteApiKeyOptions.ID}
-
-	builder := core.NewRequestBuilder(core.DELETE)
-	_, err = builder.ConstructHTTPURL(iamIdentityServices.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range deleteApiKeyOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("iam_identity_services", "V1", "DeleteApiKey")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = iamIdentityServices.Service.Request(request, nil)
-
-	return
-}
-
-// LockApiKey : Lock the API key
-// Locks an API key by ID. Users can manage user API keys for themself, or service ID API keys for service IDs that are
-// bound to an entity they have access to.
-func (iamIdentityServices *IamIdentityServicesV1) LockApiKey(lockApiKeyOptions *LockApiKeyOptions) (response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(lockApiKeyOptions, "lockApiKeyOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(lockApiKeyOptions, "lockApiKeyOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v1/apikeys", "lock"}
-	pathParameters := []string{*lockApiKeyOptions.ID}
-
-	builder := core.NewRequestBuilder(core.POST)
-	_, err = builder.ConstructHTTPURL(iamIdentityServices.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range lockApiKeyOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("iam_identity_services", "V1", "LockApiKey")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = iamIdentityServices.Service.Request(request, nil)
-
-	return
-}
-
-// UnlockApiKey : Unlock the API key
-// Unlocks an API key by ID. Users can manage user API keys for themself, or service ID API keys for service IDs that
-// are bound to an entity they have access to.
-func (iamIdentityServices *IamIdentityServicesV1) UnlockApiKey(unlockApiKeyOptions *UnlockApiKeyOptions) (response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(unlockApiKeyOptions, "unlockApiKeyOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(unlockApiKeyOptions, "unlockApiKeyOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v1/apikeys", "lock"}
-	pathParameters := []string{*unlockApiKeyOptions.ID}
-
-	builder := core.NewRequestBuilder(core.DELETE)
-	_, err = builder.ConstructHTTPURL(iamIdentityServices.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range unlockApiKeyOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("iam_identity_services", "V1", "UnlockApiKey")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = iamIdentityServices.Service.Request(request, nil)
-
-	return
-}
-
-// ListServiceIds : List service IDs
-// Returns a list of service IDs. Users can manage user API keys for themself, or service ID API keys for service IDs
-// that are bound to an entity they have access to.
-func (iamIdentityServices *IamIdentityServicesV1) ListServiceIds(listServiceIdsOptions *ListServiceIdsOptions) (result *ServiceIdsList, response *core.DetailedResponse, err error) {
-	err = core.ValidateStruct(listServiceIdsOptions, "listServiceIdsOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v1/serviceids"}
-	pathParameters := []string{}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(iamIdentityServices.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range listServiceIdsOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("iam_identity_services", "V1", "ListServiceIds")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	if listServiceIdsOptions.AccountID != nil {
-		builder.AddQuery("account_id", fmt.Sprint(*listServiceIdsOptions.AccountID))
-	}
-	if listServiceIdsOptions.Name != nil {
-		builder.AddQuery("name", fmt.Sprint(*listServiceIdsOptions.Name))
-	}
-	if listServiceIdsOptions.Pagesize != nil {
-		builder.AddQuery("pagesize", fmt.Sprint(*listServiceIdsOptions.Pagesize))
-	}
-	if listServiceIdsOptions.Pagetoken != nil {
-		builder.AddQuery("pagetoken", fmt.Sprint(*listServiceIdsOptions.Pagetoken))
-	}
-	if listServiceIdsOptions.Sort != nil {
-		builder.AddQuery("sort", fmt.Sprint(*listServiceIdsOptions.Sort))
-	}
-	if listServiceIdsOptions.Order != nil {
-		builder.AddQuery("order", fmt.Sprint(*listServiceIdsOptions.Order))
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = iamIdentityServices.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalServiceIdsList(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// CreateServiceID : Create a service ID
-// Creates a service ID for an IBM Cloud account. Users can manage user API keys for themself, or service ID API keys
-// for service IDs that are bound to an entity they have access to.
-func (iamIdentityServices *IamIdentityServicesV1) CreateServiceID(createServiceIdOptions *CreateServiceIdOptions) (result *ServiceIdDetails, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(createServiceIdOptions, "createServiceIdOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(createServiceIdOptions, "createServiceIdOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v1/serviceids"}
-	pathParameters := []string{}
-
-	builder := core.NewRequestBuilder(core.POST)
-	_, err = builder.ConstructHTTPURL(iamIdentityServices.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range createServiceIdOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("iam_identity_services", "V1", "CreateServiceID")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-	builder.AddHeader("Content-Type", "application/json")
-	if createServiceIdOptions.EntityLock != nil {
-		builder.AddHeader("Entity-Lock", fmt.Sprint(*createServiceIdOptions.EntityLock))
-	}
-
-	body := make(map[string]interface{})
-	if createServiceIdOptions.AccountID != nil {
-		body["account_id"] = createServiceIdOptions.AccountID
-	}
-	if createServiceIdOptions.Name != nil {
-		body["name"] = createServiceIdOptions.Name
-	}
-	if createServiceIdOptions.Description != nil {
-		body["description"] = createServiceIdOptions.Description
-	}
-	if createServiceIdOptions.UniqueInstanceCrns != nil {
-		body["unique_instance_crns"] = createServiceIdOptions.UniqueInstanceCrns
-	}
-	if createServiceIdOptions.Apikey != nil {
-		body["apikey"] = createServiceIdOptions.Apikey
-	}
-	_, err = builder.SetBodyContentJSON(body)
-	if err != nil {
-		return
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = iamIdentityServices.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalServiceIdDetails(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// GetServiceID : Get details of a service ID
-// Returns the details of a service ID. Users can manage user API keys for themself, or service ID API keys for service
-// IDs that are bound to an entity they have access to.
-func (iamIdentityServices *IamIdentityServicesV1) GetServiceID(getServiceIdOptions *GetServiceIdOptions) (result *ServiceIdDetails, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(getServiceIdOptions, "getServiceIdOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(getServiceIdOptions, "getServiceIdOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v1/serviceids"}
-	pathParameters := []string{*getServiceIdOptions.ID}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(iamIdentityServices.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range getServiceIdOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("iam_identity_services", "V1", "GetServiceID")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = iamIdentityServices.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalServiceIdDetails(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// UpdateServiceID : Update service ID
-// Updates properties of a service ID. This does NOT affect existing access tokens. Their token content will stay
-// unchanged until the access token is refreshed. To update a service ID, pass the property to be modified. To delete
-// one property's value, pass the property with an empty value "".Users can manage user API keys for themself, or
-// service ID API keys for service IDs that are bound to an entity they have access to.
-func (iamIdentityServices *IamIdentityServicesV1) UpdateServiceID(updateServiceIdOptions *UpdateServiceIdOptions) (result *ServiceIdDetails, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(updateServiceIdOptions, "updateServiceIdOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(updateServiceIdOptions, "updateServiceIdOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v1/serviceids"}
-	pathParameters := []string{*updateServiceIdOptions.ID}
-
-	builder := core.NewRequestBuilder(core.PUT)
-	_, err = builder.ConstructHTTPURL(iamIdentityServices.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range updateServiceIdOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("iam_identity_services", "V1", "UpdateServiceID")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-	builder.AddHeader("Content-Type", "application/json")
-	if updateServiceIdOptions.IfMatch != nil {
-		builder.AddHeader("If-Match", fmt.Sprint(*updateServiceIdOptions.IfMatch))
-	}
-
-	body := make(map[string]interface{})
-	if updateServiceIdOptions.Name != nil {
-		body["name"] = updateServiceIdOptions.Name
-	}
-	if updateServiceIdOptions.Description != nil {
-		body["description"] = updateServiceIdOptions.Description
-	}
-	if updateServiceIdOptions.UniqueInstanceCrns != nil {
-		body["unique_instance_crns"] = updateServiceIdOptions.UniqueInstanceCrns
-	}
-	_, err = builder.SetBodyContentJSON(body)
-	if err != nil {
-		return
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = iamIdentityServices.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalServiceIdDetails(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// DeleteServiceID : Deletes a service ID and associated API keys
-// Deletes a service ID and all API keys associated to it. Before deleting the service ID, all associated API keys are
-// deleted. In case a Delete Conflict (status code 409) a retry of the request may help as the service ID is only
-// deleted if the associated API keys were successfully deleted before. Users can manage user API keys for themself, or
-// service ID API keys for service IDs that are bound to an entity they have access to.
-func (iamIdentityServices *IamIdentityServicesV1) DeleteServiceID(deleteServiceIdOptions *DeleteServiceIdOptions) (response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(deleteServiceIdOptions, "deleteServiceIdOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(deleteServiceIdOptions, "deleteServiceIdOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v1/serviceids"}
-	pathParameters := []string{*deleteServiceIdOptions.ID}
-
-	builder := core.NewRequestBuilder(core.DELETE)
-	_, err = builder.ConstructHTTPURL(iamIdentityServices.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range deleteServiceIdOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("iam_identity_services", "V1", "DeleteServiceID")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = iamIdentityServices.Service.Request(request, nil)
-
-	return
-}
-
-// LockServiceID : Lock the service ID
-// Locks a service ID by ID. Users can manage user API keys for themself, or service ID API keys for service IDs that
-// are bound to an entity they have access to.
-func (iamIdentityServices *IamIdentityServicesV1) LockServiceID(lockServiceIdOptions *LockServiceIdOptions) (result *ServiceIdDetails, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(lockServiceIdOptions, "lockServiceIdOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(lockServiceIdOptions, "lockServiceIdOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v1/serviceids", "lock"}
-	pathParameters := []string{*lockServiceIdOptions.ID}
-
-	builder := core.NewRequestBuilder(core.POST)
-	_, err = builder.ConstructHTTPURL(iamIdentityServices.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range lockServiceIdOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("iam_identity_services", "V1", "LockServiceID")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = iamIdentityServices.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalServiceIdDetails(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// UnlockServiceID : Unlock the service ID
-// Unlocks a service ID by ID. Users can manage user API keys for themself, or service ID API keys for service IDs that
-// are bound to an entity they have access to.
-func (iamIdentityServices *IamIdentityServicesV1) UnlockServiceID(unlockServiceIdOptions *UnlockServiceIdOptions) (result *ServiceIdDetails, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(unlockServiceIdOptions, "unlockServiceIdOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(unlockServiceIdOptions, "unlockServiceIdOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v1/serviceids", "lock"}
-	pathParameters := []string{*unlockServiceIdOptions.ID}
-
-	builder := core.NewRequestBuilder(core.DELETE)
-	_, err = builder.ConstructHTTPURL(iamIdentityServices.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range unlockServiceIdOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("iam_identity_services", "V1", "UnlockServiceID")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = iamIdentityServices.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalServiceIdDetails(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// ApiKeyDetails : Response body format for API key V1 REST requests.
-type ApiKeyDetails struct {
-	// Context with key properties for problem determination.
-	Context *ResponseContext `json:"context,omitempty"`
-
-	// Unique identifier of this API Key.
-	ID *string `json:"id" validate:"required"`
-
-	// Version of the API Key details object. You need to specify this value when updating the API key to avoid stale
-	// updates.
-	EntityTag *string `json:"entity_tag,omitempty"`
-
-	// Cloud Resource Name of the item. Example Cloud Resource Name:
-	// 'crn:v1:bluemix:public:iam-identity:us-south:a/myaccount::apikey:1234-9012-5678'.
-	Crn *string `json:"crn" validate:"required"`
-
-	// The API key cannot be changed if set to true.
-	Locked *bool `json:"locked" validate:"required"`
-
-	// If set contains a date time string of the creation date in ISO format.
-	CreatedAt *strfmt.DateTime `json:"created_at,omitempty"`
-
-	// If set contains a date time string of the last modification date in ISO format.
-	ModifiedAt *strfmt.DateTime `json:"modified_at,omitempty"`
-
-	// Name of the API key. The name is not checked for uniqueness. Therefore multiple names with the same value can exist.
-	// Access is done via the UUID of the API key.
-	Name *string `json:"name" validate:"required"`
-
-	// The optional description of the API key. The 'description' property is only available if a description was provided
-	// during a create of an API key.
-	Description *string `json:"description,omitempty"`
-
-	// The iam_id that this API key authenticates.
-	IamID *string `json:"iam_id" validate:"required"`
-
-	// ID of the account that this API key authenticates for.
-	AccountID *string `json:"account_id" validate:"required"`
-
-	// The API key value. For API keys representing a user, this is only returned in the response to the create API key
-	// request.
-	Apikey *string `json:"apikey" validate:"required"`
-}
-
-
-// UnmarshalApiKeyDetails constructs an instance of ApiKeyDetails from the specified map.
-func UnmarshalApiKeyDetails(m map[string]interface{}) (result *ApiKeyDetails, err error) {
-	obj := new(ApiKeyDetails)
-	obj.Context, err = UnmarshalResponseContextAsProperty(m, "context")
-	if err != nil {
-		return
-	}
-	obj.ID, err = core.UnmarshalString(m, "id")
-	if err != nil {
-		return
-	}
-	obj.EntityTag, err = core.UnmarshalString(m, "entity_tag")
-	if err != nil {
-		return
-	}
-	obj.Crn, err = core.UnmarshalString(m, "crn")
-	if err != nil {
-		return
-	}
-	obj.Locked, err = core.UnmarshalBool(m, "locked")
-	if err != nil {
-		return
-	}
-	obj.CreatedAt, err = core.UnmarshalDateTime(m, "created_at")
-	if err != nil {
-		return
-	}
-	obj.ModifiedAt, err = core.UnmarshalDateTime(m, "modified_at")
-	if err != nil {
-		return
-	}
-	obj.Name, err = core.UnmarshalString(m, "name")
-	if err != nil {
-		return
-	}
-	obj.Description, err = core.UnmarshalString(m, "description")
-	if err != nil {
-		return
-	}
-	obj.IamID, err = core.UnmarshalString(m, "iam_id")
-	if err != nil {
-		return
-	}
-	obj.AccountID, err = core.UnmarshalString(m, "account_id")
-	if err != nil {
-		return
-	}
-	obj.Apikey, err = core.UnmarshalString(m, "apikey")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalApiKeyDetailsSlice unmarshals a slice of ApiKeyDetails instances from the specified list of maps.
-func UnmarshalApiKeyDetailsSlice(s []interface{}) (slice []ApiKeyDetails, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'ApiKeyDetails'")
-			return
-		}
-		obj, e := UnmarshalApiKeyDetails(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalApiKeyDetailsAsProperty unmarshals an instance of ApiKeyDetails that is stored as a property
-// within the specified map.
-func UnmarshalApiKeyDetailsAsProperty(m map[string]interface{}, propertyName string) (result *ApiKeyDetails, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'ApiKeyDetails'", propertyName)
-			return
-		}
-		result, err = UnmarshalApiKeyDetails(objMap)
-	}
-	return
-}
-
-// UnmarshalApiKeyDetailsSliceAsProperty unmarshals a slice of ApiKeyDetails instances that are stored as a property
-// within the specified map.
-func UnmarshalApiKeyDetailsSliceAsProperty(m map[string]interface{}, propertyName string) (slice []ApiKeyDetails, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'ApiKeyDetails'", propertyName)
-			return
-		}
-		slice, err = UnmarshalApiKeyDetailsSlice(vSlice)
-	}
-	return
-}
-
-// CreateApiKeyOptions : The CreateApiKey options.
-type CreateApiKeyOptions struct {
-	// Name of the API key. The name is not checked for uniqueness. Therefore multiple names with the same value can exist.
-	// Access is done via the UUID of the API key.
-	Name *string `json:"name" validate:"required"`
-
-	// The iam_id that this API key authenticates.
-	IamID *string `json:"iam_id" validate:"required"`
-
-	// The optional description of the API key. The 'description' property is only available if a description was provided
-	// during a create of an API key.
-	Description *string `json:"description,omitempty"`
-
-	// The account ID of the API key.
-	AccountID *string `json:"account_id,omitempty"`
-
-	// You can optionally passthrough the API key value for this API key. If passed, NO validation of that apiKey value is
-	// done, i.e. the value can be non-URL safe. If omitted, the API key management will create an URL safe opaque API key
-	// value. The value of the API key is checked for uniqueness. Please ensure enough variations when passing in this
-	// value.
-	Apikey *string `json:"apikey,omitempty"`
-
-	// Indicates if the API key is locked for further write operations. False by default.
-	EntityLock *string `json:"Entity-Lock,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewCreateApiKeyOptions : Instantiate CreateApiKeyOptions
-func (*IamIdentityServicesV1) NewCreateApiKeyOptions(name string, iamID string) *CreateApiKeyOptions {
-	return &CreateApiKeyOptions{
-		Name: core.StringPtr(name),
-		IamID: core.StringPtr(iamID),
-	}
-}
-
-// SetName : Allow user to set Name
-func (options *CreateApiKeyOptions) SetName(name string) *CreateApiKeyOptions {
-	options.Name = core.StringPtr(name)
-	return options
-}
-
-// SetIamID : Allow user to set IamID
-func (options *CreateApiKeyOptions) SetIamID(iamID string) *CreateApiKeyOptions {
-	options.IamID = core.StringPtr(iamID)
-	return options
-}
-
-// SetDescription : Allow user to set Description
-func (options *CreateApiKeyOptions) SetDescription(description string) *CreateApiKeyOptions {
-	options.Description = core.StringPtr(description)
-	return options
-}
-
-// SetAccountID : Allow user to set AccountID
-func (options *CreateApiKeyOptions) SetAccountID(accountID string) *CreateApiKeyOptions {
-	options.AccountID = core.StringPtr(accountID)
-	return options
-}
-
-// SetApikey : Allow user to set Apikey
-func (options *CreateApiKeyOptions) SetApikey(apikey string) *CreateApiKeyOptions {
-	options.Apikey = core.StringPtr(apikey)
-	return options
-}
-
-// SetEntityLock : Allow user to set EntityLock
-func (options *CreateApiKeyOptions) SetEntityLock(entityLock string) *CreateApiKeyOptions {
-	options.EntityLock = core.StringPtr(entityLock)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *CreateApiKeyOptions) SetHeaders(param map[string]string) *CreateApiKeyOptions {
-	options.Headers = param
-	return options
-}
-
-// CreateApiKeyRequest : Input body parameters for the Create API key V1 REST request.
-type CreateApiKeyRequest struct {
-	// Name of the API key. The name is not checked for uniqueness. Therefore multiple names with the same value can exist.
-	// Access is done via the UUID of the API key.
-	Name *string `json:"name" validate:"required"`
-
-	// The optional description of the API key. The 'description' property is only available if a description was provided
-	// during a create of an API key.
-	Description *string `json:"description,omitempty"`
-
-	// The iam_id that this API key authenticates.
-	IamID *string `json:"iam_id" validate:"required"`
-
-	// The account ID of the API key.
-	AccountID *string `json:"account_id,omitempty"`
-
-	// You can optionally passthrough the API key value for this API key. If passed, NO validation of that apiKey value is
-	// done, i.e. the value can be non-URL safe. If omitted, the API key management will create an URL safe opaque API key
-	// value. The value of the API key is checked for uniqueness. Please ensure enough variations when passing in this
-	// value.
-	Apikey *string `json:"apikey,omitempty"`
-}
-
-
-// NewCreateApiKeyRequest : Instantiate CreateApiKeyRequest (Generic Model Constructor)
-func (*IamIdentityServicesV1) NewCreateApiKeyRequest(name string, iamID string) (model *CreateApiKeyRequest, err error) {
-	model = &CreateApiKeyRequest{
-		Name: core.StringPtr(name),
-		IamID: core.StringPtr(iamID),
-	}
-	err = core.ValidateStruct(model, "required parameters")
-	return
-}
-
-// UnmarshalCreateApiKeyRequest constructs an instance of CreateApiKeyRequest from the specified map.
-func UnmarshalCreateApiKeyRequest(m map[string]interface{}) (result *CreateApiKeyRequest, err error) {
-	obj := new(CreateApiKeyRequest)
-	obj.Name, err = core.UnmarshalString(m, "name")
-	if err != nil {
-		return
-	}
-	obj.Description, err = core.UnmarshalString(m, "description")
-	if err != nil {
-		return
-	}
-	obj.IamID, err = core.UnmarshalString(m, "iam_id")
-	if err != nil {
-		return
-	}
-	obj.AccountID, err = core.UnmarshalString(m, "account_id")
-	if err != nil {
-		return
-	}
-	obj.Apikey, err = core.UnmarshalString(m, "apikey")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalCreateApiKeyRequestSlice unmarshals a slice of CreateApiKeyRequest instances from the specified list of maps.
-func UnmarshalCreateApiKeyRequestSlice(s []interface{}) (slice []CreateApiKeyRequest, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'CreateApiKeyRequest'")
-			return
-		}
-		obj, e := UnmarshalCreateApiKeyRequest(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalCreateApiKeyRequestAsProperty unmarshals an instance of CreateApiKeyRequest that is stored as a property
-// within the specified map.
-func UnmarshalCreateApiKeyRequestAsProperty(m map[string]interface{}, propertyName string) (result *CreateApiKeyRequest, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'CreateApiKeyRequest'", propertyName)
-			return
-		}
-		result, err = UnmarshalCreateApiKeyRequest(objMap)
-	}
-	return
-}
-
-// UnmarshalCreateApiKeyRequestSliceAsProperty unmarshals a slice of CreateApiKeyRequest instances that are stored as a property
-// within the specified map.
-func UnmarshalCreateApiKeyRequestSliceAsProperty(m map[string]interface{}, propertyName string) (slice []CreateApiKeyRequest, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'CreateApiKeyRequest'", propertyName)
-			return
-		}
-		slice, err = UnmarshalCreateApiKeyRequestSlice(vSlice)
-	}
-	return
-}
-
-// CreateServiceIdOptions : The CreateServiceID options.
-type CreateServiceIdOptions struct {
-	// ID of the account the service ID belongs to.
-	AccountID *string `json:"account_id" validate:"required"`
-
-	// Name of the service ID. The name is not checked for uniqueness. Therefore multiple names with the same value can
-	// exist. Access is done via the UUID of the Service Id.
-	Name *string `json:"name" validate:"required"`
-
-	// The optional description of the Service Id. The 'description' property is only available if a description was
-	// provided during a create of a ServiceId.
-	Description *string `json:"description,omitempty"`
-
-	// Optional list of CRNs (string array) which point to the services connected to the service ID.
-	UniqueInstanceCrns []string `json:"unique_instance_crns,omitempty"`
-
-	// Input body parameters for the Create API key V1 REST request.
-	Apikey *CreateApiKeyRequest `json:"apikey,omitempty"`
-
-	// Indicates if the service ID is locked for further write operations. False by default.
-	EntityLock *string `json:"Entity-Lock,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewCreateServiceIdOptions : Instantiate CreateServiceIdOptions
-func (*IamIdentityServicesV1) NewCreateServiceIdOptions(accountID string, name string) *CreateServiceIdOptions {
-	return &CreateServiceIdOptions{
-		AccountID: core.StringPtr(accountID),
-		Name: core.StringPtr(name),
-	}
-}
-
-// SetAccountID : Allow user to set AccountID
-func (options *CreateServiceIdOptions) SetAccountID(accountID string) *CreateServiceIdOptions {
-	options.AccountID = core.StringPtr(accountID)
-	return options
-}
-
-// SetName : Allow user to set Name
-func (options *CreateServiceIdOptions) SetName(name string) *CreateServiceIdOptions {
-	options.Name = core.StringPtr(name)
-	return options
-}
-
-// SetDescription : Allow user to set Description
-func (options *CreateServiceIdOptions) SetDescription(description string) *CreateServiceIdOptions {
-	options.Description = core.StringPtr(description)
-	return options
-}
-
-// SetUniqueInstanceCrns : Allow user to set UniqueInstanceCrns
-func (options *CreateServiceIdOptions) SetUniqueInstanceCrns(uniqueInstanceCrns []string) *CreateServiceIdOptions {
-	options.UniqueInstanceCrns = uniqueInstanceCrns
-	return options
-}
-
-// SetApikey : Allow user to set Apikey
-func (options *CreateServiceIdOptions) SetApikey(apikey *CreateApiKeyRequest) *CreateServiceIdOptions {
-	options.Apikey = apikey
-	return options
-}
-
-// SetEntityLock : Allow user to set EntityLock
-func (options *CreateServiceIdOptions) SetEntityLock(entityLock string) *CreateServiceIdOptions {
-	options.EntityLock = core.StringPtr(entityLock)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *CreateServiceIdOptions) SetHeaders(param map[string]string) *CreateServiceIdOptions {
-	options.Headers = param
-	return options
-}
-
-// DeleteApiKeyOptions : The DeleteApiKey options.
-type DeleteApiKeyOptions struct {
-	// Unique ID of the API key.
-	ID *string `json:"id" validate:"required"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewDeleteApiKeyOptions : Instantiate DeleteApiKeyOptions
-func (*IamIdentityServicesV1) NewDeleteApiKeyOptions(id string) *DeleteApiKeyOptions {
-	return &DeleteApiKeyOptions{
-		ID: core.StringPtr(id),
-	}
-}
-
-// SetID : Allow user to set ID
-func (options *DeleteApiKeyOptions) SetID(id string) *DeleteApiKeyOptions {
-	options.ID = core.StringPtr(id)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *DeleteApiKeyOptions) SetHeaders(param map[string]string) *DeleteApiKeyOptions {
-	options.Headers = param
-	return options
-}
-
-// DeleteServiceIdOptions : The DeleteServiceID options.
-type DeleteServiceIdOptions struct {
-	// Unique ID of the service ID.
-	ID *string `json:"id" validate:"required"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewDeleteServiceIdOptions : Instantiate DeleteServiceIdOptions
-func (*IamIdentityServicesV1) NewDeleteServiceIdOptions(id string) *DeleteServiceIdOptions {
-	return &DeleteServiceIdOptions{
-		ID: core.StringPtr(id),
-	}
-}
-
-// SetID : Allow user to set ID
-func (options *DeleteServiceIdOptions) SetID(id string) *DeleteServiceIdOptions {
-	options.ID = core.StringPtr(id)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *DeleteServiceIdOptions) SetHeaders(param map[string]string) *DeleteServiceIdOptions {
-	options.Headers = param
-	return options
-}
-
-// ExceptionResponseContext : Context fill with key properties for problem determination.
-type ExceptionResponseContext struct {
-	// The request ID of the inbound REST request.
-	RequestID *string `json:"requestId,omitempty"`
-
-	// The request type of the inbound REST request.
-	RequestType *string `json:"requestType,omitempty"`
-
-	// The user agent of the inbound REST request.
-	UserAgent *string `json:"userAgent,omitempty"`
-
-	// The client ip address of the inbound REST request.
-	ClientIp *string `json:"clientIp,omitempty"`
-
-	// The URL of that cluster.
-	URL *string `json:"url,omitempty"`
-
-	// The instance ID of the server instance processing the request.
-	InstanceID *string `json:"instanceId,omitempty"`
-
-	// The thread ID of the server instance processing the request.
-	ThreadID *string `json:"threadId,omitempty"`
-
-	// The host of the server instance processing the request.
-	Host *string `json:"host,omitempty"`
-
-	// The start time of the request.
-	StartTime *string `json:"startTime,omitempty"`
-
-	// The finish time of the request.
-	EndTime *string `json:"endTime,omitempty"`
-
-	// The elapsed time in msec.
-	ElapsedTime *string `json:"elapsedTime,omitempty"`
-
-	// The language used to present the error message.
-	Locale *string `json:"locale,omitempty"`
-
-	// The cluster name.
-	ClusterName *string `json:"clusterName,omitempty"`
-}
-
-
-// UnmarshalExceptionResponseContext constructs an instance of ExceptionResponseContext from the specified map.
-func UnmarshalExceptionResponseContext(m map[string]interface{}) (result *ExceptionResponseContext, err error) {
-	obj := new(ExceptionResponseContext)
-	obj.RequestID, err = core.UnmarshalString(m, "requestId")
-	if err != nil {
-		return
-	}
-	obj.RequestType, err = core.UnmarshalString(m, "requestType")
-	if err != nil {
-		return
-	}
-	obj.UserAgent, err = core.UnmarshalString(m, "userAgent")
-	if err != nil {
-		return
-	}
-	obj.ClientIp, err = core.UnmarshalString(m, "clientIp")
-	if err != nil {
-		return
-	}
-	obj.URL, err = core.UnmarshalString(m, "url")
-	if err != nil {
-		return
-	}
-	obj.InstanceID, err = core.UnmarshalString(m, "instanceId")
-	if err != nil {
-		return
-	}
-	obj.ThreadID, err = core.UnmarshalString(m, "threadId")
-	if err != nil {
-		return
-	}
-	obj.Host, err = core.UnmarshalString(m, "host")
-	if err != nil {
-		return
-	}
-	obj.StartTime, err = core.UnmarshalString(m, "startTime")
-	if err != nil {
-		return
-	}
-	obj.EndTime, err = core.UnmarshalString(m, "endTime")
-	if err != nil {
-		return
-	}
-	obj.ElapsedTime, err = core.UnmarshalString(m, "elapsedTime")
-	if err != nil {
-		return
-	}
-	obj.Locale, err = core.UnmarshalString(m, "locale")
-	if err != nil {
-		return
-	}
-	obj.ClusterName, err = core.UnmarshalString(m, "clusterName")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalExceptionResponseContextSlice unmarshals a slice of ExceptionResponseContext instances from the specified list of maps.
-func UnmarshalExceptionResponseContextSlice(s []interface{}) (slice []ExceptionResponseContext, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'ExceptionResponseContext'")
-			return
-		}
-		obj, e := UnmarshalExceptionResponseContext(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalExceptionResponseContextAsProperty unmarshals an instance of ExceptionResponseContext that is stored as a property
-// within the specified map.
-func UnmarshalExceptionResponseContextAsProperty(m map[string]interface{}, propertyName string) (result *ExceptionResponseContext, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'ExceptionResponseContext'", propertyName)
-			return
-		}
-		result, err = UnmarshalExceptionResponseContext(objMap)
-	}
-	return
-}
-
-// UnmarshalExceptionResponseContextSliceAsProperty unmarshals a slice of ExceptionResponseContext instances that are stored as a property
-// within the specified map.
-func UnmarshalExceptionResponseContextSliceAsProperty(m map[string]interface{}, propertyName string) (slice []ExceptionResponseContext, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'ExceptionResponseContext'", propertyName)
-			return
-		}
-		slice, err = UnmarshalExceptionResponseContextSlice(vSlice)
-	}
-	return
-}
-
-// GetApiKeyDetailsOptions : The GetApiKeyDetails options.
-type GetApiKeyDetailsOptions struct {
-	// API key value.
-	IAMApiKey *string `json:"IAM-ApiKey,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewGetApiKeyDetailsOptions : Instantiate GetApiKeyDetailsOptions
-func (*IamIdentityServicesV1) NewGetApiKeyDetailsOptions() *GetApiKeyDetailsOptions {
-	return &GetApiKeyDetailsOptions{}
-}
-
-// SetIAMApiKey : Allow user to set IAMApiKey
-func (options *GetApiKeyDetailsOptions) SetIAMApiKey(iAMApiKey string) *GetApiKeyDetailsOptions {
-	options.IAMApiKey = core.StringPtr(iAMApiKey)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *GetApiKeyDetailsOptions) SetHeaders(param map[string]string) *GetApiKeyDetailsOptions {
-	options.Headers = param
-	return options
-}
-
-// GetApiKeyOptions : The GetApiKey options.
-type GetApiKeyOptions struct {
-	// Unique ID of the API key.
-	ID *string `json:"id" validate:"required"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewGetApiKeyOptions : Instantiate GetApiKeyOptions
-func (*IamIdentityServicesV1) NewGetApiKeyOptions(id string) *GetApiKeyOptions {
-	return &GetApiKeyOptions{
-		ID: core.StringPtr(id),
-	}
-}
-
-// SetID : Allow user to set ID
-func (options *GetApiKeyOptions) SetID(id string) *GetApiKeyOptions {
-	options.ID = core.StringPtr(id)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *GetApiKeyOptions) SetHeaders(param map[string]string) *GetApiKeyOptions {
-	options.Headers = param
-	return options
-}
-
-// GetServiceIdOptions : The GetServiceID options.
-type GetServiceIdOptions struct {
-	// Unique ID of the service ID.
-	ID *string `json:"id" validate:"required"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewGetServiceIdOptions : Instantiate GetServiceIdOptions
-func (*IamIdentityServicesV1) NewGetServiceIdOptions(id string) *GetServiceIdOptions {
-	return &GetServiceIdOptions{
-		ID: core.StringPtr(id),
-	}
-}
-
-// SetID : Allow user to set ID
-func (options *GetServiceIdOptions) SetID(id string) *GetServiceIdOptions {
-	options.ID = core.StringPtr(id)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *GetServiceIdOptions) SetHeaders(param map[string]string) *GetServiceIdOptions {
-	options.Headers = param
-	return options
-}
-
-// ListApiKeysOptions : The ListApiKeys options.
-type ListApiKeysOptions struct {
-	// Account ID of the API keys(s) to query. If a service IAM ID is specified in iam_id then account_id must match the
-	// account of the IAM ID. If a user IAM ID is specified in iam_id then then account_id must match the account of the
-	// Authorization token.
-	AccountID *string `json:"account_id,omitempty"`
-
-	// IAM ID of the API key(s) to be queried. The IAM ID may be that of a user or a service. For a user IAM ID iam_id must
-	// match the Authorization token.
-	IamID *string `json:"iam_id,omitempty"`
-
-	// Optional size of a single page. Default is 20 items per page. Valid range is 1 to 100.
-	Pagesize *string `json:"pagesize,omitempty"`
-
-	// Optional Prev or Next page token returned from a previous query execution. Default is start with first page.
-	Pagetoken *string `json:"pagetoken,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewListApiKeysOptions : Instantiate ListApiKeysOptions
-func (*IamIdentityServicesV1) NewListApiKeysOptions() *ListApiKeysOptions {
-	return &ListApiKeysOptions{}
-}
-
-// SetAccountID : Allow user to set AccountID
-func (options *ListApiKeysOptions) SetAccountID(accountID string) *ListApiKeysOptions {
-	options.AccountID = core.StringPtr(accountID)
-	return options
-}
-
-// SetIamID : Allow user to set IamID
-func (options *ListApiKeysOptions) SetIamID(iamID string) *ListApiKeysOptions {
-	options.IamID = core.StringPtr(iamID)
-	return options
-}
-
-// SetPagesize : Allow user to set Pagesize
-func (options *ListApiKeysOptions) SetPagesize(pagesize string) *ListApiKeysOptions {
-	options.Pagesize = core.StringPtr(pagesize)
-	return options
-}
-
-// SetPagetoken : Allow user to set Pagetoken
-func (options *ListApiKeysOptions) SetPagetoken(pagetoken string) *ListApiKeysOptions {
-	options.Pagetoken = core.StringPtr(pagetoken)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *ListApiKeysOptions) SetHeaders(param map[string]string) *ListApiKeysOptions {
-	options.Headers = param
-	return options
-}
-
-// ListApiKeysResponse : Response body format for the List API keys V1 REST request.
-type ListApiKeysResponse struct {
-	// Context fill with key properties for problem determination.
-	Context *ExceptionResponseContext `json:"context,omitempty"`
-
-	// The offset of the current page.
-	Offset *int64 `json:"offset,omitempty"`
-
-	// Optional size of a single page. Default is 20 items per page. Valid range is 1 to 100.
-	Limit *int64 `json:"limit,omitempty"`
-
-	// Link to the first page.
-	First *string `json:"first,omitempty"`
-
-	// Link to the previous available page. If 'previous' property is not part of the response no previous page is
-	// available.
-	Previous *string `json:"previous,omitempty"`
-
-	// Link to the next available page. If 'next' property is not part of the response no next page is available.
-	Next *string `json:"next,omitempty"`
-
-	// List of API keys based on the query paramters and the page size. The apikeys array is always part of the response
-	// but might be empty depending on the query parameters values provided.
-	Apikeys []ApiKeyDetails `json:"apikeys" validate:"required"`
-}
-
-
-// UnmarshalListApiKeysResponse constructs an instance of ListApiKeysResponse from the specified map.
-func UnmarshalListApiKeysResponse(m map[string]interface{}) (result *ListApiKeysResponse, err error) {
-	obj := new(ListApiKeysResponse)
-	obj.Context, err = UnmarshalExceptionResponseContextAsProperty(m, "context")
-	if err != nil {
-		return
-	}
-	obj.Offset, err = core.UnmarshalInt64(m, "offset")
-	if err != nil {
-		return
-	}
-	obj.Limit, err = core.UnmarshalInt64(m, "limit")
-	if err != nil {
-		return
-	}
-	obj.First, err = core.UnmarshalString(m, "first")
-	if err != nil {
-		return
-	}
-	obj.Previous, err = core.UnmarshalString(m, "previous")
-	if err != nil {
-		return
-	}
-	obj.Next, err = core.UnmarshalString(m, "next")
-	if err != nil {
-		return
-	}
-	obj.Apikeys, err = UnmarshalApiKeyDetailsSliceAsProperty(m, "apikeys")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalListApiKeysResponseSlice unmarshals a slice of ListApiKeysResponse instances from the specified list of maps.
-func UnmarshalListApiKeysResponseSlice(s []interface{}) (slice []ListApiKeysResponse, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'ListApiKeysResponse'")
-			return
-		}
-		obj, e := UnmarshalListApiKeysResponse(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalListApiKeysResponseAsProperty unmarshals an instance of ListApiKeysResponse that is stored as a property
-// within the specified map.
-func UnmarshalListApiKeysResponseAsProperty(m map[string]interface{}, propertyName string) (result *ListApiKeysResponse, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'ListApiKeysResponse'", propertyName)
-			return
-		}
-		result, err = UnmarshalListApiKeysResponse(objMap)
-	}
-	return
-}
-
-// UnmarshalListApiKeysResponseSliceAsProperty unmarshals a slice of ListApiKeysResponse instances that are stored as a property
-// within the specified map.
-func UnmarshalListApiKeysResponseSliceAsProperty(m map[string]interface{}, propertyName string) (slice []ListApiKeysResponse, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'ListApiKeysResponse'", propertyName)
-			return
-		}
-		slice, err = UnmarshalListApiKeysResponseSlice(vSlice)
-	}
-	return
-}
-
-// ListServiceIdsOptions : The ListServiceIds options.
-type ListServiceIdsOptions struct {
-	// Account ID of the service ID(s) to query. This parameter is required (unless using a pagetoken).
-	AccountID *string `json:"account_id,omitempty"`
-
-	// Name of the service ID(s) to query. Optional.20 items per page.
-	Name *string `json:"name,omitempty"`
-
-	// Optional size of a single page. Default is 20 items per page. Valid range is 1 to 100.
-	Pagesize *string `json:"pagesize,omitempty"`
-
-	// Optional Prev or Next page token returned from a previous query execution. Default is start with first page.
-	Pagetoken *string `json:"pagetoken,omitempty"`
-
-	// Optional sort property, valid values are name, description, createdAt and modifiedAt. If specified, the items are
-	// sorted by the value of this property.
-	Sort *string `json:"sort,omitempty"`
-
-	// Optional sort order, valid values are asc and desc. Default: asc.
-	Order *string `json:"order,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewListServiceIdsOptions : Instantiate ListServiceIdsOptions
-func (*IamIdentityServicesV1) NewListServiceIdsOptions() *ListServiceIdsOptions {
-	return &ListServiceIdsOptions{}
-}
-
-// SetAccountID : Allow user to set AccountID
-func (options *ListServiceIdsOptions) SetAccountID(accountID string) *ListServiceIdsOptions {
-	options.AccountID = core.StringPtr(accountID)
-	return options
-}
-
-// SetName : Allow user to set Name
-func (options *ListServiceIdsOptions) SetName(name string) *ListServiceIdsOptions {
-	options.Name = core.StringPtr(name)
-	return options
-}
-
-// SetPagesize : Allow user to set Pagesize
-func (options *ListServiceIdsOptions) SetPagesize(pagesize string) *ListServiceIdsOptions {
-	options.Pagesize = core.StringPtr(pagesize)
-	return options
-}
-
-// SetPagetoken : Allow user to set Pagetoken
-func (options *ListServiceIdsOptions) SetPagetoken(pagetoken string) *ListServiceIdsOptions {
-	options.Pagetoken = core.StringPtr(pagetoken)
-	return options
-}
-
-// SetSort : Allow user to set Sort
-func (options *ListServiceIdsOptions) SetSort(sort string) *ListServiceIdsOptions {
-	options.Sort = core.StringPtr(sort)
-	return options
-}
-
-// SetOrder : Allow user to set Order
-func (options *ListServiceIdsOptions) SetOrder(order string) *ListServiceIdsOptions {
-	options.Order = core.StringPtr(order)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *ListServiceIdsOptions) SetHeaders(param map[string]string) *ListServiceIdsOptions {
-	options.Headers = param
-	return options
-}
-
-// LockApiKeyOptions : The LockApiKey options.
-type LockApiKeyOptions struct {
-	// Unique ID of the API key.
-	ID *string `json:"id" validate:"required"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewLockApiKeyOptions : Instantiate LockApiKeyOptions
-func (*IamIdentityServicesV1) NewLockApiKeyOptions(id string) *LockApiKeyOptions {
-	return &LockApiKeyOptions{
-		ID: core.StringPtr(id),
-	}
-}
-
-// SetID : Allow user to set ID
-func (options *LockApiKeyOptions) SetID(id string) *LockApiKeyOptions {
-	options.ID = core.StringPtr(id)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *LockApiKeyOptions) SetHeaders(param map[string]string) *LockApiKeyOptions {
-	options.Headers = param
-	return options
-}
-
-// LockServiceIdOptions : The LockServiceID options.
-type LockServiceIdOptions struct {
-	// Unique ID of the service ID.
-	ID *string `json:"id" validate:"required"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewLockServiceIdOptions : Instantiate LockServiceIdOptions
-func (*IamIdentityServicesV1) NewLockServiceIdOptions(id string) *LockServiceIdOptions {
-	return &LockServiceIdOptions{
-		ID: core.StringPtr(id),
-	}
-}
-
-// SetID : Allow user to set ID
-func (options *LockServiceIdOptions) SetID(id string) *LockServiceIdOptions {
-	options.ID = core.StringPtr(id)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *LockServiceIdOptions) SetHeaders(param map[string]string) *LockServiceIdOptions {
-	options.Headers = param
-	return options
-}
-
-// ResponseContext : Context with key properties for problem determination.
-type ResponseContext struct {
-	// The transaction ID of the inbound REST request.
-	TransactionID *string `json:"transaction_id,omitempty"`
-
-	// The operation of the inbound REST request.
-	Operation *string `json:"operation,omitempty"`
-
-	// The user agent of the inbound REST request.
-	UserAgent *string `json:"user_agent,omitempty"`
-
-	// The client ip address of the inbound REST request.
-	ClientIp *string `json:"client_ip,omitempty"`
-
-	// The URL of that cluster.
-	URL *string `json:"url,omitempty"`
-
-	// The instance ID of the server instance processing the request.
-	InstanceID *string `json:"instance_id,omitempty"`
-
-	// The thread ID of the server instance processing the request.
-	ThreadID *string `json:"thread_id,omitempty"`
-
-	// The host of the server instance processing the request.
-	Host *string `json:"host,omitempty"`
-
-	// The start time of the request.
-	StartTime *string `json:"start_time,omitempty"`
-
-	// The finish time of the request.
-	EndTime *string `json:"end_time,omitempty"`
-
-	// The elapsed time in msec.
-	ElapsedTime *string `json:"elapsed_time,omitempty"`
-
-	// The cluster name.
-	ClusterName *string `json:"cluster_name,omitempty"`
-}
-
-
-// UnmarshalResponseContext constructs an instance of ResponseContext from the specified map.
-func UnmarshalResponseContext(m map[string]interface{}) (result *ResponseContext, err error) {
-	obj := new(ResponseContext)
-	obj.TransactionID, err = core.UnmarshalString(m, "transaction_id")
-	if err != nil {
-		return
-	}
-	obj.Operation, err = core.UnmarshalString(m, "operation")
-	if err != nil {
-		return
-	}
-	obj.UserAgent, err = core.UnmarshalString(m, "user_agent")
-	if err != nil {
-		return
-	}
-	obj.ClientIp, err = core.UnmarshalString(m, "client_ip")
-	if err != nil {
-		return
-	}
-	obj.URL, err = core.UnmarshalString(m, "url")
-	if err != nil {
-		return
-	}
-	obj.InstanceID, err = core.UnmarshalString(m, "instance_id")
-	if err != nil {
-		return
-	}
-	obj.ThreadID, err = core.UnmarshalString(m, "thread_id")
-	if err != nil {
-		return
-	}
-	obj.Host, err = core.UnmarshalString(m, "host")
-	if err != nil {
-		return
-	}
-	obj.StartTime, err = core.UnmarshalString(m, "start_time")
-	if err != nil {
-		return
-	}
-	obj.EndTime, err = core.UnmarshalString(m, "end_time")
-	if err != nil {
-		return
-	}
-	obj.ElapsedTime, err = core.UnmarshalString(m, "elapsed_time")
-	if err != nil {
-		return
-	}
-	obj.ClusterName, err = core.UnmarshalString(m, "cluster_name")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalResponseContextSlice unmarshals a slice of ResponseContext instances from the specified list of maps.
-func UnmarshalResponseContextSlice(s []interface{}) (slice []ResponseContext, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'ResponseContext'")
-			return
-		}
-		obj, e := UnmarshalResponseContext(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalResponseContextAsProperty unmarshals an instance of ResponseContext that is stored as a property
-// within the specified map.
-func UnmarshalResponseContextAsProperty(m map[string]interface{}, propertyName string) (result *ResponseContext, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'ResponseContext'", propertyName)
-			return
-		}
-		result, err = UnmarshalResponseContext(objMap)
-	}
-	return
-}
-
-// UnmarshalResponseContextSliceAsProperty unmarshals a slice of ResponseContext instances that are stored as a property
-// within the specified map.
-func UnmarshalResponseContextSliceAsProperty(m map[string]interface{}, propertyName string) (slice []ResponseContext, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'ResponseContext'", propertyName)
-			return
-		}
-		slice, err = UnmarshalResponseContextSlice(vSlice)
-	}
-	return
-}
-
-// ServiceIdDetails : Response body format for service ID V1 REST requests.
-type ServiceIdDetails struct {
-	// Context with key properties for problem determination.
-	Context *ResponseContext `json:"context,omitempty"`
-
-	// Unique identifier of this Service ID.
-	ID *string `json:"id" validate:"required"`
-
-	// Cloud wide identifier for identities of this service ID.
-	IamID *string `json:"iam_id" validate:"required"`
-
-	// Version of the service ID details object. You need to specify this value when updating the service ID to avoid stale
-	// updates.
-	EntityTag *string `json:"entity_tag,omitempty"`
-
-	// Cloud Resource Name of the item. Example Cloud Resource Name:
-	// 'crn:v1:bluemix:public:iam-identity:us-south:a/myaccount::serviceid:1234-5678-9012'.
-	Crn *string `json:"crn" validate:"required"`
-
-	// The service ID cannot be changed if set to true.
-	Locked *bool `json:"locked" validate:"required"`
-
-	// If set contains a date time string of the creation date in ISO format.
-	CreatedAt *strfmt.DateTime `json:"created_at,omitempty"`
-
-	// If set contains a date time string of the last modification date in ISO format.
-	ModifiedAt *strfmt.DateTime `json:"modified_at,omitempty"`
-
-	// ID of the account the service ID belongs to.
-	AccountID *string `json:"account_id" validate:"required"`
-
-	// Name of the service ID. The name is not checked for uniqueness. Therefore multiple names with the same value can
-	// exist. Access is done via the UUID of the service ID.
-	Name *string `json:"name" validate:"required"`
-
-	// The optional description of the service ID. The 'description' property is only available if a description was
-	// provided during a create of a service ID.
-	Description *string `json:"description,omitempty"`
-
-	// Optional list of CRNs (string array) which point to the services connected to the service ID.
-	UniqueInstanceCrns []string `json:"unique_instance_crns,omitempty"`
-
-	// Response body format for API key V1 REST requests.
-	Apikey *ApiKeyDetails `json:"apikey" validate:"required"`
-}
-
-
-// UnmarshalServiceIdDetails constructs an instance of ServiceIdDetails from the specified map.
-func UnmarshalServiceIdDetails(m map[string]interface{}) (result *ServiceIdDetails, err error) {
-	obj := new(ServiceIdDetails)
-	obj.Context, err = UnmarshalResponseContextAsProperty(m, "context")
-	if err != nil {
-		return
-	}
-	obj.ID, err = core.UnmarshalString(m, "id")
-	if err != nil {
-		return
-	}
-	obj.IamID, err = core.UnmarshalString(m, "iam_id")
-	if err != nil {
-		return
-	}
-	obj.EntityTag, err = core.UnmarshalString(m, "entity_tag")
-	if err != nil {
-		return
-	}
-	obj.Crn, err = core.UnmarshalString(m, "crn")
-	if err != nil {
-		return
-	}
-	obj.Locked, err = core.UnmarshalBool(m, "locked")
-	if err != nil {
-		return
-	}
-	obj.CreatedAt, err = core.UnmarshalDateTime(m, "created_at")
-	if err != nil {
-		return
-	}
-	obj.ModifiedAt, err = core.UnmarshalDateTime(m, "modified_at")
-	if err != nil {
-		return
-	}
-	obj.AccountID, err = core.UnmarshalString(m, "account_id")
-	if err != nil {
-		return
-	}
-	obj.Name, err = core.UnmarshalString(m, "name")
-	if err != nil {
-		return
-	}
-	obj.Description, err = core.UnmarshalString(m, "description")
-	if err != nil {
-		return
-	}
-	obj.UniqueInstanceCrns, err = core.UnmarshalStringSlice(m, "unique_instance_crns")
-	if err != nil {
-		return
-	}
-	obj.Apikey, err = UnmarshalApiKeyDetailsAsProperty(m, "apikey")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalServiceIdDetailsSlice unmarshals a slice of ServiceIdDetails instances from the specified list of maps.
-func UnmarshalServiceIdDetailsSlice(s []interface{}) (slice []ServiceIdDetails, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'ServiceIdDetails'")
-			return
-		}
-		obj, e := UnmarshalServiceIdDetails(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalServiceIdDetailsAsProperty unmarshals an instance of ServiceIdDetails that is stored as a property
-// within the specified map.
-func UnmarshalServiceIdDetailsAsProperty(m map[string]interface{}, propertyName string) (result *ServiceIdDetails, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'ServiceIdDetails'", propertyName)
-			return
-		}
-		result, err = UnmarshalServiceIdDetails(objMap)
-	}
-	return
-}
-
-// UnmarshalServiceIdDetailsSliceAsProperty unmarshals a slice of ServiceIdDetails instances that are stored as a property
-// within the specified map.
-func UnmarshalServiceIdDetailsSliceAsProperty(m map[string]interface{}, propertyName string) (slice []ServiceIdDetails, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'ServiceIdDetails'", propertyName)
-			return
-		}
-		slice, err = UnmarshalServiceIdDetailsSlice(vSlice)
-	}
-	return
-}
-
-// ServiceIdsList : Response body format for the list service ID V1 REST request.
-type ServiceIdsList struct {
-	// Context fill with key properties for problem determination.
-	Context *ExceptionResponseContext `json:"context,omitempty"`
-
-	// The offset of the current page.
-	Offset *int64 `json:"offset,omitempty"`
-
-	// Optional size of a single page. Default is 20 items per page. Valid range is 1 to 100.
-	Limit *int64 `json:"limit,omitempty"`
-
-	// Link to the first page.
-	First *string `json:"first,omitempty"`
-
-	// Link to the previous available page. If 'previous' property is not part of the response no previous page is
-	// available.
-	Previous *string `json:"previous,omitempty"`
-
-	// Link to the next available page. If 'next' property is not part of the response no next page is available.
-	Next *string `json:"next,omitempty"`
-
-	// List of service IDs based on the query paramters and the page size. The service IDs array is always part of the
-	// response but might be empty depending on the query parameter values provided.
-	Serviceids []ServiceIdDetails `json:"serviceids" validate:"required"`
-}
-
-
-// UnmarshalServiceIdsList constructs an instance of ServiceIdsList from the specified map.
-func UnmarshalServiceIdsList(m map[string]interface{}) (result *ServiceIdsList, err error) {
-	obj := new(ServiceIdsList)
-	obj.Context, err = UnmarshalExceptionResponseContextAsProperty(m, "context")
-	if err != nil {
-		return
-	}
-	obj.Offset, err = core.UnmarshalInt64(m, "offset")
-	if err != nil {
-		return
-	}
-	obj.Limit, err = core.UnmarshalInt64(m, "limit")
-	if err != nil {
-		return
-	}
-	obj.First, err = core.UnmarshalString(m, "first")
-	if err != nil {
-		return
-	}
-	obj.Previous, err = core.UnmarshalString(m, "previous")
-	if err != nil {
-		return
-	}
-	obj.Next, err = core.UnmarshalString(m, "next")
-	if err != nil {
-		return
-	}
-	obj.Serviceids, err = UnmarshalServiceIdDetailsSliceAsProperty(m, "serviceids")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalServiceIdsListSlice unmarshals a slice of ServiceIdsList instances from the specified list of maps.
-func UnmarshalServiceIdsListSlice(s []interface{}) (slice []ServiceIdsList, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'ServiceIdsList'")
-			return
-		}
-		obj, e := UnmarshalServiceIdsList(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalServiceIdsListAsProperty unmarshals an instance of ServiceIdsList that is stored as a property
-// within the specified map.
-func UnmarshalServiceIdsListAsProperty(m map[string]interface{}, propertyName string) (result *ServiceIdsList, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'ServiceIdsList'", propertyName)
-			return
-		}
-		result, err = UnmarshalServiceIdsList(objMap)
-	}
-	return
-}
-
-// UnmarshalServiceIdsListSliceAsProperty unmarshals a slice of ServiceIdsList instances that are stored as a property
-// within the specified map.
-func UnmarshalServiceIdsListSliceAsProperty(m map[string]interface{}, propertyName string) (slice []ServiceIdsList, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'ServiceIdsList'", propertyName)
-			return
-		}
-		slice, err = UnmarshalServiceIdsListSlice(vSlice)
-	}
-	return
-}
-
-// UnlockApiKeyOptions : The UnlockApiKey options.
-type UnlockApiKeyOptions struct {
-	// Unique ID of the API key.
-	ID *string `json:"id" validate:"required"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewUnlockApiKeyOptions : Instantiate UnlockApiKeyOptions
-func (*IamIdentityServicesV1) NewUnlockApiKeyOptions(id string) *UnlockApiKeyOptions {
-	return &UnlockApiKeyOptions{
-		ID: core.StringPtr(id),
-	}
-}
-
-// SetID : Allow user to set ID
-func (options *UnlockApiKeyOptions) SetID(id string) *UnlockApiKeyOptions {
-	options.ID = core.StringPtr(id)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *UnlockApiKeyOptions) SetHeaders(param map[string]string) *UnlockApiKeyOptions {
-	options.Headers = param
-	return options
-}
-
-// UnlockServiceIdOptions : The UnlockServiceID options.
-type UnlockServiceIdOptions struct {
-	// Unique ID of the service ID.
-	ID *string `json:"id" validate:"required"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewUnlockServiceIdOptions : Instantiate UnlockServiceIdOptions
-func (*IamIdentityServicesV1) NewUnlockServiceIdOptions(id string) *UnlockServiceIdOptions {
-	return &UnlockServiceIdOptions{
-		ID: core.StringPtr(id),
-	}
-}
-
-// SetID : Allow user to set ID
-func (options *UnlockServiceIdOptions) SetID(id string) *UnlockServiceIdOptions {
-	options.ID = core.StringPtr(id)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *UnlockServiceIdOptions) SetHeaders(param map[string]string) *UnlockServiceIdOptions {
-	options.Headers = param
-	return options
-}
-
-// UpdateApiKeyOptions : The UpdateApiKey options.
-type UpdateApiKeyOptions struct {
-	// Unique ID of the API key to be updated.
-	ID *string `json:"id" validate:"required"`
-
-	// Version of the API key to be updated. Specify the version that you retrieved when reading the API key. This value
-	// helps identifying parallel usage of this API. Pass * to indicate to update any version available. This might result
-	// in stale updates.
-	IfMatch *string `json:"If-Match" validate:"required"`
-
-	// The name of the API key to update. If specified in the request the parameter must not be empty. The name is not
-	// checked for uniqueness. Failure to this will result in an Error condition.
-	Name *string `json:"name,omitempty"`
-
-	// The description of the API key to update. If specified an empty description will clear the description of the API
-	// key. If a non empty value is provided the API key will be updated.
-	Description *string `json:"description,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewUpdateApiKeyOptions : Instantiate UpdateApiKeyOptions
-func (*IamIdentityServicesV1) NewUpdateApiKeyOptions(id string, ifMatch string) *UpdateApiKeyOptions {
-	return &UpdateApiKeyOptions{
-		ID: core.StringPtr(id),
-		IfMatch: core.StringPtr(ifMatch),
-	}
-}
-
-// SetID : Allow user to set ID
-func (options *UpdateApiKeyOptions) SetID(id string) *UpdateApiKeyOptions {
-	options.ID = core.StringPtr(id)
-	return options
-}
-
-// SetIfMatch : Allow user to set IfMatch
-func (options *UpdateApiKeyOptions) SetIfMatch(ifMatch string) *UpdateApiKeyOptions {
-	options.IfMatch = core.StringPtr(ifMatch)
-	return options
-}
-
-// SetName : Allow user to set Name
-func (options *UpdateApiKeyOptions) SetName(name string) *UpdateApiKeyOptions {
-	options.Name = core.StringPtr(name)
-	return options
-}
-
-// SetDescription : Allow user to set Description
-func (options *UpdateApiKeyOptions) SetDescription(description string) *UpdateApiKeyOptions {
-	options.Description = core.StringPtr(description)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *UpdateApiKeyOptions) SetHeaders(param map[string]string) *UpdateApiKeyOptions {
-	options.Headers = param
-	return options
-}
-
-// UpdateServiceIdOptions : The UpdateServiceID options.
-type UpdateServiceIdOptions struct {
-	// Unique ID of the service ID to be updated.
-	ID *string `json:"id" validate:"required"`
-
-	// Version of the service ID to be updated. Specify the version that you retrieved as entity_tag (ETag header) when
-	// reading the service ID. This value helps identifying parallel usage of this API. Pass * to indicate to update any
-	// version available. This might result in stale updates.
-	IfMatch *string `json:"If-Match" validate:"required"`
-
-	// The name of the service ID to update. If specified in the request the parameter must not be empty. The name is not
-	// checked for uniqueness. Failure to this will result in an Error condition.
-	Name *string `json:"name,omitempty"`
-
-	// The description of the service ID to update. If specified an empty description will clear the description of the
-	// service ID. If an non empty value is provided the service ID will be updated.
-	Description *string `json:"description,omitempty"`
-
-	// List of CRNs which point to the services connected to this service ID. If specified an empty list will clear all
-	// existing unique instance crns of the service ID.
-	UniqueInstanceCrns []string `json:"unique_instance_crns,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewUpdateServiceIdOptions : Instantiate UpdateServiceIdOptions
-func (*IamIdentityServicesV1) NewUpdateServiceIdOptions(id string, ifMatch string) *UpdateServiceIdOptions {
-	return &UpdateServiceIdOptions{
-		ID: core.StringPtr(id),
-		IfMatch: core.StringPtr(ifMatch),
-	}
-}
-
-// SetID : Allow user to set ID
-func (options *UpdateServiceIdOptions) SetID(id string) *UpdateServiceIdOptions {
-	options.ID = core.StringPtr(id)
-	return options
-}
-
-// SetIfMatch : Allow user to set IfMatch
-func (options *UpdateServiceIdOptions) SetIfMatch(ifMatch string) *UpdateServiceIdOptions {
-	options.IfMatch = core.StringPtr(ifMatch)
-	return options
-}
-
-// SetName : Allow user to set Name
-func (options *UpdateServiceIdOptions) SetName(name string) *UpdateServiceIdOptions {
-	options.Name = core.StringPtr(name)
-	return options
-}
-
-// SetDescription : Allow user to set Description
-func (options *UpdateServiceIdOptions) SetDescription(description string) *UpdateServiceIdOptions {
-	options.Description = core.StringPtr(description)
-	return options
-}
-
-// SetUniqueInstanceCrns : Allow user to set UniqueInstanceCrns
-func (options *UpdateServiceIdOptions) SetUniqueInstanceCrns(uniqueInstanceCrns []string) *UpdateServiceIdOptions {
-	options.UniqueInstanceCrns = uniqueInstanceCrns
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *UpdateServiceIdOptions) SetHeaders(param map[string]string) *UpdateServiceIdOptions {
-	options.Headers = param
-	return options
-}
diff --git a/iamidentityservicesv1/iam_identity_services_v1_suite_test.go b/iamidentityservicesv1/iam_identity_services_v1_suite_test.go
deleted file mode 100644
index 00394e7e..00000000
--- a/iamidentityservicesv1/iam_identity_services_v1_suite_test.go
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * (C) Copyright IBM Corp. 2020.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package iamidentityservicesv1_test
-
-import (
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-	"testing"
-)
-
-func TestIamIdentityServicesV1(t *testing.T) {
-	RegisterFailHandler(Fail)
-	RunSpecs(t, "IamIdentityServicesV1 Suite")
-}
diff --git a/iamidentityservicesv1/iam_identity_services_v1_test.go b/iamidentityservicesv1/iam_identity_services_v1_test.go
deleted file mode 100644
index 488b4381..00000000
--- a/iamidentityservicesv1/iam_identity_services_v1_test.go
+++ /dev/null
@@ -1,772 +0,0 @@
-/**
- * (C) Copyright IBM Corp. 2020.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package iamidentityservicesv1_test
-
-import (
-	"bytes"
-	"fmt"
-	"github.com/IBM/go-sdk-core/v3/core"
-	"github.com/go-openapi/strfmt"
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-	"github.ibm.com/ibmcloud/platform-services-go-sdk/iamidentityservicesv1"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"net/http/httptest"
-	"time"
-)
-
-var _ = Describe(`IamIdentityServicesV1`, func() {
-	Describe(`ListApiKeys(listApiKeysOptions *ListApiKeysOptions)`, func() {
-		listApiKeysPath := "/v1/apikeys"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(listApiKeysPath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.URL.Query()["account_id"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["iam_id"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["pagesize"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["pagetoken"]).To(Equal([]string{"testString"}))
-
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"context": {"requestId": "RequestID", "requestType": "RequestType", "userAgent": "UserAgent", "clientIp": "ClientIp", "url": "URL", "instanceId": "InstanceID", "threadId": "ThreadID", "host": "Host", "startTime": "StartTime", "endTime": "EndTime", "elapsedTime": "ElapsedTime", "locale": "Locale", "clusterName": "ClusterName"}, "offset": 6, "limit": 5, "first": "First", "previous": "Previous", "next": "Next", "apikeys": [{"context": {"transaction_id": "TransactionID", "operation": "Operation", "user_agent": "UserAgent", "client_ip": "ClientIp", "url": "URL", "instance_id": "InstanceID", "thread_id": "ThreadID", "host": "Host", "start_time": "StartTime", "end_time": "EndTime", "elapsed_time": "ElapsedTime", "cluster_name": "ClusterName"}, "id": "ID", "entity_tag": "EntityTag", "crn": "Crn", "locked": true, "created_at": "2019-01-01T12:00:00", "modified_at": "2019-01-01T12:00:00", "name": "Name", "description": "Description", "iam_id": "IamID", "account_id": "AccountID", "apikey": "Apikey"}]}`)
-			}))
-			It(`Invoke ListApiKeys successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := iamidentityservicesv1.NewIamIdentityServicesV1(&iamidentityservicesv1.IamIdentityServicesV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.ListApiKeys(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the ListApiKeysOptions model
-				listApiKeysOptionsModel := new(iamidentityservicesv1.ListApiKeysOptions)
-				listApiKeysOptionsModel.AccountID = core.StringPtr("testString")
-				listApiKeysOptionsModel.IamID = core.StringPtr("testString")
-				listApiKeysOptionsModel.Pagesize = core.StringPtr("testString")
-				listApiKeysOptionsModel.Pagetoken = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.ListApiKeys(listApiKeysOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`CreateApiKey(createApiKeyOptions *CreateApiKeyOptions)`, func() {
-		createApiKeyPath := "/v1/apikeys"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(createApiKeyPath))
-				Expect(req.Method).To(Equal("POST"))
-				Expect(req.Header["Entity-Lock"]).ToNot(BeNil())
-				Expect(req.Header["Entity-Lock"][0]).To(Equal(fmt.Sprintf("%v", "testString")))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(201)
-				fmt.Fprintf(res, `{"context": {"transaction_id": "TransactionID", "operation": "Operation", "user_agent": "UserAgent", "client_ip": "ClientIp", "url": "URL", "instance_id": "InstanceID", "thread_id": "ThreadID", "host": "Host", "start_time": "StartTime", "end_time": "EndTime", "elapsed_time": "ElapsedTime", "cluster_name": "ClusterName"}, "id": "ID", "entity_tag": "EntityTag", "crn": "Crn", "locked": true, "created_at": "2019-01-01T12:00:00", "modified_at": "2019-01-01T12:00:00", "name": "Name", "description": "Description", "iam_id": "IamID", "account_id": "AccountID", "apikey": "Apikey"}`)
-			}))
-			It(`Invoke CreateApiKey successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := iamidentityservicesv1.NewIamIdentityServicesV1(&iamidentityservicesv1.IamIdentityServicesV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.CreateApiKey(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the CreateApiKeyOptions model
-				createApiKeyOptionsModel := new(iamidentityservicesv1.CreateApiKeyOptions)
-				createApiKeyOptionsModel.Name = core.StringPtr("testString")
-				createApiKeyOptionsModel.IamID = core.StringPtr("testString")
-				createApiKeyOptionsModel.Description = core.StringPtr("testString")
-				createApiKeyOptionsModel.AccountID = core.StringPtr("testString")
-				createApiKeyOptionsModel.Apikey = core.StringPtr("testString")
-				createApiKeyOptionsModel.EntityLock = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.CreateApiKey(createApiKeyOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`GetApiKeyDetails(getApiKeyDetailsOptions *GetApiKeyDetailsOptions)`, func() {
-		getApiKeyDetailsPath := "/v1/apikeys/details"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(getApiKeyDetailsPath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.Header["Iam-Apikey"]).ToNot(BeNil())
-				Expect(req.Header["Iam-Apikey"][0]).To(Equal(fmt.Sprintf("%v", "testString")))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"context": {"transaction_id": "TransactionID", "operation": "Operation", "user_agent": "UserAgent", "client_ip": "ClientIp", "url": "URL", "instance_id": "InstanceID", "thread_id": "ThreadID", "host": "Host", "start_time": "StartTime", "end_time": "EndTime", "elapsed_time": "ElapsedTime", "cluster_name": "ClusterName"}, "id": "ID", "entity_tag": "EntityTag", "crn": "Crn", "locked": true, "created_at": "2019-01-01T12:00:00", "modified_at": "2019-01-01T12:00:00", "name": "Name", "description": "Description", "iam_id": "IamID", "account_id": "AccountID", "apikey": "Apikey"}`)
-			}))
-			It(`Invoke GetApiKeyDetails successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := iamidentityservicesv1.NewIamIdentityServicesV1(&iamidentityservicesv1.IamIdentityServicesV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.GetApiKeyDetails(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the GetApiKeyDetailsOptions model
-				getApiKeyDetailsOptionsModel := new(iamidentityservicesv1.GetApiKeyDetailsOptions)
-				getApiKeyDetailsOptionsModel.IAMApiKey = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.GetApiKeyDetails(getApiKeyDetailsOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`GetApiKey(getApiKeyOptions *GetApiKeyOptions)`, func() {
-		getApiKeyPath := "/v1/apikeys/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(getApiKeyPath))
-				Expect(req.Method).To(Equal("GET"))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"context": {"transaction_id": "TransactionID", "operation": "Operation", "user_agent": "UserAgent", "client_ip": "ClientIp", "url": "URL", "instance_id": "InstanceID", "thread_id": "ThreadID", "host": "Host", "start_time": "StartTime", "end_time": "EndTime", "elapsed_time": "ElapsedTime", "cluster_name": "ClusterName"}, "id": "ID", "entity_tag": "EntityTag", "crn": "Crn", "locked": true, "created_at": "2019-01-01T12:00:00", "modified_at": "2019-01-01T12:00:00", "name": "Name", "description": "Description", "iam_id": "IamID", "account_id": "AccountID", "apikey": "Apikey"}`)
-			}))
-			It(`Invoke GetApiKey successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := iamidentityservicesv1.NewIamIdentityServicesV1(&iamidentityservicesv1.IamIdentityServicesV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.GetApiKey(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the GetApiKeyOptions model
-				getApiKeyOptionsModel := new(iamidentityservicesv1.GetApiKeyOptions)
-				getApiKeyOptionsModel.ID = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.GetApiKey(getApiKeyOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`UpdateApiKey(updateApiKeyOptions *UpdateApiKeyOptions)`, func() {
-		updateApiKeyPath := "/v1/apikeys/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(updateApiKeyPath))
-				Expect(req.Method).To(Equal("PUT"))
-				Expect(req.Header["If-Match"]).ToNot(BeNil())
-				Expect(req.Header["If-Match"][0]).To(Equal(fmt.Sprintf("%v", "testString")))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"context": {"transaction_id": "TransactionID", "operation": "Operation", "user_agent": "UserAgent", "client_ip": "ClientIp", "url": "URL", "instance_id": "InstanceID", "thread_id": "ThreadID", "host": "Host", "start_time": "StartTime", "end_time": "EndTime", "elapsed_time": "ElapsedTime", "cluster_name": "ClusterName"}, "id": "ID", "entity_tag": "EntityTag", "crn": "Crn", "locked": true, "created_at": "2019-01-01T12:00:00", "modified_at": "2019-01-01T12:00:00", "name": "Name", "description": "Description", "iam_id": "IamID", "account_id": "AccountID", "apikey": "Apikey"}`)
-			}))
-			It(`Invoke UpdateApiKey successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := iamidentityservicesv1.NewIamIdentityServicesV1(&iamidentityservicesv1.IamIdentityServicesV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.UpdateApiKey(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the UpdateApiKeyOptions model
-				updateApiKeyOptionsModel := new(iamidentityservicesv1.UpdateApiKeyOptions)
-				updateApiKeyOptionsModel.ID = core.StringPtr("testString")
-				updateApiKeyOptionsModel.IfMatch = core.StringPtr("testString")
-				updateApiKeyOptionsModel.Name = core.StringPtr("testString")
-				updateApiKeyOptionsModel.Description = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.UpdateApiKey(updateApiKeyOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`DeleteApiKey(deleteApiKeyOptions *DeleteApiKeyOptions)`, func() {
-		deleteApiKeyPath := "/v1/apikeys/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(deleteApiKeyPath))
-				Expect(req.Method).To(Equal("DELETE"))
-				res.WriteHeader(204)
-			}))
-			It(`Invoke DeleteApiKey successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := iamidentityservicesv1.NewIamIdentityServicesV1(&iamidentityservicesv1.IamIdentityServicesV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				response, operationErr := testService.DeleteApiKey(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-
-				// Construct an instance of the DeleteApiKeyOptions model
-				deleteApiKeyOptionsModel := new(iamidentityservicesv1.DeleteApiKeyOptions)
-				deleteApiKeyOptionsModel.ID = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				response, operationErr = testService.DeleteApiKey(deleteApiKeyOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`LockApiKey(lockApiKeyOptions *LockApiKeyOptions)`, func() {
-		lockApiKeyPath := "/v1/apikeys/testString/lock"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(lockApiKeyPath))
-				Expect(req.Method).To(Equal("POST"))
-				res.WriteHeader(204)
-			}))
-			It(`Invoke LockApiKey successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := iamidentityservicesv1.NewIamIdentityServicesV1(&iamidentityservicesv1.IamIdentityServicesV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				response, operationErr := testService.LockApiKey(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-
-				// Construct an instance of the LockApiKeyOptions model
-				lockApiKeyOptionsModel := new(iamidentityservicesv1.LockApiKeyOptions)
-				lockApiKeyOptionsModel.ID = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				response, operationErr = testService.LockApiKey(lockApiKeyOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`UnlockApiKey(unlockApiKeyOptions *UnlockApiKeyOptions)`, func() {
-		unlockApiKeyPath := "/v1/apikeys/testString/lock"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(unlockApiKeyPath))
-				Expect(req.Method).To(Equal("DELETE"))
-				res.WriteHeader(204)
-			}))
-			It(`Invoke UnlockApiKey successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := iamidentityservicesv1.NewIamIdentityServicesV1(&iamidentityservicesv1.IamIdentityServicesV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				response, operationErr := testService.UnlockApiKey(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-
-				// Construct an instance of the UnlockApiKeyOptions model
-				unlockApiKeyOptionsModel := new(iamidentityservicesv1.UnlockApiKeyOptions)
-				unlockApiKeyOptionsModel.ID = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				response, operationErr = testService.UnlockApiKey(unlockApiKeyOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`ListServiceIds(listServiceIdsOptions *ListServiceIdsOptions)`, func() {
-		listServiceIdsPath := "/v1/serviceids"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(listServiceIdsPath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.URL.Query()["account_id"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["name"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["pagesize"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["pagetoken"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["sort"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["order"]).To(Equal([]string{"testString"}))
-
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"context": {"requestId": "RequestID", "requestType": "RequestType", "userAgent": "UserAgent", "clientIp": "ClientIp", "url": "URL", "instanceId": "InstanceID", "threadId": "ThreadID", "host": "Host", "startTime": "StartTime", "endTime": "EndTime", "elapsedTime": "ElapsedTime", "locale": "Locale", "clusterName": "ClusterName"}, "offset": 6, "limit": 5, "first": "First", "previous": "Previous", "next": "Next", "serviceids": [{"context": {"transaction_id": "TransactionID", "operation": "Operation", "user_agent": "UserAgent", "client_ip": "ClientIp", "url": "URL", "instance_id": "InstanceID", "thread_id": "ThreadID", "host": "Host", "start_time": "StartTime", "end_time": "EndTime", "elapsed_time": "ElapsedTime", "cluster_name": "ClusterName"}, "id": "ID", "iam_id": "IamID", "entity_tag": "EntityTag", "crn": "Crn", "locked": true, "created_at": "2019-01-01T12:00:00", "modified_at": "2019-01-01T12:00:00", "account_id": "AccountID", "name": "Name", "description": "Description", "unique_instance_crns": ["UniqueInstanceCrns"], "apikey": {"context": {"transaction_id": "TransactionID", "operation": "Operation", "user_agent": "UserAgent", "client_ip": "ClientIp", "url": "URL", "instance_id": "InstanceID", "thread_id": "ThreadID", "host": "Host", "start_time": "StartTime", "end_time": "EndTime", "elapsed_time": "ElapsedTime", "cluster_name": "ClusterName"}, "id": "ID", "entity_tag": "EntityTag", "crn": "Crn", "locked": true, "created_at": "2019-01-01T12:00:00", "modified_at": "2019-01-01T12:00:00", "name": "Name", "description": "Description", "iam_id": "IamID", "account_id": "AccountID", "apikey": "Apikey"}}]}`)
-			}))
-			It(`Invoke ListServiceIds successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := iamidentityservicesv1.NewIamIdentityServicesV1(&iamidentityservicesv1.IamIdentityServicesV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.ListServiceIds(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the ListServiceIdsOptions model
-				listServiceIdsOptionsModel := new(iamidentityservicesv1.ListServiceIdsOptions)
-				listServiceIdsOptionsModel.AccountID = core.StringPtr("testString")
-				listServiceIdsOptionsModel.Name = core.StringPtr("testString")
-				listServiceIdsOptionsModel.Pagesize = core.StringPtr("testString")
-				listServiceIdsOptionsModel.Pagetoken = core.StringPtr("testString")
-				listServiceIdsOptionsModel.Sort = core.StringPtr("testString")
-				listServiceIdsOptionsModel.Order = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.ListServiceIds(listServiceIdsOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`CreateServiceID(createServiceIdOptions *CreateServiceIdOptions)`, func() {
-		createServiceIDPath := "/v1/serviceids"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(createServiceIDPath))
-				Expect(req.Method).To(Equal("POST"))
-				Expect(req.Header["Entity-Lock"]).ToNot(BeNil())
-				Expect(req.Header["Entity-Lock"][0]).To(Equal(fmt.Sprintf("%v", "testString")))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"context": {"transaction_id": "TransactionID", "operation": "Operation", "user_agent": "UserAgent", "client_ip": "ClientIp", "url": "URL", "instance_id": "InstanceID", "thread_id": "ThreadID", "host": "Host", "start_time": "StartTime", "end_time": "EndTime", "elapsed_time": "ElapsedTime", "cluster_name": "ClusterName"}, "id": "ID", "iam_id": "IamID", "entity_tag": "EntityTag", "crn": "Crn", "locked": true, "created_at": "2019-01-01T12:00:00", "modified_at": "2019-01-01T12:00:00", "account_id": "AccountID", "name": "Name", "description": "Description", "unique_instance_crns": ["UniqueInstanceCrns"], "apikey": {"context": {"transaction_id": "TransactionID", "operation": "Operation", "user_agent": "UserAgent", "client_ip": "ClientIp", "url": "URL", "instance_id": "InstanceID", "thread_id": "ThreadID", "host": "Host", "start_time": "StartTime", "end_time": "EndTime", "elapsed_time": "ElapsedTime", "cluster_name": "ClusterName"}, "id": "ID", "entity_tag": "EntityTag", "crn": "Crn", "locked": true, "created_at": "2019-01-01T12:00:00", "modified_at": "2019-01-01T12:00:00", "name": "Name", "description": "Description", "iam_id": "IamID", "account_id": "AccountID", "apikey": "Apikey"}}`)
-			}))
-			It(`Invoke CreateServiceID successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := iamidentityservicesv1.NewIamIdentityServicesV1(&iamidentityservicesv1.IamIdentityServicesV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.CreateServiceID(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the CreateApiKeyRequest model
-				createApiKeyRequestModel := new(iamidentityservicesv1.CreateApiKeyRequest)
-				createApiKeyRequestModel.Name = core.StringPtr("testString")
-				createApiKeyRequestModel.Description = core.StringPtr("testString")
-				createApiKeyRequestModel.IamID = core.StringPtr("testString")
-				createApiKeyRequestModel.AccountID = core.StringPtr("testString")
-				createApiKeyRequestModel.Apikey = core.StringPtr("testString")
-
-				// Construct an instance of the CreateServiceIdOptions model
-				createServiceIdOptionsModel := new(iamidentityservicesv1.CreateServiceIdOptions)
-				createServiceIdOptionsModel.AccountID = core.StringPtr("testString")
-				createServiceIdOptionsModel.Name = core.StringPtr("testString")
-				createServiceIdOptionsModel.Description = core.StringPtr("testString")
-				createServiceIdOptionsModel.UniqueInstanceCrns = []string{"testString"}
-				createServiceIdOptionsModel.Apikey = createApiKeyRequestModel
-				createServiceIdOptionsModel.EntityLock = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.CreateServiceID(createServiceIdOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`GetServiceID(getServiceIdOptions *GetServiceIdOptions)`, func() {
-		getServiceIDPath := "/v1/serviceids/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(getServiceIDPath))
-				Expect(req.Method).To(Equal("GET"))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"context": {"transaction_id": "TransactionID", "operation": "Operation", "user_agent": "UserAgent", "client_ip": "ClientIp", "url": "URL", "instance_id": "InstanceID", "thread_id": "ThreadID", "host": "Host", "start_time": "StartTime", "end_time": "EndTime", "elapsed_time": "ElapsedTime", "cluster_name": "ClusterName"}, "id": "ID", "iam_id": "IamID", "entity_tag": "EntityTag", "crn": "Crn", "locked": true, "created_at": "2019-01-01T12:00:00", "modified_at": "2019-01-01T12:00:00", "account_id": "AccountID", "name": "Name", "description": "Description", "unique_instance_crns": ["UniqueInstanceCrns"], "apikey": {"context": {"transaction_id": "TransactionID", "operation": "Operation", "user_agent": "UserAgent", "client_ip": "ClientIp", "url": "URL", "instance_id": "InstanceID", "thread_id": "ThreadID", "host": "Host", "start_time": "StartTime", "end_time": "EndTime", "elapsed_time": "ElapsedTime", "cluster_name": "ClusterName"}, "id": "ID", "entity_tag": "EntityTag", "crn": "Crn", "locked": true, "created_at": "2019-01-01T12:00:00", "modified_at": "2019-01-01T12:00:00", "name": "Name", "description": "Description", "iam_id": "IamID", "account_id": "AccountID", "apikey": "Apikey"}}`)
-			}))
-			It(`Invoke GetServiceID successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := iamidentityservicesv1.NewIamIdentityServicesV1(&iamidentityservicesv1.IamIdentityServicesV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.GetServiceID(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the GetServiceIdOptions model
-				getServiceIdOptionsModel := new(iamidentityservicesv1.GetServiceIdOptions)
-				getServiceIdOptionsModel.ID = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.GetServiceID(getServiceIdOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`UpdateServiceID(updateServiceIdOptions *UpdateServiceIdOptions)`, func() {
-		updateServiceIDPath := "/v1/serviceids/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(updateServiceIDPath))
-				Expect(req.Method).To(Equal("PUT"))
-				Expect(req.Header["If-Match"]).ToNot(BeNil())
-				Expect(req.Header["If-Match"][0]).To(Equal(fmt.Sprintf("%v", "testString")))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"context": {"transaction_id": "TransactionID", "operation": "Operation", "user_agent": "UserAgent", "client_ip": "ClientIp", "url": "URL", "instance_id": "InstanceID", "thread_id": "ThreadID", "host": "Host", "start_time": "StartTime", "end_time": "EndTime", "elapsed_time": "ElapsedTime", "cluster_name": "ClusterName"}, "id": "ID", "iam_id": "IamID", "entity_tag": "EntityTag", "crn": "Crn", "locked": true, "created_at": "2019-01-01T12:00:00", "modified_at": "2019-01-01T12:00:00", "account_id": "AccountID", "name": "Name", "description": "Description", "unique_instance_crns": ["UniqueInstanceCrns"], "apikey": {"context": {"transaction_id": "TransactionID", "operation": "Operation", "user_agent": "UserAgent", "client_ip": "ClientIp", "url": "URL", "instance_id": "InstanceID", "thread_id": "ThreadID", "host": "Host", "start_time": "StartTime", "end_time": "EndTime", "elapsed_time": "ElapsedTime", "cluster_name": "ClusterName"}, "id": "ID", "entity_tag": "EntityTag", "crn": "Crn", "locked": true, "created_at": "2019-01-01T12:00:00", "modified_at": "2019-01-01T12:00:00", "name": "Name", "description": "Description", "iam_id": "IamID", "account_id": "AccountID", "apikey": "Apikey"}}`)
-			}))
-			It(`Invoke UpdateServiceID successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := iamidentityservicesv1.NewIamIdentityServicesV1(&iamidentityservicesv1.IamIdentityServicesV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.UpdateServiceID(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the UpdateServiceIdOptions model
-				updateServiceIdOptionsModel := new(iamidentityservicesv1.UpdateServiceIdOptions)
-				updateServiceIdOptionsModel.ID = core.StringPtr("testString")
-				updateServiceIdOptionsModel.IfMatch = core.StringPtr("testString")
-				updateServiceIdOptionsModel.Name = core.StringPtr("testString")
-				updateServiceIdOptionsModel.Description = core.StringPtr("testString")
-				updateServiceIdOptionsModel.UniqueInstanceCrns = []string{"testString"}
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.UpdateServiceID(updateServiceIdOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`DeleteServiceID(deleteServiceIdOptions *DeleteServiceIdOptions)`, func() {
-		deleteServiceIDPath := "/v1/serviceids/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(deleteServiceIDPath))
-				Expect(req.Method).To(Equal("DELETE"))
-				res.WriteHeader(204)
-			}))
-			It(`Invoke DeleteServiceID successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := iamidentityservicesv1.NewIamIdentityServicesV1(&iamidentityservicesv1.IamIdentityServicesV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				response, operationErr := testService.DeleteServiceID(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-
-				// Construct an instance of the DeleteServiceIdOptions model
-				deleteServiceIdOptionsModel := new(iamidentityservicesv1.DeleteServiceIdOptions)
-				deleteServiceIdOptionsModel.ID = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				response, operationErr = testService.DeleteServiceID(deleteServiceIdOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`LockServiceID(lockServiceIdOptions *LockServiceIdOptions)`, func() {
-		lockServiceIDPath := "/v1/serviceids/testString/lock"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(lockServiceIDPath))
-				Expect(req.Method).To(Equal("POST"))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"context": {"transaction_id": "TransactionID", "operation": "Operation", "user_agent": "UserAgent", "client_ip": "ClientIp", "url": "URL", "instance_id": "InstanceID", "thread_id": "ThreadID", "host": "Host", "start_time": "StartTime", "end_time": "EndTime", "elapsed_time": "ElapsedTime", "cluster_name": "ClusterName"}, "id": "ID", "iam_id": "IamID", "entity_tag": "EntityTag", "crn": "Crn", "locked": true, "created_at": "2019-01-01T12:00:00", "modified_at": "2019-01-01T12:00:00", "account_id": "AccountID", "name": "Name", "description": "Description", "unique_instance_crns": ["UniqueInstanceCrns"], "apikey": {"context": {"transaction_id": "TransactionID", "operation": "Operation", "user_agent": "UserAgent", "client_ip": "ClientIp", "url": "URL", "instance_id": "InstanceID", "thread_id": "ThreadID", "host": "Host", "start_time": "StartTime", "end_time": "EndTime", "elapsed_time": "ElapsedTime", "cluster_name": "ClusterName"}, "id": "ID", "entity_tag": "EntityTag", "crn": "Crn", "locked": true, "created_at": "2019-01-01T12:00:00", "modified_at": "2019-01-01T12:00:00", "name": "Name", "description": "Description", "iam_id": "IamID", "account_id": "AccountID", "apikey": "Apikey"}}`)
-			}))
-			It(`Invoke LockServiceID successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := iamidentityservicesv1.NewIamIdentityServicesV1(&iamidentityservicesv1.IamIdentityServicesV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.LockServiceID(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the LockServiceIdOptions model
-				lockServiceIdOptionsModel := new(iamidentityservicesv1.LockServiceIdOptions)
-				lockServiceIdOptionsModel.ID = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.LockServiceID(lockServiceIdOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`UnlockServiceID(unlockServiceIdOptions *UnlockServiceIdOptions)`, func() {
-		unlockServiceIDPath := "/v1/serviceids/testString/lock"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(unlockServiceIDPath))
-				Expect(req.Method).To(Equal("DELETE"))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"context": {"transaction_id": "TransactionID", "operation": "Operation", "user_agent": "UserAgent", "client_ip": "ClientIp", "url": "URL", "instance_id": "InstanceID", "thread_id": "ThreadID", "host": "Host", "start_time": "StartTime", "end_time": "EndTime", "elapsed_time": "ElapsedTime", "cluster_name": "ClusterName"}, "id": "ID", "iam_id": "IamID", "entity_tag": "EntityTag", "crn": "Crn", "locked": true, "created_at": "2019-01-01T12:00:00", "modified_at": "2019-01-01T12:00:00", "account_id": "AccountID", "name": "Name", "description": "Description", "unique_instance_crns": ["UniqueInstanceCrns"], "apikey": {"context": {"transaction_id": "TransactionID", "operation": "Operation", "user_agent": "UserAgent", "client_ip": "ClientIp", "url": "URL", "instance_id": "InstanceID", "thread_id": "ThreadID", "host": "Host", "start_time": "StartTime", "end_time": "EndTime", "elapsed_time": "ElapsedTime", "cluster_name": "ClusterName"}, "id": "ID", "entity_tag": "EntityTag", "crn": "Crn", "locked": true, "created_at": "2019-01-01T12:00:00", "modified_at": "2019-01-01T12:00:00", "name": "Name", "description": "Description", "iam_id": "IamID", "account_id": "AccountID", "apikey": "Apikey"}}`)
-			}))
-			It(`Invoke UnlockServiceID successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := iamidentityservicesv1.NewIamIdentityServicesV1(&iamidentityservicesv1.IamIdentityServicesV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.UnlockServiceID(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the UnlockServiceIdOptions model
-				unlockServiceIdOptionsModel := new(iamidentityservicesv1.UnlockServiceIdOptions)
-				unlockServiceIdOptionsModel.ID = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.UnlockServiceID(unlockServiceIdOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`Model constructor tests`, func() {
-		Context(`Using a sample service client instance`, func() {
-			testService, _ := iamidentityservicesv1.NewIamIdentityServicesV1(&iamidentityservicesv1.IamIdentityServicesV1Options{
-				URL:           "http://iamidentityservicesv1modelgenerator.com",
-				Authenticator: &core.NoAuthAuthenticator{},
-			})
-			It(`Invoke NewCreateApiKeyRequest successfully`, func() {
-				name := "testString"
-				iamID := "testString"
-				model, err := testService.NewCreateApiKeyRequest(name, iamID)
-				Expect(model).ToNot(BeNil())
-				Expect(err).To(BeNil())
-			})
-		})
-	})
-	Describe(`Utility function tests`, func() {
-		It(`Invoke CreateMockMap() successfully`, func() {
-			mockMap := CreateMockMap()
-			Expect(mockMap).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockByteArray() successfully`, func() {
-			mockByteArray := CreateMockByteArray("This is a test")
-			Expect(mockByteArray).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockUUID() successfully`, func() {
-			mockUUID := CreateMockUUID("9fab83da-98cb-4f18-a7ba-b6f0435c9673")
-			Expect(mockUUID).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockReader() successfully`, func() {
-			mockReader := CreateMockReader("This is a test.")
-			Expect(mockReader).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockDate() successfully`, func() {
-			mockDate := CreateMockDate()
-			Expect(mockDate).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockDateTime() successfully`, func() {
-			mockDateTime := CreateMockDateTime()
-			Expect(mockDateTime).ToNot(BeNil())
-		})
-	})
-})
-
-//
-// Utility functions used by the generated test code
-//
-
-func CreateMockMap() map[string]interface{} {
-	m := make(map[string]interface{})
-	return m
-}
-
-func CreateMockByteArray(mockData string) *[]byte {
-	ba := make([]byte, len(mockData))
-	ba = append(ba, mockData...)
-	return &ba
-}
-
-func CreateMockUUID(mockData string) *strfmt.UUID {
-	uuid := strfmt.UUID(mockData)
-	return &uuid
-}
-
-func CreateMockReader(mockData string) io.ReadCloser {
-	return ioutil.NopCloser(bytes.NewReader([]byte(mockData)))
-}
-
-func CreateMockDate() *strfmt.Date {
-	d := strfmt.Date(time.Now())
-	return &d
-}
-
-func CreateMockDateTime() *strfmt.DateTime {
-	d := strfmt.DateTime(time.Now())
-	return &d
-}
diff --git a/iampolicymanagementv1/iam_policy_management_v1.go b/iampolicymanagementv1/iam_policy_management_v1.go
deleted file mode 100644
index 6bb69eb0..00000000
--- a/iampolicymanagementv1/iam_policy_management_v1.go
+++ /dev/null
@@ -1,2785 +0,0 @@
-/**
- * (C) Copyright IBM Corp. 2020.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// Package iampolicymanagementv1 : Operations and models for the IamPolicyManagementV1 service
-package iampolicymanagementv1
-
-import (
-	"fmt"
-	"github.com/IBM/go-sdk-core/v3/core"
-	"github.com/go-openapi/strfmt"
-	common "github.ibm.com/ibmcloud/platform-services-go-sdk/common"
-)
-
-// IamPolicyManagementV1 : IAM Policy Management API
-//
-// Version: 1.0.1
-type IamPolicyManagementV1 struct {
-	Service *core.BaseService
-}
-
-// DefaultServiceURL is the default URL to make service requests to.
-const DefaultServiceURL = "https://iam.test.cloud.ibm.com"
-
-// DefaultServiceName is the default key used to find external configuration information.
-const DefaultServiceName = "iam_policy_management"
-
-// IamPolicyManagementV1Options : Service options
-type IamPolicyManagementV1Options struct {
-	ServiceName   string
-	URL           string
-	Authenticator core.Authenticator
-}
-
-// NewIamPolicyManagementV1UsingExternalConfig : constructs an instance of IamPolicyManagementV1 with passed in options and external configuration.
-func NewIamPolicyManagementV1UsingExternalConfig(options *IamPolicyManagementV1Options) (iamPolicyManagement *IamPolicyManagementV1, err error) {
-	if options.ServiceName == "" {
-		options.ServiceName = DefaultServiceName
-	}
-
-	if options.Authenticator == nil {
-		options.Authenticator, err = core.GetAuthenticatorFromEnvironment(options.ServiceName)
-		if err != nil {
-			return
-		}
-	}
-
-	iamPolicyManagement, err = NewIamPolicyManagementV1(options)
-	if err != nil {
-		return
-	}
-
-	err = iamPolicyManagement.Service.ConfigureService(options.ServiceName)
-	if err != nil {
-		return
-	}
-
-	if options.URL != "" {
-		err = iamPolicyManagement.Service.SetServiceURL(options.URL)
-	}
-	return
-}
-
-// NewIamPolicyManagementV1 : constructs an instance of IamPolicyManagementV1 with passed in options.
-func NewIamPolicyManagementV1(options *IamPolicyManagementV1Options) (service *IamPolicyManagementV1, err error) {
-	serviceOptions := &core.ServiceOptions{
-		URL:           DefaultServiceURL,
-		Authenticator: options.Authenticator,
-	}
-
-	baseService, err := core.NewBaseService(serviceOptions)
-	if err != nil {
-		return
-	}
-
-	if options.URL != "" {
-		err = baseService.SetServiceURL(options.URL)
-		if err != nil {
-			return
-		}
-	}
-
-	service = &IamPolicyManagementV1{
-		Service: baseService,
-	}
-
-	return
-}
-
-// SetServiceURL sets the service URL
-func (iamPolicyManagement *IamPolicyManagementV1) SetServiceURL(url string) error {
-	return iamPolicyManagement.Service.SetServiceURL(url)
-}
-
-// ListPolicies : Get policies by attributes
-// Get policies and filter by attributes. While managing policies, you may want to retrieve policies in the account and
-// filter by attribute values. This can be done through query parameters. Currently, we only support the following
-// attributes: account_id, iam_id, access_group_id, type, and service_type. account_id is a required query parameter.
-// Only policies that have the specified attributes and that the caller has read access to are returned. If the caller
-// does not have read access to any policies an empty array is returned.
-func (iamPolicyManagement *IamPolicyManagementV1) ListPolicies(listPoliciesOptions *ListPoliciesOptions) (result *PolicyList, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(listPoliciesOptions, "listPoliciesOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(listPoliciesOptions, "listPoliciesOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v1/policies"}
-	pathParameters := []string{}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(iamPolicyManagement.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range listPoliciesOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("iam_policy_management", "V1", "ListPolicies")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-	if listPoliciesOptions.AcceptLanguage != nil {
-		builder.AddHeader("Accept-Language", fmt.Sprint(*listPoliciesOptions.AcceptLanguage))
-	}
-
-	builder.AddQuery("account_id", fmt.Sprint(*listPoliciesOptions.AccountID))
-	if listPoliciesOptions.IamID != nil {
-		builder.AddQuery("iam_id", fmt.Sprint(*listPoliciesOptions.IamID))
-	}
-	if listPoliciesOptions.AccessGroupID != nil {
-		builder.AddQuery("access_group_id", fmt.Sprint(*listPoliciesOptions.AccessGroupID))
-	}
-	if listPoliciesOptions.Type != nil {
-		builder.AddQuery("type", fmt.Sprint(*listPoliciesOptions.Type))
-	}
-	if listPoliciesOptions.ServiceType != nil {
-		builder.AddQuery("service_type", fmt.Sprint(*listPoliciesOptions.ServiceType))
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = iamPolicyManagement.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalPolicyList(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// CreatePolicy : Create a policy
-// Creates a policy to grant access between a subject and a resource. There are two types of policies: **access** and
-// **authorization**. A policy administrator might want to create an access policy which grants access to a user,
-// service-id, or an access group. They might also want to create an authorization policy and setup access between
-// services.
-// ### Access To create an access policy, use **`"type": "access"`** in the body. The possible subject attributes are
-// **`iam_id`** and **`access_group_id`**. Use the **`iam_id`** subject attribute for assigning access for a user or
-// service-id. Use the **`access_group_id`** subject attribute for assigning access for an access group. The roles must
-// be a subset of a service's or the platform's supported roles. The resource attributes must be a subset of a service's
-// or the platform's supported attributes. The policy resource must include either the **`serviceType`**,
-// **`serviceName`**,  or **`resourceGroupId`** attribute and the **`accountId`** attribute.` If the subject is a locked
-// service-id, the request will fail.
-// ### Authorization Authorization policies are supported by services on a case by case basis. Refer to service
-// documentation to verify their support of authorization policies. To create an authorization policy, use **`"type":
-// "authorization"`** in the body. The subject attributes must match the supported authorization subjects of the
-// resource. Multiple subject attributes might be provided. The following attributes are supported:
-//   serviceName, serviceInstance, region, resourceType, resource, accountId The policy roles must be a subset of the
-// supported authorization roles supported by the target service. The user must also have the same level of access or
-// greater to the target resource in order to grant the role. The resource attributes must be a subset of a service's or
-// the platform's supported attributes. Both the policy subject and the policy resource must include the
-// **`serviceName`** and **`accountId`** attributes.
-func (iamPolicyManagement *IamPolicyManagementV1) CreatePolicy(createPolicyOptions *CreatePolicyOptions) (result *PolicyResponse, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(createPolicyOptions, "createPolicyOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(createPolicyOptions, "createPolicyOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v1/policies"}
-	pathParameters := []string{}
-
-	builder := core.NewRequestBuilder(core.POST)
-	_, err = builder.ConstructHTTPURL(iamPolicyManagement.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range createPolicyOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("iam_policy_management", "V1", "CreatePolicy")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-	builder.AddHeader("Content-Type", "application/json")
-	if createPolicyOptions.AcceptLanguage != nil {
-		builder.AddHeader("Accept-Language", fmt.Sprint(*createPolicyOptions.AcceptLanguage))
-	}
-
-	body := make(map[string]interface{})
-	if createPolicyOptions.Type != nil {
-		body["type"] = createPolicyOptions.Type
-	}
-	if createPolicyOptions.Subjects != nil {
-		body["subjects"] = createPolicyOptions.Subjects
-	}
-	if createPolicyOptions.Roles != nil {
-		body["roles"] = createPolicyOptions.Roles
-	}
-	if createPolicyOptions.Resources != nil {
-		body["resources"] = createPolicyOptions.Resources
-	}
-	_, err = builder.SetBodyContentJSON(body)
-	if err != nil {
-		return
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = iamPolicyManagement.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalPolicyResponse(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// UpdatePolicy : Update a policy
-// Update a policy to grant access between a subject and a resource. A policy administrator might want to update an
-// existing policy. The policy type cannot be changed (You cannot change an access policy to an authorization policy).
-// ### Access To update an access policy, use **`"type": "access"`** in the body. The possible subject attributes are
-// **`iam_id`** and **`access_group_id`**. Use the **`iam_id`** subject attribute for assigning access for a user or
-// service-id. Use the **`access_group_id`** subject attribute for assigning access for an access group. The roles must
-// be a subset of a service's or the platform's supported roles. The resource attributes must be a subset of a service's
-// or the platform's supported attributes. The policy resource must include either the **`serviceType`**,
-// **`serviceName`**,  or **`resourceGroupId`** attribute and the **`accountId`** attribute.` If the subject is a locked
-// service-id, the request will fail.
-// ### Authorization To update an authorization policy, use **`"type": "authorization"`** in the body. The subject
-// attributes must match the supported authorization subjects of the resource. Multiple subject attributes might be
-// provided. The following attributes are supported:
-//   serviceName, serviceInstance, region, resourceType, resource, accountId The policy roles must be a subset of the
-// supported authorization roles supported by the target service. The user must also have the same level of access or
-// greater to the target resource in order to grant the role. The resource attributes must be a subset of a service's or
-// the platform's supported attributes. Both the policy subject and the policy resource must include the
-// **`serviceName`** and **`accountId`** attributes.
-func (iamPolicyManagement *IamPolicyManagementV1) UpdatePolicy(updatePolicyOptions *UpdatePolicyOptions) (result *PolicyResponse, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(updatePolicyOptions, "updatePolicyOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(updatePolicyOptions, "updatePolicyOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v1/policies"}
-	pathParameters := []string{*updatePolicyOptions.PolicyID}
-
-	builder := core.NewRequestBuilder(core.PUT)
-	_, err = builder.ConstructHTTPURL(iamPolicyManagement.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range updatePolicyOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("iam_policy_management", "V1", "UpdatePolicy")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-	builder.AddHeader("Content-Type", "application/json")
-	if updatePolicyOptions.IfMatch != nil {
-		builder.AddHeader("If-Match", fmt.Sprint(*updatePolicyOptions.IfMatch))
-	}
-
-	body := make(map[string]interface{})
-	if updatePolicyOptions.Type != nil {
-		body["type"] = updatePolicyOptions.Type
-	}
-	if updatePolicyOptions.Subjects != nil {
-		body["subjects"] = updatePolicyOptions.Subjects
-	}
-	if updatePolicyOptions.Roles != nil {
-		body["roles"] = updatePolicyOptions.Roles
-	}
-	if updatePolicyOptions.Resources != nil {
-		body["resources"] = updatePolicyOptions.Resources
-	}
-	_, err = builder.SetBodyContentJSON(body)
-	if err != nil {
-		return
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = iamPolicyManagement.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalPolicyResponse(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// GetPolicy : Retrieve a policy by ID
-// Retrieve a policy by providing a policy ID.
-func (iamPolicyManagement *IamPolicyManagementV1) GetPolicy(getPolicyOptions *GetPolicyOptions) (result *PolicyResponse, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(getPolicyOptions, "getPolicyOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(getPolicyOptions, "getPolicyOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v1/policies"}
-	pathParameters := []string{*getPolicyOptions.PolicyID}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(iamPolicyManagement.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range getPolicyOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("iam_policy_management", "V1", "GetPolicy")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = iamPolicyManagement.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalPolicyResponse(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// DeletePolicy : Delete a policy by ID
-// Delete a policy by providing a policy ID. A policy cannot be deleted if the subject ID contains a locked service ID.
-// If the subject of the policy is a locked service-id, the request will fail.
-func (iamPolicyManagement *IamPolicyManagementV1) DeletePolicy(deletePolicyOptions *DeletePolicyOptions) (response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(deletePolicyOptions, "deletePolicyOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(deletePolicyOptions, "deletePolicyOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v1/policies"}
-	pathParameters := []string{*deletePolicyOptions.PolicyID}
-
-	builder := core.NewRequestBuilder(core.DELETE)
-	_, err = builder.ConstructHTTPURL(iamPolicyManagement.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range deletePolicyOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("iam_policy_management", "V1", "DeletePolicy")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = iamPolicyManagement.Service.Request(request, nil)
-
-	return
-}
-
-// ListRoles : Get roles by filters
-// Get roles based on the filters. While managing roles, you may want to retrieve roles and filter by usages. This can
-// be done through query parameters. Currently, we only support the following attributes: account_id, and service_name.
-// Only roles that match the filter and that the caller has read access to are returned. If the caller does not have
-// read access to any roles an empty array is returned.
-func (iamPolicyManagement *IamPolicyManagementV1) ListRoles(listRolesOptions *ListRolesOptions) (result *RoleList, response *core.DetailedResponse, err error) {
-	err = core.ValidateStruct(listRolesOptions, "listRolesOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v2/roles"}
-	pathParameters := []string{}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(iamPolicyManagement.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range listRolesOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("iam_policy_management", "V1", "ListRoles")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-	if listRolesOptions.AcceptLanguage != nil {
-		builder.AddHeader("Accept-Language", fmt.Sprint(*listRolesOptions.AcceptLanguage))
-	}
-
-	if listRolesOptions.AccountID != nil {
-		builder.AddQuery("account_id", fmt.Sprint(*listRolesOptions.AccountID))
-	}
-	if listRolesOptions.ServiceName != nil {
-		builder.AddQuery("service_name", fmt.Sprint(*listRolesOptions.ServiceName))
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = iamPolicyManagement.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalRoleList(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// CreateRole : Create a role
-// Creates a custom role for a specific service within the account. An account owner or a user assigned the
-// Administrator role on the Role management service can create a custom role. Any number of actions for a single
-// service can be mapped to the new role, but there must be at least one service-defined action to successfully create
-// the new role.
-func (iamPolicyManagement *IamPolicyManagementV1) CreateRole(createRoleOptions *CreateRoleOptions) (result *CustomRoleResponse, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(createRoleOptions, "createRoleOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(createRoleOptions, "createRoleOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v2/roles"}
-	pathParameters := []string{}
-
-	builder := core.NewRequestBuilder(core.POST)
-	_, err = builder.ConstructHTTPURL(iamPolicyManagement.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range createRoleOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("iam_policy_management", "V1", "CreateRole")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-	builder.AddHeader("Content-Type", "application/json")
-	if createRoleOptions.AcceptLanguage != nil {
-		builder.AddHeader("Accept-Language", fmt.Sprint(*createRoleOptions.AcceptLanguage))
-	}
-
-	body := make(map[string]interface{})
-	if createRoleOptions.Name != nil {
-		body["name"] = createRoleOptions.Name
-	}
-	if createRoleOptions.AccountID != nil {
-		body["account_id"] = createRoleOptions.AccountID
-	}
-	if createRoleOptions.ServiceName != nil {
-		body["service_name"] = createRoleOptions.ServiceName
-	}
-	if createRoleOptions.DisplayName != nil {
-		body["display_name"] = createRoleOptions.DisplayName
-	}
-	if createRoleOptions.Actions != nil {
-		body["actions"] = createRoleOptions.Actions
-	}
-	if createRoleOptions.Description != nil {
-		body["description"] = createRoleOptions.Description
-	}
-	_, err = builder.SetBodyContentJSON(body)
-	if err != nil {
-		return
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = iamPolicyManagement.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalCustomRoleResponse(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// UpdateRole : Update a role
-// Update a custom role. A role administrator might want to update an existing role by updating the display name,
-// description, or the actions that are mapped to the role. The name, account_id, and service_name can't be changed.
-func (iamPolicyManagement *IamPolicyManagementV1) UpdateRole(updateRoleOptions *UpdateRoleOptions) (result *CustomRoleResponse, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(updateRoleOptions, "updateRoleOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(updateRoleOptions, "updateRoleOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v2/roles"}
-	pathParameters := []string{*updateRoleOptions.RoleID}
-
-	builder := core.NewRequestBuilder(core.PUT)
-	_, err = builder.ConstructHTTPURL(iamPolicyManagement.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range updateRoleOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("iam_policy_management", "V1", "UpdateRole")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-	builder.AddHeader("Content-Type", "application/json")
-	if updateRoleOptions.IfMatch != nil {
-		builder.AddHeader("If-Match", fmt.Sprint(*updateRoleOptions.IfMatch))
-	}
-
-	body := make(map[string]interface{})
-	if updateRoleOptions.DisplayName != nil {
-		body["display_name"] = updateRoleOptions.DisplayName
-	}
-	if updateRoleOptions.Description != nil {
-		body["description"] = updateRoleOptions.Description
-	}
-	if updateRoleOptions.Actions != nil {
-		body["actions"] = updateRoleOptions.Actions
-	}
-	_, err = builder.SetBodyContentJSON(body)
-	if err != nil {
-		return
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = iamPolicyManagement.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalCustomRoleResponse(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// GetRole : Retrieve a role by ID
-// Retrieve a role by providing a role ID.
-func (iamPolicyManagement *IamPolicyManagementV1) GetRole(getRoleOptions *GetRoleOptions) (result *CustomRoleResponse, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(getRoleOptions, "getRoleOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(getRoleOptions, "getRoleOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v2/roles"}
-	pathParameters := []string{*getRoleOptions.RoleID}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(iamPolicyManagement.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range getRoleOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("iam_policy_management", "V1", "GetRole")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = iamPolicyManagement.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalCustomRoleResponse(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// DeleteRole : Delete a role by ID
-// Delete a role by providing a role ID.
-func (iamPolicyManagement *IamPolicyManagementV1) DeleteRole(deleteRoleOptions *DeleteRoleOptions) (response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(deleteRoleOptions, "deleteRoleOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(deleteRoleOptions, "deleteRoleOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v2/roles"}
-	pathParameters := []string{*deleteRoleOptions.RoleID}
-
-	builder := core.NewRequestBuilder(core.DELETE)
-	_, err = builder.ConstructHTTPURL(iamPolicyManagement.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range deleteRoleOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("iam_policy_management", "V1", "DeleteRole")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = iamPolicyManagement.Service.Request(request, nil)
-
-	return
-}
-
-// CreatePolicyOptions : The CreatePolicy options.
-type CreatePolicyOptions struct {
-	// The policy type; either 'access' or 'authorization'.
-	Type *string `json:"type" validate:"required"`
-
-	// The subject attribute values that must match in order for this policy to apply in a permission decision.
-	Subjects []PolicyRequestSubjectsItem `json:"subjects" validate:"required"`
-
-	// A set of role cloud resource names (CRNs) granted by the policy.
-	Roles []PolicyRequestRolesItem `json:"roles" validate:"required"`
-
-	// The attributes of the resource. Note that only one resource is allowed in a policy.
-	Resources []PolicyRequestResourcesItem `json:"resources" validate:"required"`
-
-	// Translation language code.
-	AcceptLanguage *string `json:"Accept-Language,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewCreatePolicyOptions : Instantiate CreatePolicyOptions
-func (*IamPolicyManagementV1) NewCreatePolicyOptions(typeVar string, subjects []PolicyRequestSubjectsItem, roles []PolicyRequestRolesItem, resources []PolicyRequestResourcesItem) *CreatePolicyOptions {
-	return &CreatePolicyOptions{
-		Type: core.StringPtr(typeVar),
-		Subjects: subjects,
-		Roles: roles,
-		Resources: resources,
-	}
-}
-
-// SetType : Allow user to set Type
-func (options *CreatePolicyOptions) SetType(typeVar string) *CreatePolicyOptions {
-	options.Type = core.StringPtr(typeVar)
-	return options
-}
-
-// SetSubjects : Allow user to set Subjects
-func (options *CreatePolicyOptions) SetSubjects(subjects []PolicyRequestSubjectsItem) *CreatePolicyOptions {
-	options.Subjects = subjects
-	return options
-}
-
-// SetRoles : Allow user to set Roles
-func (options *CreatePolicyOptions) SetRoles(roles []PolicyRequestRolesItem) *CreatePolicyOptions {
-	options.Roles = roles
-	return options
-}
-
-// SetResources : Allow user to set Resources
-func (options *CreatePolicyOptions) SetResources(resources []PolicyRequestResourcesItem) *CreatePolicyOptions {
-	options.Resources = resources
-	return options
-}
-
-// SetAcceptLanguage : Allow user to set AcceptLanguage
-func (options *CreatePolicyOptions) SetAcceptLanguage(acceptLanguage string) *CreatePolicyOptions {
-	options.AcceptLanguage = core.StringPtr(acceptLanguage)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *CreatePolicyOptions) SetHeaders(param map[string]string) *CreatePolicyOptions {
-	options.Headers = param
-	return options
-}
-
-// CreateRoleOptions : The CreateRole options.
-type CreateRoleOptions struct {
-	// The name of the role that is used in the CRN. Can only be alphanumeric and has to be capitalized.
-	Name *string `json:"name" validate:"required"`
-
-	// The account GUID.
-	AccountID *string `json:"account_id" validate:"required"`
-
-	// The service name.
-	ServiceName *string `json:"service_name" validate:"required"`
-
-	// The display name of the role that is shown in the console.
-	DisplayName *string `json:"display_name" validate:"required"`
-
-	// The actions of the role.
-	Actions []string `json:"actions" validate:"required"`
-
-	// The description of the role.
-	Description *string `json:"description,omitempty"`
-
-	// Translation language code.
-	AcceptLanguage *string `json:"Accept-Language,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewCreateRoleOptions : Instantiate CreateRoleOptions
-func (*IamPolicyManagementV1) NewCreateRoleOptions(name string, accountID string, serviceName string, displayName string, actions []string) *CreateRoleOptions {
-	return &CreateRoleOptions{
-		Name: core.StringPtr(name),
-		AccountID: core.StringPtr(accountID),
-		ServiceName: core.StringPtr(serviceName),
-		DisplayName: core.StringPtr(displayName),
-		Actions: actions,
-	}
-}
-
-// SetName : Allow user to set Name
-func (options *CreateRoleOptions) SetName(name string) *CreateRoleOptions {
-	options.Name = core.StringPtr(name)
-	return options
-}
-
-// SetAccountID : Allow user to set AccountID
-func (options *CreateRoleOptions) SetAccountID(accountID string) *CreateRoleOptions {
-	options.AccountID = core.StringPtr(accountID)
-	return options
-}
-
-// SetServiceName : Allow user to set ServiceName
-func (options *CreateRoleOptions) SetServiceName(serviceName string) *CreateRoleOptions {
-	options.ServiceName = core.StringPtr(serviceName)
-	return options
-}
-
-// SetDisplayName : Allow user to set DisplayName
-func (options *CreateRoleOptions) SetDisplayName(displayName string) *CreateRoleOptions {
-	options.DisplayName = core.StringPtr(displayName)
-	return options
-}
-
-// SetActions : Allow user to set Actions
-func (options *CreateRoleOptions) SetActions(actions []string) *CreateRoleOptions {
-	options.Actions = actions
-	return options
-}
-
-// SetDescription : Allow user to set Description
-func (options *CreateRoleOptions) SetDescription(description string) *CreateRoleOptions {
-	options.Description = core.StringPtr(description)
-	return options
-}
-
-// SetAcceptLanguage : Allow user to set AcceptLanguage
-func (options *CreateRoleOptions) SetAcceptLanguage(acceptLanguage string) *CreateRoleOptions {
-	options.AcceptLanguage = core.StringPtr(acceptLanguage)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *CreateRoleOptions) SetHeaders(param map[string]string) *CreateRoleOptions {
-	options.Headers = param
-	return options
-}
-
-// DeletePolicyOptions : The DeletePolicy options.
-type DeletePolicyOptions struct {
-	// The policy ID.
-	PolicyID *string `json:"policy_id" validate:"required"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewDeletePolicyOptions : Instantiate DeletePolicyOptions
-func (*IamPolicyManagementV1) NewDeletePolicyOptions(policyID string) *DeletePolicyOptions {
-	return &DeletePolicyOptions{
-		PolicyID: core.StringPtr(policyID),
-	}
-}
-
-// SetPolicyID : Allow user to set PolicyID
-func (options *DeletePolicyOptions) SetPolicyID(policyID string) *DeletePolicyOptions {
-	options.PolicyID = core.StringPtr(policyID)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *DeletePolicyOptions) SetHeaders(param map[string]string) *DeletePolicyOptions {
-	options.Headers = param
-	return options
-}
-
-// DeleteRoleOptions : The DeleteRole options.
-type DeleteRoleOptions struct {
-	// The role ID.
-	RoleID *string `json:"role_id" validate:"required"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewDeleteRoleOptions : Instantiate DeleteRoleOptions
-func (*IamPolicyManagementV1) NewDeleteRoleOptions(roleID string) *DeleteRoleOptions {
-	return &DeleteRoleOptions{
-		RoleID: core.StringPtr(roleID),
-	}
-}
-
-// SetRoleID : Allow user to set RoleID
-func (options *DeleteRoleOptions) SetRoleID(roleID string) *DeleteRoleOptions {
-	options.RoleID = core.StringPtr(roleID)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *DeleteRoleOptions) SetHeaders(param map[string]string) *DeleteRoleOptions {
-	options.Headers = param
-	return options
-}
-
-// GetPolicyOptions : The GetPolicy options.
-type GetPolicyOptions struct {
-	// The policy ID.
-	PolicyID *string `json:"policy_id" validate:"required"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewGetPolicyOptions : Instantiate GetPolicyOptions
-func (*IamPolicyManagementV1) NewGetPolicyOptions(policyID string) *GetPolicyOptions {
-	return &GetPolicyOptions{
-		PolicyID: core.StringPtr(policyID),
-	}
-}
-
-// SetPolicyID : Allow user to set PolicyID
-func (options *GetPolicyOptions) SetPolicyID(policyID string) *GetPolicyOptions {
-	options.PolicyID = core.StringPtr(policyID)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *GetPolicyOptions) SetHeaders(param map[string]string) *GetPolicyOptions {
-	options.Headers = param
-	return options
-}
-
-// GetRoleOptions : The GetRole options.
-type GetRoleOptions struct {
-	// The role ID.
-	RoleID *string `json:"role_id" validate:"required"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewGetRoleOptions : Instantiate GetRoleOptions
-func (*IamPolicyManagementV1) NewGetRoleOptions(roleID string) *GetRoleOptions {
-	return &GetRoleOptions{
-		RoleID: core.StringPtr(roleID),
-	}
-}
-
-// SetRoleID : Allow user to set RoleID
-func (options *GetRoleOptions) SetRoleID(roleID string) *GetRoleOptions {
-	options.RoleID = core.StringPtr(roleID)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *GetRoleOptions) SetHeaders(param map[string]string) *GetRoleOptions {
-	options.Headers = param
-	return options
-}
-
-// ListPoliciesOptions : The ListPolicies options.
-type ListPoliciesOptions struct {
-	// The account GUID in which the policies belong to.
-	AccountID *string `json:"account_id" validate:"required"`
-
-	// Translation language code.
-	AcceptLanguage *string `json:"Accept-Language,omitempty"`
-
-	// The IAM ID used to identify the subject.
-	IamID *string `json:"iam_id,omitempty"`
-
-	// The access group id.
-	AccessGroupID *string `json:"access_group_id,omitempty"`
-
-	// The type of policy (access or authorization).
-	Type *string `json:"type,omitempty"`
-
-	// The type of service.
-	ServiceType *string `json:"service_type,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewListPoliciesOptions : Instantiate ListPoliciesOptions
-func (*IamPolicyManagementV1) NewListPoliciesOptions(accountID string) *ListPoliciesOptions {
-	return &ListPoliciesOptions{
-		AccountID: core.StringPtr(accountID),
-	}
-}
-
-// SetAccountID : Allow user to set AccountID
-func (options *ListPoliciesOptions) SetAccountID(accountID string) *ListPoliciesOptions {
-	options.AccountID = core.StringPtr(accountID)
-	return options
-}
-
-// SetAcceptLanguage : Allow user to set AcceptLanguage
-func (options *ListPoliciesOptions) SetAcceptLanguage(acceptLanguage string) *ListPoliciesOptions {
-	options.AcceptLanguage = core.StringPtr(acceptLanguage)
-	return options
-}
-
-// SetIamID : Allow user to set IamID
-func (options *ListPoliciesOptions) SetIamID(iamID string) *ListPoliciesOptions {
-	options.IamID = core.StringPtr(iamID)
-	return options
-}
-
-// SetAccessGroupID : Allow user to set AccessGroupID
-func (options *ListPoliciesOptions) SetAccessGroupID(accessGroupID string) *ListPoliciesOptions {
-	options.AccessGroupID = core.StringPtr(accessGroupID)
-	return options
-}
-
-// SetType : Allow user to set Type
-func (options *ListPoliciesOptions) SetType(typeVar string) *ListPoliciesOptions {
-	options.Type = core.StringPtr(typeVar)
-	return options
-}
-
-// SetServiceType : Allow user to set ServiceType
-func (options *ListPoliciesOptions) SetServiceType(serviceType string) *ListPoliciesOptions {
-	options.ServiceType = core.StringPtr(serviceType)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *ListPoliciesOptions) SetHeaders(param map[string]string) *ListPoliciesOptions {
-	options.Headers = param
-	return options
-}
-
-// ListRolesOptions : The ListRoles options.
-type ListRolesOptions struct {
-	// Translation language code.
-	AcceptLanguage *string `json:"Accept-Language,omitempty"`
-
-	// The account GUID in which the roles belong to.
-	AccountID *string `json:"account_id,omitempty"`
-
-	// The name of service.
-	ServiceName *string `json:"service_name,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewListRolesOptions : Instantiate ListRolesOptions
-func (*IamPolicyManagementV1) NewListRolesOptions() *ListRolesOptions {
-	return &ListRolesOptions{}
-}
-
-// SetAcceptLanguage : Allow user to set AcceptLanguage
-func (options *ListRolesOptions) SetAcceptLanguage(acceptLanguage string) *ListRolesOptions {
-	options.AcceptLanguage = core.StringPtr(acceptLanguage)
-	return options
-}
-
-// SetAccountID : Allow user to set AccountID
-func (options *ListRolesOptions) SetAccountID(accountID string) *ListRolesOptions {
-	options.AccountID = core.StringPtr(accountID)
-	return options
-}
-
-// SetServiceName : Allow user to set ServiceName
-func (options *ListRolesOptions) SetServiceName(serviceName string) *ListRolesOptions {
-	options.ServiceName = core.StringPtr(serviceName)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *ListRolesOptions) SetHeaders(param map[string]string) *ListRolesOptions {
-	options.Headers = param
-	return options
-}
-
-// PolicyBaseResourcesItem : PolicyBaseResourcesItem struct
-type PolicyBaseResourcesItem struct {
-	// List of resource attributes.
-	Attributes []PolicyBaseResourcesItemAttributesItem `json:"attributes,omitempty"`
-}
-
-
-// UnmarshalPolicyBaseResourcesItem constructs an instance of PolicyBaseResourcesItem from the specified map.
-func UnmarshalPolicyBaseResourcesItem(m map[string]interface{}) (result *PolicyBaseResourcesItem, err error) {
-	obj := new(PolicyBaseResourcesItem)
-	obj.Attributes, err = UnmarshalPolicyBaseResourcesItemAttributesItemSliceAsProperty(m, "attributes")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalPolicyBaseResourcesItemSlice unmarshals a slice of PolicyBaseResourcesItem instances from the specified list of maps.
-func UnmarshalPolicyBaseResourcesItemSlice(s []interface{}) (slice []PolicyBaseResourcesItem, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'PolicyBaseResourcesItem'")
-			return
-		}
-		obj, e := UnmarshalPolicyBaseResourcesItem(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalPolicyBaseResourcesItemAsProperty unmarshals an instance of PolicyBaseResourcesItem that is stored as a property
-// within the specified map.
-func UnmarshalPolicyBaseResourcesItemAsProperty(m map[string]interface{}, propertyName string) (result *PolicyBaseResourcesItem, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'PolicyBaseResourcesItem'", propertyName)
-			return
-		}
-		result, err = UnmarshalPolicyBaseResourcesItem(objMap)
-	}
-	return
-}
-
-// UnmarshalPolicyBaseResourcesItemSliceAsProperty unmarshals a slice of PolicyBaseResourcesItem instances that are stored as a property
-// within the specified map.
-func UnmarshalPolicyBaseResourcesItemSliceAsProperty(m map[string]interface{}, propertyName string) (slice []PolicyBaseResourcesItem, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'PolicyBaseResourcesItem'", propertyName)
-			return
-		}
-		slice, err = UnmarshalPolicyBaseResourcesItemSlice(vSlice)
-	}
-	return
-}
-
-// PolicyBaseResourcesItemAttributesItem : PolicyBaseResourcesItemAttributesItem struct
-type PolicyBaseResourcesItemAttributesItem struct {
-	// The name of an attribute.
-	Name *string `json:"name,omitempty"`
-
-	// The value of an attribute.
-	Value *string `json:"value,omitempty"`
-
-	// The operator of an attribute.
-	Operator *string `json:"operator,omitempty"`
-}
-
-
-// UnmarshalPolicyBaseResourcesItemAttributesItem constructs an instance of PolicyBaseResourcesItemAttributesItem from the specified map.
-func UnmarshalPolicyBaseResourcesItemAttributesItem(m map[string]interface{}) (result *PolicyBaseResourcesItemAttributesItem, err error) {
-	obj := new(PolicyBaseResourcesItemAttributesItem)
-	obj.Name, err = core.UnmarshalString(m, "name")
-	if err != nil {
-		return
-	}
-	obj.Value, err = core.UnmarshalString(m, "value")
-	if err != nil {
-		return
-	}
-	obj.Operator, err = core.UnmarshalString(m, "operator")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalPolicyBaseResourcesItemAttributesItemSlice unmarshals a slice of PolicyBaseResourcesItemAttributesItem instances from the specified list of maps.
-func UnmarshalPolicyBaseResourcesItemAttributesItemSlice(s []interface{}) (slice []PolicyBaseResourcesItemAttributesItem, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'PolicyBaseResourcesItemAttributesItem'")
-			return
-		}
-		obj, e := UnmarshalPolicyBaseResourcesItemAttributesItem(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalPolicyBaseResourcesItemAttributesItemAsProperty unmarshals an instance of PolicyBaseResourcesItemAttributesItem that is stored as a property
-// within the specified map.
-func UnmarshalPolicyBaseResourcesItemAttributesItemAsProperty(m map[string]interface{}, propertyName string) (result *PolicyBaseResourcesItemAttributesItem, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'PolicyBaseResourcesItemAttributesItem'", propertyName)
-			return
-		}
-		result, err = UnmarshalPolicyBaseResourcesItemAttributesItem(objMap)
-	}
-	return
-}
-
-// UnmarshalPolicyBaseResourcesItemAttributesItemSliceAsProperty unmarshals a slice of PolicyBaseResourcesItemAttributesItem instances that are stored as a property
-// within the specified map.
-func UnmarshalPolicyBaseResourcesItemAttributesItemSliceAsProperty(m map[string]interface{}, propertyName string) (slice []PolicyBaseResourcesItemAttributesItem, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'PolicyBaseResourcesItemAttributesItem'", propertyName)
-			return
-		}
-		slice, err = UnmarshalPolicyBaseResourcesItemAttributesItemSlice(vSlice)
-	}
-	return
-}
-
-// PolicyBaseSubjectsItem : PolicyBaseSubjectsItem struct
-type PolicyBaseSubjectsItem struct {
-	// List of subject attributes.
-	Attributes []PolicyBaseSubjectsItemAttributesItem `json:"attributes,omitempty"`
-}
-
-
-// UnmarshalPolicyBaseSubjectsItem constructs an instance of PolicyBaseSubjectsItem from the specified map.
-func UnmarshalPolicyBaseSubjectsItem(m map[string]interface{}) (result *PolicyBaseSubjectsItem, err error) {
-	obj := new(PolicyBaseSubjectsItem)
-	obj.Attributes, err = UnmarshalPolicyBaseSubjectsItemAttributesItemSliceAsProperty(m, "attributes")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalPolicyBaseSubjectsItemSlice unmarshals a slice of PolicyBaseSubjectsItem instances from the specified list of maps.
-func UnmarshalPolicyBaseSubjectsItemSlice(s []interface{}) (slice []PolicyBaseSubjectsItem, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'PolicyBaseSubjectsItem'")
-			return
-		}
-		obj, e := UnmarshalPolicyBaseSubjectsItem(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalPolicyBaseSubjectsItemAsProperty unmarshals an instance of PolicyBaseSubjectsItem that is stored as a property
-// within the specified map.
-func UnmarshalPolicyBaseSubjectsItemAsProperty(m map[string]interface{}, propertyName string) (result *PolicyBaseSubjectsItem, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'PolicyBaseSubjectsItem'", propertyName)
-			return
-		}
-		result, err = UnmarshalPolicyBaseSubjectsItem(objMap)
-	}
-	return
-}
-
-// UnmarshalPolicyBaseSubjectsItemSliceAsProperty unmarshals a slice of PolicyBaseSubjectsItem instances that are stored as a property
-// within the specified map.
-func UnmarshalPolicyBaseSubjectsItemSliceAsProperty(m map[string]interface{}, propertyName string) (slice []PolicyBaseSubjectsItem, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'PolicyBaseSubjectsItem'", propertyName)
-			return
-		}
-		slice, err = UnmarshalPolicyBaseSubjectsItemSlice(vSlice)
-	}
-	return
-}
-
-// PolicyBaseSubjectsItemAttributesItem : PolicyBaseSubjectsItemAttributesItem struct
-type PolicyBaseSubjectsItemAttributesItem struct {
-	// The name of an attribute.
-	Name *string `json:"name,omitempty"`
-
-	// The value of an attribute.
-	Value *string `json:"value,omitempty"`
-}
-
-
-// UnmarshalPolicyBaseSubjectsItemAttributesItem constructs an instance of PolicyBaseSubjectsItemAttributesItem from the specified map.
-func UnmarshalPolicyBaseSubjectsItemAttributesItem(m map[string]interface{}) (result *PolicyBaseSubjectsItemAttributesItem, err error) {
-	obj := new(PolicyBaseSubjectsItemAttributesItem)
-	obj.Name, err = core.UnmarshalString(m, "name")
-	if err != nil {
-		return
-	}
-	obj.Value, err = core.UnmarshalString(m, "value")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalPolicyBaseSubjectsItemAttributesItemSlice unmarshals a slice of PolicyBaseSubjectsItemAttributesItem instances from the specified list of maps.
-func UnmarshalPolicyBaseSubjectsItemAttributesItemSlice(s []interface{}) (slice []PolicyBaseSubjectsItemAttributesItem, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'PolicyBaseSubjectsItemAttributesItem'")
-			return
-		}
-		obj, e := UnmarshalPolicyBaseSubjectsItemAttributesItem(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalPolicyBaseSubjectsItemAttributesItemAsProperty unmarshals an instance of PolicyBaseSubjectsItemAttributesItem that is stored as a property
-// within the specified map.
-func UnmarshalPolicyBaseSubjectsItemAttributesItemAsProperty(m map[string]interface{}, propertyName string) (result *PolicyBaseSubjectsItemAttributesItem, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'PolicyBaseSubjectsItemAttributesItem'", propertyName)
-			return
-		}
-		result, err = UnmarshalPolicyBaseSubjectsItemAttributesItem(objMap)
-	}
-	return
-}
-
-// UnmarshalPolicyBaseSubjectsItemAttributesItemSliceAsProperty unmarshals a slice of PolicyBaseSubjectsItemAttributesItem instances that are stored as a property
-// within the specified map.
-func UnmarshalPolicyBaseSubjectsItemAttributesItemSliceAsProperty(m map[string]interface{}, propertyName string) (slice []PolicyBaseSubjectsItemAttributesItem, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'PolicyBaseSubjectsItemAttributesItem'", propertyName)
-			return
-		}
-		slice, err = UnmarshalPolicyBaseSubjectsItemAttributesItemSlice(vSlice)
-	}
-	return
-}
-
-// PolicyRequestResourcesItem : PolicyRequestResourcesItem struct
-type PolicyRequestResourcesItem struct {
-	// List of resource attributes.
-	Attributes []PolicyRequestResourcesItemAttributesItem `json:"attributes" validate:"required"`
-}
-
-
-// NewPolicyRequestResourcesItem : Instantiate PolicyRequestResourcesItem (Generic Model Constructor)
-func (*IamPolicyManagementV1) NewPolicyRequestResourcesItem(attributes []PolicyRequestResourcesItemAttributesItem) (model *PolicyRequestResourcesItem, err error) {
-	model = &PolicyRequestResourcesItem{
-		Attributes: attributes,
-	}
-	err = core.ValidateStruct(model, "required parameters")
-	return
-}
-
-// UnmarshalPolicyRequestResourcesItem constructs an instance of PolicyRequestResourcesItem from the specified map.
-func UnmarshalPolicyRequestResourcesItem(m map[string]interface{}) (result *PolicyRequestResourcesItem, err error) {
-	obj := new(PolicyRequestResourcesItem)
-	obj.Attributes, err = UnmarshalPolicyRequestResourcesItemAttributesItemSliceAsProperty(m, "attributes")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalPolicyRequestResourcesItemSlice unmarshals a slice of PolicyRequestResourcesItem instances from the specified list of maps.
-func UnmarshalPolicyRequestResourcesItemSlice(s []interface{}) (slice []PolicyRequestResourcesItem, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'PolicyRequestResourcesItem'")
-			return
-		}
-		obj, e := UnmarshalPolicyRequestResourcesItem(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalPolicyRequestResourcesItemAsProperty unmarshals an instance of PolicyRequestResourcesItem that is stored as a property
-// within the specified map.
-func UnmarshalPolicyRequestResourcesItemAsProperty(m map[string]interface{}, propertyName string) (result *PolicyRequestResourcesItem, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'PolicyRequestResourcesItem'", propertyName)
-			return
-		}
-		result, err = UnmarshalPolicyRequestResourcesItem(objMap)
-	}
-	return
-}
-
-// UnmarshalPolicyRequestResourcesItemSliceAsProperty unmarshals a slice of PolicyRequestResourcesItem instances that are stored as a property
-// within the specified map.
-func UnmarshalPolicyRequestResourcesItemSliceAsProperty(m map[string]interface{}, propertyName string) (slice []PolicyRequestResourcesItem, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'PolicyRequestResourcesItem'", propertyName)
-			return
-		}
-		slice, err = UnmarshalPolicyRequestResourcesItemSlice(vSlice)
-	}
-	return
-}
-
-// PolicyRequestResourcesItemAttributesItem : PolicyRequestResourcesItemAttributesItem struct
-type PolicyRequestResourcesItemAttributesItem struct {
-	// The name of an attribute.
-	Name *string `json:"name" validate:"required"`
-
-	// The value of an attribute.
-	Value *string `json:"value" validate:"required"`
-
-	// The operator of an attribute.
-	Operator *string `json:"operator,omitempty"`
-}
-
-
-// NewPolicyRequestResourcesItemAttributesItem : Instantiate PolicyRequestResourcesItemAttributesItem (Generic Model Constructor)
-func (*IamPolicyManagementV1) NewPolicyRequestResourcesItemAttributesItem(name string, value string) (model *PolicyRequestResourcesItemAttributesItem, err error) {
-	model = &PolicyRequestResourcesItemAttributesItem{
-		Name: core.StringPtr(name),
-		Value: core.StringPtr(value),
-	}
-	err = core.ValidateStruct(model, "required parameters")
-	return
-}
-
-// UnmarshalPolicyRequestResourcesItemAttributesItem constructs an instance of PolicyRequestResourcesItemAttributesItem from the specified map.
-func UnmarshalPolicyRequestResourcesItemAttributesItem(m map[string]interface{}) (result *PolicyRequestResourcesItemAttributesItem, err error) {
-	obj := new(PolicyRequestResourcesItemAttributesItem)
-	obj.Name, err = core.UnmarshalString(m, "name")
-	if err != nil {
-		return
-	}
-	obj.Value, err = core.UnmarshalString(m, "value")
-	if err != nil {
-		return
-	}
-	obj.Operator, err = core.UnmarshalString(m, "operator")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalPolicyRequestResourcesItemAttributesItemSlice unmarshals a slice of PolicyRequestResourcesItemAttributesItem instances from the specified list of maps.
-func UnmarshalPolicyRequestResourcesItemAttributesItemSlice(s []interface{}) (slice []PolicyRequestResourcesItemAttributesItem, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'PolicyRequestResourcesItemAttributesItem'")
-			return
-		}
-		obj, e := UnmarshalPolicyRequestResourcesItemAttributesItem(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalPolicyRequestResourcesItemAttributesItemAsProperty unmarshals an instance of PolicyRequestResourcesItemAttributesItem that is stored as a property
-// within the specified map.
-func UnmarshalPolicyRequestResourcesItemAttributesItemAsProperty(m map[string]interface{}, propertyName string) (result *PolicyRequestResourcesItemAttributesItem, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'PolicyRequestResourcesItemAttributesItem'", propertyName)
-			return
-		}
-		result, err = UnmarshalPolicyRequestResourcesItemAttributesItem(objMap)
-	}
-	return
-}
-
-// UnmarshalPolicyRequestResourcesItemAttributesItemSliceAsProperty unmarshals a slice of PolicyRequestResourcesItemAttributesItem instances that are stored as a property
-// within the specified map.
-func UnmarshalPolicyRequestResourcesItemAttributesItemSliceAsProperty(m map[string]interface{}, propertyName string) (slice []PolicyRequestResourcesItemAttributesItem, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'PolicyRequestResourcesItemAttributesItem'", propertyName)
-			return
-		}
-		slice, err = UnmarshalPolicyRequestResourcesItemAttributesItemSlice(vSlice)
-	}
-	return
-}
-
-// PolicyRequestRolesItem : PolicyRequestRolesItem struct
-type PolicyRequestRolesItem struct {
-	// A role cloud resource name (CRN).
-	RoleID *string `json:"role_id" validate:"required"`
-}
-
-
-// NewPolicyRequestRolesItem : Instantiate PolicyRequestRolesItem (Generic Model Constructor)
-func (*IamPolicyManagementV1) NewPolicyRequestRolesItem(roleID string) (model *PolicyRequestRolesItem, err error) {
-	model = &PolicyRequestRolesItem{
-		RoleID: core.StringPtr(roleID),
-	}
-	err = core.ValidateStruct(model, "required parameters")
-	return
-}
-
-// UnmarshalPolicyRequestRolesItem constructs an instance of PolicyRequestRolesItem from the specified map.
-func UnmarshalPolicyRequestRolesItem(m map[string]interface{}) (result *PolicyRequestRolesItem, err error) {
-	obj := new(PolicyRequestRolesItem)
-	obj.RoleID, err = core.UnmarshalString(m, "role_id")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalPolicyRequestRolesItemSlice unmarshals a slice of PolicyRequestRolesItem instances from the specified list of maps.
-func UnmarshalPolicyRequestRolesItemSlice(s []interface{}) (slice []PolicyRequestRolesItem, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'PolicyRequestRolesItem'")
-			return
-		}
-		obj, e := UnmarshalPolicyRequestRolesItem(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalPolicyRequestRolesItemAsProperty unmarshals an instance of PolicyRequestRolesItem that is stored as a property
-// within the specified map.
-func UnmarshalPolicyRequestRolesItemAsProperty(m map[string]interface{}, propertyName string) (result *PolicyRequestRolesItem, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'PolicyRequestRolesItem'", propertyName)
-			return
-		}
-		result, err = UnmarshalPolicyRequestRolesItem(objMap)
-	}
-	return
-}
-
-// UnmarshalPolicyRequestRolesItemSliceAsProperty unmarshals a slice of PolicyRequestRolesItem instances that are stored as a property
-// within the specified map.
-func UnmarshalPolicyRequestRolesItemSliceAsProperty(m map[string]interface{}, propertyName string) (slice []PolicyRequestRolesItem, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'PolicyRequestRolesItem'", propertyName)
-			return
-		}
-		slice, err = UnmarshalPolicyRequestRolesItemSlice(vSlice)
-	}
-	return
-}
-
-// PolicyRequestSubjectsItem : PolicyRequestSubjectsItem struct
-type PolicyRequestSubjectsItem struct {
-	// List of subject attributes.
-	Attributes []PolicyRequestSubjectsItemAttributesItem `json:"attributes" validate:"required"`
-}
-
-
-// NewPolicyRequestSubjectsItem : Instantiate PolicyRequestSubjectsItem (Generic Model Constructor)
-func (*IamPolicyManagementV1) NewPolicyRequestSubjectsItem(attributes []PolicyRequestSubjectsItemAttributesItem) (model *PolicyRequestSubjectsItem, err error) {
-	model = &PolicyRequestSubjectsItem{
-		Attributes: attributes,
-	}
-	err = core.ValidateStruct(model, "required parameters")
-	return
-}
-
-// UnmarshalPolicyRequestSubjectsItem constructs an instance of PolicyRequestSubjectsItem from the specified map.
-func UnmarshalPolicyRequestSubjectsItem(m map[string]interface{}) (result *PolicyRequestSubjectsItem, err error) {
-	obj := new(PolicyRequestSubjectsItem)
-	obj.Attributes, err = UnmarshalPolicyRequestSubjectsItemAttributesItemSliceAsProperty(m, "attributes")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalPolicyRequestSubjectsItemSlice unmarshals a slice of PolicyRequestSubjectsItem instances from the specified list of maps.
-func UnmarshalPolicyRequestSubjectsItemSlice(s []interface{}) (slice []PolicyRequestSubjectsItem, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'PolicyRequestSubjectsItem'")
-			return
-		}
-		obj, e := UnmarshalPolicyRequestSubjectsItem(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalPolicyRequestSubjectsItemAsProperty unmarshals an instance of PolicyRequestSubjectsItem that is stored as a property
-// within the specified map.
-func UnmarshalPolicyRequestSubjectsItemAsProperty(m map[string]interface{}, propertyName string) (result *PolicyRequestSubjectsItem, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'PolicyRequestSubjectsItem'", propertyName)
-			return
-		}
-		result, err = UnmarshalPolicyRequestSubjectsItem(objMap)
-	}
-	return
-}
-
-// UnmarshalPolicyRequestSubjectsItemSliceAsProperty unmarshals a slice of PolicyRequestSubjectsItem instances that are stored as a property
-// within the specified map.
-func UnmarshalPolicyRequestSubjectsItemSliceAsProperty(m map[string]interface{}, propertyName string) (slice []PolicyRequestSubjectsItem, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'PolicyRequestSubjectsItem'", propertyName)
-			return
-		}
-		slice, err = UnmarshalPolicyRequestSubjectsItemSlice(vSlice)
-	}
-	return
-}
-
-// PolicyRequestSubjectsItemAttributesItem : PolicyRequestSubjectsItemAttributesItem struct
-type PolicyRequestSubjectsItemAttributesItem struct {
-	// The name of an attribute.
-	Name *string `json:"name" validate:"required"`
-
-	// The value of an attribute.
-	Value *string `json:"value" validate:"required"`
-}
-
-
-// NewPolicyRequestSubjectsItemAttributesItem : Instantiate PolicyRequestSubjectsItemAttributesItem (Generic Model Constructor)
-func (*IamPolicyManagementV1) NewPolicyRequestSubjectsItemAttributesItem(name string, value string) (model *PolicyRequestSubjectsItemAttributesItem, err error) {
-	model = &PolicyRequestSubjectsItemAttributesItem{
-		Name: core.StringPtr(name),
-		Value: core.StringPtr(value),
-	}
-	err = core.ValidateStruct(model, "required parameters")
-	return
-}
-
-// UnmarshalPolicyRequestSubjectsItemAttributesItem constructs an instance of PolicyRequestSubjectsItemAttributesItem from the specified map.
-func UnmarshalPolicyRequestSubjectsItemAttributesItem(m map[string]interface{}) (result *PolicyRequestSubjectsItemAttributesItem, err error) {
-	obj := new(PolicyRequestSubjectsItemAttributesItem)
-	obj.Name, err = core.UnmarshalString(m, "name")
-	if err != nil {
-		return
-	}
-	obj.Value, err = core.UnmarshalString(m, "value")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalPolicyRequestSubjectsItemAttributesItemSlice unmarshals a slice of PolicyRequestSubjectsItemAttributesItem instances from the specified list of maps.
-func UnmarshalPolicyRequestSubjectsItemAttributesItemSlice(s []interface{}) (slice []PolicyRequestSubjectsItemAttributesItem, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'PolicyRequestSubjectsItemAttributesItem'")
-			return
-		}
-		obj, e := UnmarshalPolicyRequestSubjectsItemAttributesItem(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalPolicyRequestSubjectsItemAttributesItemAsProperty unmarshals an instance of PolicyRequestSubjectsItemAttributesItem that is stored as a property
-// within the specified map.
-func UnmarshalPolicyRequestSubjectsItemAttributesItemAsProperty(m map[string]interface{}, propertyName string) (result *PolicyRequestSubjectsItemAttributesItem, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'PolicyRequestSubjectsItemAttributesItem'", propertyName)
-			return
-		}
-		result, err = UnmarshalPolicyRequestSubjectsItemAttributesItem(objMap)
-	}
-	return
-}
-
-// UnmarshalPolicyRequestSubjectsItemAttributesItemSliceAsProperty unmarshals a slice of PolicyRequestSubjectsItemAttributesItem instances that are stored as a property
-// within the specified map.
-func UnmarshalPolicyRequestSubjectsItemAttributesItemSliceAsProperty(m map[string]interface{}, propertyName string) (slice []PolicyRequestSubjectsItemAttributesItem, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'PolicyRequestSubjectsItemAttributesItem'", propertyName)
-			return
-		}
-		slice, err = UnmarshalPolicyRequestSubjectsItemAttributesItemSlice(vSlice)
-	}
-	return
-}
-
-// PolicyResponseRolesItem : PolicyResponseRolesItem struct
-type PolicyResponseRolesItem struct {
-	// The role cloud resource name granted by the policy.
-	RoleID *string `json:"role_id,omitempty"`
-
-	// The display name of the role.
-	DisplayName *string `json:"display_name,omitempty"`
-
-	// The description of the role.
-	Description *string `json:"description,omitempty"`
-}
-
-
-// UnmarshalPolicyResponseRolesItem constructs an instance of PolicyResponseRolesItem from the specified map.
-func UnmarshalPolicyResponseRolesItem(m map[string]interface{}) (result *PolicyResponseRolesItem, err error) {
-	obj := new(PolicyResponseRolesItem)
-	obj.RoleID, err = core.UnmarshalString(m, "role_id")
-	if err != nil {
-		return
-	}
-	obj.DisplayName, err = core.UnmarshalString(m, "display_name")
-	if err != nil {
-		return
-	}
-	obj.Description, err = core.UnmarshalString(m, "description")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalPolicyResponseRolesItemSlice unmarshals a slice of PolicyResponseRolesItem instances from the specified list of maps.
-func UnmarshalPolicyResponseRolesItemSlice(s []interface{}) (slice []PolicyResponseRolesItem, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'PolicyResponseRolesItem'")
-			return
-		}
-		obj, e := UnmarshalPolicyResponseRolesItem(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalPolicyResponseRolesItemAsProperty unmarshals an instance of PolicyResponseRolesItem that is stored as a property
-// within the specified map.
-func UnmarshalPolicyResponseRolesItemAsProperty(m map[string]interface{}, propertyName string) (result *PolicyResponseRolesItem, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'PolicyResponseRolesItem'", propertyName)
-			return
-		}
-		result, err = UnmarshalPolicyResponseRolesItem(objMap)
-	}
-	return
-}
-
-// UnmarshalPolicyResponseRolesItemSliceAsProperty unmarshals a slice of PolicyResponseRolesItem instances that are stored as a property
-// within the specified map.
-func UnmarshalPolicyResponseRolesItemSliceAsProperty(m map[string]interface{}, propertyName string) (slice []PolicyResponseRolesItem, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'PolicyResponseRolesItem'", propertyName)
-			return
-		}
-		slice, err = UnmarshalPolicyResponseRolesItemSlice(vSlice)
-	}
-	return
-}
-
-// RoleListCustomRolesItem : RoleListCustomRolesItem struct
-type RoleListCustomRolesItem struct {
-	// The role ID.
-	ID *string `json:"id,omitempty"`
-
-	// The name of the role that is used in the CRN. Can only be alphanumeric and has to be capitalized.
-	Name *string `json:"name,omitempty"`
-
-	// The account GUID.
-	AccountID *string `json:"account_id,omitempty"`
-
-	// The service name.
-	ServiceName *string `json:"service_name,omitempty"`
-
-	// The role CRN.
-	Crn *string `json:"crn,omitempty"`
-
-	// The display name of the role that is shown in the console.
-	DisplayName *string `json:"display_name,omitempty"`
-
-	// The description of the role.
-	Description *string `json:"description,omitempty"`
-
-	// The actions of the role.
-	Actions []string `json:"actions,omitempty"`
-
-	// The UTC timestamp when the role was created.
-	CreatedAt *strfmt.DateTime `json:"created_at,omitempty"`
-
-	// The iam ID of the entity that created the role.
-	CreatedByID *string `json:"created_by_id,omitempty"`
-
-	// The UTC timestamp when the role was last modified.
-	LastModifiedAt *strfmt.DateTime `json:"last_modified_at,omitempty"`
-
-	// The iam ID of the entity that last modified the policy.
-	LastModifiedByID *string `json:"last_modified_by_id,omitempty"`
-
-	// The href link back to the role.
-	Href *string `json:"href,omitempty"`
-}
-
-
-// UnmarshalRoleListCustomRolesItem constructs an instance of RoleListCustomRolesItem from the specified map.
-func UnmarshalRoleListCustomRolesItem(m map[string]interface{}) (result *RoleListCustomRolesItem, err error) {
-	obj := new(RoleListCustomRolesItem)
-	obj.ID, err = core.UnmarshalString(m, "id")
-	if err != nil {
-		return
-	}
-	obj.Name, err = core.UnmarshalString(m, "name")
-	if err != nil {
-		return
-	}
-	obj.AccountID, err = core.UnmarshalString(m, "account_id")
-	if err != nil {
-		return
-	}
-	obj.ServiceName, err = core.UnmarshalString(m, "service_name")
-	if err != nil {
-		return
-	}
-	obj.Crn, err = core.UnmarshalString(m, "crn")
-	if err != nil {
-		return
-	}
-	obj.DisplayName, err = core.UnmarshalString(m, "display_name")
-	if err != nil {
-		return
-	}
-	obj.Description, err = core.UnmarshalString(m, "description")
-	if err != nil {
-		return
-	}
-	obj.Actions, err = core.UnmarshalStringSlice(m, "actions")
-	if err != nil {
-		return
-	}
-	obj.CreatedAt, err = core.UnmarshalDateTime(m, "created_at")
-	if err != nil {
-		return
-	}
-	obj.CreatedByID, err = core.UnmarshalString(m, "created_by_id")
-	if err != nil {
-		return
-	}
-	obj.LastModifiedAt, err = core.UnmarshalDateTime(m, "last_modified_at")
-	if err != nil {
-		return
-	}
-	obj.LastModifiedByID, err = core.UnmarshalString(m, "last_modified_by_id")
-	if err != nil {
-		return
-	}
-	obj.Href, err = core.UnmarshalString(m, "href")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalRoleListCustomRolesItemSlice unmarshals a slice of RoleListCustomRolesItem instances from the specified list of maps.
-func UnmarshalRoleListCustomRolesItemSlice(s []interface{}) (slice []RoleListCustomRolesItem, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'RoleListCustomRolesItem'")
-			return
-		}
-		obj, e := UnmarshalRoleListCustomRolesItem(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalRoleListCustomRolesItemAsProperty unmarshals an instance of RoleListCustomRolesItem that is stored as a property
-// within the specified map.
-func UnmarshalRoleListCustomRolesItemAsProperty(m map[string]interface{}, propertyName string) (result *RoleListCustomRolesItem, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'RoleListCustomRolesItem'", propertyName)
-			return
-		}
-		result, err = UnmarshalRoleListCustomRolesItem(objMap)
-	}
-	return
-}
-
-// UnmarshalRoleListCustomRolesItemSliceAsProperty unmarshals a slice of RoleListCustomRolesItem instances that are stored as a property
-// within the specified map.
-func UnmarshalRoleListCustomRolesItemSliceAsProperty(m map[string]interface{}, propertyName string) (slice []RoleListCustomRolesItem, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'RoleListCustomRolesItem'", propertyName)
-			return
-		}
-		slice, err = UnmarshalRoleListCustomRolesItemSlice(vSlice)
-	}
-	return
-}
-
-// RoleListServiceRolesItem : RoleListServiceRolesItem struct
-type RoleListServiceRolesItem struct {
-	// The role CRN.
-	Crn *string `json:"crn,omitempty"`
-
-	// The display name of the role that is shown in the console.
-	DisplayName *string `json:"display_name,omitempty"`
-
-	// The description of the role.
-	Description *string `json:"description,omitempty"`
-
-	// The actions of the role.
-	Actions []string `json:"actions,omitempty"`
-}
-
-
-// UnmarshalRoleListServiceRolesItem constructs an instance of RoleListServiceRolesItem from the specified map.
-func UnmarshalRoleListServiceRolesItem(m map[string]interface{}) (result *RoleListServiceRolesItem, err error) {
-	obj := new(RoleListServiceRolesItem)
-	obj.Crn, err = core.UnmarshalString(m, "crn")
-	if err != nil {
-		return
-	}
-	obj.DisplayName, err = core.UnmarshalString(m, "display_name")
-	if err != nil {
-		return
-	}
-	obj.Description, err = core.UnmarshalString(m, "description")
-	if err != nil {
-		return
-	}
-	obj.Actions, err = core.UnmarshalStringSlice(m, "actions")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalRoleListServiceRolesItemSlice unmarshals a slice of RoleListServiceRolesItem instances from the specified list of maps.
-func UnmarshalRoleListServiceRolesItemSlice(s []interface{}) (slice []RoleListServiceRolesItem, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'RoleListServiceRolesItem'")
-			return
-		}
-		obj, e := UnmarshalRoleListServiceRolesItem(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalRoleListServiceRolesItemAsProperty unmarshals an instance of RoleListServiceRolesItem that is stored as a property
-// within the specified map.
-func UnmarshalRoleListServiceRolesItemAsProperty(m map[string]interface{}, propertyName string) (result *RoleListServiceRolesItem, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'RoleListServiceRolesItem'", propertyName)
-			return
-		}
-		result, err = UnmarshalRoleListServiceRolesItem(objMap)
-	}
-	return
-}
-
-// UnmarshalRoleListServiceRolesItemSliceAsProperty unmarshals a slice of RoleListServiceRolesItem instances that are stored as a property
-// within the specified map.
-func UnmarshalRoleListServiceRolesItemSliceAsProperty(m map[string]interface{}, propertyName string) (slice []RoleListServiceRolesItem, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'RoleListServiceRolesItem'", propertyName)
-			return
-		}
-		slice, err = UnmarshalRoleListServiceRolesItemSlice(vSlice)
-	}
-	return
-}
-
-// RoleListSystemRolesItem : RoleListSystemRolesItem struct
-type RoleListSystemRolesItem struct {
-	// The role CRN.
-	Crn *string `json:"crn,omitempty"`
-
-	// The display name of the role that is shown in the console.
-	DisplayName *string `json:"display_name,omitempty"`
-
-	// The description of the role.
-	Description *string `json:"description,omitempty"`
-
-	// The actions of the role.
-	Actions []string `json:"actions,omitempty"`
-}
-
-
-// UnmarshalRoleListSystemRolesItem constructs an instance of RoleListSystemRolesItem from the specified map.
-func UnmarshalRoleListSystemRolesItem(m map[string]interface{}) (result *RoleListSystemRolesItem, err error) {
-	obj := new(RoleListSystemRolesItem)
-	obj.Crn, err = core.UnmarshalString(m, "crn")
-	if err != nil {
-		return
-	}
-	obj.DisplayName, err = core.UnmarshalString(m, "display_name")
-	if err != nil {
-		return
-	}
-	obj.Description, err = core.UnmarshalString(m, "description")
-	if err != nil {
-		return
-	}
-	obj.Actions, err = core.UnmarshalStringSlice(m, "actions")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalRoleListSystemRolesItemSlice unmarshals a slice of RoleListSystemRolesItem instances from the specified list of maps.
-func UnmarshalRoleListSystemRolesItemSlice(s []interface{}) (slice []RoleListSystemRolesItem, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'RoleListSystemRolesItem'")
-			return
-		}
-		obj, e := UnmarshalRoleListSystemRolesItem(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalRoleListSystemRolesItemAsProperty unmarshals an instance of RoleListSystemRolesItem that is stored as a property
-// within the specified map.
-func UnmarshalRoleListSystemRolesItemAsProperty(m map[string]interface{}, propertyName string) (result *RoleListSystemRolesItem, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'RoleListSystemRolesItem'", propertyName)
-			return
-		}
-		result, err = UnmarshalRoleListSystemRolesItem(objMap)
-	}
-	return
-}
-
-// UnmarshalRoleListSystemRolesItemSliceAsProperty unmarshals a slice of RoleListSystemRolesItem instances that are stored as a property
-// within the specified map.
-func UnmarshalRoleListSystemRolesItemSliceAsProperty(m map[string]interface{}, propertyName string) (slice []RoleListSystemRolesItem, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'RoleListSystemRolesItem'", propertyName)
-			return
-		}
-		slice, err = UnmarshalRoleListSystemRolesItemSlice(vSlice)
-	}
-	return
-}
-
-// UpdatePolicyOptions : The UpdatePolicy options.
-type UpdatePolicyOptions struct {
-	// The policy ID.
-	PolicyID *string `json:"policy_id" validate:"required"`
-
-	// The revision number for updating a policy and must match the ETag value of the existing policy. The Etag can be
-	// retrieved using the GET /v1/policies/{policy_id} API and looking at the ETag response header.
-	IfMatch *string `json:"If-Match" validate:"required"`
-
-	// The policy type; either 'access' or 'authorization'.
-	Type *string `json:"type" validate:"required"`
-
-	// The subject attribute values that must match in order for this policy to apply in a permission decision.
-	Subjects []PolicyRequestSubjectsItem `json:"subjects" validate:"required"`
-
-	// A set of role cloud resource names (CRNs) granted by the policy.
-	Roles []PolicyRequestRolesItem `json:"roles" validate:"required"`
-
-	// The attributes of the resource. Note that only one resource is allowed in a policy.
-	Resources []PolicyRequestResourcesItem `json:"resources" validate:"required"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewUpdatePolicyOptions : Instantiate UpdatePolicyOptions
-func (*IamPolicyManagementV1) NewUpdatePolicyOptions(policyID string, ifMatch string, typeVar string, subjects []PolicyRequestSubjectsItem, roles []PolicyRequestRolesItem, resources []PolicyRequestResourcesItem) *UpdatePolicyOptions {
-	return &UpdatePolicyOptions{
-		PolicyID: core.StringPtr(policyID),
-		IfMatch: core.StringPtr(ifMatch),
-		Type: core.StringPtr(typeVar),
-		Subjects: subjects,
-		Roles: roles,
-		Resources: resources,
-	}
-}
-
-// SetPolicyID : Allow user to set PolicyID
-func (options *UpdatePolicyOptions) SetPolicyID(policyID string) *UpdatePolicyOptions {
-	options.PolicyID = core.StringPtr(policyID)
-	return options
-}
-
-// SetIfMatch : Allow user to set IfMatch
-func (options *UpdatePolicyOptions) SetIfMatch(ifMatch string) *UpdatePolicyOptions {
-	options.IfMatch = core.StringPtr(ifMatch)
-	return options
-}
-
-// SetType : Allow user to set Type
-func (options *UpdatePolicyOptions) SetType(typeVar string) *UpdatePolicyOptions {
-	options.Type = core.StringPtr(typeVar)
-	return options
-}
-
-// SetSubjects : Allow user to set Subjects
-func (options *UpdatePolicyOptions) SetSubjects(subjects []PolicyRequestSubjectsItem) *UpdatePolicyOptions {
-	options.Subjects = subjects
-	return options
-}
-
-// SetRoles : Allow user to set Roles
-func (options *UpdatePolicyOptions) SetRoles(roles []PolicyRequestRolesItem) *UpdatePolicyOptions {
-	options.Roles = roles
-	return options
-}
-
-// SetResources : Allow user to set Resources
-func (options *UpdatePolicyOptions) SetResources(resources []PolicyRequestResourcesItem) *UpdatePolicyOptions {
-	options.Resources = resources
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *UpdatePolicyOptions) SetHeaders(param map[string]string) *UpdatePolicyOptions {
-	options.Headers = param
-	return options
-}
-
-// UpdateRoleOptions : The UpdateRole options.
-type UpdateRoleOptions struct {
-	// The role ID.
-	RoleID *string `json:"role_id" validate:"required"`
-
-	// The revision number for updating a role and must match the ETag value of the existing role. The Etag can be
-	// retrieved using the GET /v2/roles/{role_id} API and looking at the ETag response header.
-	IfMatch *string `json:"If-Match" validate:"required"`
-
-	// The display name of the role that is shown in the console.
-	DisplayName *string `json:"display_name,omitempty"`
-
-	// The description of the role.
-	Description *string `json:"description,omitempty"`
-
-	// The actions of the role.
-	Actions []string `json:"actions,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewUpdateRoleOptions : Instantiate UpdateRoleOptions
-func (*IamPolicyManagementV1) NewUpdateRoleOptions(roleID string, ifMatch string) *UpdateRoleOptions {
-	return &UpdateRoleOptions{
-		RoleID: core.StringPtr(roleID),
-		IfMatch: core.StringPtr(ifMatch),
-	}
-}
-
-// SetRoleID : Allow user to set RoleID
-func (options *UpdateRoleOptions) SetRoleID(roleID string) *UpdateRoleOptions {
-	options.RoleID = core.StringPtr(roleID)
-	return options
-}
-
-// SetIfMatch : Allow user to set IfMatch
-func (options *UpdateRoleOptions) SetIfMatch(ifMatch string) *UpdateRoleOptions {
-	options.IfMatch = core.StringPtr(ifMatch)
-	return options
-}
-
-// SetDisplayName : Allow user to set DisplayName
-func (options *UpdateRoleOptions) SetDisplayName(displayName string) *UpdateRoleOptions {
-	options.DisplayName = core.StringPtr(displayName)
-	return options
-}
-
-// SetDescription : Allow user to set Description
-func (options *UpdateRoleOptions) SetDescription(description string) *UpdateRoleOptions {
-	options.Description = core.StringPtr(description)
-	return options
-}
-
-// SetActions : Allow user to set Actions
-func (options *UpdateRoleOptions) SetActions(actions []string) *UpdateRoleOptions {
-	options.Actions = actions
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *UpdateRoleOptions) SetHeaders(param map[string]string) *UpdateRoleOptions {
-	options.Headers = param
-	return options
-}
-
-// CustomRoleResponse : CustomRoleResponse struct
-type CustomRoleResponse struct {
-	// The role ID.
-	ID *string `json:"id,omitempty"`
-
-	// The name of the role that is used in the CRN. Can only be alphanumeric and has to be capitalized.
-	Name *string `json:"name,omitempty"`
-
-	// The account GUID.
-	AccountID *string `json:"account_id,omitempty"`
-
-	// The service name.
-	ServiceName *string `json:"service_name,omitempty"`
-
-	// The role CRN.
-	Crn *string `json:"crn,omitempty"`
-
-	// The display name of the role that is shown in the console.
-	DisplayName *string `json:"display_name,omitempty"`
-
-	// The description of the role.
-	Description *string `json:"description,omitempty"`
-
-	// The actions of the role.
-	Actions []string `json:"actions,omitempty"`
-
-	// The UTC timestamp when the role was created.
-	CreatedAt *strfmt.DateTime `json:"created_at,omitempty"`
-
-	// The iam ID of the entity that created the role.
-	CreatedByID *string `json:"created_by_id,omitempty"`
-
-	// The UTC timestamp when the role was last modified.
-	LastModifiedAt *strfmt.DateTime `json:"last_modified_at,omitempty"`
-
-	// The iam ID of the entity that last modified the policy.
-	LastModifiedByID *string `json:"last_modified_by_id,omitempty"`
-
-	// The href link back to the role.
-	Href *string `json:"href,omitempty"`
-}
-
-
-// UnmarshalCustomRoleResponse constructs an instance of CustomRoleResponse from the specified map.
-func UnmarshalCustomRoleResponse(m map[string]interface{}) (result *CustomRoleResponse, err error) {
-	obj := new(CustomRoleResponse)
-	obj.ID, err = core.UnmarshalString(m, "id")
-	if err != nil {
-		return
-	}
-	obj.Name, err = core.UnmarshalString(m, "name")
-	if err != nil {
-		return
-	}
-	obj.AccountID, err = core.UnmarshalString(m, "account_id")
-	if err != nil {
-		return
-	}
-	obj.ServiceName, err = core.UnmarshalString(m, "service_name")
-	if err != nil {
-		return
-	}
-	obj.Crn, err = core.UnmarshalString(m, "crn")
-	if err != nil {
-		return
-	}
-	obj.DisplayName, err = core.UnmarshalString(m, "display_name")
-	if err != nil {
-		return
-	}
-	obj.Description, err = core.UnmarshalString(m, "description")
-	if err != nil {
-		return
-	}
-	obj.Actions, err = core.UnmarshalStringSlice(m, "actions")
-	if err != nil {
-		return
-	}
-	obj.CreatedAt, err = core.UnmarshalDateTime(m, "created_at")
-	if err != nil {
-		return
-	}
-	obj.CreatedByID, err = core.UnmarshalString(m, "created_by_id")
-	if err != nil {
-		return
-	}
-	obj.LastModifiedAt, err = core.UnmarshalDateTime(m, "last_modified_at")
-	if err != nil {
-		return
-	}
-	obj.LastModifiedByID, err = core.UnmarshalString(m, "last_modified_by_id")
-	if err != nil {
-		return
-	}
-	obj.Href, err = core.UnmarshalString(m, "href")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalCustomRoleResponseSlice unmarshals a slice of CustomRoleResponse instances from the specified list of maps.
-func UnmarshalCustomRoleResponseSlice(s []interface{}) (slice []CustomRoleResponse, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'CustomRoleResponse'")
-			return
-		}
-		obj, e := UnmarshalCustomRoleResponse(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalCustomRoleResponseAsProperty unmarshals an instance of CustomRoleResponse that is stored as a property
-// within the specified map.
-func UnmarshalCustomRoleResponseAsProperty(m map[string]interface{}, propertyName string) (result *CustomRoleResponse, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'CustomRoleResponse'", propertyName)
-			return
-		}
-		result, err = UnmarshalCustomRoleResponse(objMap)
-	}
-	return
-}
-
-// UnmarshalCustomRoleResponseSliceAsProperty unmarshals a slice of CustomRoleResponse instances that are stored as a property
-// within the specified map.
-func UnmarshalCustomRoleResponseSliceAsProperty(m map[string]interface{}, propertyName string) (slice []CustomRoleResponse, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'CustomRoleResponse'", propertyName)
-			return
-		}
-		slice, err = UnmarshalCustomRoleResponseSlice(vSlice)
-	}
-	return
-}
-
-// PolicyList : PolicyList struct
-type PolicyList struct {
-	// List of policies.
-	Policies []PolicyResponse `json:"policies,omitempty"`
-}
-
-
-// UnmarshalPolicyList constructs an instance of PolicyList from the specified map.
-func UnmarshalPolicyList(m map[string]interface{}) (result *PolicyList, err error) {
-	obj := new(PolicyList)
-	obj.Policies, err = UnmarshalPolicyResponseSliceAsProperty(m, "policies")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalPolicyListSlice unmarshals a slice of PolicyList instances from the specified list of maps.
-func UnmarshalPolicyListSlice(s []interface{}) (slice []PolicyList, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'PolicyList'")
-			return
-		}
-		obj, e := UnmarshalPolicyList(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalPolicyListAsProperty unmarshals an instance of PolicyList that is stored as a property
-// within the specified map.
-func UnmarshalPolicyListAsProperty(m map[string]interface{}, propertyName string) (result *PolicyList, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'PolicyList'", propertyName)
-			return
-		}
-		result, err = UnmarshalPolicyList(objMap)
-	}
-	return
-}
-
-// UnmarshalPolicyListSliceAsProperty unmarshals a slice of PolicyList instances that are stored as a property
-// within the specified map.
-func UnmarshalPolicyListSliceAsProperty(m map[string]interface{}, propertyName string) (slice []PolicyList, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'PolicyList'", propertyName)
-			return
-		}
-		slice, err = UnmarshalPolicyListSlice(vSlice)
-	}
-	return
-}
-
-// PolicyResponse : PolicyResponse struct
-type PolicyResponse struct {
-	// The policy ID.
-	ID *string `json:"id,omitempty"`
-
-	// The policy type; either 'access' or 'authorization'.
-	Type *string `json:"type,omitempty"`
-
-	// The subject attribute values that must match in order for this policy to apply in a permission decision.
-	Subjects []PolicyBaseSubjectsItem `json:"subjects,omitempty"`
-
-	// A set of role cloud resource names (CRNs) granted by the policy.
-	Roles []PolicyResponseRolesItem `json:"roles,omitempty"`
-
-	// The attributes of the resource. Note that only one resource is allowed in a policy.
-	Resources []PolicyBaseResourcesItem `json:"resources,omitempty"`
-
-	// The href link back to the policy.
-	Href *string `json:"href,omitempty"`
-
-	// The UTC timestamp when the policy was created.
-	CreatedAt *strfmt.DateTime `json:"created_at,omitempty"`
-
-	// The iam ID of the entity that created the policy.
-	CreatedByID *string `json:"created_by_id,omitempty"`
-
-	// The UTC timestamp when the policy was last modified.
-	LastModifiedAt *strfmt.DateTime `json:"last_modified_at,omitempty"`
-
-	// The iam ID of the entity that last modified the policy.
-	LastModifiedByID *string `json:"last_modified_by_id,omitempty"`
-}
-
-
-// UnmarshalPolicyResponse constructs an instance of PolicyResponse from the specified map.
-func UnmarshalPolicyResponse(m map[string]interface{}) (result *PolicyResponse, err error) {
-	obj := new(PolicyResponse)
-	obj.ID, err = core.UnmarshalString(m, "id")
-	if err != nil {
-		return
-	}
-	obj.Type, err = core.UnmarshalString(m, "type")
-	if err != nil {
-		return
-	}
-	obj.Subjects, err = UnmarshalPolicyBaseSubjectsItemSliceAsProperty(m, "subjects")
-	if err != nil {
-		return
-	}
-	obj.Roles, err = UnmarshalPolicyResponseRolesItemSliceAsProperty(m, "roles")
-	if err != nil {
-		return
-	}
-	obj.Resources, err = UnmarshalPolicyBaseResourcesItemSliceAsProperty(m, "resources")
-	if err != nil {
-		return
-	}
-	obj.Href, err = core.UnmarshalString(m, "href")
-	if err != nil {
-		return
-	}
-	obj.CreatedAt, err = core.UnmarshalDateTime(m, "created_at")
-	if err != nil {
-		return
-	}
-	obj.CreatedByID, err = core.UnmarshalString(m, "created_by_id")
-	if err != nil {
-		return
-	}
-	obj.LastModifiedAt, err = core.UnmarshalDateTime(m, "last_modified_at")
-	if err != nil {
-		return
-	}
-	obj.LastModifiedByID, err = core.UnmarshalString(m, "last_modified_by_id")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalPolicyResponseSlice unmarshals a slice of PolicyResponse instances from the specified list of maps.
-func UnmarshalPolicyResponseSlice(s []interface{}) (slice []PolicyResponse, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'PolicyResponse'")
-			return
-		}
-		obj, e := UnmarshalPolicyResponse(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalPolicyResponseAsProperty unmarshals an instance of PolicyResponse that is stored as a property
-// within the specified map.
-func UnmarshalPolicyResponseAsProperty(m map[string]interface{}, propertyName string) (result *PolicyResponse, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'PolicyResponse'", propertyName)
-			return
-		}
-		result, err = UnmarshalPolicyResponse(objMap)
-	}
-	return
-}
-
-// UnmarshalPolicyResponseSliceAsProperty unmarshals a slice of PolicyResponse instances that are stored as a property
-// within the specified map.
-func UnmarshalPolicyResponseSliceAsProperty(m map[string]interface{}, propertyName string) (slice []PolicyResponse, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'PolicyResponse'", propertyName)
-			return
-		}
-		slice, err = UnmarshalPolicyResponseSlice(vSlice)
-	}
-	return
-}
-
-// RoleList : RoleList struct
-type RoleList struct {
-	// List of custom roles.
-	CustomRoles []RoleListCustomRolesItem `json:"custom_roles,omitempty"`
-
-	// List of service roles.
-	ServiceRoles []RoleListServiceRolesItem `json:"service_roles,omitempty"`
-
-	// List of system roles.
-	SystemRoles []RoleListSystemRolesItem `json:"system_roles,omitempty"`
-}
-
-
-// UnmarshalRoleList constructs an instance of RoleList from the specified map.
-func UnmarshalRoleList(m map[string]interface{}) (result *RoleList, err error) {
-	obj := new(RoleList)
-	obj.CustomRoles, err = UnmarshalRoleListCustomRolesItemSliceAsProperty(m, "custom_roles")
-	if err != nil {
-		return
-	}
-	obj.ServiceRoles, err = UnmarshalRoleListServiceRolesItemSliceAsProperty(m, "service_roles")
-	if err != nil {
-		return
-	}
-	obj.SystemRoles, err = UnmarshalRoleListSystemRolesItemSliceAsProperty(m, "system_roles")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalRoleListSlice unmarshals a slice of RoleList instances from the specified list of maps.
-func UnmarshalRoleListSlice(s []interface{}) (slice []RoleList, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'RoleList'")
-			return
-		}
-		obj, e := UnmarshalRoleList(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalRoleListAsProperty unmarshals an instance of RoleList that is stored as a property
-// within the specified map.
-func UnmarshalRoleListAsProperty(m map[string]interface{}, propertyName string) (result *RoleList, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'RoleList'", propertyName)
-			return
-		}
-		result, err = UnmarshalRoleList(objMap)
-	}
-	return
-}
-
-// UnmarshalRoleListSliceAsProperty unmarshals a slice of RoleList instances that are stored as a property
-// within the specified map.
-func UnmarshalRoleListSliceAsProperty(m map[string]interface{}, propertyName string) (slice []RoleList, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'RoleList'", propertyName)
-			return
-		}
-		slice, err = UnmarshalRoleListSlice(vSlice)
-	}
-	return
-}
diff --git a/iampolicymanagementv1/iam_policy_management_v1_integration_test.go b/iampolicymanagementv1/iam_policy_management_v1_integration_test.go
deleted file mode 100644
index 1edb5ccf..00000000
--- a/iampolicymanagementv1/iam_policy_management_v1_integration_test.go
+++ /dev/null
@@ -1,225 +0,0 @@
-// +build integrationSKIP
-
-package iampolicymanagementv1_test
-
-/**
- * (C) Copyright IBM Corp. 2020.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import (
-	"log"
-	"net/http"
-	"os"
-	"testing"
-
-	"github.com/IBM/go-sdk-core/v3/core"
-	"github.com/joho/godotenv"
-	"github.com/stretchr/testify/assert"
-	"github.ibm.com/ibmcloud/platform-services-go-sdk/iampolicymanagementv1"
-)
-
-var service *iampolicymanagementv1.IamPolicyManagementV1
-var serviceErr error
-var policyID string
-var eTag string
-
-func init() {
-	err := godotenv.Load("../.env")
-	if err != nil {
-		log.Fatal("Error while loading .env file")
-	}
-
-	// Create the authenticator.
-	authenticator := &core.IamAuthenticator{
-		ApiKey: os.Getenv("IAMAPIKEY"),
-	}
-
-	service, serviceErr = iampolicymanagementv1.NewIamPolicyManagementV1(&iampolicymanagementv1.IamPolicyManagementV1Options{
-		Authenticator: authenticator,
-	})
-
-	if serviceErr == nil {
-		customHeaders := http.Header{}
-		customHeaders.Add("X-Watson-Learning-Opt-Out", "1")
-		customHeaders.Add("X-Watson-Test", "1")
-		service.Service.SetDefaultHeaders(customHeaders)
-	}
-}
-
-func shouldSkipTest(t *testing.T) {
-	if service == nil {
-		t.Skip("Skipping test as service credentials are missing")
-	}
-}
-
-func TestCreatePolicy(t *testing.T) {
-	shouldSkipTest(t)
-
-	// hardcode parameters
-	typeAccess := "access"
-	accIDKey := "accountId"
-	accountID := "91631433ee674cd9ab0ef150b8e7030f"
-	resAttKey := "resourceGroupId"
-	resAttValue := "96714c6a77b04bd39d042a265428aea4"
-	roleID := "crn:v1:bluemix:public:iam::::serviceRole:Writer"
-	subjectAttKey := "iam_id"
-	subjectAttValue := "iam-ServiceId-251553c1-8ae0-4144-8d31-04a26c7cede2"
-
-	// Create an instance of the options model so we can invoke CreatePolicy.
-	createPolicyOptionsModel := &iampolicymanagementv1.CreatePolicyOptions{
-		Type: &typeAccess,
-		Subjects: []iampolicymanagementv1.SubjectAttributes{
-			iampolicymanagementv1.SubjectAttributes{
-				Attributes: []iampolicymanagementv1.Attribute{
-					iampolicymanagementv1.Attribute{
-						Name:  &subjectAttKey,
-						Value: &subjectAttValue,
-					},
-				},
-			},
-		},
-		Roles: []iampolicymanagementv1.PolicyRole{
-			iampolicymanagementv1.PolicyRole{
-				RoleID: &roleID,
-			},
-		},
-		Resources: []iampolicymanagementv1.ResourceAttributes{
-			iampolicymanagementv1.ResourceAttributes{
-				Attributes: []iampolicymanagementv1.ResourceAttribute{
-					iampolicymanagementv1.ResourceAttribute{
-						Name:  &accIDKey,
-						Value: &accountID,
-					},
-					iampolicymanagementv1.ResourceAttribute{
-						Name:  &resAttKey,
-						Value: &resAttValue,
-					},
-				},
-			},
-		},
-	}
-
-	// Invoke the CreatePolicy operation.
-	result, returnValue, returnValueErr := service.CreatePolicy(createPolicyOptionsModel)
-	assert.Nil(t, returnValueErr)
-	assert.NotNil(t, returnValue)
-	assert.NotNil(t, result)
-	assert.Equal(t, 201, returnValue.StatusCode)
-
-	// save policy_id of the created policy
-	policyID = *result.ID
-}
-
-func TestGetPolicy(t *testing.T) {
-	shouldSkipTest(t)
-
-	// Invoke the GetPolicy operation.
-	result, returnValue, returnValueErr := service.GetPolicy(nil)
-	assert.Nil(t, returnValueErr)
-	assert.NotNil(t, returnValue)
-	assert.NotNil(t, result)
-	assert.Equal(t, 200, returnValue.StatusCode)
-
-	// Retrieve the ETag header from the response.
-	eTag = returnValue.Headers.Get("Etag")
-	assert.NotNil(t, eTag)
-}
-
-func TestUpdatePolicy(t *testing.T) {
-	shouldSkipTest(t)
-
-	// hardcode parameters
-	typeAccess := "access"
-	accIDKey := "accountId"
-	accountID := "91631433ee674cd9ab0ef150b8e7030f"
-	resAttKey := "resourceGroupId"
-	resAttValue := "96714c6a77b04bd39d042a265428aea4"
-	roleID_writer := "crn:v1:bluemix:public:iam::::serviceRole:Writer"
-	roleID_manager := "crn:v1:bluemix:public:iam::::serviceRole:Manager"
-	subjectAttKey := "iam_id"
-	subjectAttValue := "iam-ServiceId-251553c1-8ae0-4144-8d31-04a26c7cede2"
-
-	// Create an instance of the options model so we can invoke UpdatePolicy.
-	updatePolicyOptionsModel := &iampolicymanagementv1.UpdatePolicyOptions{
-		Type: &typeAccess,
-		Subjects: []iampolicymanagementv1.SubjectAttributes{
-			iampolicymanagementv1.SubjectAttributes{
-				Attributes: []iampolicymanagementv1.Attribute{
-					iampolicymanagementv1.Attribute{
-						Name:  &subjectAttKey,
-						Value: &subjectAttValue,
-					},
-				},
-			},
-		},
-		Roles: []iampolicymanagementv1.PolicyRole{
-			iampolicymanagementv1.PolicyRole{
-				RoleID: &roleID_writer,
-			},
-			iampolicymanagementv1.PolicyRole{
-				RoleID: &roleID_manager,
-			},
-		},
-		Resources: []iampolicymanagementv1.ResourceAttributes{
-			iampolicymanagementv1.ResourceAttributes{
-				Attributes: []iampolicymanagementv1.ResourceAttribute{
-					iampolicymanagementv1.ResourceAttribute{
-						Name:  &accIDKey,
-						Value: &accountID,
-					},
-					iampolicymanagementv1.ResourceAttribute{
-						Name:  &resAttKey,
-						Value: &resAttValue,
-					},
-				},
-			},
-		},
-	}
-
-	// Invoke the UpdatePolicy operation.
-	result, returnValue, returnValueErr := service.UpdatePolicy(updatePolicyOptionsModel)
-	assert.NotNil(t, result)
-	assert.Nil(t, returnValueErr)
-	assert.NotNil(t, returnValue)
-	assert.Equal(t, 200, returnValue.StatusCode)
-}
-
-func TestListPolicies(t *testing.T) {
-	shouldSkipTest(t)
-
-	//	hardcode parameters
-	accountID := "91631433ee674cd9ab0ef150b8e7030f"
-
-	// Invoke the ListPolicies operation.
-	result, returnValue, returnValueErr := service.ListPolicies(
-		&iampolicymanagementv1.ListPoliciesOptions{
-			AccountID: &accountID,
-		},
-	)
-	assert.Nil(t, returnValueErr)
-	assert.NotNil(t, result)
-	assert.NotNil(t, returnValue)
-	assert.Equal(t, 200, returnValue.StatusCode)
-}
-
-func TestDeletePolicy(t *testing.T) {
-	shouldSkipTest(t)
-	
-	// Invoke the DeletePolicy operation, using the policy id set above by CreatePolicy().
-	returnValue, returnValueErr := service.DeletePolicy(service.NewDeletePolicyOptions(policyID))
-	assert.Nil(t, returnValueErr)
-	assert.NotNil(t, returnValue)
-	assert.Equal(t, 204, returnValue.StatusCode)
-}
diff --git a/iampolicymanagementv1/iam_policy_management_v1_suite_test.go b/iampolicymanagementv1/iam_policy_management_v1_suite_test.go
deleted file mode 100644
index 2f43fb0d..00000000
--- a/iampolicymanagementv1/iam_policy_management_v1_suite_test.go
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * (C) Copyright IBM Corp. 2020.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package iampolicymanagementv1_test
-
-import (
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-	"testing"
-)
-
-func TestIamPolicyManagementV1(t *testing.T) {
-	RegisterFailHandler(Fail)
-	RunSpecs(t, "IamPolicyManagementV1 Suite")
-}
diff --git a/iampolicymanagementv1/iam_policy_management_v1_test.go b/iampolicymanagementv1/iam_policy_management_v1_test.go
deleted file mode 100644
index 47c4d0a6..00000000
--- a/iampolicymanagementv1/iam_policy_management_v1_test.go
+++ /dev/null
@@ -1,635 +0,0 @@
-/**
- * (C) Copyright IBM Corp. 2020.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package iampolicymanagementv1_test
-
-import (
-	"bytes"
-	"fmt"
-	"github.com/IBM/go-sdk-core/v3/core"
-	"github.com/go-openapi/strfmt"
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-	"github.ibm.com/ibmcloud/platform-services-go-sdk/iampolicymanagementv1"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"net/http/httptest"
-	"time"
-)
-
-var _ = Describe(`IamPolicyManagementV1`, func() {
-	Describe(`ListPolicies(listPoliciesOptions *ListPoliciesOptions)`, func() {
-		listPoliciesPath := "/v1/policies"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(listPoliciesPath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.Header["Accept-Language"]).ToNot(BeNil())
-				Expect(req.Header["Accept-Language"][0]).To(Equal(fmt.Sprintf("%v", "testString")))
-				Expect(req.URL.Query()["account_id"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["iam_id"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["access_group_id"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["type"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["service_type"]).To(Equal([]string{"testString"}))
-
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"policies": [{"id": "ID", "type": "Type", "subjects": [{"attributes": [{"name": "Name", "value": "Value"}]}], "roles": [{"role_id": "RoleID", "display_name": "DisplayName", "description": "Description"}], "resources": [{"attributes": [{"name": "Name", "value": "Value", "operator": "Operator"}]}], "href": "Href", "created_at": "2019-01-01T12:00:00", "created_by_id": "CreatedByID", "last_modified_at": "2019-01-01T12:00:00", "last_modified_by_id": "LastModifiedByID"}]}`)
-			}))
-			It(`Invoke ListPolicies successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := iampolicymanagementv1.NewIamPolicyManagementV1(&iampolicymanagementv1.IamPolicyManagementV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.ListPolicies(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the ListPoliciesOptions model
-				listPoliciesOptionsModel := new(iampolicymanagementv1.ListPoliciesOptions)
-				listPoliciesOptionsModel.AccountID = core.StringPtr("testString")
-				listPoliciesOptionsModel.AcceptLanguage = core.StringPtr("testString")
-				listPoliciesOptionsModel.IamID = core.StringPtr("testString")
-				listPoliciesOptionsModel.AccessGroupID = core.StringPtr("testString")
-				listPoliciesOptionsModel.Type = core.StringPtr("testString")
-				listPoliciesOptionsModel.ServiceType = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.ListPolicies(listPoliciesOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`CreatePolicy(createPolicyOptions *CreatePolicyOptions)`, func() {
-		createPolicyPath := "/v1/policies"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(createPolicyPath))
-				Expect(req.Method).To(Equal("POST"))
-				Expect(req.Header["Accept-Language"]).ToNot(BeNil())
-				Expect(req.Header["Accept-Language"][0]).To(Equal(fmt.Sprintf("%v", "testString")))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(201)
-				fmt.Fprintf(res, `{"id": "ID", "type": "Type", "subjects": [{"attributes": [{"name": "Name", "value": "Value"}]}], "roles": [{"role_id": "RoleID", "display_name": "DisplayName", "description": "Description"}], "resources": [{"attributes": [{"name": "Name", "value": "Value", "operator": "Operator"}]}], "href": "Href", "created_at": "2019-01-01T12:00:00", "created_by_id": "CreatedByID", "last_modified_at": "2019-01-01T12:00:00", "last_modified_by_id": "LastModifiedByID"}`)
-			}))
-			It(`Invoke CreatePolicy successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := iampolicymanagementv1.NewIamPolicyManagementV1(&iampolicymanagementv1.IamPolicyManagementV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.CreatePolicy(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the PolicyRequestResourcesItemAttributesItem model
-				policyRequestResourcesItemAttributesItemModel := new(iampolicymanagementv1.PolicyRequestResourcesItemAttributesItem)
-				policyRequestResourcesItemAttributesItemModel.Name = core.StringPtr("testString")
-				policyRequestResourcesItemAttributesItemModel.Value = core.StringPtr("testString")
-				policyRequestResourcesItemAttributesItemModel.Operator = core.StringPtr("testString")
-
-				// Construct an instance of the PolicyRequestSubjectsItemAttributesItem model
-				policyRequestSubjectsItemAttributesItemModel := new(iampolicymanagementv1.PolicyRequestSubjectsItemAttributesItem)
-				policyRequestSubjectsItemAttributesItemModel.Name = core.StringPtr("testString")
-				policyRequestSubjectsItemAttributesItemModel.Value = core.StringPtr("testString")
-
-				// Construct an instance of the PolicyRequestResourcesItem model
-				policyRequestResourcesItemModel := new(iampolicymanagementv1.PolicyRequestResourcesItem)
-				policyRequestResourcesItemModel.Attributes = []iampolicymanagementv1.PolicyRequestResourcesItemAttributesItem{*policyRequestResourcesItemAttributesItemModel}
-
-				// Construct an instance of the PolicyRequestRolesItem model
-				policyRequestRolesItemModel := new(iampolicymanagementv1.PolicyRequestRolesItem)
-				policyRequestRolesItemModel.RoleID = core.StringPtr("testString")
-
-				// Construct an instance of the PolicyRequestSubjectsItem model
-				policyRequestSubjectsItemModel := new(iampolicymanagementv1.PolicyRequestSubjectsItem)
-				policyRequestSubjectsItemModel.Attributes = []iampolicymanagementv1.PolicyRequestSubjectsItemAttributesItem{*policyRequestSubjectsItemAttributesItemModel}
-
-				// Construct an instance of the CreatePolicyOptions model
-				createPolicyOptionsModel := new(iampolicymanagementv1.CreatePolicyOptions)
-				createPolicyOptionsModel.Type = core.StringPtr("testString")
-				createPolicyOptionsModel.Subjects = []iampolicymanagementv1.PolicyRequestSubjectsItem{*policyRequestSubjectsItemModel}
-				createPolicyOptionsModel.Roles = []iampolicymanagementv1.PolicyRequestRolesItem{*policyRequestRolesItemModel}
-				createPolicyOptionsModel.Resources = []iampolicymanagementv1.PolicyRequestResourcesItem{*policyRequestResourcesItemModel}
-				createPolicyOptionsModel.AcceptLanguage = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.CreatePolicy(createPolicyOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`UpdatePolicy(updatePolicyOptions *UpdatePolicyOptions)`, func() {
-		updatePolicyPath := "/v1/policies/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(updatePolicyPath))
-				Expect(req.Method).To(Equal("PUT"))
-				Expect(req.Header["If-Match"]).ToNot(BeNil())
-				Expect(req.Header["If-Match"][0]).To(Equal(fmt.Sprintf("%v", "testString")))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"id": "ID", "type": "Type", "subjects": [{"attributes": [{"name": "Name", "value": "Value"}]}], "roles": [{"role_id": "RoleID", "display_name": "DisplayName", "description": "Description"}], "resources": [{"attributes": [{"name": "Name", "value": "Value", "operator": "Operator"}]}], "href": "Href", "created_at": "2019-01-01T12:00:00", "created_by_id": "CreatedByID", "last_modified_at": "2019-01-01T12:00:00", "last_modified_by_id": "LastModifiedByID"}`)
-			}))
-			It(`Invoke UpdatePolicy successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := iampolicymanagementv1.NewIamPolicyManagementV1(&iampolicymanagementv1.IamPolicyManagementV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.UpdatePolicy(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the PolicyRequestResourcesItemAttributesItem model
-				policyRequestResourcesItemAttributesItemModel := new(iampolicymanagementv1.PolicyRequestResourcesItemAttributesItem)
-				policyRequestResourcesItemAttributesItemModel.Name = core.StringPtr("testString")
-				policyRequestResourcesItemAttributesItemModel.Value = core.StringPtr("testString")
-				policyRequestResourcesItemAttributesItemModel.Operator = core.StringPtr("testString")
-
-				// Construct an instance of the PolicyRequestSubjectsItemAttributesItem model
-				policyRequestSubjectsItemAttributesItemModel := new(iampolicymanagementv1.PolicyRequestSubjectsItemAttributesItem)
-				policyRequestSubjectsItemAttributesItemModel.Name = core.StringPtr("testString")
-				policyRequestSubjectsItemAttributesItemModel.Value = core.StringPtr("testString")
-
-				// Construct an instance of the PolicyRequestResourcesItem model
-				policyRequestResourcesItemModel := new(iampolicymanagementv1.PolicyRequestResourcesItem)
-				policyRequestResourcesItemModel.Attributes = []iampolicymanagementv1.PolicyRequestResourcesItemAttributesItem{*policyRequestResourcesItemAttributesItemModel}
-
-				// Construct an instance of the PolicyRequestRolesItem model
-				policyRequestRolesItemModel := new(iampolicymanagementv1.PolicyRequestRolesItem)
-				policyRequestRolesItemModel.RoleID = core.StringPtr("testString")
-
-				// Construct an instance of the PolicyRequestSubjectsItem model
-				policyRequestSubjectsItemModel := new(iampolicymanagementv1.PolicyRequestSubjectsItem)
-				policyRequestSubjectsItemModel.Attributes = []iampolicymanagementv1.PolicyRequestSubjectsItemAttributesItem{*policyRequestSubjectsItemAttributesItemModel}
-
-				// Construct an instance of the UpdatePolicyOptions model
-				updatePolicyOptionsModel := new(iampolicymanagementv1.UpdatePolicyOptions)
-				updatePolicyOptionsModel.PolicyID = core.StringPtr("testString")
-				updatePolicyOptionsModel.IfMatch = core.StringPtr("testString")
-				updatePolicyOptionsModel.Type = core.StringPtr("testString")
-				updatePolicyOptionsModel.Subjects = []iampolicymanagementv1.PolicyRequestSubjectsItem{*policyRequestSubjectsItemModel}
-				updatePolicyOptionsModel.Roles = []iampolicymanagementv1.PolicyRequestRolesItem{*policyRequestRolesItemModel}
-				updatePolicyOptionsModel.Resources = []iampolicymanagementv1.PolicyRequestResourcesItem{*policyRequestResourcesItemModel}
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.UpdatePolicy(updatePolicyOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`GetPolicy(getPolicyOptions *GetPolicyOptions)`, func() {
-		getPolicyPath := "/v1/policies/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(getPolicyPath))
-				Expect(req.Method).To(Equal("GET"))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"id": "ID", "type": "Type", "subjects": [{"attributes": [{"name": "Name", "value": "Value"}]}], "roles": [{"role_id": "RoleID", "display_name": "DisplayName", "description": "Description"}], "resources": [{"attributes": [{"name": "Name", "value": "Value", "operator": "Operator"}]}], "href": "Href", "created_at": "2019-01-01T12:00:00", "created_by_id": "CreatedByID", "last_modified_at": "2019-01-01T12:00:00", "last_modified_by_id": "LastModifiedByID"}`)
-			}))
-			It(`Invoke GetPolicy successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := iampolicymanagementv1.NewIamPolicyManagementV1(&iampolicymanagementv1.IamPolicyManagementV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.GetPolicy(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the GetPolicyOptions model
-				getPolicyOptionsModel := new(iampolicymanagementv1.GetPolicyOptions)
-				getPolicyOptionsModel.PolicyID = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.GetPolicy(getPolicyOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`DeletePolicy(deletePolicyOptions *DeletePolicyOptions)`, func() {
-		deletePolicyPath := "/v1/policies/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(deletePolicyPath))
-				Expect(req.Method).To(Equal("DELETE"))
-				res.WriteHeader(204)
-			}))
-			It(`Invoke DeletePolicy successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := iampolicymanagementv1.NewIamPolicyManagementV1(&iampolicymanagementv1.IamPolicyManagementV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				response, operationErr := testService.DeletePolicy(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-
-				// Construct an instance of the DeletePolicyOptions model
-				deletePolicyOptionsModel := new(iampolicymanagementv1.DeletePolicyOptions)
-				deletePolicyOptionsModel.PolicyID = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				response, operationErr = testService.DeletePolicy(deletePolicyOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`ListRoles(listRolesOptions *ListRolesOptions)`, func() {
-		listRolesPath := "/v2/roles"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(listRolesPath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.Header["Accept-Language"]).ToNot(BeNil())
-				Expect(req.Header["Accept-Language"][0]).To(Equal(fmt.Sprintf("%v", "testString")))
-				Expect(req.URL.Query()["account_id"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["service_name"]).To(Equal([]string{"testString"}))
-
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"custom_roles": [{"id": "ID", "name": "Name", "account_id": "AccountID", "service_name": "ServiceName", "crn": "Crn", "display_name": "DisplayName", "description": "Description", "actions": ["Actions"], "created_at": "2019-01-01T12:00:00", "created_by_id": "CreatedByID", "last_modified_at": "2019-01-01T12:00:00", "last_modified_by_id": "LastModifiedByID", "href": "Href"}], "service_roles": [{"crn": "Crn", "display_name": "DisplayName", "description": "Description", "actions": ["Actions"]}], "system_roles": [{"crn": "Crn", "display_name": "DisplayName", "description": "Description", "actions": ["Actions"]}]}`)
-			}))
-			It(`Invoke ListRoles successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := iampolicymanagementv1.NewIamPolicyManagementV1(&iampolicymanagementv1.IamPolicyManagementV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.ListRoles(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the ListRolesOptions model
-				listRolesOptionsModel := new(iampolicymanagementv1.ListRolesOptions)
-				listRolesOptionsModel.AcceptLanguage = core.StringPtr("testString")
-				listRolesOptionsModel.AccountID = core.StringPtr("testString")
-				listRolesOptionsModel.ServiceName = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.ListRoles(listRolesOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`CreateRole(createRoleOptions *CreateRoleOptions)`, func() {
-		createRolePath := "/v2/roles"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(createRolePath))
-				Expect(req.Method).To(Equal("POST"))
-				Expect(req.Header["Accept-Language"]).ToNot(BeNil())
-				Expect(req.Header["Accept-Language"][0]).To(Equal(fmt.Sprintf("%v", "testString")))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(201)
-				fmt.Fprintf(res, `{"id": "ID", "name": "Name", "account_id": "AccountID", "service_name": "ServiceName", "crn": "Crn", "display_name": "DisplayName", "description": "Description", "actions": ["Actions"], "created_at": "2019-01-01T12:00:00", "created_by_id": "CreatedByID", "last_modified_at": "2019-01-01T12:00:00", "last_modified_by_id": "LastModifiedByID", "href": "Href"}`)
-			}))
-			It(`Invoke CreateRole successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := iampolicymanagementv1.NewIamPolicyManagementV1(&iampolicymanagementv1.IamPolicyManagementV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.CreateRole(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the CreateRoleOptions model
-				createRoleOptionsModel := new(iampolicymanagementv1.CreateRoleOptions)
-				createRoleOptionsModel.Name = core.StringPtr("testString")
-				createRoleOptionsModel.AccountID = core.StringPtr("testString")
-				createRoleOptionsModel.ServiceName = core.StringPtr("testString")
-				createRoleOptionsModel.DisplayName = core.StringPtr("testString")
-				createRoleOptionsModel.Actions = []string{"testString"}
-				createRoleOptionsModel.Description = core.StringPtr("testString")
-				createRoleOptionsModel.AcceptLanguage = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.CreateRole(createRoleOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`UpdateRole(updateRoleOptions *UpdateRoleOptions)`, func() {
-		updateRolePath := "/v2/roles/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(updateRolePath))
-				Expect(req.Method).To(Equal("PUT"))
-				Expect(req.Header["If-Match"]).ToNot(BeNil())
-				Expect(req.Header["If-Match"][0]).To(Equal(fmt.Sprintf("%v", "testString")))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"id": "ID", "name": "Name", "account_id": "AccountID", "service_name": "ServiceName", "crn": "Crn", "display_name": "DisplayName", "description": "Description", "actions": ["Actions"], "created_at": "2019-01-01T12:00:00", "created_by_id": "CreatedByID", "last_modified_at": "2019-01-01T12:00:00", "last_modified_by_id": "LastModifiedByID", "href": "Href"}`)
-			}))
-			It(`Invoke UpdateRole successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := iampolicymanagementv1.NewIamPolicyManagementV1(&iampolicymanagementv1.IamPolicyManagementV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.UpdateRole(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the UpdateRoleOptions model
-				updateRoleOptionsModel := new(iampolicymanagementv1.UpdateRoleOptions)
-				updateRoleOptionsModel.RoleID = core.StringPtr("testString")
-				updateRoleOptionsModel.IfMatch = core.StringPtr("testString")
-				updateRoleOptionsModel.DisplayName = core.StringPtr("testString")
-				updateRoleOptionsModel.Description = core.StringPtr("testString")
-				updateRoleOptionsModel.Actions = []string{"testString"}
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.UpdateRole(updateRoleOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`GetRole(getRoleOptions *GetRoleOptions)`, func() {
-		getRolePath := "/v2/roles/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(getRolePath))
-				Expect(req.Method).To(Equal("GET"))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"id": "ID", "name": "Name", "account_id": "AccountID", "service_name": "ServiceName", "crn": "Crn", "display_name": "DisplayName", "description": "Description", "actions": ["Actions"], "created_at": "2019-01-01T12:00:00", "created_by_id": "CreatedByID", "last_modified_at": "2019-01-01T12:00:00", "last_modified_by_id": "LastModifiedByID", "href": "Href"}`)
-			}))
-			It(`Invoke GetRole successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := iampolicymanagementv1.NewIamPolicyManagementV1(&iampolicymanagementv1.IamPolicyManagementV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.GetRole(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the GetRoleOptions model
-				getRoleOptionsModel := new(iampolicymanagementv1.GetRoleOptions)
-				getRoleOptionsModel.RoleID = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.GetRole(getRoleOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`DeleteRole(deleteRoleOptions *DeleteRoleOptions)`, func() {
-		deleteRolePath := "/v2/roles/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(deleteRolePath))
-				Expect(req.Method).To(Equal("DELETE"))
-				res.WriteHeader(204)
-			}))
-			It(`Invoke DeleteRole successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := iampolicymanagementv1.NewIamPolicyManagementV1(&iampolicymanagementv1.IamPolicyManagementV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.NoAuthAuthenticator{},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				response, operationErr := testService.DeleteRole(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-
-				// Construct an instance of the DeleteRoleOptions model
-				deleteRoleOptionsModel := new(iampolicymanagementv1.DeleteRoleOptions)
-				deleteRoleOptionsModel.RoleID = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				response, operationErr = testService.DeleteRole(deleteRoleOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`Model constructor tests`, func() {
-		Context(`Using a sample service client instance`, func() {
-			testService, _ := iampolicymanagementv1.NewIamPolicyManagementV1(&iampolicymanagementv1.IamPolicyManagementV1Options{
-				URL:           "http://iampolicymanagementv1modelgenerator.com",
-				Authenticator: &core.NoAuthAuthenticator{},
-			})
-			It(`Invoke NewPolicyRequestResourcesItem successfully`, func() {
-				attributes := []iampolicymanagementv1.PolicyRequestResourcesItemAttributesItem{}
-				model, err := testService.NewPolicyRequestResourcesItem(attributes)
-				Expect(model).ToNot(BeNil())
-				Expect(err).To(BeNil())
-			})
-			It(`Invoke NewPolicyRequestResourcesItemAttributesItem successfully`, func() {
-				name := "testString"
-				value := "testString"
-				model, err := testService.NewPolicyRequestResourcesItemAttributesItem(name, value)
-				Expect(model).ToNot(BeNil())
-				Expect(err).To(BeNil())
-			})
-			It(`Invoke NewPolicyRequestRolesItem successfully`, func() {
-				roleID := "testString"
-				model, err := testService.NewPolicyRequestRolesItem(roleID)
-				Expect(model).ToNot(BeNil())
-				Expect(err).To(BeNil())
-			})
-			It(`Invoke NewPolicyRequestSubjectsItem successfully`, func() {
-				attributes := []iampolicymanagementv1.PolicyRequestSubjectsItemAttributesItem{}
-				model, err := testService.NewPolicyRequestSubjectsItem(attributes)
-				Expect(model).ToNot(BeNil())
-				Expect(err).To(BeNil())
-			})
-			It(`Invoke NewPolicyRequestSubjectsItemAttributesItem successfully`, func() {
-				name := "testString"
-				value := "testString"
-				model, err := testService.NewPolicyRequestSubjectsItemAttributesItem(name, value)
-				Expect(model).ToNot(BeNil())
-				Expect(err).To(BeNil())
-			})
-		})
-	})
-	Describe(`Utility function tests`, func() {
-		It(`Invoke CreateMockMap() successfully`, func() {
-			mockMap := CreateMockMap()
-			Expect(mockMap).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockByteArray() successfully`, func() {
-			mockByteArray := CreateMockByteArray("This is a test")
-			Expect(mockByteArray).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockUUID() successfully`, func() {
-			mockUUID := CreateMockUUID("9fab83da-98cb-4f18-a7ba-b6f0435c9673")
-			Expect(mockUUID).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockReader() successfully`, func() {
-			mockReader := CreateMockReader("This is a test.")
-			Expect(mockReader).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockDate() successfully`, func() {
-			mockDate := CreateMockDate()
-			Expect(mockDate).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockDateTime() successfully`, func() {
-			mockDateTime := CreateMockDateTime()
-			Expect(mockDateTime).ToNot(BeNil())
-		})
-	})
-})
-
-//
-// Utility functions used by the generated test code
-//
-
-func CreateMockMap() map[string]interface{} {
-	m := make(map[string]interface{})
-	return m
-}
-
-func CreateMockByteArray(mockData string) *[]byte {
-	ba := make([]byte, len(mockData))
-	ba = append(ba, mockData...)
-	return &ba
-}
-
-func CreateMockUUID(mockData string) *strfmt.UUID {
-	uuid := strfmt.UUID(mockData)
-	return &uuid
-}
-
-func CreateMockReader(mockData string) io.ReadCloser {
-	return ioutil.NopCloser(bytes.NewReader([]byte(mockData)))
-}
-
-func CreateMockDate() *strfmt.Date {
-	d := strfmt.Date(time.Now())
-	return &d
-}
-
-func CreateMockDateTime() *strfmt.DateTime {
-	d := strfmt.DateTime(time.Now())
-	return &d
-}
diff --git a/openservicebrokerv1/open_service_broker_v1.go b/openservicebrokerv1/open_service_broker_v1.go
deleted file mode 100644
index 657bf784..00000000
--- a/openservicebrokerv1/open_service_broker_v1.go
+++ /dev/null
@@ -1,2039 +0,0 @@
-/**
- * (C) Copyright IBM Corp. 2020.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// Package openservicebrokerv1 : Operations and models for the OpenServiceBrokerV1 service
-package openservicebrokerv1
-
-import (
-	"fmt"
-	"github.com/IBM/go-sdk-core/v3/core"
-	common "github.ibm.com/ibmcloud/platform-services-go-sdk/common"
-)
-
-// OpenServiceBrokerV1 : Contribute resources to the IBM Cloud catalog by implementing a `service broker` that conforms
-// to the [Open Service Broker API](https://github.com/openservicebrokerapi/servicebroker/blob/master/spec.md) version
-// 2.12  specification and provides enablement extensions for integration with IBM Cloud and the Resource Controller
-// provisioning model.
-//
-// Version: 1.4
-type OpenServiceBrokerV1 struct {
-	Service *core.BaseService
-}
-
-// DefaultServiceURL is the default URL to make service requests to.
-const DefaultServiceURL = ""
-
-// DefaultServiceName is the default key used to find external configuration information.
-const DefaultServiceName = "open_service_broker"
-
-// OpenServiceBrokerV1Options : Service options
-type OpenServiceBrokerV1Options struct {
-	ServiceName   string
-	URL           string
-	Authenticator core.Authenticator
-}
-
-// NewOpenServiceBrokerV1UsingExternalConfig : constructs an instance of OpenServiceBrokerV1 with passed in options and external configuration.
-func NewOpenServiceBrokerV1UsingExternalConfig(options *OpenServiceBrokerV1Options) (openServiceBroker *OpenServiceBrokerV1, err error) {
-	if options.ServiceName == "" {
-		options.ServiceName = DefaultServiceName
-	}
-
-	if options.Authenticator == nil {
-		options.Authenticator, err = core.GetAuthenticatorFromEnvironment(options.ServiceName)
-		if err != nil {
-			return
-		}
-	}
-
-	openServiceBroker, err = NewOpenServiceBrokerV1(options)
-	if err != nil {
-		return
-	}
-
-	err = openServiceBroker.Service.ConfigureService(options.ServiceName)
-	if err != nil {
-		return
-	}
-
-	if options.URL != "" {
-		err = openServiceBroker.Service.SetServiceURL(options.URL)
-	}
-	return
-}
-
-// NewOpenServiceBrokerV1 : constructs an instance of OpenServiceBrokerV1 with passed in options.
-func NewOpenServiceBrokerV1(options *OpenServiceBrokerV1Options) (service *OpenServiceBrokerV1, err error) {
-	serviceOptions := &core.ServiceOptions{
-		URL:           DefaultServiceURL,
-		Authenticator: options.Authenticator,
-	}
-
-	baseService, err := core.NewBaseService(serviceOptions)
-	if err != nil {
-		return
-	}
-
-	if options.URL != "" {
-		err = baseService.SetServiceURL(options.URL)
-		if err != nil {
-			return
-		}
-	}
-
-	service = &OpenServiceBrokerV1{
-		Service: baseService,
-	}
-
-	return
-}
-
-// SetServiceURL sets the service URL
-func (openServiceBroker *OpenServiceBrokerV1) SetServiceURL(url string) error {
-	return openServiceBroker.Service.SetServiceURL(url)
-}
-
-// GetServiceInstanceState : Get the current state of the service instance
-// Get the current state information associated with the service instance.
-//
-// As a service provider you need a way to manage provisioned service instances.  If an account comes past due, you may
-// need a to disable the service (without deleting it), and when the account is settled re-enable the service.
-//
-// This endpoint allows both the provider and IBM Cloud to query for the state of a provisioned service instance.  For
-// example, IBM Cloud may query the provider to figure out if a given service is disabled or not and present that state
-// to the user.
-func (openServiceBroker *OpenServiceBrokerV1) GetServiceInstanceState(getServiceInstanceStateOptions *GetServiceInstanceStateOptions) (result *Resp1874644Root, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(getServiceInstanceStateOptions, "getServiceInstanceStateOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(getServiceInstanceStateOptions, "getServiceInstanceStateOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"bluemix_v1/service_instances"}
-	pathParameters := []string{*getServiceInstanceStateOptions.InstanceID}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(openServiceBroker.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range getServiceInstanceStateOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("open_service_broker", "V1", "GetServiceInstanceState")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = openServiceBroker.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalResp1874644Root(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// ReplaceState : Update the state of a provisioned service instance
-// Update (disable or enable) the state of a provisioned service instance. As a service provider you need a way to
-// manage provisioned service instances. If an account comes past due, you may need a to disable the service (without
-// deleting it), and when the account is settled re-enable the service. This endpoint allows the provider to enable or
-// disable the state of a provisioned service instance. It is the service provider's responsibility to disable access to
-// the service instance when the disable endpoint is invoked and to re-enable that access when the enable endpoint is
-// invoked. When your service broker receives an enable / disable request, it should take whatever action is necessary
-// to enable / disable (respectively) the service.  Additionally, If a bind request comes in for a disabled service, the
-// broker should reject that request with any code other than `204`, and provide a user-facing message in the
-// description.
-func (openServiceBroker *OpenServiceBrokerV1) ReplaceState(replaceStateOptions *ReplaceStateOptions) (result *Resp2448145Root, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(replaceStateOptions, "replaceStateOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(replaceStateOptions, "replaceStateOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"bluemix_v1/service_instances"}
-	pathParameters := []string{*replaceStateOptions.InstanceID}
-
-	builder := core.NewRequestBuilder(core.PUT)
-	_, err = builder.ConstructHTTPURL(openServiceBroker.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range replaceStateOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("open_service_broker", "V1", "ReplaceState")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-	builder.AddHeader("Content-Type", "application/json")
-
-	body := make(map[string]interface{})
-	if replaceStateOptions.Enabled != nil {
-		body["enabled"] = replaceStateOptions.Enabled
-	}
-	if replaceStateOptions.InitiatorID != nil {
-		body["initiator_id"] = replaceStateOptions.InitiatorID
-	}
-	if replaceStateOptions.ReasonCode != nil {
-		body["reason_code"] = replaceStateOptions.ReasonCode
-	}
-	_, err = builder.SetBodyContentJSON(body)
-	if err != nil {
-		return
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = openServiceBroker.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalResp2448145Root(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// ReplaceServiceInstance : Create (provision) a service instance
-// Create a service instance with GUID. When your service broker receives a provision request from the IBM Cloud
-// platform, it MUST take whatever action is necessary to create a new resource.
-//
-// When a user creates a service instance from the IBM Cloud console or the IBM Cloud CLI, the IBM Cloud platform
-// validates that the user has permission to create the service instance using IBM Cloud IAM. After this validation
-// occurs, your service broker's provision endpoint (PUT /v2/resource_instances/:instance_id) will be invoked. When
-// provisioning occurs, the IBM Cloud platform provides the following values:
-//
-// - The IBM Cloud context is included in the context variable
-// - The X-Broker-API-Originating-Identity will have the IBM IAM ID of the user that initiated the request
-// - The parameters section will include the requested location (and additional parameters required by your service).
-func (openServiceBroker *OpenServiceBrokerV1) ReplaceServiceInstance(replaceServiceInstanceOptions *ReplaceServiceInstanceOptions) (result *Resp2079872Root, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(replaceServiceInstanceOptions, "replaceServiceInstanceOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(replaceServiceInstanceOptions, "replaceServiceInstanceOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v2/service_instances"}
-	pathParameters := []string{*replaceServiceInstanceOptions.InstanceID}
-
-	builder := core.NewRequestBuilder(core.PUT)
-	_, err = builder.ConstructHTTPURL(openServiceBroker.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range replaceServiceInstanceOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("open_service_broker", "V1", "ReplaceServiceInstance")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-	builder.AddHeader("Content-Type", "application/json")
-
-	if replaceServiceInstanceOptions.AcceptsIncomplete != nil {
-		builder.AddQuery("accepts_incomplete", fmt.Sprint(*replaceServiceInstanceOptions.AcceptsIncomplete))
-	}
-
-	body := make(map[string]interface{})
-	if replaceServiceInstanceOptions.Context != nil {
-		body["context"] = replaceServiceInstanceOptions.Context
-	}
-	if replaceServiceInstanceOptions.OrganizationGuid != nil {
-		body["organization_guid"] = replaceServiceInstanceOptions.OrganizationGuid
-	}
-	if replaceServiceInstanceOptions.Parameters != nil {
-		body["parameters"] = replaceServiceInstanceOptions.Parameters
-	}
-	if replaceServiceInstanceOptions.PlanID != nil {
-		body["plan_id"] = replaceServiceInstanceOptions.PlanID
-	}
-	if replaceServiceInstanceOptions.ServiceID != nil {
-		body["service_id"] = replaceServiceInstanceOptions.ServiceID
-	}
-	if replaceServiceInstanceOptions.SpaceGuid != nil {
-		body["space_guid"] = replaceServiceInstanceOptions.SpaceGuid
-	}
-	_, err = builder.SetBodyContentJSON(body)
-	if err != nil {
-		return
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = openServiceBroker.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalResp2079872Root(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// UpdateServiceInstance : Update a service instance
-// Patch an instance by GUID. Enabling this endpoint allows your user to change plans and service parameters in a
-// provisioned service instance. If your offering supports multiple plans, and you want users to be able to change plans
-// for a provisioned instance, you will need to enable the ability for users to update their service instance.
-//
-// To enable support for the update of the plan, a broker MUST declare support per service by specifying
-// `"plan_updateable": true` in your brokers' catalog.json.
-func (openServiceBroker *OpenServiceBrokerV1) UpdateServiceInstance(updateServiceInstanceOptions *UpdateServiceInstanceOptions) (result *string, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(updateServiceInstanceOptions, "updateServiceInstanceOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(updateServiceInstanceOptions, "updateServiceInstanceOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v2/service_instances"}
-	pathParameters := []string{*updateServiceInstanceOptions.InstanceID}
-
-	builder := core.NewRequestBuilder(core.PATCH)
-	_, err = builder.ConstructHTTPURL(openServiceBroker.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range updateServiceInstanceOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("open_service_broker", "V1", "UpdateServiceInstance")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-	builder.AddHeader("Content-Type", "application/json")
-
-	if updateServiceInstanceOptions.AcceptsIncomplete != nil {
-		builder.AddQuery("accepts_incomplete", fmt.Sprint(*updateServiceInstanceOptions.AcceptsIncomplete))
-	}
-
-	body := make(map[string]interface{})
-	if updateServiceInstanceOptions.Context != nil {
-		body["context"] = updateServiceInstanceOptions.Context
-	}
-	if updateServiceInstanceOptions.Parameters != nil {
-		body["parameters"] = updateServiceInstanceOptions.Parameters
-	}
-	if updateServiceInstanceOptions.PlanID != nil {
-		body["plan_id"] = updateServiceInstanceOptions.PlanID
-	}
-	if updateServiceInstanceOptions.PreviousValues != nil {
-		body["previous_values"] = updateServiceInstanceOptions.PreviousValues
-	}
-	if updateServiceInstanceOptions.ServiceID != nil {
-		body["service_id"] = updateServiceInstanceOptions.ServiceID
-	}
-	_, err = builder.SetBodyContentJSON(body)
-	if err != nil {
-		return
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = openServiceBroker.Service.Request(request, new(string))
-	if err == nil {
-		var ok bool
-		result, ok = response.Result.(*string)
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-		}
-	}
-
-	return
-}
-
-// DeleteServiceInstance : Delete (deprovision) a service instance
-// Delete (deprovision) a service instance by GUID. When a service broker receives a deprovision request from the IBM
-// Cloud platform, it MUST delete any resources it created during the provision. Usually this means that all resources
-// are immediately reclaimed for future provisions.
-func (openServiceBroker *OpenServiceBrokerV1) DeleteServiceInstance(deleteServiceInstanceOptions *DeleteServiceInstanceOptions) (result *string, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(deleteServiceInstanceOptions, "deleteServiceInstanceOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(deleteServiceInstanceOptions, "deleteServiceInstanceOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v2/service_instances"}
-	pathParameters := []string{*deleteServiceInstanceOptions.InstanceID}
-
-	builder := core.NewRequestBuilder(core.DELETE)
-	_, err = builder.ConstructHTTPURL(openServiceBroker.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range deleteServiceInstanceOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("open_service_broker", "V1", "DeleteServiceInstance")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	builder.AddQuery("service_id", fmt.Sprint(*deleteServiceInstanceOptions.ServiceID))
-	builder.AddQuery("plan_id", fmt.Sprint(*deleteServiceInstanceOptions.PlanID))
-	if deleteServiceInstanceOptions.AcceptsIncomplete != nil {
-		builder.AddQuery("accepts_incomplete", fmt.Sprint(*deleteServiceInstanceOptions.AcceptsIncomplete))
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = openServiceBroker.Service.Request(request, new(string))
-	if err == nil {
-		var ok bool
-		result, ok = response.Result.(*string)
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-		}
-	}
-
-	return
-}
-
-// ListCatalog : Get the catalog metadata stored within the broker
-// This endpoints defines the contract between the broker and the IBM Cloud platform for the services and plans that the
-// broker supports. This endpoint returns the catalog metadata stored within your broker. These values define the
-// minimal provisioning contract between your service and the IBM Cloud platform. All additional catalog metadata that
-// is not required for provisioning is stored within the IBM Cloud catalog, and any updates to catalog display values
-// that are used to render your dashboard like links, icons, and i18n translated metadata should be updated in the
-// Resource Management Console (RMC), and not housed in your broker. None of metadata stored in your broker is displayed
-// in the IBM Cloud console or the IBM Cloud CLI; the console and CLI will return what was set withn RMC and stored in
-// the IBM Cloud catalog.
-func (openServiceBroker *OpenServiceBrokerV1) ListCatalog(listCatalogOptions *ListCatalogOptions) (result *[]Services, response *core.DetailedResponse, err error) {
-	err = core.ValidateStruct(listCatalogOptions, "listCatalogOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v2/catalog"}
-	pathParameters := []string{}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(openServiceBroker.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range listCatalogOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("open_service_broker", "V1", "ListCatalog")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = openServiceBroker.Service.Request(request, make([]map[string]interface{}, 1))
-	if err == nil {
-		s, ok := response.Result.([]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		slice, e := UnmarshalServicesSlice(s)
-		result = &slice
-		err = e
-		response.Result = result
-	}
-
-	return
-}
-
-// ListLastOperation : Get the current status of a provision in-progress for a service instance
-// Get `last_operation` for instance by GUID (for asynchronous provision calls). When a broker returns status code `202
-// Accepted` during a provision, update, or deprovision call, the IBM Cloud platform will begin polling the
-// `last_operation` endpoint to obtain the state of the last requested operation. The broker response MUST contain the
-// field `state` and MAY contain the field `description`.
-//
-// Valid values for `state` are `in progress`, `succeeded`, and `failed`. The platform will poll the `last_operation
-// `endpoint as long as the broker returns "state": "in progress". Returning "state": "succeeded" or "state": "failed"
-// will cause the platform to cease polling. The value provided for description will be passed through to the platform
-// API client and can be used to provide additional detail for users about the progress of the operation.
-func (openServiceBroker *OpenServiceBrokerV1) ListLastOperation(listLastOperationOptions *ListLastOperationOptions) (result *Resp2079894Root, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(listLastOperationOptions, "listLastOperationOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(listLastOperationOptions, "listLastOperationOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v2/service_instances", "last_operation"}
-	pathParameters := []string{*listLastOperationOptions.InstanceID}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(openServiceBroker.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range listLastOperationOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("open_service_broker", "V1", "ListLastOperation")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	if listLastOperationOptions.Operation != nil {
-		builder.AddQuery("operation", fmt.Sprint(*listLastOperationOptions.Operation))
-	}
-	if listLastOperationOptions.PlanID != nil {
-		builder.AddQuery("plan_id", fmt.Sprint(*listLastOperationOptions.PlanID))
-	}
-	if listLastOperationOptions.ServiceID != nil {
-		builder.AddQuery("service_id", fmt.Sprint(*listLastOperationOptions.ServiceID))
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = openServiceBroker.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalResp2079894Root(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// ReplaceServiceBinding : Bind a service instance to another resource
-// Create binding by GUID on service instance.
-//
-// If your service can be bound to applications in IBM Cloud, `bindable:true` must be specified in the catalog.json of
-// your service broker. If bindable, it must be able to return API endpoints and credentials to your service consumers.
-//
-// **Note:** Brokers that do not offer any bindable services do not need to implement the endpoint for bind requests.
-//
-// See the OSB 2.12 spec for more details on
-// [binding](https://github.com/openservicebrokerapi/servicebroker/blob/v2.12/spec.md#binding).
-func (openServiceBroker *OpenServiceBrokerV1) ReplaceServiceBinding(replaceServiceBindingOptions *ReplaceServiceBindingOptions) (result *string, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(replaceServiceBindingOptions, "replaceServiceBindingOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(replaceServiceBindingOptions, "replaceServiceBindingOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v2/service_instances", "service_bindings"}
-	pathParameters := []string{*replaceServiceBindingOptions.BindingID, *replaceServiceBindingOptions.InstanceID}
-
-	builder := core.NewRequestBuilder(core.PUT)
-	_, err = builder.ConstructHTTPURL(openServiceBroker.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range replaceServiceBindingOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("open_service_broker", "V1", "ReplaceServiceBinding")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-	builder.AddHeader("Content-Type", "application/json")
-
-	body := make(map[string]interface{})
-	if replaceServiceBindingOptions.BindResource != nil {
-		body["bind_resource"] = replaceServiceBindingOptions.BindResource
-	}
-	if replaceServiceBindingOptions.Parameters != nil {
-		body["parameters"] = replaceServiceBindingOptions.Parameters
-	}
-	if replaceServiceBindingOptions.PlanID != nil {
-		body["plan_id"] = replaceServiceBindingOptions.PlanID
-	}
-	if replaceServiceBindingOptions.ServiceID != nil {
-		body["service_id"] = replaceServiceBindingOptions.ServiceID
-	}
-	_, err = builder.SetBodyContentJSON(body)
-	if err != nil {
-		return
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = openServiceBroker.Service.Request(request, new(string))
-	if err == nil {
-		var ok bool
-		result, ok = response.Result.(*string)
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-		}
-	}
-
-	return
-}
-
-// DeleteServiceBinding : Delete (unbind) the credentials bound to a resource
-// Delete instance binding by GUID.
-//
-// When a broker receives an unbind request from the IBM Cloud platform, it MUST delete any resources associated with
-// the binding. In the case where credentials were generated, this might result in requests to the service instance
-// failing to authenticate.
-//
-// **Note**: Brokers that do not provide any bindable services or plans do not need to implement this endpoint.
-func (openServiceBroker *OpenServiceBrokerV1) DeleteServiceBinding(deleteServiceBindingOptions *DeleteServiceBindingOptions) (result *string, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(deleteServiceBindingOptions, "deleteServiceBindingOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(deleteServiceBindingOptions, "deleteServiceBindingOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v2/service_instances", "service_bindings"}
-	pathParameters := []string{*deleteServiceBindingOptions.BindingID, *deleteServiceBindingOptions.InstanceID}
-
-	builder := core.NewRequestBuilder(core.DELETE)
-	_, err = builder.ConstructHTTPURL(openServiceBroker.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range deleteServiceBindingOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("open_service_broker", "V1", "DeleteServiceBinding")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	builder.AddQuery("plan_id", fmt.Sprint(*deleteServiceBindingOptions.PlanID))
-	builder.AddQuery("service_id", fmt.Sprint(*deleteServiceBindingOptions.ServiceID))
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = openServiceBroker.Service.Request(request, new(string))
-	if err == nil {
-		var ok bool
-		result, ok = response.Result.(*string)
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-		}
-	}
-
-	return
-}
-
-// DeleteServiceBindingOptions : The DeleteServiceBinding options.
-type DeleteServiceBindingOptions struct {
-	// The `binding_id` is the ID of a previously provisioned binding for that service instance.
-	BindingID *string `json:"binding_id" validate:"required"`
-
-	// The `instance_id` is the ID of a previously provisioned service instance.
-	InstanceID *string `json:"instance_id" validate:"required"`
-
-	// The ID of the plan from the catalog.json in the broker. It MUST be a non-empty string and should be a GUID.
-	PlanID *string `json:"plan_id" validate:"required"`
-
-	// The ID of the service from the catalog.json in the broker. It MUST be a non-empty string and should be a GUID.
-	ServiceID *string `json:"service_id" validate:"required"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewDeleteServiceBindingOptions : Instantiate DeleteServiceBindingOptions
-func (*OpenServiceBrokerV1) NewDeleteServiceBindingOptions(bindingID string, instanceID string, planID string, serviceID string) *DeleteServiceBindingOptions {
-	return &DeleteServiceBindingOptions{
-		BindingID: core.StringPtr(bindingID),
-		InstanceID: core.StringPtr(instanceID),
-		PlanID: core.StringPtr(planID),
-		ServiceID: core.StringPtr(serviceID),
-	}
-}
-
-// SetBindingID : Allow user to set BindingID
-func (options *DeleteServiceBindingOptions) SetBindingID(bindingID string) *DeleteServiceBindingOptions {
-	options.BindingID = core.StringPtr(bindingID)
-	return options
-}
-
-// SetInstanceID : Allow user to set InstanceID
-func (options *DeleteServiceBindingOptions) SetInstanceID(instanceID string) *DeleteServiceBindingOptions {
-	options.InstanceID = core.StringPtr(instanceID)
-	return options
-}
-
-// SetPlanID : Allow user to set PlanID
-func (options *DeleteServiceBindingOptions) SetPlanID(planID string) *DeleteServiceBindingOptions {
-	options.PlanID = core.StringPtr(planID)
-	return options
-}
-
-// SetServiceID : Allow user to set ServiceID
-func (options *DeleteServiceBindingOptions) SetServiceID(serviceID string) *DeleteServiceBindingOptions {
-	options.ServiceID = core.StringPtr(serviceID)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *DeleteServiceBindingOptions) SetHeaders(param map[string]string) *DeleteServiceBindingOptions {
-	options.Headers = param
-	return options
-}
-
-// DeleteServiceInstanceOptions : The DeleteServiceInstance options.
-type DeleteServiceInstanceOptions struct {
-	// The ID of the service stored in the catalog.json of your broker. This value should be a GUID. MUST be a non-empty
-	// string.
-	ServiceID *string `json:"service_id" validate:"required"`
-
-	// The ID of the plan for which the service instance has been requested, which is stored in the catalog.json of your
-	// broker. This value should be a GUID. MUST be a non-empty string.
-	PlanID *string `json:"plan_id" validate:"required"`
-
-	// The ID of a previously provisioned service instance.
-	InstanceID *string `json:"instance_id" validate:"required"`
-
-	// A value of true indicates that both the IBM Cloud platform and the requesting client support asynchronous
-	// deprovisioning. If this parameter is not included in the request, and the broker can only deprovision a service
-	// instance of the requested plan asynchronously, the broker MUST reject the request with a `422` Unprocessable Entity.
-	AcceptsIncomplete *bool `json:"accepts_incomplete,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewDeleteServiceInstanceOptions : Instantiate DeleteServiceInstanceOptions
-func (*OpenServiceBrokerV1) NewDeleteServiceInstanceOptions(serviceID string, planID string, instanceID string) *DeleteServiceInstanceOptions {
-	return &DeleteServiceInstanceOptions{
-		ServiceID: core.StringPtr(serviceID),
-		PlanID: core.StringPtr(planID),
-		InstanceID: core.StringPtr(instanceID),
-	}
-}
-
-// SetServiceID : Allow user to set ServiceID
-func (options *DeleteServiceInstanceOptions) SetServiceID(serviceID string) *DeleteServiceInstanceOptions {
-	options.ServiceID = core.StringPtr(serviceID)
-	return options
-}
-
-// SetPlanID : Allow user to set PlanID
-func (options *DeleteServiceInstanceOptions) SetPlanID(planID string) *DeleteServiceInstanceOptions {
-	options.PlanID = core.StringPtr(planID)
-	return options
-}
-
-// SetInstanceID : Allow user to set InstanceID
-func (options *DeleteServiceInstanceOptions) SetInstanceID(instanceID string) *DeleteServiceInstanceOptions {
-	options.InstanceID = core.StringPtr(instanceID)
-	return options
-}
-
-// SetAcceptsIncomplete : Allow user to set AcceptsIncomplete
-func (options *DeleteServiceInstanceOptions) SetAcceptsIncomplete(acceptsIncomplete bool) *DeleteServiceInstanceOptions {
-	options.AcceptsIncomplete = core.BoolPtr(acceptsIncomplete)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *DeleteServiceInstanceOptions) SetHeaders(param map[string]string) *DeleteServiceInstanceOptions {
-	options.Headers = param
-	return options
-}
-
-// GetServiceInstanceStateOptions : The GetServiceInstanceState options.
-type GetServiceInstanceStateOptions struct {
-	// The `instance_id` of a service instance is provided by the IBM Cloud platform. This ID will be used for future
-	// requests to bind and deprovision, so the broker can use it to correlate the resource it creates.
-	InstanceID *string `json:"instance_id" validate:"required"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewGetServiceInstanceStateOptions : Instantiate GetServiceInstanceStateOptions
-func (*OpenServiceBrokerV1) NewGetServiceInstanceStateOptions(instanceID string) *GetServiceInstanceStateOptions {
-	return &GetServiceInstanceStateOptions{
-		InstanceID: core.StringPtr(instanceID),
-	}
-}
-
-// SetInstanceID : Allow user to set InstanceID
-func (options *GetServiceInstanceStateOptions) SetInstanceID(instanceID string) *GetServiceInstanceStateOptions {
-	options.InstanceID = core.StringPtr(instanceID)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *GetServiceInstanceStateOptions) SetHeaders(param map[string]string) *GetServiceInstanceStateOptions {
-	options.Headers = param
-	return options
-}
-
-// ListCatalogOptions : The ListCatalog options.
-type ListCatalogOptions struct {
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewListCatalogOptions : Instantiate ListCatalogOptions
-func (*OpenServiceBrokerV1) NewListCatalogOptions() *ListCatalogOptions {
-	return &ListCatalogOptions{}
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *ListCatalogOptions) SetHeaders(param map[string]string) *ListCatalogOptions {
-	options.Headers = param
-	return options
-}
-
-// ListLastOperationOptions : The ListLastOperation options.
-type ListLastOperationOptions struct {
-	// The unique instance ID generated during provisioning by the IBM Cloud platform.
-	InstanceID *string `json:"instance_id" validate:"required"`
-
-	// A broker-provided identifier for the operation. When a value for operation is included with asynchronous responses
-	// for provision and update, and deprovision requests, the IBM Cloud platform will provide the same value using this
-	// query parameter as a URL-encoded string. If present, MUST be a non-empty string.
-	Operation *string `json:"operation,omitempty"`
-
-	// ID of the plan from the catalog.json in your broker. If present, MUST be a non-empty string.
-	PlanID *string `json:"plan_id,omitempty"`
-
-	// ID of the service from the catalog.json in your service broker. If present, MUST be a non-empty string.
-	ServiceID *string `json:"service_id,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewListLastOperationOptions : Instantiate ListLastOperationOptions
-func (*OpenServiceBrokerV1) NewListLastOperationOptions(instanceID string) *ListLastOperationOptions {
-	return &ListLastOperationOptions{
-		InstanceID: core.StringPtr(instanceID),
-	}
-}
-
-// SetInstanceID : Allow user to set InstanceID
-func (options *ListLastOperationOptions) SetInstanceID(instanceID string) *ListLastOperationOptions {
-	options.InstanceID = core.StringPtr(instanceID)
-	return options
-}
-
-// SetOperation : Allow user to set Operation
-func (options *ListLastOperationOptions) SetOperation(operation string) *ListLastOperationOptions {
-	options.Operation = core.StringPtr(operation)
-	return options
-}
-
-// SetPlanID : Allow user to set PlanID
-func (options *ListLastOperationOptions) SetPlanID(planID string) *ListLastOperationOptions {
-	options.PlanID = core.StringPtr(planID)
-	return options
-}
-
-// SetServiceID : Allow user to set ServiceID
-func (options *ListLastOperationOptions) SetServiceID(serviceID string) *ListLastOperationOptions {
-	options.ServiceID = core.StringPtr(serviceID)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *ListLastOperationOptions) SetHeaders(param map[string]string) *ListLastOperationOptions {
-	options.Headers = param
-	return options
-}
-
-// ReplaceServiceBindingOptions : The ReplaceServiceBinding options.
-type ReplaceServiceBindingOptions struct {
-	// The `binding_id` is provided by the IBM Cloud platform. This ID will be used for future unbind requests, so the
-	// broker can use it to correlate the resource it creates.
-	BindingID *string `json:"binding_id" validate:"required"`
-
-	// The :`instance_id` is the ID of a previously provisioned service instance.
-	InstanceID *string `json:"instance_id" validate:"required"`
-
-	// A JSON object that contains data for platform resources associated with the binding to be created.
-	BindResource []BindResource `json:"bind_resource,omitempty"`
-
-	// Configuration options for the service binding.
-	Parameters interface{} `json:"parameters,omitempty"`
-
-	// The ID of the plan from the catalog.json in your broker. If present, it MUST be a non-empty string.
-	PlanID *string `json:"plan_id,omitempty"`
-
-	// The ID of the service from the catalog.json in your broker. If present, it MUST be a non-empty string.
-	ServiceID *string `json:"service_id,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewReplaceServiceBindingOptions : Instantiate ReplaceServiceBindingOptions
-func (*OpenServiceBrokerV1) NewReplaceServiceBindingOptions(bindingID string, instanceID string) *ReplaceServiceBindingOptions {
-	return &ReplaceServiceBindingOptions{
-		BindingID: core.StringPtr(bindingID),
-		InstanceID: core.StringPtr(instanceID),
-	}
-}
-
-// SetBindingID : Allow user to set BindingID
-func (options *ReplaceServiceBindingOptions) SetBindingID(bindingID string) *ReplaceServiceBindingOptions {
-	options.BindingID = core.StringPtr(bindingID)
-	return options
-}
-
-// SetInstanceID : Allow user to set InstanceID
-func (options *ReplaceServiceBindingOptions) SetInstanceID(instanceID string) *ReplaceServiceBindingOptions {
-	options.InstanceID = core.StringPtr(instanceID)
-	return options
-}
-
-// SetBindResource : Allow user to set BindResource
-func (options *ReplaceServiceBindingOptions) SetBindResource(bindResource []BindResource) *ReplaceServiceBindingOptions {
-	options.BindResource = bindResource
-	return options
-}
-
-// SetParameters : Allow user to set Parameters
-func (options *ReplaceServiceBindingOptions) SetParameters(parameters interface{}) *ReplaceServiceBindingOptions {
-	options.Parameters = parameters
-	return options
-}
-
-// SetPlanID : Allow user to set PlanID
-func (options *ReplaceServiceBindingOptions) SetPlanID(planID string) *ReplaceServiceBindingOptions {
-	options.PlanID = core.StringPtr(planID)
-	return options
-}
-
-// SetServiceID : Allow user to set ServiceID
-func (options *ReplaceServiceBindingOptions) SetServiceID(serviceID string) *ReplaceServiceBindingOptions {
-	options.ServiceID = core.StringPtr(serviceID)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *ReplaceServiceBindingOptions) SetHeaders(param map[string]string) *ReplaceServiceBindingOptions {
-	options.Headers = param
-	return options
-}
-
-// ReplaceServiceInstanceOptions : The ReplaceServiceInstance options.
-type ReplaceServiceInstanceOptions struct {
-	// The `instance_id` of a service instance is provided by the IBM Cloud platform. This ID will be used for future
-	// requests to bind and deprovision, so the broker can use it to correlate the resource it creates.
-	InstanceID *string `json:"instance_id" validate:"required"`
-
-	// Platform specific contextual information under which the service instance is to be provisioned.
-	Context []Context `json:"context,omitempty"`
-
-	// Deprecated in favor of `context`. The identifier for the project space within the IBM Cloud platform organization.
-	// Although most brokers will not use this field, it might be helpful for executing operations on a user's behalf. It
-	// MUST be a non-empty string.
-	OrganizationGuid *string `json:"organization_guid,omitempty"`
-
-	// A list of plans for this service that must contain at least one plan.
-	Parameters []Parameters `json:"parameters,omitempty"`
-
-	// The ID of the plan for which the service instance has been requested, which is stored in the catalog.json of your
-	// broker. This value should be a GUID and it MUST be unique to a service.
-	PlanID *string `json:"plan_id,omitempty"`
-
-	// The ID of the service stored in the catalog.json of your broker. This value should be a GUID and it MUST be a
-	// non-empty string.
-	ServiceID *string `json:"service_id,omitempty"`
-
-	// Deprecated in favor of `context`. The IBM Cloud platform GUID for the organization under which the service instance
-	// is to be provisioned. Although most brokers will not use this field, it might be helpful for executing operations on
-	// a user's behalf. It MUST be a non-empty string.
-	SpaceGuid *string `json:"space_guid,omitempty"`
-
-	// A value of true indicates that both the IBM Cloud platform and the requesting client support asynchronous
-	// deprovisioning. If this parameter is not included in the request, and the broker can only deprovision a service
-	// instance of the requested plan asynchronously, the broker MUST reject the request with a `422` Unprocessable Entity.
-	AcceptsIncomplete *bool `json:"accepts_incomplete,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewReplaceServiceInstanceOptions : Instantiate ReplaceServiceInstanceOptions
-func (*OpenServiceBrokerV1) NewReplaceServiceInstanceOptions(instanceID string) *ReplaceServiceInstanceOptions {
-	return &ReplaceServiceInstanceOptions{
-		InstanceID: core.StringPtr(instanceID),
-	}
-}
-
-// SetInstanceID : Allow user to set InstanceID
-func (options *ReplaceServiceInstanceOptions) SetInstanceID(instanceID string) *ReplaceServiceInstanceOptions {
-	options.InstanceID = core.StringPtr(instanceID)
-	return options
-}
-
-// SetContext : Allow user to set Context
-func (options *ReplaceServiceInstanceOptions) SetContext(context []Context) *ReplaceServiceInstanceOptions {
-	options.Context = context
-	return options
-}
-
-// SetOrganizationGuid : Allow user to set OrganizationGuid
-func (options *ReplaceServiceInstanceOptions) SetOrganizationGuid(organizationGuid string) *ReplaceServiceInstanceOptions {
-	options.OrganizationGuid = core.StringPtr(organizationGuid)
-	return options
-}
-
-// SetParameters : Allow user to set Parameters
-func (options *ReplaceServiceInstanceOptions) SetParameters(parameters []Parameters) *ReplaceServiceInstanceOptions {
-	options.Parameters = parameters
-	return options
-}
-
-// SetPlanID : Allow user to set PlanID
-func (options *ReplaceServiceInstanceOptions) SetPlanID(planID string) *ReplaceServiceInstanceOptions {
-	options.PlanID = core.StringPtr(planID)
-	return options
-}
-
-// SetServiceID : Allow user to set ServiceID
-func (options *ReplaceServiceInstanceOptions) SetServiceID(serviceID string) *ReplaceServiceInstanceOptions {
-	options.ServiceID = core.StringPtr(serviceID)
-	return options
-}
-
-// SetSpaceGuid : Allow user to set SpaceGuid
-func (options *ReplaceServiceInstanceOptions) SetSpaceGuid(spaceGuid string) *ReplaceServiceInstanceOptions {
-	options.SpaceGuid = core.StringPtr(spaceGuid)
-	return options
-}
-
-// SetAcceptsIncomplete : Allow user to set AcceptsIncomplete
-func (options *ReplaceServiceInstanceOptions) SetAcceptsIncomplete(acceptsIncomplete bool) *ReplaceServiceInstanceOptions {
-	options.AcceptsIncomplete = core.BoolPtr(acceptsIncomplete)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *ReplaceServiceInstanceOptions) SetHeaders(param map[string]string) *ReplaceServiceInstanceOptions {
-	options.Headers = param
-	return options
-}
-
-// ReplaceStateOptions : The ReplaceState options.
-type ReplaceStateOptions struct {
-	// The `instance_id` of a service instance is provided by the IBM Cloud platform. This ID will be used for future
-	// requests to bind and deprovision, so the broker can use it to correlate the resource it creates.
-	InstanceID *string `json:"instance_id" validate:"required"`
-
-	// Indicates the current state of the service instance.
-	Enabled *bool `json:"enabled,omitempty"`
-
-	// Optional string that shows the user ID that is initiating the call.
-	InitiatorID *string `json:"initiator_id,omitempty"`
-
-	// Optional string that states the reason code for the service instance state change. Valid values are
-	// `IBMCLOUD_ACCT_ACTIVATE`, `IBMCLOUD_RECLAMATION_RESTORE`, or `IBMCLOUD_SERVICE_INSTANCE_BELOW_CAP` for enable calls;
-	// `IBMCLOUD_ACCT_SUSPEND`, `IBMCLOUD_RECLAMATION_SCHEDULE`, or `IBMCLOUD_SERVICE_INSTANCE_ABOVE_CAP` for disable
-	// calls; and `IBMCLOUD_ADMIN_REQUEST` for enable and disable calls.<br/><br/>Previously accepted values had a `BMX_`
-	// prefix, such as `BMX_ACCT_ACTIVATE`. These values are deprecated.
-	ReasonCode *string `json:"reason_code,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewReplaceStateOptions : Instantiate ReplaceStateOptions
-func (*OpenServiceBrokerV1) NewReplaceStateOptions(instanceID string) *ReplaceStateOptions {
-	return &ReplaceStateOptions{
-		InstanceID: core.StringPtr(instanceID),
-	}
-}
-
-// SetInstanceID : Allow user to set InstanceID
-func (options *ReplaceStateOptions) SetInstanceID(instanceID string) *ReplaceStateOptions {
-	options.InstanceID = core.StringPtr(instanceID)
-	return options
-}
-
-// SetEnabled : Allow user to set Enabled
-func (options *ReplaceStateOptions) SetEnabled(enabled bool) *ReplaceStateOptions {
-	options.Enabled = core.BoolPtr(enabled)
-	return options
-}
-
-// SetInitiatorID : Allow user to set InitiatorID
-func (options *ReplaceStateOptions) SetInitiatorID(initiatorID string) *ReplaceStateOptions {
-	options.InitiatorID = core.StringPtr(initiatorID)
-	return options
-}
-
-// SetReasonCode : Allow user to set ReasonCode
-func (options *ReplaceStateOptions) SetReasonCode(reasonCode string) *ReplaceStateOptions {
-	options.ReasonCode = core.StringPtr(reasonCode)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *ReplaceStateOptions) SetHeaders(param map[string]string) *ReplaceStateOptions {
-	options.Headers = param
-	return options
-}
-
-// Resp1874644Root : Check the active status of an enabled service.
-type Resp1874644Root struct {
-	// Indicates (from the viewpoint of the provider) whether the service instance is active and is meaningful if enabled
-	// is true. The default value is true if not specified.
-	Active *bool `json:"active,omitempty"`
-
-	// Indicates the current state of the service instance.
-	Enabled *bool `json:"enabled,omitempty"`
-
-	// Indicates when the service instance was last accessed/modified/etc., and is meaningful if enabled is true AND active
-	// is false. Represented as milliseconds since the epoch, but does not need to be accurate to the second/hour.
-	LastActive *float64 `json:"last_active,omitempty"`
-}
-
-
-// UnmarshalResp1874644Root constructs an instance of Resp1874644Root from the specified map.
-func UnmarshalResp1874644Root(m map[string]interface{}) (result *Resp1874644Root, err error) {
-	obj := new(Resp1874644Root)
-	obj.Active, err = core.UnmarshalBool(m, "active")
-	if err != nil {
-		return
-	}
-	obj.Enabled, err = core.UnmarshalBool(m, "enabled")
-	if err != nil {
-		return
-	}
-	obj.LastActive, err = core.UnmarshalFloat64(m, "last_active")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalResp1874644RootSlice unmarshals a slice of Resp1874644Root instances from the specified list of maps.
-func UnmarshalResp1874644RootSlice(s []interface{}) (slice []Resp1874644Root, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'Resp1874644Root'")
-			return
-		}
-		obj, e := UnmarshalResp1874644Root(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalResp1874644RootAsProperty unmarshals an instance of Resp1874644Root that is stored as a property
-// within the specified map.
-func UnmarshalResp1874644RootAsProperty(m map[string]interface{}, propertyName string) (result *Resp1874644Root, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'Resp1874644Root'", propertyName)
-			return
-		}
-		result, err = UnmarshalResp1874644Root(objMap)
-	}
-	return
-}
-
-// UnmarshalResp1874644RootSliceAsProperty unmarshals a slice of Resp1874644Root instances that are stored as a property
-// within the specified map.
-func UnmarshalResp1874644RootSliceAsProperty(m map[string]interface{}, propertyName string) (slice []Resp1874644Root, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'Resp1874644Root'", propertyName)
-			return
-		}
-		slice, err = UnmarshalResp1874644RootSlice(vSlice)
-	}
-	return
-}
-
-// Resp2079872Root : OK - MUST be returned if the service instance already exists, is fully provisioned, and the requested parameters are
-// identical to the existing service instance.
-type Resp2079872Root struct {
-	// The URL of a web-based management user interface for the service instance; we refer to this as a service dashboard.
-	// The URL MUST contain enough information for the dashboard to identify the resource being accessed. Note: a broker
-	// that wishes to return `dashboard_url` for a service instance MUST return it with the initial response to the
-	// provision request, even if the service is provisioned asynchronously. If present, it MUST be a non-empty string.
-	DashboardURL *string `json:"dashboard_url,omitempty"`
-
-	// For asynchronous responses, service brokers MAY return an identifier representing the operation. The value of this
-	// field MUST be provided by the platform with requests to the `last_operation` endpoint in a URL encoded query
-	// parameter. If present, MUST be a non-empty string.
-	Operation *string `json:"operation,omitempty"`
-}
-
-
-// UnmarshalResp2079872Root constructs an instance of Resp2079872Root from the specified map.
-func UnmarshalResp2079872Root(m map[string]interface{}) (result *Resp2079872Root, err error) {
-	obj := new(Resp2079872Root)
-	obj.DashboardURL, err = core.UnmarshalString(m, "dashboard_url")
-	if err != nil {
-		return
-	}
-	obj.Operation, err = core.UnmarshalString(m, "operation")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalResp2079872RootSlice unmarshals a slice of Resp2079872Root instances from the specified list of maps.
-func UnmarshalResp2079872RootSlice(s []interface{}) (slice []Resp2079872Root, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'Resp2079872Root'")
-			return
-		}
-		obj, e := UnmarshalResp2079872Root(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalResp2079872RootAsProperty unmarshals an instance of Resp2079872Root that is stored as a property
-// within the specified map.
-func UnmarshalResp2079872RootAsProperty(m map[string]interface{}, propertyName string) (result *Resp2079872Root, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'Resp2079872Root'", propertyName)
-			return
-		}
-		result, err = UnmarshalResp2079872Root(objMap)
-	}
-	return
-}
-
-// UnmarshalResp2079872RootSliceAsProperty unmarshals a slice of Resp2079872Root instances that are stored as a property
-// within the specified map.
-func UnmarshalResp2079872RootSliceAsProperty(m map[string]interface{}, propertyName string) (slice []Resp2079872Root, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'Resp2079872Root'", propertyName)
-			return
-		}
-		slice, err = UnmarshalResp2079872RootSlice(vSlice)
-	}
-	return
-}
-
-// Resp2079894Root : OK - MUST be returned upon successful processing of this request.
-type Resp2079894Root struct {
-	// A user-facing message displayed to the platform API client. Can be used to tell the user details about the status of
-	// the operation. If present, MUST be a non-empty string.
-	Description *string `json:"description,omitempty"`
-
-	// Valid values are `in progress`, `succeeded`, and `failed`. While `†state": "in progress†`, the platform SHOULD
-	// continue polling. A response with `†state": "succeeded†` or `†state": "failed†` MUST cause the platform to
-	// cease polling.
-	State *string `json:"state" validate:"required"`
-}
-
-
-// UnmarshalResp2079894Root constructs an instance of Resp2079894Root from the specified map.
-func UnmarshalResp2079894Root(m map[string]interface{}) (result *Resp2079894Root, err error) {
-	obj := new(Resp2079894Root)
-	obj.Description, err = core.UnmarshalString(m, "description")
-	if err != nil {
-		return
-	}
-	obj.State, err = core.UnmarshalString(m, "state")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalResp2079894RootSlice unmarshals a slice of Resp2079894Root instances from the specified list of maps.
-func UnmarshalResp2079894RootSlice(s []interface{}) (slice []Resp2079894Root, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'Resp2079894Root'")
-			return
-		}
-		obj, e := UnmarshalResp2079894Root(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalResp2079894RootAsProperty unmarshals an instance of Resp2079894Root that is stored as a property
-// within the specified map.
-func UnmarshalResp2079894RootAsProperty(m map[string]interface{}, propertyName string) (result *Resp2079894Root, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'Resp2079894Root'", propertyName)
-			return
-		}
-		result, err = UnmarshalResp2079894Root(objMap)
-	}
-	return
-}
-
-// UnmarshalResp2079894RootSliceAsProperty unmarshals a slice of Resp2079894Root instances that are stored as a property
-// within the specified map.
-func UnmarshalResp2079894RootSliceAsProperty(m map[string]interface{}, propertyName string) (slice []Resp2079894Root, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'Resp2079894Root'", propertyName)
-			return
-		}
-		slice, err = UnmarshalResp2079894RootSlice(vSlice)
-	}
-	return
-}
-
-// Resp2448145Root : Check the enabled status of active service.
-type Resp2448145Root struct {
-	// Indicates (from the viewpoint of the provider) whether the service instance is active and is meaningful if `enabled`
-	// is true.  The default value is true if not specified.
-	Active *bool `json:"active,omitempty"`
-
-	// Indicates the current state of the service instance.
-	Enabled *bool `json:"enabled" validate:"required"`
-
-	// Indicates when the service instance was last accessed or modified, and is meaningful if `enabled` is true AND
-	// `active` is false.  Represented as milliseconds since the epoch, but does not need to be accurate to the
-	// second/hour.
-	LastActive *int64 `json:"last_active,omitempty"`
-}
-
-
-// UnmarshalResp2448145Root constructs an instance of Resp2448145Root from the specified map.
-func UnmarshalResp2448145Root(m map[string]interface{}) (result *Resp2448145Root, err error) {
-	obj := new(Resp2448145Root)
-	obj.Active, err = core.UnmarshalBool(m, "active")
-	if err != nil {
-		return
-	}
-	obj.Enabled, err = core.UnmarshalBool(m, "enabled")
-	if err != nil {
-		return
-	}
-	obj.LastActive, err = core.UnmarshalInt64(m, "last_active")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalResp2448145RootSlice unmarshals a slice of Resp2448145Root instances from the specified list of maps.
-func UnmarshalResp2448145RootSlice(s []interface{}) (slice []Resp2448145Root, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'Resp2448145Root'")
-			return
-		}
-		obj, e := UnmarshalResp2448145Root(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalResp2448145RootAsProperty unmarshals an instance of Resp2448145Root that is stored as a property
-// within the specified map.
-func UnmarshalResp2448145RootAsProperty(m map[string]interface{}, propertyName string) (result *Resp2448145Root, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'Resp2448145Root'", propertyName)
-			return
-		}
-		result, err = UnmarshalResp2448145Root(objMap)
-	}
-	return
-}
-
-// UnmarshalResp2448145RootSliceAsProperty unmarshals a slice of Resp2448145Root instances that are stored as a property
-// within the specified map.
-func UnmarshalResp2448145RootSliceAsProperty(m map[string]interface{}, propertyName string) (slice []Resp2448145Root, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'Resp2448145Root'", propertyName)
-			return
-		}
-		slice, err = UnmarshalResp2448145RootSlice(vSlice)
-	}
-	return
-}
-
-// UpdateServiceInstanceOptions : The UpdateServiceInstance options.
-type UpdateServiceInstanceOptions struct {
-	// The ID of a previously provisioned service instance.
-	InstanceID *string `json:"instance_id" validate:"required"`
-
-	// Contextual data under which the service instance is created.
-	Context []Context `json:"context,omitempty"`
-
-	// Configuration options for the service instance. An opaque object, controller treats this as a blob. Brokers should
-	// ensure that the client has provided valid configuration parameters and values for the operation. If this field is
-	// not present in the request message, then the broker MUST NOT change the parameters of the instance as a result of
-	// this request.
-	Parameters *Parameters `json:"parameters,omitempty"`
-
-	// The ID of the plan for which the service instance has been requested, which is stored in the catalog.json of your
-	// broker. This value should be a GUID. MUST be unique to a service. If present, MUST be a non-empty string. If this
-	// field is not present in the request message, then the broker MUST NOT change the plan of the instance as a result of
-	// this request.
-	PlanID *string `json:"plan_id,omitempty"`
-
-	// Information about the service instance prior to the update.
-	PreviousValues []string `json:"previous_values,omitempty"`
-
-	// The ID of the service stored in the catalog.json of your broker. This value should be a GUID. It MUST be a non-empty
-	// string.
-	ServiceID *string `json:"service_id,omitempty"`
-
-	// A value of true indicates that both the IBM Cloud platform and the requesting client support asynchronous
-	// deprovisioning. If this parameter is not included in the request, and the broker can only deprovision a service
-	// instance of the requested plan asynchronously, the broker MUST reject the request with a `422` Unprocessable Entity.
-	AcceptsIncomplete *string `json:"accepts_incomplete,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewUpdateServiceInstanceOptions : Instantiate UpdateServiceInstanceOptions
-func (*OpenServiceBrokerV1) NewUpdateServiceInstanceOptions(instanceID string) *UpdateServiceInstanceOptions {
-	return &UpdateServiceInstanceOptions{
-		InstanceID: core.StringPtr(instanceID),
-	}
-}
-
-// SetInstanceID : Allow user to set InstanceID
-func (options *UpdateServiceInstanceOptions) SetInstanceID(instanceID string) *UpdateServiceInstanceOptions {
-	options.InstanceID = core.StringPtr(instanceID)
-	return options
-}
-
-// SetContext : Allow user to set Context
-func (options *UpdateServiceInstanceOptions) SetContext(context []Context) *UpdateServiceInstanceOptions {
-	options.Context = context
-	return options
-}
-
-// SetParameters : Allow user to set Parameters
-func (options *UpdateServiceInstanceOptions) SetParameters(parameters *Parameters) *UpdateServiceInstanceOptions {
-	options.Parameters = parameters
-	return options
-}
-
-// SetPlanID : Allow user to set PlanID
-func (options *UpdateServiceInstanceOptions) SetPlanID(planID string) *UpdateServiceInstanceOptions {
-	options.PlanID = core.StringPtr(planID)
-	return options
-}
-
-// SetPreviousValues : Allow user to set PreviousValues
-func (options *UpdateServiceInstanceOptions) SetPreviousValues(previousValues []string) *UpdateServiceInstanceOptions {
-	options.PreviousValues = previousValues
-	return options
-}
-
-// SetServiceID : Allow user to set ServiceID
-func (options *UpdateServiceInstanceOptions) SetServiceID(serviceID string) *UpdateServiceInstanceOptions {
-	options.ServiceID = core.StringPtr(serviceID)
-	return options
-}
-
-// SetAcceptsIncomplete : Allow user to set AcceptsIncomplete
-func (options *UpdateServiceInstanceOptions) SetAcceptsIncomplete(acceptsIncomplete string) *UpdateServiceInstanceOptions {
-	options.AcceptsIncomplete = core.StringPtr(acceptsIncomplete)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *UpdateServiceInstanceOptions) SetHeaders(param map[string]string) *UpdateServiceInstanceOptions {
-	options.Headers = param
-	return options
-}
-
-// BindResource : Bind a resource.
-type BindResource struct {
-	// Account owner of resource to bind.
-	AccountID *string `json:"account_id,omitempty"`
-
-	// Service ID of resource to bind.
-	ServiceidCrn *string `json:"serviceid_crn,omitempty"`
-
-	// Target ID of resource to bind.
-	TargetCrn *string `json:"target_crn,omitempty"`
-}
-
-
-// UnmarshalBindResource constructs an instance of BindResource from the specified map.
-func UnmarshalBindResource(m map[string]interface{}) (result *BindResource, err error) {
-	obj := new(BindResource)
-	obj.AccountID, err = core.UnmarshalString(m, "account_id")
-	if err != nil {
-		return
-	}
-	obj.ServiceidCrn, err = core.UnmarshalString(m, "serviceid_crn")
-	if err != nil {
-		return
-	}
-	obj.TargetCrn, err = core.UnmarshalString(m, "target_crn")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalBindResourceSlice unmarshals a slice of BindResource instances from the specified list of maps.
-func UnmarshalBindResourceSlice(s []interface{}) (slice []BindResource, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'BindResource'")
-			return
-		}
-		obj, e := UnmarshalBindResource(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalBindResourceAsProperty unmarshals an instance of BindResource that is stored as a property
-// within the specified map.
-func UnmarshalBindResourceAsProperty(m map[string]interface{}, propertyName string) (result *BindResource, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'BindResource'", propertyName)
-			return
-		}
-		result, err = UnmarshalBindResource(objMap)
-	}
-	return
-}
-
-// UnmarshalBindResourceSliceAsProperty unmarshals a slice of BindResource instances that are stored as a property
-// within the specified map.
-func UnmarshalBindResourceSliceAsProperty(m map[string]interface{}, propertyName string) (slice []BindResource, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'BindResource'", propertyName)
-			return
-		}
-		slice, err = UnmarshalBindResourceSlice(vSlice)
-	}
-	return
-}
-
-// Context : Contextual data under which the service instance is created.
-type Context struct {
-	// Returns the ID of the account in IBM Cloud that is provisioning the service instance.
-	AccountID *string `json:"account_id,omitempty"`
-
-	// When a customer provisions your service in IBM Cloud, a service instance is created and this instance is identified
-	// by its IBM Cloud Resource Name (CRN). The CRN is utilized in all aspects of the interaction with IBM Cloud including
-	// provisioning, binding (creating credentials and endpoints), metering, dashboard display, and access control. From a
-	// service provider perspective, the CRN can largely be treated as an opaque string to be utilized with the IBM Cloud
-	// APIs, but it can also be decomposed via the following structure:
-	// `crn:version:cname:ctype:service-name:location:scope:service-instance:resource-type:resource`.
-	Crn *string `json:"crn,omitempty"`
-
-	// Identifies the platform as "ibmcloud".
-	Platform *string `json:"platform,omitempty"`
-}
-
-
-// UnmarshalContext constructs an instance of Context from the specified map.
-func UnmarshalContext(m map[string]interface{}) (result *Context, err error) {
-	obj := new(Context)
-	obj.AccountID, err = core.UnmarshalString(m, "account_id")
-	if err != nil {
-		return
-	}
-	obj.Crn, err = core.UnmarshalString(m, "crn")
-	if err != nil {
-		return
-	}
-	obj.Platform, err = core.UnmarshalString(m, "platform")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalContextSlice unmarshals a slice of Context instances from the specified list of maps.
-func UnmarshalContextSlice(s []interface{}) (slice []Context, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'Context'")
-			return
-		}
-		obj, e := UnmarshalContext(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalContextAsProperty unmarshals an instance of Context that is stored as a property
-// within the specified map.
-func UnmarshalContextAsProperty(m map[string]interface{}, propertyName string) (result *Context, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'Context'", propertyName)
-			return
-		}
-		result, err = UnmarshalContext(objMap)
-	}
-	return
-}
-
-// UnmarshalContextSliceAsProperty unmarshals a slice of Context instances that are stored as a property
-// within the specified map.
-func UnmarshalContextSliceAsProperty(m map[string]interface{}, propertyName string) (slice []Context, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'Context'", propertyName)
-			return
-		}
-		slice, err = UnmarshalContextSlice(vSlice)
-	}
-	return
-}
-
-// Parameters : Configuration options for the service instance. An opaque object, controller treats this as a blob. Brokers should
-// ensure that the client has provided valid configuration parameters and values for the operation. If this field is not
-// present in the request message, then the broker MUST NOT change the parameters of the instance as a result of this
-// request.
-type Parameters struct {
-	// a custom integer or string within the parameters JSON object.
-	Parameter1 *int64 `json:"parameter1,omitempty"`
-
-	// a custom integer or string within the parameters JSON object.
-	Parameter2 *string `json:"parameter2,omitempty"`
-}
-
-
-// UnmarshalParameters constructs an instance of Parameters from the specified map.
-func UnmarshalParameters(m map[string]interface{}) (result *Parameters, err error) {
-	obj := new(Parameters)
-	obj.Parameter1, err = core.UnmarshalInt64(m, "parameter1")
-	if err != nil {
-		return
-	}
-	obj.Parameter2, err = core.UnmarshalString(m, "parameter2")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalParametersSlice unmarshals a slice of Parameters instances from the specified list of maps.
-func UnmarshalParametersSlice(s []interface{}) (slice []Parameters, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'Parameters'")
-			return
-		}
-		obj, e := UnmarshalParameters(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalParametersAsProperty unmarshals an instance of Parameters that is stored as a property
-// within the specified map.
-func UnmarshalParametersAsProperty(m map[string]interface{}, propertyName string) (result *Parameters, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'Parameters'", propertyName)
-			return
-		}
-		result, err = UnmarshalParameters(objMap)
-	}
-	return
-}
-
-// UnmarshalParametersSliceAsProperty unmarshals a slice of Parameters instances that are stored as a property
-// within the specified map.
-func UnmarshalParametersSliceAsProperty(m map[string]interface{}, propertyName string) (slice []Parameters, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'Parameters'", propertyName)
-			return
-		}
-		slice, err = UnmarshalParametersSlice(vSlice)
-	}
-	return
-}
-
-// Plans : Where is this in the source?.
-type Plans struct {
-	// A short description of the plan. It MUST be a non-empty string. The description is NOT displayed in the IBM Cloud
-	// catalog or IBM Cloud CLI.
-	Description *string `json:"description" validate:"required"`
-
-	// When false, service instances of this plan have a cost. The default is true.
-	Free *bool `json:"free,omitempty"`
-
-	// An identifier used to correlate this plan in future requests to the broker.  This MUST be globally unique within a
-	// platform marketplace. It MUST be a non-empty string and using a GUID is RECOMMENDED. If you define your service in
-	// the RMC, it will create a unique GUID for you to use. It is recommended to use the RMC to define and generate these
-	// values and then use them in your catalog.json metadata in your broker. This value is NOT displayed in the IBM Cloud
-	// catalog or IBM Cloud CLI.
-	ID *string `json:"id" validate:"required"`
-
-	// The programmatic name of the plan. It MUST be unique within the service. All lowercase, no spaces. It MUST be a
-	// non-empty string, and it's NOT displayed in the IBM Cloud catalog or IBM Cloud CLI.
-	Name *string `json:"name" validate:"required"`
-}
-
-
-// UnmarshalPlans constructs an instance of Plans from the specified map.
-func UnmarshalPlans(m map[string]interface{}) (result *Plans, err error) {
-	obj := new(Plans)
-	obj.Description, err = core.UnmarshalString(m, "description")
-	if err != nil {
-		return
-	}
-	obj.Free, err = core.UnmarshalBool(m, "free")
-	if err != nil {
-		return
-	}
-	obj.ID, err = core.UnmarshalString(m, "id")
-	if err != nil {
-		return
-	}
-	obj.Name, err = core.UnmarshalString(m, "name")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalPlansSlice unmarshals a slice of Plans instances from the specified list of maps.
-func UnmarshalPlansSlice(s []interface{}) (slice []Plans, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'Plans'")
-			return
-		}
-		obj, e := UnmarshalPlans(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalPlansAsProperty unmarshals an instance of Plans that is stored as a property
-// within the specified map.
-func UnmarshalPlansAsProperty(m map[string]interface{}, propertyName string) (result *Plans, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'Plans'", propertyName)
-			return
-		}
-		result, err = UnmarshalPlans(objMap)
-	}
-	return
-}
-
-// UnmarshalPlansSliceAsProperty unmarshals a slice of Plans instances that are stored as a property
-// within the specified map.
-func UnmarshalPlansSliceAsProperty(m map[string]interface{}, propertyName string) (slice []Plans, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'Plans'", propertyName)
-			return
-		}
-		slice, err = UnmarshalPlansSlice(vSlice)
-	}
-	return
-}
-
-// Services : The service object that describes the properties of your service.
-type Services struct {
-	// Specifies whether or not your service can be bound to applications in IBM Cloud. If bindable, it must be able to
-	// return API endpoints and credentials to your service consumers.
-	Bindable *bool `json:"bindable" validate:"required"`
-
-	// A short description of the service. It MUST be a non-empty string. Note that this description is not displayed by
-	// the the IBM Cloud console or IBM Cloud CLI.
-	Description *string `json:"description" validate:"required"`
-
-	// An identifier used to correlate this service in future requests to the broker. This MUST be globally unique within
-	// the IBM Cloud platform. It MUST be a non-empty string, and using a GUID is recommended. Recommended: If you define
-	// your service in the RMC, the RMC will generate a globally unique GUID service ID that you can use in your service
-	// broker.
-	ID *string `json:"id" validate:"required"`
-
-	// The service name is not your display name. Your service name must follow the follow these rules:
-	//  - It must be all lowercase.
-	//  - It can't include spaces but may include hyphens (`-`).
-	//  - It must be less than 32 characters.
-	//  Your service name should include your company name. If your company has more then one offering your service name
-	// should include both company and offering as part of the name. For example, the Compose company has offerings for
-	// Redis and Elasticsearch. Sample service names on IBM Cloud for these offerings would be `compose-redis` and
-	// `compose-elasticsearch`.  Each of these service names have associated display names that are shown in the IBM Cloud
-	// catalog: *Compose Redis* and *Compose Elasticsearch*. Another company (e.g. FastJetMail) may only have the single
-	// JetMail offering, in which case the service name should be `fastjetmail`. Recommended: If you define your service in
-	// RMC, you can export a catalog.json that will include the service name you defined within the RMC.
-	Name *string `json:"name" validate:"required"`
-
-	// The Default is false. This specifices whether or not you support plan changes for provisioned instances. If your
-	// offering supports multiple plans, and you want users to be able to change plans for a provisioned instance, you will
-	// need to enable the ability for users to update their service instance by using /v2/service_instances/{instance_id}
-	// PATCH.
-	PlanUpdateable *bool `json:"plan_updateable,omitempty"`
-
-	// A list of plans for this service that must contain at least one plan.
-	Plans []Plans `json:"plans" validate:"required"`
-}
-
-
-// UnmarshalServices constructs an instance of Services from the specified map.
-func UnmarshalServices(m map[string]interface{}) (result *Services, err error) {
-	obj := new(Services)
-	obj.Bindable, err = core.UnmarshalBool(m, "bindable")
-	if err != nil {
-		return
-	}
-	obj.Description, err = core.UnmarshalString(m, "description")
-	if err != nil {
-		return
-	}
-	obj.ID, err = core.UnmarshalString(m, "id")
-	if err != nil {
-		return
-	}
-	obj.Name, err = core.UnmarshalString(m, "name")
-	if err != nil {
-		return
-	}
-	obj.PlanUpdateable, err = core.UnmarshalBool(m, "plan_updateable")
-	if err != nil {
-		return
-	}
-	obj.Plans, err = UnmarshalPlansSliceAsProperty(m, "plans")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalServicesSlice unmarshals a slice of Services instances from the specified list of maps.
-func UnmarshalServicesSlice(s []interface{}) (slice []Services, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'Services'")
-			return
-		}
-		obj, e := UnmarshalServices(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalServicesAsProperty unmarshals an instance of Services that is stored as a property
-// within the specified map.
-func UnmarshalServicesAsProperty(m map[string]interface{}, propertyName string) (result *Services, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'Services'", propertyName)
-			return
-		}
-		result, err = UnmarshalServices(objMap)
-	}
-	return
-}
-
-// UnmarshalServicesSliceAsProperty unmarshals a slice of Services instances that are stored as a property
-// within the specified map.
-func UnmarshalServicesSliceAsProperty(m map[string]interface{}, propertyName string) (slice []Services, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'Services'", propertyName)
-			return
-		}
-		slice, err = UnmarshalServicesSlice(vSlice)
-	}
-	return
-}
diff --git a/openservicebrokerv1/open_service_broker_v1_suite_test.go b/openservicebrokerv1/open_service_broker_v1_suite_test.go
deleted file mode 100644
index 4149582d..00000000
--- a/openservicebrokerv1/open_service_broker_v1_suite_test.go
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * (C) Copyright IBM Corp. 2020.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package openservicebrokerv1_test
-
-import (
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-	"testing"
-)
-
-func TestOpenServiceBrokerV1(t *testing.T) {
-	RegisterFailHandler(Fail)
-	RunSpecs(t, "OpenServiceBrokerV1 Suite")
-}
diff --git a/openservicebrokerv1/open_service_broker_v1_test.go b/openservicebrokerv1/open_service_broker_v1_test.go
deleted file mode 100644
index 7cb3377c..00000000
--- a/openservicebrokerv1/open_service_broker_v1_test.go
+++ /dev/null
@@ -1,616 +0,0 @@
-/**
- * (C) Copyright IBM Corp. 2020.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package openservicebrokerv1_test
-
-import (
-	"bytes"
-	"encoding/base64"
-	"fmt"
-	"github.com/IBM/go-sdk-core/v3/core"
-	"github.com/go-openapi/strfmt"
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-	"github.ibm.com/ibmcloud/platform-services-go-sdk/openservicebrokerv1"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"net/http/httptest"
-	"time"
-)
-
-var _ = Describe(`OpenServiceBrokerV1`, func() {
-	Describe(`GetServiceInstanceState(getServiceInstanceStateOptions *GetServiceInstanceStateOptions)`, func() {
-		username := "user1"
-		password := "pass1"
-		encodedBasicAuth := base64.StdEncoding.EncodeToString([]byte(username + ":" + password))
-		getServiceInstanceStatePath := "/bluemix_v1/service_instances/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(getServiceInstanceStatePath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Basic " + encodedBasicAuth))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"active": true, "enabled": false, "last_active": 10}`)
-			}))
-			It(`Invoke GetServiceInstanceState successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := openservicebrokerv1.NewOpenServiceBrokerV1(&openservicebrokerv1.OpenServiceBrokerV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BasicAuthenticator{
-						Username: username,
-						Password: password,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.GetServiceInstanceState(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the GetServiceInstanceStateOptions model
-				getServiceInstanceStateOptionsModel := new(openservicebrokerv1.GetServiceInstanceStateOptions)
-				getServiceInstanceStateOptionsModel.InstanceID = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.GetServiceInstanceState(getServiceInstanceStateOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`ReplaceState(replaceStateOptions *ReplaceStateOptions)`, func() {
-		username := "user1"
-		password := "pass1"
-		encodedBasicAuth := base64.StdEncoding.EncodeToString([]byte(username + ":" + password))
-		replaceStatePath := "/bluemix_v1/service_instances/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(replaceStatePath))
-				Expect(req.Method).To(Equal("PUT"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Basic " + encodedBasicAuth))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"active": true, "enabled": false, "last_active": 10}`)
-			}))
-			It(`Invoke ReplaceState successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := openservicebrokerv1.NewOpenServiceBrokerV1(&openservicebrokerv1.OpenServiceBrokerV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BasicAuthenticator{
-						Username: username,
-						Password: password,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.ReplaceState(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the ReplaceStateOptions model
-				replaceStateOptionsModel := new(openservicebrokerv1.ReplaceStateOptions)
-				replaceStateOptionsModel.InstanceID = core.StringPtr("testString")
-				replaceStateOptionsModel.Enabled = core.BoolPtr(false)
-				replaceStateOptionsModel.InitiatorID = core.StringPtr("null")
-				replaceStateOptionsModel.ReasonCode = core.StringPtr("null")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.ReplaceState(replaceStateOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`ReplaceServiceInstance(replaceServiceInstanceOptions *ReplaceServiceInstanceOptions)`, func() {
-		username := "user1"
-		password := "pass1"
-		encodedBasicAuth := base64.StdEncoding.EncodeToString([]byte(username + ":" + password))
-		replaceServiceInstancePath := "/v2/service_instances/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(replaceServiceInstancePath))
-				Expect(req.Method).To(Equal("PUT"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Basic " + encodedBasicAuth))
-
-				// TODO: Add check for accepts_incomplete query parameter
-
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"dashboard_url": "DashboardURL", "operation": "Operation"}`)
-			}))
-			It(`Invoke ReplaceServiceInstance successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := openservicebrokerv1.NewOpenServiceBrokerV1(&openservicebrokerv1.OpenServiceBrokerV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BasicAuthenticator{
-						Username: username,
-						Password: password,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.ReplaceServiceInstance(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the Context model
-				contextModel := new(openservicebrokerv1.Context)
-				contextModel.AccountID = core.StringPtr("null")
-				contextModel.Crn = core.StringPtr("null")
-				contextModel.Platform = core.StringPtr("null")
-
-				// Construct an instance of the Parameters model
-				parametersModel := new(openservicebrokerv1.Parameters)
-				parametersModel.Parameter1 = core.Int64Ptr(int64(38))
-				parametersModel.Parameter2 = core.StringPtr("null")
-
-				// Construct an instance of the ReplaceServiceInstanceOptions model
-				replaceServiceInstanceOptionsModel := new(openservicebrokerv1.ReplaceServiceInstanceOptions)
-				replaceServiceInstanceOptionsModel.InstanceID = core.StringPtr("testString")
-				replaceServiceInstanceOptionsModel.Context = []openservicebrokerv1.Context{*contextModel}
-				replaceServiceInstanceOptionsModel.OrganizationGuid = core.StringPtr("null")
-				replaceServiceInstanceOptionsModel.Parameters = []openservicebrokerv1.Parameters{*parametersModel}
-				replaceServiceInstanceOptionsModel.PlanID = core.StringPtr("null")
-				replaceServiceInstanceOptionsModel.ServiceID = core.StringPtr("null")
-				replaceServiceInstanceOptionsModel.SpaceGuid = core.StringPtr("null")
-				replaceServiceInstanceOptionsModel.AcceptsIncomplete = core.BoolPtr(true)
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.ReplaceServiceInstance(replaceServiceInstanceOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`UpdateServiceInstance(updateServiceInstanceOptions *UpdateServiceInstanceOptions)`, func() {
-		username := "user1"
-		password := "pass1"
-		encodedBasicAuth := base64.StdEncoding.EncodeToString([]byte(username + ":" + password))
-		updateServiceInstancePath := "/v2/service_instances/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(updateServiceInstancePath))
-				Expect(req.Method).To(Equal("PATCH"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Basic " + encodedBasicAuth))
-				Expect(req.URL.Query()["accepts_incomplete"]).To(Equal([]string{"testString"}))
-
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `"This is a string response..."`)
-			}))
-			It(`Invoke UpdateServiceInstance successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := openservicebrokerv1.NewOpenServiceBrokerV1(&openservicebrokerv1.OpenServiceBrokerV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BasicAuthenticator{
-						Username: username,
-						Password: password,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.UpdateServiceInstance(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the Context model
-				contextModel := new(openservicebrokerv1.Context)
-				contextModel.AccountID = core.StringPtr("null")
-				contextModel.Crn = core.StringPtr("null")
-				contextModel.Platform = core.StringPtr("null")
-
-				// Construct an instance of the Parameters model
-				parametersModel := new(openservicebrokerv1.Parameters)
-				parametersModel.Parameter1 = core.Int64Ptr(int64(38))
-				parametersModel.Parameter2 = core.StringPtr("null")
-
-				// Construct an instance of the UpdateServiceInstanceOptions model
-				updateServiceInstanceOptionsModel := new(openservicebrokerv1.UpdateServiceInstanceOptions)
-				updateServiceInstanceOptionsModel.InstanceID = core.StringPtr("testString")
-				updateServiceInstanceOptionsModel.Context = []openservicebrokerv1.Context{*contextModel}
-				updateServiceInstanceOptionsModel.Parameters = parametersModel
-				updateServiceInstanceOptionsModel.PlanID = core.StringPtr("null")
-				updateServiceInstanceOptionsModel.PreviousValues = []string{"testString"}
-				updateServiceInstanceOptionsModel.ServiceID = core.StringPtr("null")
-				updateServiceInstanceOptionsModel.AcceptsIncomplete = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.UpdateServiceInstance(updateServiceInstanceOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`DeleteServiceInstance(deleteServiceInstanceOptions *DeleteServiceInstanceOptions)`, func() {
-		username := "user1"
-		password := "pass1"
-		encodedBasicAuth := base64.StdEncoding.EncodeToString([]byte(username + ":" + password))
-		deleteServiceInstancePath := "/v2/service_instances/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(deleteServiceInstancePath))
-				Expect(req.Method).To(Equal("DELETE"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Basic " + encodedBasicAuth))
-				Expect(req.URL.Query()["service_id"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["plan_id"]).To(Equal([]string{"testString"}))
-
-
-				// TODO: Add check for accepts_incomplete query parameter
-
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `"This is a string response..."`)
-			}))
-			It(`Invoke DeleteServiceInstance successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := openservicebrokerv1.NewOpenServiceBrokerV1(&openservicebrokerv1.OpenServiceBrokerV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BasicAuthenticator{
-						Username: username,
-						Password: password,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.DeleteServiceInstance(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the DeleteServiceInstanceOptions model
-				deleteServiceInstanceOptionsModel := new(openservicebrokerv1.DeleteServiceInstanceOptions)
-				deleteServiceInstanceOptionsModel.ServiceID = core.StringPtr("testString")
-				deleteServiceInstanceOptionsModel.PlanID = core.StringPtr("testString")
-				deleteServiceInstanceOptionsModel.InstanceID = core.StringPtr("testString")
-				deleteServiceInstanceOptionsModel.AcceptsIncomplete = core.BoolPtr(true)
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.DeleteServiceInstance(deleteServiceInstanceOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`ListCatalog(listCatalogOptions *ListCatalogOptions)`, func() {
-		username := "user1"
-		password := "pass1"
-		encodedBasicAuth := base64.StdEncoding.EncodeToString([]byte(username + ":" + password))
-		listCatalogPath := "/v2/catalog"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(listCatalogPath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Basic " + encodedBasicAuth))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `[{}]`)
-			}))
-			It(`Invoke ListCatalog successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := openservicebrokerv1.NewOpenServiceBrokerV1(&openservicebrokerv1.OpenServiceBrokerV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BasicAuthenticator{
-						Username: username,
-						Password: password,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.ListCatalog(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the ListCatalogOptions model
-				listCatalogOptionsModel := new(openservicebrokerv1.ListCatalogOptions)
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.ListCatalog(listCatalogOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`ListLastOperation(listLastOperationOptions *ListLastOperationOptions)`, func() {
-		username := "user1"
-		password := "pass1"
-		encodedBasicAuth := base64.StdEncoding.EncodeToString([]byte(username + ":" + password))
-		listLastOperationPath := "/v2/service_instances/testString/last_operation"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(listLastOperationPath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Basic " + encodedBasicAuth))
-				Expect(req.URL.Query()["operation"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["plan_id"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["service_id"]).To(Equal([]string{"testString"}))
-
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"description": "Description", "state": "State"}`)
-			}))
-			It(`Invoke ListLastOperation successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := openservicebrokerv1.NewOpenServiceBrokerV1(&openservicebrokerv1.OpenServiceBrokerV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BasicAuthenticator{
-						Username: username,
-						Password: password,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.ListLastOperation(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the ListLastOperationOptions model
-				listLastOperationOptionsModel := new(openservicebrokerv1.ListLastOperationOptions)
-				listLastOperationOptionsModel.InstanceID = core.StringPtr("testString")
-				listLastOperationOptionsModel.Operation = core.StringPtr("testString")
-				listLastOperationOptionsModel.PlanID = core.StringPtr("testString")
-				listLastOperationOptionsModel.ServiceID = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.ListLastOperation(listLastOperationOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`ReplaceServiceBinding(replaceServiceBindingOptions *ReplaceServiceBindingOptions)`, func() {
-		username := "user1"
-		password := "pass1"
-		encodedBasicAuth := base64.StdEncoding.EncodeToString([]byte(username + ":" + password))
-		replaceServiceBindingPath := "/v2/service_instances/testString/service_bindings/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(replaceServiceBindingPath))
-				Expect(req.Method).To(Equal("PUT"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Basic " + encodedBasicAuth))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `"This is a string response..."`)
-			}))
-			It(`Invoke ReplaceServiceBinding successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := openservicebrokerv1.NewOpenServiceBrokerV1(&openservicebrokerv1.OpenServiceBrokerV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BasicAuthenticator{
-						Username: username,
-						Password: password,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.ReplaceServiceBinding(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the BindResource model
-				bindResourceModel := new(openservicebrokerv1.BindResource)
-				bindResourceModel.AccountID = core.StringPtr("null")
-				bindResourceModel.ServiceidCrn = core.StringPtr("null")
-				bindResourceModel.TargetCrn = core.StringPtr("null")
-
-				// Construct an instance of the ReplaceServiceBindingOptions model
-				replaceServiceBindingOptionsModel := new(openservicebrokerv1.ReplaceServiceBindingOptions)
-				replaceServiceBindingOptionsModel.BindingID = core.StringPtr("testString")
-				replaceServiceBindingOptionsModel.InstanceID = core.StringPtr("testString")
-				replaceServiceBindingOptionsModel.BindResource = []openservicebrokerv1.BindResource{*bindResourceModel}
-				replaceServiceBindingOptionsModel.Parameters = CreateMockMap()
-				replaceServiceBindingOptionsModel.PlanID = core.StringPtr("null")
-				replaceServiceBindingOptionsModel.ServiceID = core.StringPtr("null")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.ReplaceServiceBinding(replaceServiceBindingOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`DeleteServiceBinding(deleteServiceBindingOptions *DeleteServiceBindingOptions)`, func() {
-		username := "user1"
-		password := "pass1"
-		encodedBasicAuth := base64.StdEncoding.EncodeToString([]byte(username + ":" + password))
-		deleteServiceBindingPath := "/v2/service_instances/testString/service_bindings/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(deleteServiceBindingPath))
-				Expect(req.Method).To(Equal("DELETE"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Basic " + encodedBasicAuth))
-				Expect(req.URL.Query()["plan_id"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["service_id"]).To(Equal([]string{"testString"}))
-
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `"This is a string response..."`)
-			}))
-			It(`Invoke DeleteServiceBinding successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := openservicebrokerv1.NewOpenServiceBrokerV1(&openservicebrokerv1.OpenServiceBrokerV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BasicAuthenticator{
-						Username: username,
-						Password: password,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.DeleteServiceBinding(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the DeleteServiceBindingOptions model
-				deleteServiceBindingOptionsModel := new(openservicebrokerv1.DeleteServiceBindingOptions)
-				deleteServiceBindingOptionsModel.BindingID = core.StringPtr("testString")
-				deleteServiceBindingOptionsModel.InstanceID = core.StringPtr("testString")
-				deleteServiceBindingOptionsModel.PlanID = core.StringPtr("testString")
-				deleteServiceBindingOptionsModel.ServiceID = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.DeleteServiceBinding(deleteServiceBindingOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`Utility function tests`, func() {
-		It(`Invoke CreateMockMap() successfully`, func() {
-			mockMap := CreateMockMap()
-			Expect(mockMap).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockByteArray() successfully`, func() {
-			mockByteArray := CreateMockByteArray("This is a test")
-			Expect(mockByteArray).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockUUID() successfully`, func() {
-			mockUUID := CreateMockUUID("9fab83da-98cb-4f18-a7ba-b6f0435c9673")
-			Expect(mockUUID).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockReader() successfully`, func() {
-			mockReader := CreateMockReader("This is a test.")
-			Expect(mockReader).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockDate() successfully`, func() {
-			mockDate := CreateMockDate()
-			Expect(mockDate).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockDateTime() successfully`, func() {
-			mockDateTime := CreateMockDateTime()
-			Expect(mockDateTime).ToNot(BeNil())
-		})
-	})
-})
-
-//
-// Utility functions used by the generated test code
-//
-
-func CreateMockMap() map[string]interface{} {
-	m := make(map[string]interface{})
-	return m
-}
-
-func CreateMockByteArray(mockData string) *[]byte {
-	ba := make([]byte, len(mockData))
-	ba = append(ba, mockData...)
-	return &ba
-}
-
-func CreateMockUUID(mockData string) *strfmt.UUID {
-	uuid := strfmt.UUID(mockData)
-	return &uuid
-}
-
-func CreateMockReader(mockData string) io.ReadCloser {
-	return ioutil.NopCloser(bytes.NewReader([]byte(mockData)))
-}
-
-func CreateMockDate() *strfmt.Date {
-	d := strfmt.Date(time.Now())
-	return &d
-}
-
-func CreateMockDateTime() *strfmt.DateTime {
-	d := strfmt.DateTime(time.Now())
-	return &d
-}
diff --git a/package-lock.json b/package-lock.json
deleted file mode 100644
index 85a107fc..00000000
--- a/package-lock.json
+++ /dev/null
@@ -1,982 +0,0 @@
-{
-  "requires": true,
-  "lockfileVersion": 1,
-  "dependencies": {
-    "@babel/code-frame": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz",
-      "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==",
-      "requires": {
-        "@babel/highlight": "^7.8.3"
-      }
-    },
-    "@babel/helper-validator-identifier": {
-      "version": "7.9.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.0.tgz",
-      "integrity": "sha512-6G8bQKjOh+of4PV/ThDm/rRqlU7+IGoJuofpagU5GlEl29Vv0RGqqt86ZGRV8ZuSOY3o+8yXl5y782SMcG7SHw=="
-    },
-    "@babel/highlight": {
-      "version": "7.9.0",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz",
-      "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==",
-      "requires": {
-        "@babel/helper-validator-identifier": "^7.9.0",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      }
-    },
-    "@nodelib/fs.scandir": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz",
-      "integrity": "sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==",
-      "requires": {
-        "@nodelib/fs.stat": "2.0.3",
-        "run-parallel": "^1.1.9"
-      }
-    },
-    "@nodelib/fs.stat": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz",
-      "integrity": "sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA=="
-    },
-    "@nodelib/fs.walk": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz",
-      "integrity": "sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==",
-      "requires": {
-        "@nodelib/fs.scandir": "2.1.3",
-        "fastq": "^1.6.0"
-      }
-    },
-    "@octokit/auth-token": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.4.0.tgz",
-      "integrity": "sha512-eoOVMjILna7FVQf96iWc3+ZtE/ZT6y8ob8ZzcqKY1ibSQCnu4O/B7pJvzMx5cyZ/RjAff6DAdEb0O0Cjcxidkg==",
-      "requires": {
-        "@octokit/types": "^2.0.0"
-      }
-    },
-    "@octokit/core": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-2.4.3.tgz",
-      "integrity": "sha512-9T91nYeBB7+PNK3oxOuA+6DXCPRvhJ80ke+NqhXirBjVtNepTKFJXoWPqguRSBQ+dkEVA8dZJMxfFzjz9yhiuA==",
-      "requires": {
-        "@octokit/auth-token": "^2.4.0",
-        "@octokit/graphql": "^4.3.1",
-        "@octokit/request": "^5.3.1",
-        "@octokit/types": "^2.0.0",
-        "before-after-hook": "^2.1.0",
-        "universal-user-agent": "^5.0.0"
-      }
-    },
-    "@octokit/endpoint": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.0.tgz",
-      "integrity": "sha512-3nx+MEYoZeD0uJ+7F/gvELLvQJzLXhep2Az0bBSXagbApDvDW0LWwpnAIY/hb0Jwe17A0fJdz0O12dPh05cj7A==",
-      "requires": {
-        "@octokit/types": "^2.0.0",
-        "is-plain-object": "^3.0.0",
-        "universal-user-agent": "^5.0.0"
-      }
-    },
-    "@octokit/graphql": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.3.1.tgz",
-      "integrity": "sha512-hCdTjfvrK+ilU2keAdqNBWOk+gm1kai1ZcdjRfB30oA3/T6n53UVJb7w0L5cR3/rhU91xT3HSqCd+qbvH06yxA==",
-      "requires": {
-        "@octokit/request": "^5.3.0",
-        "@octokit/types": "^2.0.0",
-        "universal-user-agent": "^4.0.0"
-      },
-      "dependencies": {
-        "universal-user-agent": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-4.0.1.tgz",
-          "integrity": "sha512-LnST3ebHwVL2aNe4mejI9IQh2HfZ1RLo8Io2HugSif8ekzD1TlWpHpColOB/eh8JHMLkGH3Akqf040I+4ylNxg==",
-          "requires": {
-            "os-name": "^3.1.0"
-          }
-        }
-      }
-    },
-    "@octokit/plugin-paginate-rest": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.0.2.tgz",
-      "integrity": "sha512-HzODcSUt9mjErly26TlTOGZrhf9bmF/FEDQ2zln1izhgmIV6ulsjsHmgmR4VZ0wzVr/m52Eb6U2XuyS8fkcR1A==",
-      "requires": {
-        "@octokit/types": "^2.0.1"
-      }
-    },
-    "@octokit/plugin-request-log": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.0.tgz",
-      "integrity": "sha512-ywoxP68aOT3zHCLgWZgwUJatiENeHE7xJzYjfz8WI0goynp96wETBF+d95b8g/uL4QmS6owPVlaxiz3wyMAzcw=="
-    },
-    "@octokit/plugin-rest-endpoint-methods": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-3.3.2.tgz",
-      "integrity": "sha512-v+XCH76ExaFDzQW3gPFvjfcMTTCuIkK5ACvBvzfDr74M+k6HYa+m4Iu1bAlj50Gybahe/ee93zt2hfYVI4k9Lg==",
-      "requires": {
-        "@octokit/types": "^2.0.1",
-        "deprecation": "^2.3.1"
-      }
-    },
-    "@octokit/request": {
-      "version": "5.3.4",
-      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.3.4.tgz",
-      "integrity": "sha512-qyj8G8BxQyXjt9Xu6NvfvOr1E0l35lsXtwm3SopsYg/JWXjlsnwqLc8rsD2OLguEL/JjLfBvrXr4az7z8Lch2A==",
-      "requires": {
-        "@octokit/endpoint": "^6.0.0",
-        "@octokit/request-error": "^2.0.0",
-        "@octokit/types": "^2.0.0",
-        "deprecation": "^2.0.0",
-        "is-plain-object": "^3.0.0",
-        "node-fetch": "^2.3.0",
-        "once": "^1.4.0",
-        "universal-user-agent": "^5.0.0"
-      }
-    },
-    "@octokit/request-error": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.0.0.tgz",
-      "integrity": "sha512-rtYicB4Absc60rUv74Rjpzek84UbVHGHJRu4fNVlZ1mCcyUPPuzFfG9Rn6sjHrd95DEsmjSt1Axlc699ZlbDkw==",
-      "requires": {
-        "@octokit/types": "^2.0.0",
-        "deprecation": "^2.0.0",
-        "once": "^1.4.0"
-      }
-    },
-    "@octokit/rest": {
-      "version": "17.1.1",
-      "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-17.1.1.tgz",
-      "integrity": "sha512-Cn9XpevTJdQj/GbACY1WjArDabPpdAhvlS5zoCdZ/chiKbl4vutL1X1VeJHzDLK0K6BdZXXe4SnEPN31wKPA7A==",
-      "requires": {
-        "@octokit/core": "^2.4.0",
-        "@octokit/plugin-paginate-rest": "^2.0.0",
-        "@octokit/plugin-request-log": "^1.0.0",
-        "@octokit/plugin-rest-endpoint-methods": "^3.3.0"
-      }
-    },
-    "@octokit/types": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-2.5.0.tgz",
-      "integrity": "sha512-KEnLwOfdXzxPNL34fj508bhi9Z9cStyN7qY1kOfVahmqtAfrWw6Oq3P4R+dtsg0lYtZdWBpUrS/Ixmd5YILSww==",
-      "requires": {
-        "@types/node": ">= 8"
-      }
-    },
-    "@semantic-release/changelog": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@semantic-release/changelog/-/changelog-5.0.0.tgz",
-      "integrity": "sha512-A1uKqWtQG4WX9Vh4QI5b2ddhqx1qAJFlbow8szSNiXn+TaJg15LSUA9NVqyu0VxQFy3hKUJYwbBHGRXCxCy2fg==",
-      "requires": {
-        "@semantic-release/error": "^2.1.0",
-        "aggregate-error": "^3.0.0",
-        "fs-extra": "^8.0.0",
-        "lodash": "^4.17.4"
-      }
-    },
-    "@semantic-release/error": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@semantic-release/error/-/error-2.2.0.tgz",
-      "integrity": "sha512-9Tj/qn+y2j+sjCI3Jd+qseGtHjOAeg7dU2/lVcqIQ9TV3QDaDXDYXcoOHU+7o2Hwh8L8ymL4gfuO7KxDs3q2zg=="
-    },
-    "@semantic-release/exec": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@semantic-release/exec/-/exec-5.0.0.tgz",
-      "integrity": "sha512-t7LWXIvDJQbuGCy2WmMG51WyaGSLTvZBv9INvcI4S0kn+QjnnVVUMhcioIqhb0r3yqqarMzHVcABFug0q0OXjw==",
-      "requires": {
-        "@semantic-release/error": "^2.1.0",
-        "aggregate-error": "^3.0.0",
-        "debug": "^4.0.0",
-        "execa": "^4.0.0",
-        "lodash": "^4.17.4",
-        "parse-json": "^5.0.0"
-      }
-    },
-    "@semantic-release/git": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/@semantic-release/git/-/git-9.0.0.tgz",
-      "integrity": "sha512-AZ4Zha5NAPAciIJH3ipzw/WU9qLAn8ENaoVAhD6srRPxTpTzuV3NhNh14rcAo8Paj9dO+5u4rTKcpetOBluYVw==",
-      "requires": {
-        "@semantic-release/error": "^2.1.0",
-        "aggregate-error": "^3.0.0",
-        "debug": "^4.0.0",
-        "dir-glob": "^3.0.0",
-        "execa": "^4.0.0",
-        "lodash": "^4.17.4",
-        "micromatch": "^4.0.0",
-        "p-reduce": "^2.0.0"
-      }
-    },
-    "@semantic-release/github": {
-      "version": "7.0.5",
-      "resolved": "https://registry.npmjs.org/@semantic-release/github/-/github-7.0.5.tgz",
-      "integrity": "sha512-1nJCMeomspRIXKiFO3VXtkUMbIBEreYLFNBdWoLjvlUNcEK0/pEbupEZJA3XHfJuSzv43u3OLpPhF/JBrMuv+A==",
-      "requires": {
-        "@octokit/rest": "^17.0.0",
-        "@semantic-release/error": "^2.2.0",
-        "aggregate-error": "^3.0.0",
-        "bottleneck": "^2.18.1",
-        "debug": "^4.0.0",
-        "dir-glob": "^3.0.0",
-        "fs-extra": "^9.0.0",
-        "globby": "^11.0.0",
-        "http-proxy-agent": "^4.0.0",
-        "https-proxy-agent": "^5.0.0",
-        "issue-parser": "^6.0.0",
-        "lodash": "^4.17.4",
-        "mime": "^2.4.3",
-        "p-filter": "^2.0.0",
-        "p-retry": "^4.0.0",
-        "url-join": "^4.0.0"
-      },
-      "dependencies": {
-        "fs-extra": {
-          "version": "9.0.0",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.0.tgz",
-          "integrity": "sha512-pmEYSk3vYsG/bF651KPUXZ+hvjpgWYw/Gc7W9NFUe3ZVLczKKWIij3IKpOrQcdw4TILtibFslZ0UmR8Vvzig4g==",
-          "requires": {
-            "at-least-node": "^1.0.0",
-            "graceful-fs": "^4.2.0",
-            "jsonfile": "^6.0.1",
-            "universalify": "^1.0.0"
-          }
-        },
-        "jsonfile": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.0.1.tgz",
-          "integrity": "sha512-jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg==",
-          "requires": {
-            "graceful-fs": "^4.1.6",
-            "universalify": "^1.0.0"
-          }
-        },
-        "universalify": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz",
-          "integrity": "sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug=="
-        }
-      }
-    },
-    "@tootallnate/once": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.0.0.tgz",
-      "integrity": "sha512-KYyTT/T6ALPkIRd2Ge080X/BsXvy9O0hcWTtMWkPvwAwF99+vn6Dv4GzrFT/Nn1LePr+FFDbRXXlqmsy9lw2zA=="
-    },
-    "@types/node": {
-      "version": "13.9.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-13.9.3.tgz",
-      "integrity": "sha512-01s+ac4qerwd6RHD+mVbOEsraDHSgUaefQlEdBbUolnQFjKwCr7luvAlEwW1RFojh67u0z4OUTjPn9LEl4zIkA=="
-    },
-    "@types/retry": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz",
-      "integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA=="
-    },
-    "agent-base": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.0.tgz",
-      "integrity": "sha512-j1Q7cSCqN+AwrmDd+pzgqc0/NpC655x2bUf5ZjRIO77DcNBFmh+OgRNzF6OKdCC9RSCb19fGd99+bhXFdkRNqw==",
-      "requires": {
-        "debug": "4"
-      }
-    },
-    "aggregate-error": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.0.1.tgz",
-      "integrity": "sha512-quoaXsZ9/BLNae5yiNoUz+Nhkwz83GhWwtYFglcjEQB2NDHCIpApbqXxIFnm4Pq/Nvhrsq5sYJFyohrrxnTGAA==",
-      "requires": {
-        "clean-stack": "^2.0.0",
-        "indent-string": "^4.0.0"
-      }
-    },
-    "ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "requires": {
-        "color-convert": "^1.9.0"
-      }
-    },
-    "array-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw=="
-    },
-    "at-least-node": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
-      "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg=="
-    },
-    "before-after-hook": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.1.0.tgz",
-      "integrity": "sha512-IWIbu7pMqyw3EAJHzzHbWa85b6oud/yfKYg5rqB5hNE8CeMi3nX+2C2sj0HswfblST86hpVEOAb9x34NZd6P7A=="
-    },
-    "bottleneck": {
-      "version": "2.19.5",
-      "resolved": "https://registry.npmjs.org/bottleneck/-/bottleneck-2.19.5.tgz",
-      "integrity": "sha512-VHiNCbI1lKdl44tGrhNfU3lup0Tj/ZBMJB5/2ZbNXRCPuRCO7ed2mgcK4r17y+KB2EfuYuRaVlwNbAeaWGSpbw=="
-    },
-    "braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-      "requires": {
-        "fill-range": "^7.0.1"
-      }
-    },
-    "chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "requires": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      }
-    },
-    "clean-stack": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
-      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A=="
-    },
-    "color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "requires": {
-        "color-name": "1.1.3"
-      }
-    },
-    "color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
-    },
-    "cross-spawn": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.1.tgz",
-      "integrity": "sha512-u7v4o84SwFpD32Z8IIcPZ6z1/ie24O6RU3RbtL5Y316l3KuHVPx9ItBgWQ6VlfAFnRnTtMUrsQ9MUUTuEZjogg==",
-      "requires": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
-      }
-    },
-    "debug": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-      "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-      "requires": {
-        "ms": "^2.1.1"
-      }
-    },
-    "deprecation": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz",
-      "integrity": "sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ=="
-    },
-    "dir-glob": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-      "requires": {
-        "path-type": "^4.0.0"
-      }
-    },
-    "end-of-stream": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-      "requires": {
-        "once": "^1.4.0"
-      }
-    },
-    "error-ex": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-      "requires": {
-        "is-arrayish": "^0.2.1"
-      }
-    },
-    "escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
-    },
-    "execa": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-4.0.0.tgz",
-      "integrity": "sha512-JbDUxwV3BoT5ZVXQrSVbAiaXhXUkIwvbhPIwZ0N13kX+5yCzOhUNdocxB/UQRuYOHRYYwAxKYwJYc0T4D12pDA==",
-      "requires": {
-        "cross-spawn": "^7.0.0",
-        "get-stream": "^5.0.0",
-        "human-signals": "^1.1.1",
-        "is-stream": "^2.0.0",
-        "merge-stream": "^2.0.0",
-        "npm-run-path": "^4.0.0",
-        "onetime": "^5.1.0",
-        "signal-exit": "^3.0.2",
-        "strip-final-newline": "^2.0.0"
-      }
-    },
-    "fast-glob": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.2.tgz",
-      "integrity": "sha512-UDV82o4uQyljznxwMxyVRJgZZt3O5wENYojjzbaGEGZgeOxkLFf+V4cnUD+krzb2F72E18RhamkMZ7AdeggF7A==",
-      "requires": {
-        "@nodelib/fs.stat": "^2.0.2",
-        "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.0",
-        "merge2": "^1.3.0",
-        "micromatch": "^4.0.2",
-        "picomatch": "^2.2.1"
-      }
-    },
-    "fastq": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.6.1.tgz",
-      "integrity": "sha512-mpIH5sKYueh3YyeJwqtVo8sORi0CgtmkVbK6kZStpQlZBYQuTzG2CZ7idSiJuA7bY0SFCWUc5WIs+oYumGCQNw==",
-      "requires": {
-        "reusify": "^1.0.4"
-      }
-    },
-    "fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-      "requires": {
-        "to-regex-range": "^5.0.1"
-      }
-    },
-    "fs-extra": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
-      "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
-      "requires": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^4.0.0",
-        "universalify": "^0.1.0"
-      }
-    },
-    "get-stream": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz",
-      "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==",
-      "requires": {
-        "pump": "^3.0.0"
-      }
-    },
-    "glob-parent": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
-      "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
-      "requires": {
-        "is-glob": "^4.0.1"
-      }
-    },
-    "globby": {
-      "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.0.tgz",
-      "integrity": "sha512-iuehFnR3xu5wBBtm4xi0dMe92Ob87ufyu/dHwpDYfbcpYpIbrO5OnS8M1vWvrBhSGEJ3/Ecj7gnX76P8YxpPEg==",
-      "requires": {
-        "array-union": "^2.1.0",
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.1.1",
-        "ignore": "^5.1.4",
-        "merge2": "^1.3.0",
-        "slash": "^3.0.0"
-      }
-    },
-    "graceful-fs": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz",
-      "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ=="
-    },
-    "has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
-    },
-    "http-proxy-agent": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
-      "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
-      "requires": {
-        "@tootallnate/once": "1",
-        "agent-base": "6",
-        "debug": "4"
-      }
-    },
-    "https-proxy-agent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
-      "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
-      "requires": {
-        "agent-base": "6",
-        "debug": "4"
-      }
-    },
-    "human-signals": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
-      "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw=="
-    },
-    "ignore": {
-      "version": "5.1.4",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.4.tgz",
-      "integrity": "sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A=="
-    },
-    "indent-string": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg=="
-    },
-    "is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
-    },
-    "is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
-    },
-    "is-glob": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
-      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
-      "requires": {
-        "is-extglob": "^2.1.1"
-      }
-    },
-    "is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="
-    },
-    "is-plain-object": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-3.0.0.tgz",
-      "integrity": "sha512-tZIpofR+P05k8Aocp7UI/2UTa9lTJSebCXpFFoR9aibpokDj/uXBsJ8luUu0tTVYKkMU6URDUuOfJZ7koewXvg==",
-      "requires": {
-        "isobject": "^4.0.0"
-      }
-    },
-    "is-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
-      "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw=="
-    },
-    "isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
-    },
-    "isobject": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-4.0.0.tgz",
-      "integrity": "sha512-S/2fF5wH8SJA/kmwr6HYhK/RI/OkhD84k8ntalo0iJjZikgq1XFvR5M8NPT1x5F7fBwCG3qHfnzeP/Vh/ZxCUA=="
-    },
-    "issue-parser": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/issue-parser/-/issue-parser-6.0.0.tgz",
-      "integrity": "sha512-zKa/Dxq2lGsBIXQ7CUZWTHfvxPC2ej0KfO7fIPqLlHB9J2hJ7rGhZ5rilhuufylr4RXYPzJUeFjKxz305OsNlA==",
-      "requires": {
-        "lodash.capitalize": "^4.2.1",
-        "lodash.escaperegexp": "^4.1.2",
-        "lodash.isplainobject": "^4.0.6",
-        "lodash.isstring": "^4.0.1",
-        "lodash.uniqby": "^4.7.0"
-      }
-    },
-    "js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
-    },
-    "json-parse-better-errors": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="
-    },
-    "jsonfile": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
-      "requires": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
-    "lines-and-columns": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
-      "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA="
-    },
-    "lodash": {
-      "version": "4.17.15",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
-    },
-    "lodash.capitalize": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/lodash.capitalize/-/lodash.capitalize-4.2.1.tgz",
-      "integrity": "sha1-+CbJtOKoUR2E46yinbBeGk87cqk="
-    },
-    "lodash.escaperegexp": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz",
-      "integrity": "sha1-ZHYsSGGAglGKw99Mz11YhtriA0c="
-    },
-    "lodash.isplainobject": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
-      "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs="
-    },
-    "lodash.isstring": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz",
-      "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE="
-    },
-    "lodash.uniqby": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz",
-      "integrity": "sha1-2ZwHpmnp5tJOE2Lf4mbGdhavEwI="
-    },
-    "macos-release": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/macos-release/-/macos-release-2.3.0.tgz",
-      "integrity": "sha512-OHhSbtcviqMPt7yfw5ef5aghS2jzFVKEFyCJndQt2YpSQ9qRVSEv2axSJI1paVThEu+FFGs584h/1YhxjVqajA=="
-    },
-    "merge-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="
-    },
-    "merge2": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.3.0.tgz",
-      "integrity": "sha512-2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw=="
-    },
-    "micromatch": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
-      "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
-      "requires": {
-        "braces": "^3.0.1",
-        "picomatch": "^2.0.5"
-      }
-    },
-    "mime": {
-      "version": "2.4.4",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz",
-      "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA=="
-    },
-    "mimic-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="
-    },
-    "ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-    },
-    "nice-try": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
-      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
-    },
-    "node-fetch": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz",
-      "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA=="
-    },
-    "npm-run-path": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-      "requires": {
-        "path-key": "^3.0.0"
-      }
-    },
-    "once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "requires": {
-        "wrappy": "1"
-      }
-    },
-    "onetime": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz",
-      "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==",
-      "requires": {
-        "mimic-fn": "^2.1.0"
-      }
-    },
-    "os-name": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/os-name/-/os-name-3.1.0.tgz",
-      "integrity": "sha512-h8L+8aNjNcMpo/mAIBPn5PXCM16iyPGjHNWo6U1YO8sJTMHtEtyczI6QJnLoplswm6goopQkqc7OAnjhWcugVg==",
-      "requires": {
-        "macos-release": "^2.2.0",
-        "windows-release": "^3.1.0"
-      }
-    },
-    "p-filter": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/p-filter/-/p-filter-2.1.0.tgz",
-      "integrity": "sha512-ZBxxZ5sL2HghephhpGAQdoskxplTwr7ICaehZwLIlfL6acuVgZPm8yBNuRAFBGEqtD/hmUeq9eqLg2ys9Xr/yw==",
-      "requires": {
-        "p-map": "^2.0.0"
-      }
-    },
-    "p-finally": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
-      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4="
-    },
-    "p-map": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
-      "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw=="
-    },
-    "p-reduce": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/p-reduce/-/p-reduce-2.1.0.tgz",
-      "integrity": "sha512-2USApvnsutq8uoxZBGbbWM0JIYLiEMJ9RlaN7fAzVNb9OZN0SHjjTTfIcb667XynS5Y1VhwDJVDa72TnPzAYWw=="
-    },
-    "p-retry": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.2.0.tgz",
-      "integrity": "sha512-jPH38/MRh263KKcq0wBNOGFJbm+U6784RilTmHjB/HM9kH9V8WlCpVUcdOmip9cjXOh6MxZ5yk1z2SjDUJfWmA==",
-      "requires": {
-        "@types/retry": "^0.12.0",
-        "retry": "^0.12.0"
-      }
-    },
-    "parse-json": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.0.0.tgz",
-      "integrity": "sha512-OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw==",
-      "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "error-ex": "^1.3.1",
-        "json-parse-better-errors": "^1.0.1",
-        "lines-and-columns": "^1.1.6"
-      }
-    },
-    "path-key": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="
-    },
-    "path-type": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="
-    },
-    "picomatch": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
-      "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg=="
-    },
-    "pump": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-      "requires": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
-      }
-    },
-    "retry": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
-      "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs="
-    },
-    "reusify": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="
-    },
-    "run-parallel": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz",
-      "integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q=="
-    },
-    "semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
-    },
-    "shebang-command": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-      "requires": {
-        "shebang-regex": "^3.0.0"
-      }
-    },
-    "shebang-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
-    },
-    "signal-exit": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
-    },
-    "slash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="
-    },
-    "strip-eof": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
-      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8="
-    },
-    "strip-final-newline": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
-      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA=="
-    },
-    "supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "requires": {
-        "has-flag": "^3.0.0"
-      }
-    },
-    "to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "requires": {
-        "is-number": "^7.0.0"
-      }
-    },
-    "universal-user-agent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-5.0.0.tgz",
-      "integrity": "sha512-B5TPtzZleXyPrUMKCpEHFmVhMN6EhmJYjG5PQna9s7mXeSqGTLap4OpqLl5FCEFUI3UBmllkETwKf/db66Y54Q==",
-      "requires": {
-        "os-name": "^3.1.0"
-      }
-    },
-    "universalify": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
-    },
-    "url-join": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/url-join/-/url-join-4.0.1.tgz",
-      "integrity": "sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA=="
-    },
-    "which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "requires": {
-        "isexe": "^2.0.0"
-      }
-    },
-    "windows-release": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/windows-release/-/windows-release-3.2.0.tgz",
-      "integrity": "sha512-QTlz2hKLrdqukrsapKsINzqMgOUpQW268eJ0OaOpJN32h272waxR9fkB9VoWRtK7uKHG5EHJcTXQBD8XZVJkFA==",
-      "requires": {
-        "execa": "^1.0.0"
-      },
-      "dependencies": {
-        "cross-spawn": {
-          "version": "6.0.5",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-          "requires": {
-            "nice-try": "^1.0.4",
-            "path-key": "^2.0.1",
-            "semver": "^5.5.0",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
-          }
-        },
-        "execa": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-          "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
-          "requires": {
-            "cross-spawn": "^6.0.0",
-            "get-stream": "^4.0.0",
-            "is-stream": "^1.1.0",
-            "npm-run-path": "^2.0.0",
-            "p-finally": "^1.0.0",
-            "signal-exit": "^3.0.0",
-            "strip-eof": "^1.0.0"
-          }
-        },
-        "get-stream": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-          "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-          "requires": {
-            "pump": "^3.0.0"
-          }
-        },
-        "is-stream": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-          "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
-        },
-        "npm-run-path": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
-          "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
-          "requires": {
-            "path-key": "^2.0.0"
-          }
-        },
-        "path-key": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-          "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A="
-        },
-        "shebang-command": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-          "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
-          "requires": {
-            "shebang-regex": "^1.0.0"
-          }
-        },
-        "shebang-regex": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-          "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM="
-        },
-        "which": {
-          "version": "1.3.1",
-          "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-          "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-          "requires": {
-            "isexe": "^2.0.0"
-          }
-        }
-      }
-    },
-    "wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
-    }
-  }
-}
diff --git a/resourcecontrollerv2/resource_controller_v2.go b/resourcecontrollerv2/resource_controller_v2.go
deleted file mode 100644
index 5591abda..00000000
--- a/resourcecontrollerv2/resource_controller_v2.go
+++ /dev/null
@@ -1,4235 +0,0 @@
-/**
- * (C) Copyright IBM Corp. 2020.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// Package resourcecontrollerv2 : Operations and models for the ResourceControllerV2 service
-package resourcecontrollerv2
-
-import (
-	"encoding/json"
-	"fmt"
-	"github.com/IBM/go-sdk-core/v3/core"
-	"github.com/go-openapi/strfmt"
-	common "github.ibm.com/ibmcloud/platform-services-go-sdk/common"
-)
-
-// ResourceControllerV2 : Manage lifecycle of your Cloud resources using Resource Controller APIs. Resources are
-// provisioned globally in an account scope. Supports asynchronous provisioning of resources. Enables consumption of a
-// global resource through a Cloud Foundry space in any region.
-//
-// Version: 2.0
-type ResourceControllerV2 struct {
-	Service *core.BaseService
-}
-
-// DefaultServiceURL is the default URL to make service requests to.
-const DefaultServiceURL = "https://resource-controller.cloud.ibm.com/v2"
-
-// DefaultServiceName is the default key used to find external configuration information.
-const DefaultServiceName = "resource_controller"
-
-// ResourceControllerV2Options : Service options
-type ResourceControllerV2Options struct {
-	ServiceName   string
-	URL           string
-	Authenticator core.Authenticator
-}
-
-// NewResourceControllerV2UsingExternalConfig : constructs an instance of ResourceControllerV2 with passed in options and external configuration.
-func NewResourceControllerV2UsingExternalConfig(options *ResourceControllerV2Options) (resourceController *ResourceControllerV2, err error) {
-	if options.ServiceName == "" {
-		options.ServiceName = DefaultServiceName
-	}
-
-	if options.Authenticator == nil {
-		options.Authenticator, err = core.GetAuthenticatorFromEnvironment(options.ServiceName)
-		if err != nil {
-			return
-		}
-	}
-
-	resourceController, err = NewResourceControllerV2(options)
-	if err != nil {
-		return
-	}
-
-	err = resourceController.Service.ConfigureService(options.ServiceName)
-	if err != nil {
-		return
-	}
-
-	if options.URL != "" {
-		err = resourceController.Service.SetServiceURL(options.URL)
-	}
-	return
-}
-
-// NewResourceControllerV2 : constructs an instance of ResourceControllerV2 with passed in options.
-func NewResourceControllerV2(options *ResourceControllerV2Options) (service *ResourceControllerV2, err error) {
-	serviceOptions := &core.ServiceOptions{
-		URL:           DefaultServiceURL,
-		Authenticator: options.Authenticator,
-	}
-
-	baseService, err := core.NewBaseService(serviceOptions)
-	if err != nil {
-		return
-	}
-
-	if options.URL != "" {
-		err = baseService.SetServiceURL(options.URL)
-		if err != nil {
-			return
-		}
-	}
-
-	service = &ResourceControllerV2{
-		Service: baseService,
-	}
-
-	return
-}
-
-// SetServiceURL sets the service URL
-func (resourceController *ResourceControllerV2) SetServiceURL(url string) error {
-	return resourceController.Service.SetServiceURL(url)
-}
-
-// ListResourceInstances : Get a list of all resource instances
-// Get a list of all resource instances.
-func (resourceController *ResourceControllerV2) ListResourceInstances(listResourceInstancesOptions *ListResourceInstancesOptions) (result *ResourceInstancesList, response *core.DetailedResponse, err error) {
-	err = core.ValidateStruct(listResourceInstancesOptions, "listResourceInstancesOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"resource_instances"}
-	pathParameters := []string{}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(resourceController.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range listResourceInstancesOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("resource_controller", "V2", "ListResourceInstances")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	if listResourceInstancesOptions.Guid != nil {
-		builder.AddQuery("guid", fmt.Sprint(*listResourceInstancesOptions.Guid))
-	}
-	if listResourceInstancesOptions.Name != nil {
-		builder.AddQuery("name", fmt.Sprint(*listResourceInstancesOptions.Name))
-	}
-	if listResourceInstancesOptions.ResourceGroupID != nil {
-		builder.AddQuery("resource_group_id", fmt.Sprint(*listResourceInstancesOptions.ResourceGroupID))
-	}
-	if listResourceInstancesOptions.ResourceID != nil {
-		builder.AddQuery("resource_id", fmt.Sprint(*listResourceInstancesOptions.ResourceID))
-	}
-	if listResourceInstancesOptions.ResourcePlanID != nil {
-		builder.AddQuery("resource_plan_id", fmt.Sprint(*listResourceInstancesOptions.ResourcePlanID))
-	}
-	if listResourceInstancesOptions.Type != nil {
-		builder.AddQuery("type", fmt.Sprint(*listResourceInstancesOptions.Type))
-	}
-	if listResourceInstancesOptions.SubType != nil {
-		builder.AddQuery("sub_type", fmt.Sprint(*listResourceInstancesOptions.SubType))
-	}
-	if listResourceInstancesOptions.Limit != nil {
-		builder.AddQuery("limit", fmt.Sprint(*listResourceInstancesOptions.Limit))
-	}
-	if listResourceInstancesOptions.UpdatedFrom != nil {
-		builder.AddQuery("updated_from", fmt.Sprint(*listResourceInstancesOptions.UpdatedFrom))
-	}
-	if listResourceInstancesOptions.UpdatedTo != nil {
-		builder.AddQuery("updated_to", fmt.Sprint(*listResourceInstancesOptions.UpdatedTo))
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = resourceController.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalResourceInstancesList(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// CreateResourceInstance : Create (provision) a new resource instance
-// Provision a new resource in the specified location for the selected plan.
-func (resourceController *ResourceControllerV2) CreateResourceInstance(createResourceInstanceOptions *CreateResourceInstanceOptions) (result *ResourceInstance, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(createResourceInstanceOptions, "createResourceInstanceOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(createResourceInstanceOptions, "createResourceInstanceOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"resource_instances"}
-	pathParameters := []string{}
-
-	builder := core.NewRequestBuilder(core.POST)
-	_, err = builder.ConstructHTTPURL(resourceController.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range createResourceInstanceOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("resource_controller", "V2", "CreateResourceInstance")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-	builder.AddHeader("Content-Type", "application/json")
-
-	body := make(map[string]interface{})
-	if createResourceInstanceOptions.Name != nil {
-		body["name"] = createResourceInstanceOptions.Name
-	}
-	if createResourceInstanceOptions.Target != nil {
-		body["target"] = createResourceInstanceOptions.Target
-	}
-	if createResourceInstanceOptions.ResourceGroup != nil {
-		body["resource_group"] = createResourceInstanceOptions.ResourceGroup
-	}
-	if createResourceInstanceOptions.ResourcePlanID != nil {
-		body["resource_plan_id"] = createResourceInstanceOptions.ResourcePlanID
-	}
-	if createResourceInstanceOptions.Tags != nil {
-		body["tags"] = createResourceInstanceOptions.Tags
-	}
-	if createResourceInstanceOptions.AllowCleanup != nil {
-		body["allow_cleanup"] = createResourceInstanceOptions.AllowCleanup
-	}
-	if createResourceInstanceOptions.Parameters != nil {
-		body["parameters"] = createResourceInstanceOptions.Parameters
-	}
-	_, err = builder.SetBodyContentJSON(body)
-	if err != nil {
-		return
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = resourceController.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalResourceInstance(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// GetResourceInstance : Get a resource instance
-// Retrieve a resource instance by ID.
-func (resourceController *ResourceControllerV2) GetResourceInstance(getResourceInstanceOptions *GetResourceInstanceOptions) (result *ResourceInstance, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(getResourceInstanceOptions, "getResourceInstanceOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(getResourceInstanceOptions, "getResourceInstanceOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"resource_instances"}
-	pathParameters := []string{*getResourceInstanceOptions.ID}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(resourceController.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range getResourceInstanceOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("resource_controller", "V2", "GetResourceInstance")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = resourceController.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalResourceInstance(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// DeleteResourceInstance : Delete a resource instance
-// Delete a resource instance by ID.
-func (resourceController *ResourceControllerV2) DeleteResourceInstance(deleteResourceInstanceOptions *DeleteResourceInstanceOptions) (result *ResourceInstance, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(deleteResourceInstanceOptions, "deleteResourceInstanceOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(deleteResourceInstanceOptions, "deleteResourceInstanceOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"resource_instances"}
-	pathParameters := []string{*deleteResourceInstanceOptions.ID}
-
-	builder := core.NewRequestBuilder(core.DELETE)
-	_, err = builder.ConstructHTTPURL(resourceController.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range deleteResourceInstanceOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("resource_controller", "V2", "DeleteResourceInstance")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = resourceController.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalResourceInstance(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// UpdateResourceInstance : Update a resource instance
-// Update a resource instance by ID.
-func (resourceController *ResourceControllerV2) UpdateResourceInstance(updateResourceInstanceOptions *UpdateResourceInstanceOptions) (result *ResourceInstance, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(updateResourceInstanceOptions, "updateResourceInstanceOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(updateResourceInstanceOptions, "updateResourceInstanceOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"resource_instances"}
-	pathParameters := []string{*updateResourceInstanceOptions.ID}
-
-	builder := core.NewRequestBuilder(core.PATCH)
-	_, err = builder.ConstructHTTPURL(resourceController.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range updateResourceInstanceOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("resource_controller", "V2", "UpdateResourceInstance")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-	builder.AddHeader("Content-Type", "application/json")
-
-	body := make(map[string]interface{})
-	if updateResourceInstanceOptions.Name != nil {
-		body["name"] = updateResourceInstanceOptions.Name
-	}
-	if updateResourceInstanceOptions.Parameters != nil {
-		body["parameters"] = updateResourceInstanceOptions.Parameters
-	}
-	if updateResourceInstanceOptions.ResourcePlanID != nil {
-		body["resource_plan_id"] = updateResourceInstanceOptions.ResourcePlanID
-	}
-	if updateResourceInstanceOptions.AllowCleanup != nil {
-		body["allow_cleanup"] = updateResourceInstanceOptions.AllowCleanup
-	}
-	_, err = builder.SetBodyContentJSON(body)
-	if err != nil {
-		return
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = resourceController.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalResourceInstance(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// ListResourceKeys : Get a list of all of the resource keys
-// List all resource keys.
-func (resourceController *ResourceControllerV2) ListResourceKeys(listResourceKeysOptions *ListResourceKeysOptions) (result *ResourceKeysList, response *core.DetailedResponse, err error) {
-	err = core.ValidateStruct(listResourceKeysOptions, "listResourceKeysOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"resource_keys"}
-	pathParameters := []string{}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(resourceController.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range listResourceKeysOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("resource_controller", "V2", "ListResourceKeys")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	if listResourceKeysOptions.Guid != nil {
-		builder.AddQuery("guid", fmt.Sprint(*listResourceKeysOptions.Guid))
-	}
-	if listResourceKeysOptions.Name != nil {
-		builder.AddQuery("name", fmt.Sprint(*listResourceKeysOptions.Name))
-	}
-	if listResourceKeysOptions.ResourceGroupID != nil {
-		builder.AddQuery("resource_group_id", fmt.Sprint(*listResourceKeysOptions.ResourceGroupID))
-	}
-	if listResourceKeysOptions.ResourceID != nil {
-		builder.AddQuery("resource_id", fmt.Sprint(*listResourceKeysOptions.ResourceID))
-	}
-	if listResourceKeysOptions.Limit != nil {
-		builder.AddQuery("limit", fmt.Sprint(*listResourceKeysOptions.Limit))
-	}
-	if listResourceKeysOptions.UpdatedFrom != nil {
-		builder.AddQuery("updated_from", fmt.Sprint(*listResourceKeysOptions.UpdatedFrom))
-	}
-	if listResourceKeysOptions.UpdatedTo != nil {
-		builder.AddQuery("updated_to", fmt.Sprint(*listResourceKeysOptions.UpdatedTo))
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = resourceController.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalResourceKeysList(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// CreateResourceKey : Create a new resource key
-// Create a new resource key.
-func (resourceController *ResourceControllerV2) CreateResourceKey(createResourceKeyOptions *CreateResourceKeyOptions) (result *ResourceKey, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(createResourceKeyOptions, "createResourceKeyOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(createResourceKeyOptions, "createResourceKeyOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"resource_keys"}
-	pathParameters := []string{}
-
-	builder := core.NewRequestBuilder(core.POST)
-	_, err = builder.ConstructHTTPURL(resourceController.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range createResourceKeyOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("resource_controller", "V2", "CreateResourceKey")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-	builder.AddHeader("Content-Type", "application/json")
-
-	body := make(map[string]interface{})
-	if createResourceKeyOptions.Name != nil {
-		body["name"] = createResourceKeyOptions.Name
-	}
-	if createResourceKeyOptions.Source != nil {
-		body["source"] = createResourceKeyOptions.Source
-	}
-	if createResourceKeyOptions.Parameters != nil {
-		body["parameters"] = createResourceKeyOptions.Parameters
-	}
-	if createResourceKeyOptions.Role != nil {
-		body["role"] = createResourceKeyOptions.Role
-	}
-	_, err = builder.SetBodyContentJSON(body)
-	if err != nil {
-		return
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = resourceController.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalResourceKey(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// GetResourceKey : Get resource key by ID
-// Get resource key by ID.
-func (resourceController *ResourceControllerV2) GetResourceKey(getResourceKeyOptions *GetResourceKeyOptions) (result *ResourceKey, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(getResourceKeyOptions, "getResourceKeyOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(getResourceKeyOptions, "getResourceKeyOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"resource_keys"}
-	pathParameters := []string{*getResourceKeyOptions.ID}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(resourceController.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range getResourceKeyOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("resource_controller", "V2", "GetResourceKey")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = resourceController.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalResourceKey(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// DeleteResourceKey : Delete a resource key by ID
-// Delete a resource key by ID.
-func (resourceController *ResourceControllerV2) DeleteResourceKey(deleteResourceKeyOptions *DeleteResourceKeyOptions) (response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(deleteResourceKeyOptions, "deleteResourceKeyOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(deleteResourceKeyOptions, "deleteResourceKeyOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"resource_keys"}
-	pathParameters := []string{*deleteResourceKeyOptions.ID}
-
-	builder := core.NewRequestBuilder(core.DELETE)
-	_, err = builder.ConstructHTTPURL(resourceController.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range deleteResourceKeyOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("resource_controller", "V2", "DeleteResourceKey")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = resourceController.Service.Request(request, nil)
-
-	return
-}
-
-// UpdateResourceKey : Update a resource key
-// Update a resource key by ID.
-func (resourceController *ResourceControllerV2) UpdateResourceKey(updateResourceKeyOptions *UpdateResourceKeyOptions) (result *ResourceKey, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(updateResourceKeyOptions, "updateResourceKeyOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(updateResourceKeyOptions, "updateResourceKeyOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"resource_keys"}
-	pathParameters := []string{*updateResourceKeyOptions.ID}
-
-	builder := core.NewRequestBuilder(core.PATCH)
-	_, err = builder.ConstructHTTPURL(resourceController.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range updateResourceKeyOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("resource_controller", "V2", "UpdateResourceKey")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-	builder.AddHeader("Content-Type", "application/json")
-
-	body := make(map[string]interface{})
-	if updateResourceKeyOptions.Name != nil {
-		body["name"] = updateResourceKeyOptions.Name
-	}
-	_, err = builder.SetBodyContentJSON(body)
-	if err != nil {
-		return
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = resourceController.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalResourceKey(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// ListResourceBindings : Get a list of all resource bindings
-// Get a list of all resource bindings.
-func (resourceController *ResourceControllerV2) ListResourceBindings(listResourceBindingsOptions *ListResourceBindingsOptions) (result *ResourceBindingsList, response *core.DetailedResponse, err error) {
-	err = core.ValidateStruct(listResourceBindingsOptions, "listResourceBindingsOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"resource_bindings"}
-	pathParameters := []string{}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(resourceController.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range listResourceBindingsOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("resource_controller", "V2", "ListResourceBindings")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	if listResourceBindingsOptions.Guid != nil {
-		builder.AddQuery("guid", fmt.Sprint(*listResourceBindingsOptions.Guid))
-	}
-	if listResourceBindingsOptions.Name != nil {
-		builder.AddQuery("name", fmt.Sprint(*listResourceBindingsOptions.Name))
-	}
-	if listResourceBindingsOptions.ResourceGroupID != nil {
-		builder.AddQuery("resource_group_id", fmt.Sprint(*listResourceBindingsOptions.ResourceGroupID))
-	}
-	if listResourceBindingsOptions.ResourceID != nil {
-		builder.AddQuery("resource_id", fmt.Sprint(*listResourceBindingsOptions.ResourceID))
-	}
-	if listResourceBindingsOptions.RegionBindingID != nil {
-		builder.AddQuery("region_binding_id", fmt.Sprint(*listResourceBindingsOptions.RegionBindingID))
-	}
-	if listResourceBindingsOptions.Limit != nil {
-		builder.AddQuery("limit", fmt.Sprint(*listResourceBindingsOptions.Limit))
-	}
-	if listResourceBindingsOptions.UpdatedFrom != nil {
-		builder.AddQuery("updated_from", fmt.Sprint(*listResourceBindingsOptions.UpdatedFrom))
-	}
-	if listResourceBindingsOptions.UpdatedTo != nil {
-		builder.AddQuery("updated_to", fmt.Sprint(*listResourceBindingsOptions.UpdatedTo))
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = resourceController.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalResourceBindingsList(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// CreateResourceBinding : Create a new resource binding
-// Create a new resource binding.
-func (resourceController *ResourceControllerV2) CreateResourceBinding(createResourceBindingOptions *CreateResourceBindingOptions) (result *ResourceBinding, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(createResourceBindingOptions, "createResourceBindingOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(createResourceBindingOptions, "createResourceBindingOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"resource_bindings"}
-	pathParameters := []string{}
-
-	builder := core.NewRequestBuilder(core.POST)
-	_, err = builder.ConstructHTTPURL(resourceController.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range createResourceBindingOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("resource_controller", "V2", "CreateResourceBinding")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-	builder.AddHeader("Content-Type", "application/json")
-
-	body := make(map[string]interface{})
-	if createResourceBindingOptions.Source != nil {
-		body["source"] = createResourceBindingOptions.Source
-	}
-	if createResourceBindingOptions.Target != nil {
-		body["target"] = createResourceBindingOptions.Target
-	}
-	if createResourceBindingOptions.Name != nil {
-		body["name"] = createResourceBindingOptions.Name
-	}
-	if createResourceBindingOptions.Parameters != nil {
-		body["parameters"] = createResourceBindingOptions.Parameters
-	}
-	if createResourceBindingOptions.Role != nil {
-		body["role"] = createResourceBindingOptions.Role
-	}
-	_, err = builder.SetBodyContentJSON(body)
-	if err != nil {
-		return
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = resourceController.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalResourceBinding(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// GetResourceBinding : Get a resource binding
-// Retrieve a resource binding by ID.
-func (resourceController *ResourceControllerV2) GetResourceBinding(getResourceBindingOptions *GetResourceBindingOptions) (result *ResourceBinding, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(getResourceBindingOptions, "getResourceBindingOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(getResourceBindingOptions, "getResourceBindingOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"resource_bindings"}
-	pathParameters := []string{*getResourceBindingOptions.ID}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(resourceController.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range getResourceBindingOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("resource_controller", "V2", "GetResourceBinding")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = resourceController.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalResourceBinding(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// DeleteResourceBinding : Delete a resource binding
-// Delete a resource binding by ID.
-func (resourceController *ResourceControllerV2) DeleteResourceBinding(deleteResourceBindingOptions *DeleteResourceBindingOptions) (response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(deleteResourceBindingOptions, "deleteResourceBindingOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(deleteResourceBindingOptions, "deleteResourceBindingOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"resource_bindings"}
-	pathParameters := []string{*deleteResourceBindingOptions.ID}
-
-	builder := core.NewRequestBuilder(core.DELETE)
-	_, err = builder.ConstructHTTPURL(resourceController.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range deleteResourceBindingOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("resource_controller", "V2", "DeleteResourceBinding")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = resourceController.Service.Request(request, nil)
-
-	return
-}
-
-// UpdateResourceBinding : Update a resource binding
-// Update a resource binding by ID.
-func (resourceController *ResourceControllerV2) UpdateResourceBinding(updateResourceBindingOptions *UpdateResourceBindingOptions) (result *ResourceBinding, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(updateResourceBindingOptions, "updateResourceBindingOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(updateResourceBindingOptions, "updateResourceBindingOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"resource_bindings"}
-	pathParameters := []string{*updateResourceBindingOptions.ID}
-
-	builder := core.NewRequestBuilder(core.PATCH)
-	_, err = builder.ConstructHTTPURL(resourceController.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range updateResourceBindingOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("resource_controller", "V2", "UpdateResourceBinding")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-	builder.AddHeader("Content-Type", "application/json")
-
-	body := make(map[string]interface{})
-	if updateResourceBindingOptions.Name != nil {
-		body["name"] = updateResourceBindingOptions.Name
-	}
-	_, err = builder.SetBodyContentJSON(body)
-	if err != nil {
-		return
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = resourceController.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalResourceBinding(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// ListResourceAliases : Get a list of all resource aliases
-// Get a list of all resource aliases.
-func (resourceController *ResourceControllerV2) ListResourceAliases(listResourceAliasesOptions *ListResourceAliasesOptions) (result *ResourceAliasesList, response *core.DetailedResponse, err error) {
-	err = core.ValidateStruct(listResourceAliasesOptions, "listResourceAliasesOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"resource_aliases"}
-	pathParameters := []string{}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(resourceController.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range listResourceAliasesOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("resource_controller", "V2", "ListResourceAliases")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	if listResourceAliasesOptions.Guid != nil {
-		builder.AddQuery("guid", fmt.Sprint(*listResourceAliasesOptions.Guid))
-	}
-	if listResourceAliasesOptions.Name != nil {
-		builder.AddQuery("name", fmt.Sprint(*listResourceAliasesOptions.Name))
-	}
-	if listResourceAliasesOptions.ResourceInstanceID != nil {
-		builder.AddQuery("resource_instance_id", fmt.Sprint(*listResourceAliasesOptions.ResourceInstanceID))
-	}
-	if listResourceAliasesOptions.RegionInstanceID != nil {
-		builder.AddQuery("region_instance_id", fmt.Sprint(*listResourceAliasesOptions.RegionInstanceID))
-	}
-	if listResourceAliasesOptions.ResourceID != nil {
-		builder.AddQuery("resource_id", fmt.Sprint(*listResourceAliasesOptions.ResourceID))
-	}
-	if listResourceAliasesOptions.ResourceGroupID != nil {
-		builder.AddQuery("resource_group_id", fmt.Sprint(*listResourceAliasesOptions.ResourceGroupID))
-	}
-	if listResourceAliasesOptions.Limit != nil {
-		builder.AddQuery("limit", fmt.Sprint(*listResourceAliasesOptions.Limit))
-	}
-	if listResourceAliasesOptions.UpdatedFrom != nil {
-		builder.AddQuery("updated_from", fmt.Sprint(*listResourceAliasesOptions.UpdatedFrom))
-	}
-	if listResourceAliasesOptions.UpdatedTo != nil {
-		builder.AddQuery("updated_to", fmt.Sprint(*listResourceAliasesOptions.UpdatedTo))
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = resourceController.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalResourceAliasesList(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// CreateResourceAlias : Create a new resource alias
-// Alias a resource instance into a targeted environment's (name)space.
-func (resourceController *ResourceControllerV2) CreateResourceAlias(createResourceAliasOptions *CreateResourceAliasOptions) (result *ResourceAlias, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(createResourceAliasOptions, "createResourceAliasOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(createResourceAliasOptions, "createResourceAliasOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"resource_aliases"}
-	pathParameters := []string{}
-
-	builder := core.NewRequestBuilder(core.POST)
-	_, err = builder.ConstructHTTPURL(resourceController.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range createResourceAliasOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("resource_controller", "V2", "CreateResourceAlias")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-	builder.AddHeader("Content-Type", "application/json")
-
-	body := make(map[string]interface{})
-	if createResourceAliasOptions.Name != nil {
-		body["name"] = createResourceAliasOptions.Name
-	}
-	if createResourceAliasOptions.Source != nil {
-		body["source"] = createResourceAliasOptions.Source
-	}
-	if createResourceAliasOptions.Target != nil {
-		body["target"] = createResourceAliasOptions.Target
-	}
-	_, err = builder.SetBodyContentJSON(body)
-	if err != nil {
-		return
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = resourceController.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalResourceAlias(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// GetResourceAlias : Get a resource alias
-// Retrieve a resource alias by ID.
-func (resourceController *ResourceControllerV2) GetResourceAlias(getResourceAliasOptions *GetResourceAliasOptions) (result *ResourceAlias, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(getResourceAliasOptions, "getResourceAliasOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(getResourceAliasOptions, "getResourceAliasOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"resource_aliases"}
-	pathParameters := []string{*getResourceAliasOptions.ID}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(resourceController.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range getResourceAliasOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("resource_controller", "V2", "GetResourceAlias")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = resourceController.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalResourceAlias(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// DeleteResourceAlias : Delete a resource alias
-// Delete a resource alias by ID.
-func (resourceController *ResourceControllerV2) DeleteResourceAlias(deleteResourceAliasOptions *DeleteResourceAliasOptions) (response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(deleteResourceAliasOptions, "deleteResourceAliasOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(deleteResourceAliasOptions, "deleteResourceAliasOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"resource_aliases"}
-	pathParameters := []string{*deleteResourceAliasOptions.ID}
-
-	builder := core.NewRequestBuilder(core.DELETE)
-	_, err = builder.ConstructHTTPURL(resourceController.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range deleteResourceAliasOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("resource_controller", "V2", "DeleteResourceAlias")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = resourceController.Service.Request(request, nil)
-
-	return
-}
-
-// UpdateResourceAlias : Update a resource alias
-// Update a resource alias by ID.
-func (resourceController *ResourceControllerV2) UpdateResourceAlias(updateResourceAliasOptions *UpdateResourceAliasOptions) (result *ResourceAlias, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(updateResourceAliasOptions, "updateResourceAliasOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(updateResourceAliasOptions, "updateResourceAliasOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"resource_aliases"}
-	pathParameters := []string{*updateResourceAliasOptions.ID}
-
-	builder := core.NewRequestBuilder(core.PATCH)
-	_, err = builder.ConstructHTTPURL(resourceController.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range updateResourceAliasOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("resource_controller", "V2", "UpdateResourceAlias")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-	builder.AddHeader("Content-Type", "application/json")
-
-	body := make(map[string]interface{})
-	if updateResourceAliasOptions.Name != nil {
-		body["name"] = updateResourceAliasOptions.Name
-	}
-	_, err = builder.SetBodyContentJSON(body)
-	if err != nil {
-		return
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = resourceController.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalResourceAlias(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// ListReclamations : Get a list of all reclamations
-// Get a list of all reclamations.
-func (resourceController *ResourceControllerV2) ListReclamations(listReclamationsOptions *ListReclamationsOptions) (result *ReclamationsList, response *core.DetailedResponse, err error) {
-	err = core.ValidateStruct(listReclamationsOptions, "listReclamationsOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v1/reclamations"}
-	pathParameters := []string{}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(resourceController.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range listReclamationsOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("resource_controller", "V2", "ListReclamations")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	if listReclamationsOptions.AccountID != nil {
-		builder.AddQuery("account_id", fmt.Sprint(*listReclamationsOptions.AccountID))
-	}
-	if listReclamationsOptions.ResourceInstanceID != nil {
-		builder.AddQuery("resource_instance_id", fmt.Sprint(*listReclamationsOptions.ResourceInstanceID))
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = resourceController.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalReclamationsList(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// RunReclamationAction : Perform a reclamation action
-// Reclaim (provisionally delete) a resource so that it can no longer be used, or restore a resource so that it's usable
-// again.
-func (resourceController *ResourceControllerV2) RunReclamationAction(runReclamationActionOptions *RunReclamationActionOptions) (result *Reclamation, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(runReclamationActionOptions, "runReclamationActionOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(runReclamationActionOptions, "runReclamationActionOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v1/reclamations", "actions"}
-	pathParameters := []string{*runReclamationActionOptions.ID, *runReclamationActionOptions.ActionName}
-
-	builder := core.NewRequestBuilder(core.POST)
-	_, err = builder.ConstructHTTPURL(resourceController.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range runReclamationActionOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("resource_controller", "V2", "RunReclamationAction")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-	builder.AddHeader("Content-Type", "application/json")
-
-	body := make(map[string]interface{})
-	if runReclamationActionOptions.RequestBy != nil {
-		body["request_by"] = runReclamationActionOptions.RequestBy
-	}
-	if runReclamationActionOptions.Comment != nil {
-		body["comment"] = runReclamationActionOptions.Comment
-	}
-	_, err = builder.SetBodyContentJSON(body)
-	if err != nil {
-		return
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = resourceController.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalReclamation(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// CreateResourceAliasOptions : The CreateResourceAlias options.
-type CreateResourceAliasOptions struct {
-	// The name of the alias. Must be 180 characters or less and cannot include any special characters other than `(space)
-	// - . _ :`.
-	Name *string `json:"name" validate:"required"`
-
-	// The short or long ID of resource instance.
-	Source *string `json:"source" validate:"required"`
-
-	// The CRN of target name(space) in a specific environment, e.g. space in Dallas YP, CFEE instance etc.
-	Target *string `json:"target" validate:"required"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewCreateResourceAliasOptions : Instantiate CreateResourceAliasOptions
-func (*ResourceControllerV2) NewCreateResourceAliasOptions(name string, source string, target string) *CreateResourceAliasOptions {
-	return &CreateResourceAliasOptions{
-		Name: core.StringPtr(name),
-		Source: core.StringPtr(source),
-		Target: core.StringPtr(target),
-	}
-}
-
-// SetName : Allow user to set Name
-func (options *CreateResourceAliasOptions) SetName(name string) *CreateResourceAliasOptions {
-	options.Name = core.StringPtr(name)
-	return options
-}
-
-// SetSource : Allow user to set Source
-func (options *CreateResourceAliasOptions) SetSource(source string) *CreateResourceAliasOptions {
-	options.Source = core.StringPtr(source)
-	return options
-}
-
-// SetTarget : Allow user to set Target
-func (options *CreateResourceAliasOptions) SetTarget(target string) *CreateResourceAliasOptions {
-	options.Target = core.StringPtr(target)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *CreateResourceAliasOptions) SetHeaders(param map[string]string) *CreateResourceAliasOptions {
-	options.Headers = param
-	return options
-}
-
-// CreateResourceBindingOptions : The CreateResourceBinding options.
-type CreateResourceBindingOptions struct {
-	// The short or long ID of resource alias.
-	Source *string `json:"source" validate:"required"`
-
-	// The CRN of application to bind to in a specific environment, e.g. Dallas YP, CFEE instance.
-	Target *string `json:"target" validate:"required"`
-
-	// The name of the binding. Must be 180 characters or less and cannot include any special characters other than
-	// `(space) - . _ :`.
-	Name *string `json:"name,omitempty"`
-
-	// Configuration options represented as key-value pairs. Service defined options are passed through to the target
-	// resource brokers, whereas platform defined options are not.
-	Parameters *ResourceBindingPostParameters `json:"parameters,omitempty"`
-
-	// The role name or it's CRN.
-	Role *string `json:"role,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewCreateResourceBindingOptions : Instantiate CreateResourceBindingOptions
-func (*ResourceControllerV2) NewCreateResourceBindingOptions(source string, target string) *CreateResourceBindingOptions {
-	return &CreateResourceBindingOptions{
-		Source: core.StringPtr(source),
-		Target: core.StringPtr(target),
-	}
-}
-
-// SetSource : Allow user to set Source
-func (options *CreateResourceBindingOptions) SetSource(source string) *CreateResourceBindingOptions {
-	options.Source = core.StringPtr(source)
-	return options
-}
-
-// SetTarget : Allow user to set Target
-func (options *CreateResourceBindingOptions) SetTarget(target string) *CreateResourceBindingOptions {
-	options.Target = core.StringPtr(target)
-	return options
-}
-
-// SetName : Allow user to set Name
-func (options *CreateResourceBindingOptions) SetName(name string) *CreateResourceBindingOptions {
-	options.Name = core.StringPtr(name)
-	return options
-}
-
-// SetParameters : Allow user to set Parameters
-func (options *CreateResourceBindingOptions) SetParameters(parameters *ResourceBindingPostParameters) *CreateResourceBindingOptions {
-	options.Parameters = parameters
-	return options
-}
-
-// SetRole : Allow user to set Role
-func (options *CreateResourceBindingOptions) SetRole(role string) *CreateResourceBindingOptions {
-	options.Role = core.StringPtr(role)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *CreateResourceBindingOptions) SetHeaders(param map[string]string) *CreateResourceBindingOptions {
-	options.Headers = param
-	return options
-}
-
-// CreateResourceInstanceOptions : The CreateResourceInstance options.
-type CreateResourceInstanceOptions struct {
-	// The name of the instance. Must be 180 characters or less and cannot include any special characters other than
-	// `(space) - . _ :`.
-	Name *string `json:"name" validate:"required"`
-
-	// The deployment location where the instance should be hosted.
-	Target *string `json:"target" validate:"required"`
-
-	// Short or long ID of resource group.
-	ResourceGroup *string `json:"resource_group" validate:"required"`
-
-	// The unique ID of the plan associated with the offering. This value is provided by and stored in the global catalog.
-	ResourcePlanID *string `json:"resource_plan_id" validate:"required"`
-
-	// Tags that are attached to the instance after provisioning. These tags can be searched and managed through the
-	// Tagging API in IBM Cloud.
-	Tags []string `json:"tags,omitempty"`
-
-	// A boolean that dictates if the resource instance should be deleted (cleaned up) during the processing of a region
-	// instance delete call.
-	AllowCleanup *bool `json:"allow_cleanup,omitempty"`
-
-	// Configuration options represented as key-value pairs that are passed through to the target resource brokers.
-	Parameters map[string]interface{} `json:"parameters,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewCreateResourceInstanceOptions : Instantiate CreateResourceInstanceOptions
-func (*ResourceControllerV2) NewCreateResourceInstanceOptions(name string, target string, resourceGroup string, resourcePlanID string) *CreateResourceInstanceOptions {
-	return &CreateResourceInstanceOptions{
-		Name: core.StringPtr(name),
-		Target: core.StringPtr(target),
-		ResourceGroup: core.StringPtr(resourceGroup),
-		ResourcePlanID: core.StringPtr(resourcePlanID),
-	}
-}
-
-// SetName : Allow user to set Name
-func (options *CreateResourceInstanceOptions) SetName(name string) *CreateResourceInstanceOptions {
-	options.Name = core.StringPtr(name)
-	return options
-}
-
-// SetTarget : Allow user to set Target
-func (options *CreateResourceInstanceOptions) SetTarget(target string) *CreateResourceInstanceOptions {
-	options.Target = core.StringPtr(target)
-	return options
-}
-
-// SetResourceGroup : Allow user to set ResourceGroup
-func (options *CreateResourceInstanceOptions) SetResourceGroup(resourceGroup string) *CreateResourceInstanceOptions {
-	options.ResourceGroup = core.StringPtr(resourceGroup)
-	return options
-}
-
-// SetResourcePlanID : Allow user to set ResourcePlanID
-func (options *CreateResourceInstanceOptions) SetResourcePlanID(resourcePlanID string) *CreateResourceInstanceOptions {
-	options.ResourcePlanID = core.StringPtr(resourcePlanID)
-	return options
-}
-
-// SetTags : Allow user to set Tags
-func (options *CreateResourceInstanceOptions) SetTags(tags []string) *CreateResourceInstanceOptions {
-	options.Tags = tags
-	return options
-}
-
-// SetAllowCleanup : Allow user to set AllowCleanup
-func (options *CreateResourceInstanceOptions) SetAllowCleanup(allowCleanup bool) *CreateResourceInstanceOptions {
-	options.AllowCleanup = core.BoolPtr(allowCleanup)
-	return options
-}
-
-// SetParameters : Allow user to set Parameters
-func (options *CreateResourceInstanceOptions) SetParameters(parameters map[string]interface{}) *CreateResourceInstanceOptions {
-	options.Parameters = parameters
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *CreateResourceInstanceOptions) SetHeaders(param map[string]string) *CreateResourceInstanceOptions {
-	options.Headers = param
-	return options
-}
-
-// CreateResourceKeyOptions : The CreateResourceKey options.
-type CreateResourceKeyOptions struct {
-	// The name of the key.
-	Name *string `json:"name" validate:"required"`
-
-	// The short or long ID of resource instance or alias.
-	Source *string `json:"source" validate:"required"`
-
-	// Configuration options represented as key-value pairs. Service defined options are passed through to the target
-	// resource brokers, whereas platform defined options are not.
-	Parameters *ResourceKeyPostParameters `json:"parameters,omitempty"`
-
-	// The role name or it's CRN.
-	Role *string `json:"role,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewCreateResourceKeyOptions : Instantiate CreateResourceKeyOptions
-func (*ResourceControllerV2) NewCreateResourceKeyOptions(name string, source string) *CreateResourceKeyOptions {
-	return &CreateResourceKeyOptions{
-		Name: core.StringPtr(name),
-		Source: core.StringPtr(source),
-	}
-}
-
-// SetName : Allow user to set Name
-func (options *CreateResourceKeyOptions) SetName(name string) *CreateResourceKeyOptions {
-	options.Name = core.StringPtr(name)
-	return options
-}
-
-// SetSource : Allow user to set Source
-func (options *CreateResourceKeyOptions) SetSource(source string) *CreateResourceKeyOptions {
-	options.Source = core.StringPtr(source)
-	return options
-}
-
-// SetParameters : Allow user to set Parameters
-func (options *CreateResourceKeyOptions) SetParameters(parameters *ResourceKeyPostParameters) *CreateResourceKeyOptions {
-	options.Parameters = parameters
-	return options
-}
-
-// SetRole : Allow user to set Role
-func (options *CreateResourceKeyOptions) SetRole(role string) *CreateResourceKeyOptions {
-	options.Role = core.StringPtr(role)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *CreateResourceKeyOptions) SetHeaders(param map[string]string) *CreateResourceKeyOptions {
-	options.Headers = param
-	return options
-}
-
-// Credentials : The credentials for a resource.
-type Credentials struct {
-	// The API key for the credentials.
-	Apikey *string `json:"apikey,omitempty"`
-
-	// The optional description of the API key.
-	IamApikeyDescription *string `json:"iam_apikey_description,omitempty"`
-
-	// The name of the API key.
-	IamApikeyName *string `json:"iam_apikey_name,omitempty"`
-
-	// The Cloud Resource Name for the role of the credentials.
-	IamRoleCrn *string `json:"iam_role_crn,omitempty"`
-
-	// The Cloud Resource Name for the service ID of the credentials.
-	IamServiceidCrn *string `json:"iam_serviceid_crn,omitempty"`
-
-	// Allows users to set arbitrary properties
-	additionalProperties map[string]interface{}
-}
-
-
-// SetProperty allows the user to set an arbitrary property on an instance of Credentials
-func (o *Credentials) SetProperty(key string, value interface{}) {
-	if o.additionalProperties == nil {
-		o.additionalProperties = make(map[string]interface{})
-	}
-	o.additionalProperties[key] = value
-}
-
-// GetProperty allows the user to retrieve an arbitrary property from an instance of Credentials
-func (o *Credentials) GetProperty(key string) interface{} {
-	return o.additionalProperties[key]
-}
-
-// GetProperties allows the user to retrieve the map of arbitrary properties from an instance of Credentials
-func (o *Credentials) GetProperties() map[string]interface{} {
-	return o.additionalProperties
-}
-
-// MarshalJSON performs custom serialization for instances of Credentials
-func (o *Credentials) MarshalJSON() (buffer []byte, err error) {
-	m := make(map[string]interface{})
-	if len(o.additionalProperties) > 0 {
-		for k, v := range o.additionalProperties {
-			m[k] = v
-		}
-	}
-	if o.Apikey != nil {
-		m["apikey"] = o.Apikey
-	}
-	if o.IamApikeyDescription != nil {
-		m["iam_apikey_description"] = o.IamApikeyDescription
-	}
-	if o.IamApikeyName != nil {
-		m["iam_apikey_name"] = o.IamApikeyName
-	}
-	if o.IamRoleCrn != nil {
-		m["iam_role_crn"] = o.IamRoleCrn
-	}
-	if o.IamServiceidCrn != nil {
-		m["iam_serviceid_crn"] = o.IamServiceidCrn
-	}
-	buffer, err = json.Marshal(m)	
-	return
-}
-
-// UnmarshalCredentials constructs an instance of Credentials from the specified map.
-func UnmarshalCredentials(m map[string]interface{}) (result *Credentials, err error) {
-	m = core.CopyMap(m)
-	obj := new(Credentials)
-	obj.Apikey, err = core.UnmarshalString(m, "apikey")
-	if err != nil {
-		return
-	}
-	delete(m, "apikey")
-	obj.IamApikeyDescription, err = core.UnmarshalString(m, "iam_apikey_description")
-	if err != nil {
-		return
-	}
-	delete(m, "iam_apikey_description")
-	obj.IamApikeyName, err = core.UnmarshalString(m, "iam_apikey_name")
-	if err != nil {
-		return
-	}
-	delete(m, "iam_apikey_name")
-	obj.IamRoleCrn, err = core.UnmarshalString(m, "iam_role_crn")
-	if err != nil {
-		return
-	}
-	delete(m, "iam_role_crn")
-	obj.IamServiceidCrn, err = core.UnmarshalString(m, "iam_serviceid_crn")
-	if err != nil {
-		return
-	}
-	delete(m, "iam_serviceid_crn")
-	for k := range m {
-		v, e := core.UnmarshalAny(m, k)
-		if e != nil {
-			err = e
-			return
-		}
-		obj.SetProperty(k, v)
-	}
-	result = obj
-	return
-}
-
-// UnmarshalCredentialsSlice unmarshals a slice of Credentials instances from the specified list of maps.
-func UnmarshalCredentialsSlice(s []interface{}) (slice []Credentials, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'Credentials'")
-			return
-		}
-		obj, e := UnmarshalCredentials(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalCredentialsAsProperty unmarshals an instance of Credentials that is stored as a property
-// within the specified map.
-func UnmarshalCredentialsAsProperty(m map[string]interface{}, propertyName string) (result *Credentials, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'Credentials'", propertyName)
-			return
-		}
-		result, err = UnmarshalCredentials(objMap)
-	}
-	return
-}
-
-// UnmarshalCredentialsSliceAsProperty unmarshals a slice of Credentials instances that are stored as a property
-// within the specified map.
-func UnmarshalCredentialsSliceAsProperty(m map[string]interface{}, propertyName string) (slice []Credentials, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'Credentials'", propertyName)
-			return
-		}
-		slice, err = UnmarshalCredentialsSlice(vSlice)
-	}
-	return
-}
-
-// DeleteResourceAliasOptions : The DeleteResourceAlias options.
-type DeleteResourceAliasOptions struct {
-	// The short or long ID of the alias.
-	ID *string `json:"id" validate:"required"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewDeleteResourceAliasOptions : Instantiate DeleteResourceAliasOptions
-func (*ResourceControllerV2) NewDeleteResourceAliasOptions(id string) *DeleteResourceAliasOptions {
-	return &DeleteResourceAliasOptions{
-		ID: core.StringPtr(id),
-	}
-}
-
-// SetID : Allow user to set ID
-func (options *DeleteResourceAliasOptions) SetID(id string) *DeleteResourceAliasOptions {
-	options.ID = core.StringPtr(id)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *DeleteResourceAliasOptions) SetHeaders(param map[string]string) *DeleteResourceAliasOptions {
-	options.Headers = param
-	return options
-}
-
-// DeleteResourceBindingOptions : The DeleteResourceBinding options.
-type DeleteResourceBindingOptions struct {
-	// The short or long ID of the binding.
-	ID *string `json:"id" validate:"required"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewDeleteResourceBindingOptions : Instantiate DeleteResourceBindingOptions
-func (*ResourceControllerV2) NewDeleteResourceBindingOptions(id string) *DeleteResourceBindingOptions {
-	return &DeleteResourceBindingOptions{
-		ID: core.StringPtr(id),
-	}
-}
-
-// SetID : Allow user to set ID
-func (options *DeleteResourceBindingOptions) SetID(id string) *DeleteResourceBindingOptions {
-	options.ID = core.StringPtr(id)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *DeleteResourceBindingOptions) SetHeaders(param map[string]string) *DeleteResourceBindingOptions {
-	options.Headers = param
-	return options
-}
-
-// DeleteResourceInstanceOptions : The DeleteResourceInstance options.
-type DeleteResourceInstanceOptions struct {
-	// The short or long ID of the instance.
-	ID *string `json:"id" validate:"required"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewDeleteResourceInstanceOptions : Instantiate DeleteResourceInstanceOptions
-func (*ResourceControllerV2) NewDeleteResourceInstanceOptions(id string) *DeleteResourceInstanceOptions {
-	return &DeleteResourceInstanceOptions{
-		ID: core.StringPtr(id),
-	}
-}
-
-// SetID : Allow user to set ID
-func (options *DeleteResourceInstanceOptions) SetID(id string) *DeleteResourceInstanceOptions {
-	options.ID = core.StringPtr(id)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *DeleteResourceInstanceOptions) SetHeaders(param map[string]string) *DeleteResourceInstanceOptions {
-	options.Headers = param
-	return options
-}
-
-// DeleteResourceKeyOptions : The DeleteResourceKey options.
-type DeleteResourceKeyOptions struct {
-	// The short or long ID of the key.
-	ID *string `json:"id" validate:"required"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewDeleteResourceKeyOptions : Instantiate DeleteResourceKeyOptions
-func (*ResourceControllerV2) NewDeleteResourceKeyOptions(id string) *DeleteResourceKeyOptions {
-	return &DeleteResourceKeyOptions{
-		ID: core.StringPtr(id),
-	}
-}
-
-// SetID : Allow user to set ID
-func (options *DeleteResourceKeyOptions) SetID(id string) *DeleteResourceKeyOptions {
-	options.ID = core.StringPtr(id)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *DeleteResourceKeyOptions) SetHeaders(param map[string]string) *DeleteResourceKeyOptions {
-	options.Headers = param
-	return options
-}
-
-// GetResourceAliasOptions : The GetResourceAlias options.
-type GetResourceAliasOptions struct {
-	// The short or long ID of the alias.
-	ID *string `json:"id" validate:"required"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewGetResourceAliasOptions : Instantiate GetResourceAliasOptions
-func (*ResourceControllerV2) NewGetResourceAliasOptions(id string) *GetResourceAliasOptions {
-	return &GetResourceAliasOptions{
-		ID: core.StringPtr(id),
-	}
-}
-
-// SetID : Allow user to set ID
-func (options *GetResourceAliasOptions) SetID(id string) *GetResourceAliasOptions {
-	options.ID = core.StringPtr(id)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *GetResourceAliasOptions) SetHeaders(param map[string]string) *GetResourceAliasOptions {
-	options.Headers = param
-	return options
-}
-
-// GetResourceBindingOptions : The GetResourceBinding options.
-type GetResourceBindingOptions struct {
-	// The short or long ID of the binding.
-	ID *string `json:"id" validate:"required"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewGetResourceBindingOptions : Instantiate GetResourceBindingOptions
-func (*ResourceControllerV2) NewGetResourceBindingOptions(id string) *GetResourceBindingOptions {
-	return &GetResourceBindingOptions{
-		ID: core.StringPtr(id),
-	}
-}
-
-// SetID : Allow user to set ID
-func (options *GetResourceBindingOptions) SetID(id string) *GetResourceBindingOptions {
-	options.ID = core.StringPtr(id)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *GetResourceBindingOptions) SetHeaders(param map[string]string) *GetResourceBindingOptions {
-	options.Headers = param
-	return options
-}
-
-// GetResourceInstanceOptions : The GetResourceInstance options.
-type GetResourceInstanceOptions struct {
-	// The short or long ID of the instance.
-	ID *string `json:"id" validate:"required"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewGetResourceInstanceOptions : Instantiate GetResourceInstanceOptions
-func (*ResourceControllerV2) NewGetResourceInstanceOptions(id string) *GetResourceInstanceOptions {
-	return &GetResourceInstanceOptions{
-		ID: core.StringPtr(id),
-	}
-}
-
-// SetID : Allow user to set ID
-func (options *GetResourceInstanceOptions) SetID(id string) *GetResourceInstanceOptions {
-	options.ID = core.StringPtr(id)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *GetResourceInstanceOptions) SetHeaders(param map[string]string) *GetResourceInstanceOptions {
-	options.Headers = param
-	return options
-}
-
-// GetResourceKeyOptions : The GetResourceKey options.
-type GetResourceKeyOptions struct {
-	// The short or long ID of the key.
-	ID *string `json:"id" validate:"required"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewGetResourceKeyOptions : Instantiate GetResourceKeyOptions
-func (*ResourceControllerV2) NewGetResourceKeyOptions(id string) *GetResourceKeyOptions {
-	return &GetResourceKeyOptions{
-		ID: core.StringPtr(id),
-	}
-}
-
-// SetID : Allow user to set ID
-func (options *GetResourceKeyOptions) SetID(id string) *GetResourceKeyOptions {
-	options.ID = core.StringPtr(id)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *GetResourceKeyOptions) SetHeaders(param map[string]string) *GetResourceKeyOptions {
-	options.Headers = param
-	return options
-}
-
-// ListReclamationsOptions : The ListReclamations options.
-type ListReclamationsOptions struct {
-	// An alpha-numeric value identifying the account ID.
-	AccountID *string `json:"account_id,omitempty"`
-
-	// The short ID of the resource instance.
-	ResourceInstanceID *string `json:"resource_instance_id,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewListReclamationsOptions : Instantiate ListReclamationsOptions
-func (*ResourceControllerV2) NewListReclamationsOptions() *ListReclamationsOptions {
-	return &ListReclamationsOptions{}
-}
-
-// SetAccountID : Allow user to set AccountID
-func (options *ListReclamationsOptions) SetAccountID(accountID string) *ListReclamationsOptions {
-	options.AccountID = core.StringPtr(accountID)
-	return options
-}
-
-// SetResourceInstanceID : Allow user to set ResourceInstanceID
-func (options *ListReclamationsOptions) SetResourceInstanceID(resourceInstanceID string) *ListReclamationsOptions {
-	options.ResourceInstanceID = core.StringPtr(resourceInstanceID)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *ListReclamationsOptions) SetHeaders(param map[string]string) *ListReclamationsOptions {
-	options.Headers = param
-	return options
-}
-
-// ListResourceAliasesOptions : The ListResourceAliases options.
-type ListResourceAliasesOptions struct {
-	// Short ID of the alias.
-	Guid *string `json:"guid,omitempty"`
-
-	// The human-readable name of the alias.
-	Name *string `json:"name,omitempty"`
-
-	// Resource instance short ID.
-	ResourceInstanceID *string `json:"resource_instance_id,omitempty"`
-
-	// Short ID of the instance in a specific targeted environment. For example, `service_instance_id` in a given IBM Cloud
-	// environment.
-	RegionInstanceID *string `json:"region_instance_id,omitempty"`
-
-	// The unique ID of the offering (service name). This value is provided by and stored in the global catalog.
-	ResourceID *string `json:"resource_id,omitempty"`
-
-	// Short ID of Resource group.
-	ResourceGroupID *string `json:"resource_group_id,omitempty"`
-
-	// Limit on how many items should be returned.
-	Limit *string `json:"limit,omitempty"`
-
-	// Start date inclusive filter.
-	UpdatedFrom *string `json:"updated_from,omitempty"`
-
-	// End date inclusive filter.
-	UpdatedTo *string `json:"updated_to,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewListResourceAliasesOptions : Instantiate ListResourceAliasesOptions
-func (*ResourceControllerV2) NewListResourceAliasesOptions() *ListResourceAliasesOptions {
-	return &ListResourceAliasesOptions{}
-}
-
-// SetGuid : Allow user to set Guid
-func (options *ListResourceAliasesOptions) SetGuid(guid string) *ListResourceAliasesOptions {
-	options.Guid = core.StringPtr(guid)
-	return options
-}
-
-// SetName : Allow user to set Name
-func (options *ListResourceAliasesOptions) SetName(name string) *ListResourceAliasesOptions {
-	options.Name = core.StringPtr(name)
-	return options
-}
-
-// SetResourceInstanceID : Allow user to set ResourceInstanceID
-func (options *ListResourceAliasesOptions) SetResourceInstanceID(resourceInstanceID string) *ListResourceAliasesOptions {
-	options.ResourceInstanceID = core.StringPtr(resourceInstanceID)
-	return options
-}
-
-// SetRegionInstanceID : Allow user to set RegionInstanceID
-func (options *ListResourceAliasesOptions) SetRegionInstanceID(regionInstanceID string) *ListResourceAliasesOptions {
-	options.RegionInstanceID = core.StringPtr(regionInstanceID)
-	return options
-}
-
-// SetResourceID : Allow user to set ResourceID
-func (options *ListResourceAliasesOptions) SetResourceID(resourceID string) *ListResourceAliasesOptions {
-	options.ResourceID = core.StringPtr(resourceID)
-	return options
-}
-
-// SetResourceGroupID : Allow user to set ResourceGroupID
-func (options *ListResourceAliasesOptions) SetResourceGroupID(resourceGroupID string) *ListResourceAliasesOptions {
-	options.ResourceGroupID = core.StringPtr(resourceGroupID)
-	return options
-}
-
-// SetLimit : Allow user to set Limit
-func (options *ListResourceAliasesOptions) SetLimit(limit string) *ListResourceAliasesOptions {
-	options.Limit = core.StringPtr(limit)
-	return options
-}
-
-// SetUpdatedFrom : Allow user to set UpdatedFrom
-func (options *ListResourceAliasesOptions) SetUpdatedFrom(updatedFrom string) *ListResourceAliasesOptions {
-	options.UpdatedFrom = core.StringPtr(updatedFrom)
-	return options
-}
-
-// SetUpdatedTo : Allow user to set UpdatedTo
-func (options *ListResourceAliasesOptions) SetUpdatedTo(updatedTo string) *ListResourceAliasesOptions {
-	options.UpdatedTo = core.StringPtr(updatedTo)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *ListResourceAliasesOptions) SetHeaders(param map[string]string) *ListResourceAliasesOptions {
-	options.Headers = param
-	return options
-}
-
-// ListResourceBindingsOptions : The ListResourceBindings options.
-type ListResourceBindingsOptions struct {
-	// The short ID of the binding.
-	Guid *string `json:"guid,omitempty"`
-
-	// The human-readable name of the binding.
-	Name *string `json:"name,omitempty"`
-
-	// Short ID of the resource group.
-	ResourceGroupID *string `json:"resource_group_id,omitempty"`
-
-	// The unique ID of the offering (service name). This value is provided by and stored in the global catalog.
-	ResourceID *string `json:"resource_id,omitempty"`
-
-	// Short ID of the binding in the specific targeted environment, e.g. service_binding_id in a given IBM Cloud
-	// environment.
-	RegionBindingID *string `json:"region_binding_id,omitempty"`
-
-	// Limit on how many items should be returned.
-	Limit *string `json:"limit,omitempty"`
-
-	// Start date inclusive filter.
-	UpdatedFrom *string `json:"updated_from,omitempty"`
-
-	// End date inclusive filter.
-	UpdatedTo *string `json:"updated_to,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewListResourceBindingsOptions : Instantiate ListResourceBindingsOptions
-func (*ResourceControllerV2) NewListResourceBindingsOptions() *ListResourceBindingsOptions {
-	return &ListResourceBindingsOptions{}
-}
-
-// SetGuid : Allow user to set Guid
-func (options *ListResourceBindingsOptions) SetGuid(guid string) *ListResourceBindingsOptions {
-	options.Guid = core.StringPtr(guid)
-	return options
-}
-
-// SetName : Allow user to set Name
-func (options *ListResourceBindingsOptions) SetName(name string) *ListResourceBindingsOptions {
-	options.Name = core.StringPtr(name)
-	return options
-}
-
-// SetResourceGroupID : Allow user to set ResourceGroupID
-func (options *ListResourceBindingsOptions) SetResourceGroupID(resourceGroupID string) *ListResourceBindingsOptions {
-	options.ResourceGroupID = core.StringPtr(resourceGroupID)
-	return options
-}
-
-// SetResourceID : Allow user to set ResourceID
-func (options *ListResourceBindingsOptions) SetResourceID(resourceID string) *ListResourceBindingsOptions {
-	options.ResourceID = core.StringPtr(resourceID)
-	return options
-}
-
-// SetRegionBindingID : Allow user to set RegionBindingID
-func (options *ListResourceBindingsOptions) SetRegionBindingID(regionBindingID string) *ListResourceBindingsOptions {
-	options.RegionBindingID = core.StringPtr(regionBindingID)
-	return options
-}
-
-// SetLimit : Allow user to set Limit
-func (options *ListResourceBindingsOptions) SetLimit(limit string) *ListResourceBindingsOptions {
-	options.Limit = core.StringPtr(limit)
-	return options
-}
-
-// SetUpdatedFrom : Allow user to set UpdatedFrom
-func (options *ListResourceBindingsOptions) SetUpdatedFrom(updatedFrom string) *ListResourceBindingsOptions {
-	options.UpdatedFrom = core.StringPtr(updatedFrom)
-	return options
-}
-
-// SetUpdatedTo : Allow user to set UpdatedTo
-func (options *ListResourceBindingsOptions) SetUpdatedTo(updatedTo string) *ListResourceBindingsOptions {
-	options.UpdatedTo = core.StringPtr(updatedTo)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *ListResourceBindingsOptions) SetHeaders(param map[string]string) *ListResourceBindingsOptions {
-	options.Headers = param
-	return options
-}
-
-// ListResourceInstancesOptions : The ListResourceInstances options.
-type ListResourceInstancesOptions struct {
-	// When you provision a new resource in the specified location for the selected plan, a GUID (globally unique
-	// identifier) is created. This is a unique internal GUID managed by Resource controller that corresponds to the
-	// instance.
-	Guid *string `json:"guid,omitempty"`
-
-	// The human-readable name of the instance.
-	Name *string `json:"name,omitempty"`
-
-	// Short ID of a resource group.
-	ResourceGroupID *string `json:"resource_group_id,omitempty"`
-
-	// The unique ID of the offering. This value is provided by and stored in the global catalog.
-	ResourceID *string `json:"resource_id,omitempty"`
-
-	// The unique ID of the plan associated with the offering. This value is provided by and stored in the global catalog.
-	ResourcePlanID *string `json:"resource_plan_id,omitempty"`
-
-	// The type of the instance. For example, `service_instance`.
-	Type *string `json:"type,omitempty"`
-
-	// The sub-type of instance, e.g. `cfaas`.
-	SubType *string `json:"sub_type,omitempty"`
-
-	// Limit on how many items should be returned.
-	Limit *string `json:"limit,omitempty"`
-
-	// Start date inclusive filter.
-	UpdatedFrom *string `json:"updated_from,omitempty"`
-
-	// End date inclusive filter.
-	UpdatedTo *string `json:"updated_to,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewListResourceInstancesOptions : Instantiate ListResourceInstancesOptions
-func (*ResourceControllerV2) NewListResourceInstancesOptions() *ListResourceInstancesOptions {
-	return &ListResourceInstancesOptions{}
-}
-
-// SetGuid : Allow user to set Guid
-func (options *ListResourceInstancesOptions) SetGuid(guid string) *ListResourceInstancesOptions {
-	options.Guid = core.StringPtr(guid)
-	return options
-}
-
-// SetName : Allow user to set Name
-func (options *ListResourceInstancesOptions) SetName(name string) *ListResourceInstancesOptions {
-	options.Name = core.StringPtr(name)
-	return options
-}
-
-// SetResourceGroupID : Allow user to set ResourceGroupID
-func (options *ListResourceInstancesOptions) SetResourceGroupID(resourceGroupID string) *ListResourceInstancesOptions {
-	options.ResourceGroupID = core.StringPtr(resourceGroupID)
-	return options
-}
-
-// SetResourceID : Allow user to set ResourceID
-func (options *ListResourceInstancesOptions) SetResourceID(resourceID string) *ListResourceInstancesOptions {
-	options.ResourceID = core.StringPtr(resourceID)
-	return options
-}
-
-// SetResourcePlanID : Allow user to set ResourcePlanID
-func (options *ListResourceInstancesOptions) SetResourcePlanID(resourcePlanID string) *ListResourceInstancesOptions {
-	options.ResourcePlanID = core.StringPtr(resourcePlanID)
-	return options
-}
-
-// SetType : Allow user to set Type
-func (options *ListResourceInstancesOptions) SetType(typeVar string) *ListResourceInstancesOptions {
-	options.Type = core.StringPtr(typeVar)
-	return options
-}
-
-// SetSubType : Allow user to set SubType
-func (options *ListResourceInstancesOptions) SetSubType(subType string) *ListResourceInstancesOptions {
-	options.SubType = core.StringPtr(subType)
-	return options
-}
-
-// SetLimit : Allow user to set Limit
-func (options *ListResourceInstancesOptions) SetLimit(limit string) *ListResourceInstancesOptions {
-	options.Limit = core.StringPtr(limit)
-	return options
-}
-
-// SetUpdatedFrom : Allow user to set UpdatedFrom
-func (options *ListResourceInstancesOptions) SetUpdatedFrom(updatedFrom string) *ListResourceInstancesOptions {
-	options.UpdatedFrom = core.StringPtr(updatedFrom)
-	return options
-}
-
-// SetUpdatedTo : Allow user to set UpdatedTo
-func (options *ListResourceInstancesOptions) SetUpdatedTo(updatedTo string) *ListResourceInstancesOptions {
-	options.UpdatedTo = core.StringPtr(updatedTo)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *ListResourceInstancesOptions) SetHeaders(param map[string]string) *ListResourceInstancesOptions {
-	options.Headers = param
-	return options
-}
-
-// ListResourceKeysOptions : The ListResourceKeys options.
-type ListResourceKeysOptions struct {
-	// When you create a new key, a GUID (globally unique identifier) is assigned. This is a unique internal GUID managed
-	// by Resource controller that corresponds to the key.
-	Guid *string `json:"guid,omitempty"`
-
-	// The human-readable name of the key.
-	Name *string `json:"name,omitempty"`
-
-	// The short ID of the resource group.
-	ResourceGroupID *string `json:"resource_group_id,omitempty"`
-
-	// The unique ID of the offering. This value is provided by and stored in the global catalog.
-	ResourceID *string `json:"resource_id,omitempty"`
-
-	// Limit on how many items should be returned.
-	Limit *string `json:"limit,omitempty"`
-
-	// Start date inclusive filter.
-	UpdatedFrom *string `json:"updated_from,omitempty"`
-
-	// End date inclusive filter.
-	UpdatedTo *string `json:"updated_to,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewListResourceKeysOptions : Instantiate ListResourceKeysOptions
-func (*ResourceControllerV2) NewListResourceKeysOptions() *ListResourceKeysOptions {
-	return &ListResourceKeysOptions{}
-}
-
-// SetGuid : Allow user to set Guid
-func (options *ListResourceKeysOptions) SetGuid(guid string) *ListResourceKeysOptions {
-	options.Guid = core.StringPtr(guid)
-	return options
-}
-
-// SetName : Allow user to set Name
-func (options *ListResourceKeysOptions) SetName(name string) *ListResourceKeysOptions {
-	options.Name = core.StringPtr(name)
-	return options
-}
-
-// SetResourceGroupID : Allow user to set ResourceGroupID
-func (options *ListResourceKeysOptions) SetResourceGroupID(resourceGroupID string) *ListResourceKeysOptions {
-	options.ResourceGroupID = core.StringPtr(resourceGroupID)
-	return options
-}
-
-// SetResourceID : Allow user to set ResourceID
-func (options *ListResourceKeysOptions) SetResourceID(resourceID string) *ListResourceKeysOptions {
-	options.ResourceID = core.StringPtr(resourceID)
-	return options
-}
-
-// SetLimit : Allow user to set Limit
-func (options *ListResourceKeysOptions) SetLimit(limit string) *ListResourceKeysOptions {
-	options.Limit = core.StringPtr(limit)
-	return options
-}
-
-// SetUpdatedFrom : Allow user to set UpdatedFrom
-func (options *ListResourceKeysOptions) SetUpdatedFrom(updatedFrom string) *ListResourceKeysOptions {
-	options.UpdatedFrom = core.StringPtr(updatedFrom)
-	return options
-}
-
-// SetUpdatedTo : Allow user to set UpdatedTo
-func (options *ListResourceKeysOptions) SetUpdatedTo(updatedTo string) *ListResourceKeysOptions {
-	options.UpdatedTo = core.StringPtr(updatedTo)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *ListResourceKeysOptions) SetHeaders(param map[string]string) *ListResourceKeysOptions {
-	options.Headers = param
-	return options
-}
-
-// PlanHistoryItem : An element of the plan history of the instance.
-type PlanHistoryItem struct {
-	// The unique ID of the plan associated with the offering. This value is provided by and stored in the global catalog.
-	ResourcePlanID *string `json:"resource_plan_id" validate:"required"`
-
-	// The date on which the plan was changed.
-	StartDate *strfmt.DateTime `json:"start_date" validate:"required"`
-}
-
-
-// UnmarshalPlanHistoryItem constructs an instance of PlanHistoryItem from the specified map.
-func UnmarshalPlanHistoryItem(m map[string]interface{}) (result *PlanHistoryItem, err error) {
-	obj := new(PlanHistoryItem)
-	obj.ResourcePlanID, err = core.UnmarshalString(m, "resource_plan_id")
-	if err != nil {
-		return
-	}
-	obj.StartDate, err = core.UnmarshalDateTime(m, "start_date")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalPlanHistoryItemSlice unmarshals a slice of PlanHistoryItem instances from the specified list of maps.
-func UnmarshalPlanHistoryItemSlice(s []interface{}) (slice []PlanHistoryItem, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'PlanHistoryItem'")
-			return
-		}
-		obj, e := UnmarshalPlanHistoryItem(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalPlanHistoryItemAsProperty unmarshals an instance of PlanHistoryItem that is stored as a property
-// within the specified map.
-func UnmarshalPlanHistoryItemAsProperty(m map[string]interface{}, propertyName string) (result *PlanHistoryItem, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'PlanHistoryItem'", propertyName)
-			return
-		}
-		result, err = UnmarshalPlanHistoryItem(objMap)
-	}
-	return
-}
-
-// UnmarshalPlanHistoryItemSliceAsProperty unmarshals a slice of PlanHistoryItem instances that are stored as a property
-// within the specified map.
-func UnmarshalPlanHistoryItemSliceAsProperty(m map[string]interface{}, propertyName string) (slice []PlanHistoryItem, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'PlanHistoryItem'", propertyName)
-			return
-		}
-		slice, err = UnmarshalPlanHistoryItemSlice(vSlice)
-	}
-	return
-}
-
-// Reclamation : A reclamation.
-type Reclamation struct {
-	// The ID associated with the reclamation.
-	ID *string `json:"id,omitempty"`
-
-	// The short ID of the entity for the reclamation.
-	EntityID *string `json:"entity_id,omitempty"`
-
-	// The short ID of the entity type for the reclamation.
-	EntityTypeID *string `json:"entity_type_id,omitempty"`
-
-	// The full Cloud Resource Name (CRN) associated with the binding. For more information about this format, see [Cloud
-	// Resource Names](https://cloud.ibm.com/docs/overview?topic=overview-crn).
-	EntityCrn *string `json:"entity_crn,omitempty"`
-
-	// The short ID of the resource instance.
-	ResourceInstanceID interface{} `json:"resource_instance_id,omitempty"`
-
-	// The short ID of the resource group.
-	ResourceGroupID *string `json:"resource_group_id,omitempty"`
-
-	// An alpha-numeric value identifying the account ID.
-	AccountID *string `json:"account_id,omitempty"`
-
-	// The short ID of policy for the reclamation.
-	PolicyID *string `json:"policy_id,omitempty"`
-
-	// The state of the reclamation.
-	State *string `json:"state,omitempty"`
-
-	// The target time that the reclamation retention period end.
-	TargetTime *string `json:"target_time,omitempty"`
-
-	// The custom properties of the reclamation.
-	CustomProperties *string `json:"custom_properties,omitempty"`
-
-	// The date when the reclamation was created.
-	CreatedAt *strfmt.DateTime `json:"created_at,omitempty"`
-
-	// The subject who created the reclamation.
-	CreatedBy *string `json:"created_by,omitempty"`
-
-	// The date when the reclamation was last updated.
-	UpdatedAt *strfmt.DateTime `json:"updated_at,omitempty"`
-
-	// The subject who updated the reclamation.
-	UpdatedBy *string `json:"updated_by,omitempty"`
-}
-
-
-// UnmarshalReclamation constructs an instance of Reclamation from the specified map.
-func UnmarshalReclamation(m map[string]interface{}) (result *Reclamation, err error) {
-	obj := new(Reclamation)
-	obj.ID, err = core.UnmarshalString(m, "id")
-	if err != nil {
-		return
-	}
-	obj.EntityID, err = core.UnmarshalString(m, "entity_id")
-	if err != nil {
-		return
-	}
-	obj.EntityTypeID, err = core.UnmarshalString(m, "entity_type_id")
-	if err != nil {
-		return
-	}
-	obj.EntityCrn, err = core.UnmarshalString(m, "entity_crn")
-	if err != nil {
-		return
-	}
-	obj.ResourceInstanceID, err = core.UnmarshalAny(m, "resource_instance_id")
-	if err != nil {
-		return
-	}
-	obj.ResourceGroupID, err = core.UnmarshalString(m, "resource_group_id")
-	if err != nil {
-		return
-	}
-	obj.AccountID, err = core.UnmarshalString(m, "account_id")
-	if err != nil {
-		return
-	}
-	obj.PolicyID, err = core.UnmarshalString(m, "policy_id")
-	if err != nil {
-		return
-	}
-	obj.State, err = core.UnmarshalString(m, "state")
-	if err != nil {
-		return
-	}
-	obj.TargetTime, err = core.UnmarshalString(m, "target_time")
-	if err != nil {
-		return
-	}
-	obj.CustomProperties, err = core.UnmarshalString(m, "custom_properties")
-	if err != nil {
-		return
-	}
-	obj.CreatedAt, err = core.UnmarshalDateTime(m, "created_at")
-	if err != nil {
-		return
-	}
-	obj.CreatedBy, err = core.UnmarshalString(m, "created_by")
-	if err != nil {
-		return
-	}
-	obj.UpdatedAt, err = core.UnmarshalDateTime(m, "updated_at")
-	if err != nil {
-		return
-	}
-	obj.UpdatedBy, err = core.UnmarshalString(m, "updated_by")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalReclamationSlice unmarshals a slice of Reclamation instances from the specified list of maps.
-func UnmarshalReclamationSlice(s []interface{}) (slice []Reclamation, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'Reclamation'")
-			return
-		}
-		obj, e := UnmarshalReclamation(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalReclamationAsProperty unmarshals an instance of Reclamation that is stored as a property
-// within the specified map.
-func UnmarshalReclamationAsProperty(m map[string]interface{}, propertyName string) (result *Reclamation, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'Reclamation'", propertyName)
-			return
-		}
-		result, err = UnmarshalReclamation(objMap)
-	}
-	return
-}
-
-// UnmarshalReclamationSliceAsProperty unmarshals a slice of Reclamation instances that are stored as a property
-// within the specified map.
-func UnmarshalReclamationSliceAsProperty(m map[string]interface{}, propertyName string) (slice []Reclamation, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'Reclamation'", propertyName)
-			return
-		}
-		slice, err = UnmarshalReclamationSlice(vSlice)
-	}
-	return
-}
-
-// ReclamationsList : A list of reclamations.
-type ReclamationsList struct {
-	// A list of reclamations.
-	Resources []Reclamation `json:"resources,omitempty"`
-}
-
-
-// UnmarshalReclamationsList constructs an instance of ReclamationsList from the specified map.
-func UnmarshalReclamationsList(m map[string]interface{}) (result *ReclamationsList, err error) {
-	obj := new(ReclamationsList)
-	obj.Resources, err = UnmarshalReclamationSliceAsProperty(m, "resources")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalReclamationsListSlice unmarshals a slice of ReclamationsList instances from the specified list of maps.
-func UnmarshalReclamationsListSlice(s []interface{}) (slice []ReclamationsList, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'ReclamationsList'")
-			return
-		}
-		obj, e := UnmarshalReclamationsList(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalReclamationsListAsProperty unmarshals an instance of ReclamationsList that is stored as a property
-// within the specified map.
-func UnmarshalReclamationsListAsProperty(m map[string]interface{}, propertyName string) (result *ReclamationsList, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'ReclamationsList'", propertyName)
-			return
-		}
-		result, err = UnmarshalReclamationsList(objMap)
-	}
-	return
-}
-
-// UnmarshalReclamationsListSliceAsProperty unmarshals a slice of ReclamationsList instances that are stored as a property
-// within the specified map.
-func UnmarshalReclamationsListSliceAsProperty(m map[string]interface{}, propertyName string) (slice []ReclamationsList, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'ReclamationsList'", propertyName)
-			return
-		}
-		slice, err = UnmarshalReclamationsListSlice(vSlice)
-	}
-	return
-}
-
-// ResourceAlias : A resource alias.
-type ResourceAlias struct {
-	// The ID associated with the alias.
-	ID *string `json:"id,omitempty"`
-
-	// When you create a new alias, a globally unique identifier (GUID) is assigned. This GUID is a unique internal
-	// indentifier managed by the resource controller that corresponds to the alias.
-	Guid *string `json:"guid,omitempty"`
-
-	// The full Cloud Resource Name (CRN) associated with the alias. For more information about this format, see [Cloud
-	// Resource Names](https://cloud.ibm.com/docs/overview?topic=overview-crn).
-	Crn *string `json:"crn,omitempty"`
-
-	// When you created a new alias, a relative URL path is created identifying the location of the alias.
-	URL *string `json:"url,omitempty"`
-
-	// The human-readable name of the alias.
-	Name *string `json:"name,omitempty"`
-
-	// An alpha-numeric value identifying the account ID.
-	AccountID *string `json:"account_id,omitempty"`
-
-	// The short ID of the resource group.
-	ResourceGroupID *string `json:"resource_group_id,omitempty"`
-
-	// The long ID (full CRN) of the resource group.
-	ResourceGroupCrn *string `json:"resource_group_crn,omitempty"`
-
-	// The CRN of the target namespace in the specific environment.
-	TargetCrn *string `json:"target_crn,omitempty"`
-
-	// The state of the alias.
-	State *string `json:"state,omitempty"`
-
-	// The short ID of the resource instance that is being aliased.
-	ResourceInstanceID *string `json:"resource_instance_id,omitempty"`
-
-	// The short ID of the instance in the specific target environment, e.g. `service_instance_id` in a given IBM Cloud
-	// environment.
-	RegionInstanceID *string `json:"region_instance_id,omitempty"`
-
-	// The relative path to the instance.
-	ResourceInstanceURL *string `json:"resource_instance_url,omitempty"`
-
-	// The relative path to the resource bindings for the alias.
-	ResourceBindingsURL *string `json:"resource_bindings_url,omitempty"`
-
-	// The relative path to the resource keys for the alias.
-	ResourceKeysURL *string `json:"resource_keys_url,omitempty"`
-
-	// The date when the alias was created.
-	CreatedAt *strfmt.DateTime `json:"created_at,omitempty"`
-
-	// The date when the alias was last updated.
-	UpdatedAt *strfmt.DateTime `json:"updated_at,omitempty"`
-
-	// The date when the alias was deleted.
-	DeletedAt *strfmt.DateTime `json:"deleted_at,omitempty"`
-}
-
-
-// UnmarshalResourceAlias constructs an instance of ResourceAlias from the specified map.
-func UnmarshalResourceAlias(m map[string]interface{}) (result *ResourceAlias, err error) {
-	obj := new(ResourceAlias)
-	obj.ID, err = core.UnmarshalString(m, "id")
-	if err != nil {
-		return
-	}
-	obj.Guid, err = core.UnmarshalString(m, "guid")
-	if err != nil {
-		return
-	}
-	obj.Crn, err = core.UnmarshalString(m, "crn")
-	if err != nil {
-		return
-	}
-	obj.URL, err = core.UnmarshalString(m, "url")
-	if err != nil {
-		return
-	}
-	obj.Name, err = core.UnmarshalString(m, "name")
-	if err != nil {
-		return
-	}
-	obj.AccountID, err = core.UnmarshalString(m, "account_id")
-	if err != nil {
-		return
-	}
-	obj.ResourceGroupID, err = core.UnmarshalString(m, "resource_group_id")
-	if err != nil {
-		return
-	}
-	obj.ResourceGroupCrn, err = core.UnmarshalString(m, "resource_group_crn")
-	if err != nil {
-		return
-	}
-	obj.TargetCrn, err = core.UnmarshalString(m, "target_crn")
-	if err != nil {
-		return
-	}
-	obj.State, err = core.UnmarshalString(m, "state")
-	if err != nil {
-		return
-	}
-	obj.ResourceInstanceID, err = core.UnmarshalString(m, "resource_instance_id")
-	if err != nil {
-		return
-	}
-	obj.RegionInstanceID, err = core.UnmarshalString(m, "region_instance_id")
-	if err != nil {
-		return
-	}
-	obj.ResourceInstanceURL, err = core.UnmarshalString(m, "resource_instance_url")
-	if err != nil {
-		return
-	}
-	obj.ResourceBindingsURL, err = core.UnmarshalString(m, "resource_bindings_url")
-	if err != nil {
-		return
-	}
-	obj.ResourceKeysURL, err = core.UnmarshalString(m, "resource_keys_url")
-	if err != nil {
-		return
-	}
-	obj.CreatedAt, err = core.UnmarshalDateTime(m, "created_at")
-	if err != nil {
-		return
-	}
-	obj.UpdatedAt, err = core.UnmarshalDateTime(m, "updated_at")
-	if err != nil {
-		return
-	}
-	obj.DeletedAt, err = core.UnmarshalDateTime(m, "deleted_at")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalResourceAliasSlice unmarshals a slice of ResourceAlias instances from the specified list of maps.
-func UnmarshalResourceAliasSlice(s []interface{}) (slice []ResourceAlias, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'ResourceAlias'")
-			return
-		}
-		obj, e := UnmarshalResourceAlias(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalResourceAliasAsProperty unmarshals an instance of ResourceAlias that is stored as a property
-// within the specified map.
-func UnmarshalResourceAliasAsProperty(m map[string]interface{}, propertyName string) (result *ResourceAlias, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'ResourceAlias'", propertyName)
-			return
-		}
-		result, err = UnmarshalResourceAlias(objMap)
-	}
-	return
-}
-
-// UnmarshalResourceAliasSliceAsProperty unmarshals a slice of ResourceAlias instances that are stored as a property
-// within the specified map.
-func UnmarshalResourceAliasSliceAsProperty(m map[string]interface{}, propertyName string) (slice []ResourceAlias, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'ResourceAlias'", propertyName)
-			return
-		}
-		slice, err = UnmarshalResourceAliasSlice(vSlice)
-	}
-	return
-}
-
-// ResourceAliasesList : A list of resource aliases.
-type ResourceAliasesList struct {
-	// The URL for requesting the next page of results.
-	NextURL *string `json:"next_url" validate:"required"`
-
-	// A list of resource aliases.
-	Resources []ResourceAlias `json:"resources" validate:"required"`
-
-	// The number of resource aliases in `resources`.
-	RowsCount *float64 `json:"rows_count" validate:"required"`
-}
-
-
-// UnmarshalResourceAliasesList constructs an instance of ResourceAliasesList from the specified map.
-func UnmarshalResourceAliasesList(m map[string]interface{}) (result *ResourceAliasesList, err error) {
-	obj := new(ResourceAliasesList)
-	obj.NextURL, err = core.UnmarshalString(m, "next_url")
-	if err != nil {
-		return
-	}
-	obj.Resources, err = UnmarshalResourceAliasSliceAsProperty(m, "resources")
-	if err != nil {
-		return
-	}
-	obj.RowsCount, err = core.UnmarshalFloat64(m, "rows_count")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalResourceAliasesListSlice unmarshals a slice of ResourceAliasesList instances from the specified list of maps.
-func UnmarshalResourceAliasesListSlice(s []interface{}) (slice []ResourceAliasesList, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'ResourceAliasesList'")
-			return
-		}
-		obj, e := UnmarshalResourceAliasesList(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalResourceAliasesListAsProperty unmarshals an instance of ResourceAliasesList that is stored as a property
-// within the specified map.
-func UnmarshalResourceAliasesListAsProperty(m map[string]interface{}, propertyName string) (result *ResourceAliasesList, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'ResourceAliasesList'", propertyName)
-			return
-		}
-		result, err = UnmarshalResourceAliasesList(objMap)
-	}
-	return
-}
-
-// UnmarshalResourceAliasesListSliceAsProperty unmarshals a slice of ResourceAliasesList instances that are stored as a property
-// within the specified map.
-func UnmarshalResourceAliasesListSliceAsProperty(m map[string]interface{}, propertyName string) (slice []ResourceAliasesList, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'ResourceAliasesList'", propertyName)
-			return
-		}
-		slice, err = UnmarshalResourceAliasesListSlice(vSlice)
-	}
-	return
-}
-
-// ResourceBinding : A resource binding.
-type ResourceBinding struct {
-	// The ID associated with the binding.
-	ID *string `json:"id,omitempty"`
-
-	// When you create a new binding, a globally unique identifier (GUID) is assigned. This GUID is a unique internal
-	// identifier managed by the resource controller that corresponds to the binding.
-	Guid *string `json:"guid,omitempty"`
-
-	// The full Cloud Resource Name (CRN) associated with the binding. For more information about this format, see [Cloud
-	// Resource Names](https://cloud.ibm.com/docs/overview?topic=overview-crn).
-	Crn *string `json:"crn,omitempty"`
-
-	// When you provision a new binding, a relative URL path is created identifying the location of the binding.
-	URL *string `json:"url,omitempty"`
-
-	// The human-readable name of the binding.
-	Name *string `json:"name,omitempty"`
-
-	// An alpha-numeric value identifying the account ID.
-	AccountID *string `json:"account_id,omitempty"`
-
-	// The short ID of the resource group.
-	ResourceGroupID *string `json:"resource_group_id,omitempty"`
-
-	// The CRN of resource alias associated to the binding.
-	SourceCrn *string `json:"source_crn,omitempty"`
-
-	// The CRN of target resource, e.g. application, in a specific environment.
-	TargetCrn *string `json:"target_crn,omitempty"`
-
-	// The short ID of the binding in specific targeted environment, e.g. `service_binding_id` in a given IBM Cloud
-	// environment.
-	RegionBindingID *string `json:"region_binding_id,omitempty"`
-
-	// The state of the binding.
-	State *string `json:"state,omitempty"`
-
-	// The credentials for the binding. Additional key-value pairs are passed through from the resource brokers.  For
-	// additional details, see the service’s documentation.
-	Credentials *Credentials `json:"credentials,omitempty"`
-
-	// Specifies whether the binding’s credentials support IAM.
-	IamCompatible *bool `json:"iam_compatible,omitempty"`
-
-	// The relative path to the resource alias that this binding is associated with.
-	ResourceAliasURL *string `json:"resource_alias_url,omitempty"`
-
-	// The date when the binding was created.
-	CreatedAt *strfmt.DateTime `json:"created_at,omitempty"`
-
-	// The date when the binding was last updated.
-	UpdatedAt *strfmt.DateTime `json:"updated_at,omitempty"`
-
-	// The date when the binding was deleted.
-	DeletedAt *strfmt.DateTime `json:"deleted_at,omitempty"`
-}
-
-
-// UnmarshalResourceBinding constructs an instance of ResourceBinding from the specified map.
-func UnmarshalResourceBinding(m map[string]interface{}) (result *ResourceBinding, err error) {
-	obj := new(ResourceBinding)
-	obj.ID, err = core.UnmarshalString(m, "id")
-	if err != nil {
-		return
-	}
-	obj.Guid, err = core.UnmarshalString(m, "guid")
-	if err != nil {
-		return
-	}
-	obj.Crn, err = core.UnmarshalString(m, "crn")
-	if err != nil {
-		return
-	}
-	obj.URL, err = core.UnmarshalString(m, "url")
-	if err != nil {
-		return
-	}
-	obj.Name, err = core.UnmarshalString(m, "name")
-	if err != nil {
-		return
-	}
-	obj.AccountID, err = core.UnmarshalString(m, "account_id")
-	if err != nil {
-		return
-	}
-	obj.ResourceGroupID, err = core.UnmarshalString(m, "resource_group_id")
-	if err != nil {
-		return
-	}
-	obj.SourceCrn, err = core.UnmarshalString(m, "source_crn")
-	if err != nil {
-		return
-	}
-	obj.TargetCrn, err = core.UnmarshalString(m, "target_crn")
-	if err != nil {
-		return
-	}
-	obj.RegionBindingID, err = core.UnmarshalString(m, "region_binding_id")
-	if err != nil {
-		return
-	}
-	obj.State, err = core.UnmarshalString(m, "state")
-	if err != nil {
-		return
-	}
-	obj.Credentials, err = UnmarshalCredentialsAsProperty(m, "credentials")
-	if err != nil {
-		return
-	}
-	obj.IamCompatible, err = core.UnmarshalBool(m, "iam_compatible")
-	if err != nil {
-		return
-	}
-	obj.ResourceAliasURL, err = core.UnmarshalString(m, "resource_alias_url")
-	if err != nil {
-		return
-	}
-	obj.CreatedAt, err = core.UnmarshalDateTime(m, "created_at")
-	if err != nil {
-		return
-	}
-	obj.UpdatedAt, err = core.UnmarshalDateTime(m, "updated_at")
-	if err != nil {
-		return
-	}
-	obj.DeletedAt, err = core.UnmarshalDateTime(m, "deleted_at")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalResourceBindingSlice unmarshals a slice of ResourceBinding instances from the specified list of maps.
-func UnmarshalResourceBindingSlice(s []interface{}) (slice []ResourceBinding, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'ResourceBinding'")
-			return
-		}
-		obj, e := UnmarshalResourceBinding(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalResourceBindingAsProperty unmarshals an instance of ResourceBinding that is stored as a property
-// within the specified map.
-func UnmarshalResourceBindingAsProperty(m map[string]interface{}, propertyName string) (result *ResourceBinding, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'ResourceBinding'", propertyName)
-			return
-		}
-		result, err = UnmarshalResourceBinding(objMap)
-	}
-	return
-}
-
-// UnmarshalResourceBindingSliceAsProperty unmarshals a slice of ResourceBinding instances that are stored as a property
-// within the specified map.
-func UnmarshalResourceBindingSliceAsProperty(m map[string]interface{}, propertyName string) (slice []ResourceBinding, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'ResourceBinding'", propertyName)
-			return
-		}
-		slice, err = UnmarshalResourceBindingSlice(vSlice)
-	}
-	return
-}
-
-// ResourceBindingPostParameters : Configuration options represented as key-value pairs. Service defined options are passed through to the target
-// resource brokers, whereas platform defined options are not.
-type ResourceBindingPostParameters struct {
-	// An optional platform defined option to reuse an existing IAM serviceId for the role assignment.
-	ServiceidCrn *string `json:"serviceid_crn,omitempty"`
-}
-
-
-// UnmarshalResourceBindingPostParameters constructs an instance of ResourceBindingPostParameters from the specified map.
-func UnmarshalResourceBindingPostParameters(m map[string]interface{}) (result *ResourceBindingPostParameters, err error) {
-	obj := new(ResourceBindingPostParameters)
-	obj.ServiceidCrn, err = core.UnmarshalString(m, "serviceid_crn")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalResourceBindingPostParametersSlice unmarshals a slice of ResourceBindingPostParameters instances from the specified list of maps.
-func UnmarshalResourceBindingPostParametersSlice(s []interface{}) (slice []ResourceBindingPostParameters, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'ResourceBindingPostParameters'")
-			return
-		}
-		obj, e := UnmarshalResourceBindingPostParameters(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalResourceBindingPostParametersAsProperty unmarshals an instance of ResourceBindingPostParameters that is stored as a property
-// within the specified map.
-func UnmarshalResourceBindingPostParametersAsProperty(m map[string]interface{}, propertyName string) (result *ResourceBindingPostParameters, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'ResourceBindingPostParameters'", propertyName)
-			return
-		}
-		result, err = UnmarshalResourceBindingPostParameters(objMap)
-	}
-	return
-}
-
-// UnmarshalResourceBindingPostParametersSliceAsProperty unmarshals a slice of ResourceBindingPostParameters instances that are stored as a property
-// within the specified map.
-func UnmarshalResourceBindingPostParametersSliceAsProperty(m map[string]interface{}, propertyName string) (slice []ResourceBindingPostParameters, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'ResourceBindingPostParameters'", propertyName)
-			return
-		}
-		slice, err = UnmarshalResourceBindingPostParametersSlice(vSlice)
-	}
-	return
-}
-
-// ResourceBindingsList : A list of resource bindings.
-type ResourceBindingsList struct {
-	// The URL for requesting the next page of results.
-	NextURL *string `json:"next_url" validate:"required"`
-
-	// A list of resource bindings.
-	Resources []ResourceBinding `json:"resources" validate:"required"`
-
-	// The number of resource bindings in `resources`.
-	RowsCount *float64 `json:"rows_count" validate:"required"`
-}
-
-
-// UnmarshalResourceBindingsList constructs an instance of ResourceBindingsList from the specified map.
-func UnmarshalResourceBindingsList(m map[string]interface{}) (result *ResourceBindingsList, err error) {
-	obj := new(ResourceBindingsList)
-	obj.NextURL, err = core.UnmarshalString(m, "next_url")
-	if err != nil {
-		return
-	}
-	obj.Resources, err = UnmarshalResourceBindingSliceAsProperty(m, "resources")
-	if err != nil {
-		return
-	}
-	obj.RowsCount, err = core.UnmarshalFloat64(m, "rows_count")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalResourceBindingsListSlice unmarshals a slice of ResourceBindingsList instances from the specified list of maps.
-func UnmarshalResourceBindingsListSlice(s []interface{}) (slice []ResourceBindingsList, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'ResourceBindingsList'")
-			return
-		}
-		obj, e := UnmarshalResourceBindingsList(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalResourceBindingsListAsProperty unmarshals an instance of ResourceBindingsList that is stored as a property
-// within the specified map.
-func UnmarshalResourceBindingsListAsProperty(m map[string]interface{}, propertyName string) (result *ResourceBindingsList, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'ResourceBindingsList'", propertyName)
-			return
-		}
-		result, err = UnmarshalResourceBindingsList(objMap)
-	}
-	return
-}
-
-// UnmarshalResourceBindingsListSliceAsProperty unmarshals a slice of ResourceBindingsList instances that are stored as a property
-// within the specified map.
-func UnmarshalResourceBindingsListSliceAsProperty(m map[string]interface{}, propertyName string) (slice []ResourceBindingsList, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'ResourceBindingsList'", propertyName)
-			return
-		}
-		slice, err = UnmarshalResourceBindingsListSlice(vSlice)
-	}
-	return
-}
-
-// ResourceInstance : A resource instance.
-type ResourceInstance struct {
-	// The ID associated with the instance.
-	ID *string `json:"id,omitempty"`
-
-	// When you create a new resource, a globally unique identifier (GUID) is assigned. This GUID is a unique internal
-	// identifier managed by the resource controller that corresponds to the instance.
-	Guid *string `json:"guid,omitempty"`
-
-	// The full Cloud Resource Name (CRN) associated with the instance. For more information about this format, see [Cloud
-	// Resource Names](https://cloud.ibm.com/docs/overview?topic=overview-crn).
-	Crn *string `json:"crn,omitempty"`
-
-	// When you provision a new resource, a relative URL path is created identifying the location of the instance.
-	URL *string `json:"url,omitempty"`
-
-	// The human-readable name of the instance.
-	Name *string `json:"name,omitempty"`
-
-	// An alpha-numeric value identifying the account ID.
-	AccountID *string `json:"account_id,omitempty"`
-
-	// The short ID of the resource group.
-	ResourceGroupID *string `json:"resource_group_id,omitempty"`
-
-	// The long ID (full CRN) of the resource group.
-	ResourceGroupCrn *string `json:"resource_group_crn,omitempty"`
-
-	// The unique ID of the offering. This value is provided by and stored in the global catalog.
-	ResourceID *string `json:"resource_id,omitempty"`
-
-	// The unique ID of the plan associated with the offering. This value is provided by and stored in the global catalog.
-	ResourcePlanID *string `json:"resource_plan_id,omitempty"`
-
-	// The full deployment CRN as defined in the global catalog. The Cloud Resource Name (CRN) of the deployment location
-	// where the instance is provisioned.
-	TargetCrn *string `json:"target_crn,omitempty"`
-
-	// The current state of the instance. For example, if the instance is deleted, it will return removed.
-	State *string `json:"state,omitempty"`
-
-	// The type of the instance, e.g. `service_instance`.
-	Type *string `json:"type,omitempty"`
-
-	// The sub-type of instance, e.g. `cfaas`.
-	SubType *string `json:"sub_type,omitempty"`
-
-	// A boolean that dictates if the resource instance should be deleted (cleaned up) during the processing of a region
-	// instance delete call.
-	AllowCleanup *bool `json:"allow_cleanup,omitempty"`
-
-	// The status of the last operation requested on the instance.
-	LastOperation map[string]interface{} `json:"last_operation,omitempty"`
-
-	// The resource-broker-provided URL to access administrative features of the instance.
-	DashboardURL *string `json:"dashboard_url,omitempty"`
-
-	// The plan history of the instance.
-	PlanHistory []PlanHistoryItem `json:"plan_history,omitempty"`
-
-	// The relative path to the resource aliases for the instance.
-	ResourceAliasesURL *string `json:"resource_aliases_url,omitempty"`
-
-	// The relative path to the resource bindings for the instance.
-	ResourceBindingsURL *string `json:"resource_bindings_url,omitempty"`
-
-	// The relative path to the resource keys for the instance.
-	ResourceKeysURL *string `json:"resource_keys_url,omitempty"`
-
-	// The date when the instance was created.
-	CreatedAt *strfmt.DateTime `json:"created_at,omitempty"`
-
-	// The date when the instance was last updated.
-	UpdatedAt *strfmt.DateTime `json:"updated_at,omitempty"`
-
-	// The date when the instance was deleted.
-	DeletedAt *strfmt.DateTime `json:"deleted_at,omitempty"`
-}
-
-
-// UnmarshalResourceInstance constructs an instance of ResourceInstance from the specified map.
-func UnmarshalResourceInstance(m map[string]interface{}) (result *ResourceInstance, err error) {
-	obj := new(ResourceInstance)
-	obj.ID, err = core.UnmarshalString(m, "id")
-	if err != nil {
-		return
-	}
-	obj.Guid, err = core.UnmarshalString(m, "guid")
-	if err != nil {
-		return
-	}
-	obj.Crn, err = core.UnmarshalString(m, "crn")
-	if err != nil {
-		return
-	}
-	obj.URL, err = core.UnmarshalString(m, "url")
-	if err != nil {
-		return
-	}
-	obj.Name, err = core.UnmarshalString(m, "name")
-	if err != nil {
-		return
-	}
-	obj.AccountID, err = core.UnmarshalString(m, "account_id")
-	if err != nil {
-		return
-	}
-	obj.ResourceGroupID, err = core.UnmarshalString(m, "resource_group_id")
-	if err != nil {
-		return
-	}
-	obj.ResourceGroupCrn, err = core.UnmarshalString(m, "resource_group_crn")
-	if err != nil {
-		return
-	}
-	obj.ResourceID, err = core.UnmarshalString(m, "resource_id")
-	if err != nil {
-		return
-	}
-	obj.ResourcePlanID, err = core.UnmarshalString(m, "resource_plan_id")
-	if err != nil {
-		return
-	}
-	obj.TargetCrn, err = core.UnmarshalString(m, "target_crn")
-	if err != nil {
-		return
-	}
-	obj.State, err = core.UnmarshalString(m, "state")
-	if err != nil {
-		return
-	}
-	obj.Type, err = core.UnmarshalString(m, "type")
-	if err != nil {
-		return
-	}
-	obj.SubType, err = core.UnmarshalString(m, "sub_type")
-	if err != nil {
-		return
-	}
-	obj.AllowCleanup, err = core.UnmarshalBool(m, "allow_cleanup")
-	if err != nil {
-		return
-	}
-	obj.DashboardURL, err = core.UnmarshalString(m, "dashboard_url")
-	if err != nil {
-		return
-	}
-	obj.PlanHistory, err = UnmarshalPlanHistoryItemSliceAsProperty(m, "plan_history")
-	if err != nil {
-		return
-	}
-	obj.ResourceAliasesURL, err = core.UnmarshalString(m, "resource_aliases_url")
-	if err != nil {
-		return
-	}
-	obj.ResourceBindingsURL, err = core.UnmarshalString(m, "resource_bindings_url")
-	if err != nil {
-		return
-	}
-	obj.ResourceKeysURL, err = core.UnmarshalString(m, "resource_keys_url")
-	if err != nil {
-		return
-	}
-	obj.CreatedAt, err = core.UnmarshalDateTime(m, "created_at")
-	if err != nil {
-		return
-	}
-	obj.UpdatedAt, err = core.UnmarshalDateTime(m, "updated_at")
-	if err != nil {
-		return
-	}
-	obj.DeletedAt, err = core.UnmarshalDateTime(m, "deleted_at")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalResourceInstanceSlice unmarshals a slice of ResourceInstance instances from the specified list of maps.
-func UnmarshalResourceInstanceSlice(s []interface{}) (slice []ResourceInstance, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'ResourceInstance'")
-			return
-		}
-		obj, e := UnmarshalResourceInstance(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalResourceInstanceAsProperty unmarshals an instance of ResourceInstance that is stored as a property
-// within the specified map.
-func UnmarshalResourceInstanceAsProperty(m map[string]interface{}, propertyName string) (result *ResourceInstance, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'ResourceInstance'", propertyName)
-			return
-		}
-		result, err = UnmarshalResourceInstance(objMap)
-	}
-	return
-}
-
-// UnmarshalResourceInstanceSliceAsProperty unmarshals a slice of ResourceInstance instances that are stored as a property
-// within the specified map.
-func UnmarshalResourceInstanceSliceAsProperty(m map[string]interface{}, propertyName string) (slice []ResourceInstance, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'ResourceInstance'", propertyName)
-			return
-		}
-		slice, err = UnmarshalResourceInstanceSlice(vSlice)
-	}
-	return
-}
-
-// ResourceInstancesList : A list of resource instances.
-type ResourceInstancesList struct {
-	// The URL for requesting the next page of results.
-	NextURL *string `json:"next_url" validate:"required"`
-
-	// A list of resource instances.
-	Resources []ResourceInstance `json:"resources" validate:"required"`
-
-	// The number of resource instances in `resources`.
-	RowsCount *int64 `json:"rows_count" validate:"required"`
-}
-
-
-// UnmarshalResourceInstancesList constructs an instance of ResourceInstancesList from the specified map.
-func UnmarshalResourceInstancesList(m map[string]interface{}) (result *ResourceInstancesList, err error) {
-	obj := new(ResourceInstancesList)
-	obj.NextURL, err = core.UnmarshalString(m, "next_url")
-	if err != nil {
-		return
-	}
-	obj.Resources, err = UnmarshalResourceInstanceSliceAsProperty(m, "resources")
-	if err != nil {
-		return
-	}
-	obj.RowsCount, err = core.UnmarshalInt64(m, "rows_count")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalResourceInstancesListSlice unmarshals a slice of ResourceInstancesList instances from the specified list of maps.
-func UnmarshalResourceInstancesListSlice(s []interface{}) (slice []ResourceInstancesList, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'ResourceInstancesList'")
-			return
-		}
-		obj, e := UnmarshalResourceInstancesList(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalResourceInstancesListAsProperty unmarshals an instance of ResourceInstancesList that is stored as a property
-// within the specified map.
-func UnmarshalResourceInstancesListAsProperty(m map[string]interface{}, propertyName string) (result *ResourceInstancesList, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'ResourceInstancesList'", propertyName)
-			return
-		}
-		result, err = UnmarshalResourceInstancesList(objMap)
-	}
-	return
-}
-
-// UnmarshalResourceInstancesListSliceAsProperty unmarshals a slice of ResourceInstancesList instances that are stored as a property
-// within the specified map.
-func UnmarshalResourceInstancesListSliceAsProperty(m map[string]interface{}, propertyName string) (slice []ResourceInstancesList, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'ResourceInstancesList'", propertyName)
-			return
-		}
-		slice, err = UnmarshalResourceInstancesListSlice(vSlice)
-	}
-	return
-}
-
-// ResourceKey : A resource key.
-type ResourceKey struct {
-	// The ID associated with the key.
-	ID *string `json:"id,omitempty"`
-
-	// When you create a new key, a globally unique identifier (GUID) is assigned. This GUID is a unique internal
-	// identifier managed by the resource controller that corresponds to the key.
-	Guid *string `json:"guid,omitempty"`
-
-	// The full Cloud Resource Name (CRN) associated with the key. For more information about this format, see [Cloud
-	// Resource Names](https://cloud.ibm.com/docs/overview?topic=overview-crn).
-	Crn *string `json:"crn,omitempty"`
-
-	// When you created a new key, a relative URL path is created identifying the location of the key.
-	URL *string `json:"url,omitempty"`
-
-	// The human-readable name of the key.
-	Name *string `json:"name,omitempty"`
-
-	// An alpha-numeric value identifying the account ID.
-	AccountID *string `json:"account_id,omitempty"`
-
-	// The short ID of the resource group.
-	ResourceGroupID *string `json:"resource_group_id,omitempty"`
-
-	// The CRN of resource instance or alias associated to the key.
-	SourceCrn *string `json:"source_crn,omitempty"`
-
-	// The state of the key.
-	State *string `json:"state,omitempty"`
-
-	// The credentials for the key. Additional key-value pairs are passed through from the resource brokers.  Refer to
-	// service’s documentation for additional details.
-	Credentials *Credentials `json:"credentials,omitempty"`
-
-	// Specifies whether the key’s credentials support IAM.
-	IamCompatible *bool `json:"iam_compatible,omitempty"`
-
-	// The relative path to the resource.
-	ResourceInstanceURL *string `json:"resource_instance_url,omitempty"`
-
-	// The date when the key was created.
-	CreatedAt *strfmt.DateTime `json:"created_at,omitempty"`
-
-	// The date when the key was last updated.
-	UpdatedAt *strfmt.DateTime `json:"updated_at,omitempty"`
-
-	// The date when the key was deleted.
-	DeletedAt *strfmt.DateTime `json:"deleted_at,omitempty"`
-}
-
-
-// UnmarshalResourceKey constructs an instance of ResourceKey from the specified map.
-func UnmarshalResourceKey(m map[string]interface{}) (result *ResourceKey, err error) {
-	obj := new(ResourceKey)
-	obj.ID, err = core.UnmarshalString(m, "id")
-	if err != nil {
-		return
-	}
-	obj.Guid, err = core.UnmarshalString(m, "guid")
-	if err != nil {
-		return
-	}
-	obj.Crn, err = core.UnmarshalString(m, "crn")
-	if err != nil {
-		return
-	}
-	obj.URL, err = core.UnmarshalString(m, "url")
-	if err != nil {
-		return
-	}
-	obj.Name, err = core.UnmarshalString(m, "name")
-	if err != nil {
-		return
-	}
-	obj.AccountID, err = core.UnmarshalString(m, "account_id")
-	if err != nil {
-		return
-	}
-	obj.ResourceGroupID, err = core.UnmarshalString(m, "resource_group_id")
-	if err != nil {
-		return
-	}
-	obj.SourceCrn, err = core.UnmarshalString(m, "source_crn")
-	if err != nil {
-		return
-	}
-	obj.State, err = core.UnmarshalString(m, "state")
-	if err != nil {
-		return
-	}
-	obj.Credentials, err = UnmarshalCredentialsAsProperty(m, "credentials")
-	if err != nil {
-		return
-	}
-	obj.IamCompatible, err = core.UnmarshalBool(m, "iam_compatible")
-	if err != nil {
-		return
-	}
-	obj.ResourceInstanceURL, err = core.UnmarshalString(m, "resource_instance_url")
-	if err != nil {
-		return
-	}
-	obj.CreatedAt, err = core.UnmarshalDateTime(m, "created_at")
-	if err != nil {
-		return
-	}
-	obj.UpdatedAt, err = core.UnmarshalDateTime(m, "updated_at")
-	if err != nil {
-		return
-	}
-	obj.DeletedAt, err = core.UnmarshalDateTime(m, "deleted_at")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalResourceKeySlice unmarshals a slice of ResourceKey instances from the specified list of maps.
-func UnmarshalResourceKeySlice(s []interface{}) (slice []ResourceKey, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'ResourceKey'")
-			return
-		}
-		obj, e := UnmarshalResourceKey(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalResourceKeyAsProperty unmarshals an instance of ResourceKey that is stored as a property
-// within the specified map.
-func UnmarshalResourceKeyAsProperty(m map[string]interface{}, propertyName string) (result *ResourceKey, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'ResourceKey'", propertyName)
-			return
-		}
-		result, err = UnmarshalResourceKey(objMap)
-	}
-	return
-}
-
-// UnmarshalResourceKeySliceAsProperty unmarshals a slice of ResourceKey instances that are stored as a property
-// within the specified map.
-func UnmarshalResourceKeySliceAsProperty(m map[string]interface{}, propertyName string) (slice []ResourceKey, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'ResourceKey'", propertyName)
-			return
-		}
-		slice, err = UnmarshalResourceKeySlice(vSlice)
-	}
-	return
-}
-
-// ResourceKeyPostParameters : Configuration options represented as key-value pairs. Service defined options are passed through to the target
-// resource brokers, whereas platform defined options are not.
-type ResourceKeyPostParameters struct {
-	// An optional platform defined option to reuse an existing IAM serviceId for the role assignment.
-	ServiceidCrn *string `json:"serviceid_crn,omitempty"`
-}
-
-
-// UnmarshalResourceKeyPostParameters constructs an instance of ResourceKeyPostParameters from the specified map.
-func UnmarshalResourceKeyPostParameters(m map[string]interface{}) (result *ResourceKeyPostParameters, err error) {
-	obj := new(ResourceKeyPostParameters)
-	obj.ServiceidCrn, err = core.UnmarshalString(m, "serviceid_crn")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalResourceKeyPostParametersSlice unmarshals a slice of ResourceKeyPostParameters instances from the specified list of maps.
-func UnmarshalResourceKeyPostParametersSlice(s []interface{}) (slice []ResourceKeyPostParameters, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'ResourceKeyPostParameters'")
-			return
-		}
-		obj, e := UnmarshalResourceKeyPostParameters(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalResourceKeyPostParametersAsProperty unmarshals an instance of ResourceKeyPostParameters that is stored as a property
-// within the specified map.
-func UnmarshalResourceKeyPostParametersAsProperty(m map[string]interface{}, propertyName string) (result *ResourceKeyPostParameters, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'ResourceKeyPostParameters'", propertyName)
-			return
-		}
-		result, err = UnmarshalResourceKeyPostParameters(objMap)
-	}
-	return
-}
-
-// UnmarshalResourceKeyPostParametersSliceAsProperty unmarshals a slice of ResourceKeyPostParameters instances that are stored as a property
-// within the specified map.
-func UnmarshalResourceKeyPostParametersSliceAsProperty(m map[string]interface{}, propertyName string) (slice []ResourceKeyPostParameters, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'ResourceKeyPostParameters'", propertyName)
-			return
-		}
-		slice, err = UnmarshalResourceKeyPostParametersSlice(vSlice)
-	}
-	return
-}
-
-// ResourceKeysList : A list of resource keys.
-type ResourceKeysList struct {
-	// The URL for requesting the next page of results.
-	NextURL *string `json:"next_url" validate:"required"`
-
-	// A list of resource keys.
-	Resources []ResourceKey `json:"resources" validate:"required"`
-
-	// The number of resource keys in `resources`.
-	RowsCount *float64 `json:"rows_count" validate:"required"`
-}
-
-
-// UnmarshalResourceKeysList constructs an instance of ResourceKeysList from the specified map.
-func UnmarshalResourceKeysList(m map[string]interface{}) (result *ResourceKeysList, err error) {
-	obj := new(ResourceKeysList)
-	obj.NextURL, err = core.UnmarshalString(m, "next_url")
-	if err != nil {
-		return
-	}
-	obj.Resources, err = UnmarshalResourceKeySliceAsProperty(m, "resources")
-	if err != nil {
-		return
-	}
-	obj.RowsCount, err = core.UnmarshalFloat64(m, "rows_count")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalResourceKeysListSlice unmarshals a slice of ResourceKeysList instances from the specified list of maps.
-func UnmarshalResourceKeysListSlice(s []interface{}) (slice []ResourceKeysList, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'ResourceKeysList'")
-			return
-		}
-		obj, e := UnmarshalResourceKeysList(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalResourceKeysListAsProperty unmarshals an instance of ResourceKeysList that is stored as a property
-// within the specified map.
-func UnmarshalResourceKeysListAsProperty(m map[string]interface{}, propertyName string) (result *ResourceKeysList, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'ResourceKeysList'", propertyName)
-			return
-		}
-		result, err = UnmarshalResourceKeysList(objMap)
-	}
-	return
-}
-
-// UnmarshalResourceKeysListSliceAsProperty unmarshals a slice of ResourceKeysList instances that are stored as a property
-// within the specified map.
-func UnmarshalResourceKeysListSliceAsProperty(m map[string]interface{}, propertyName string) (slice []ResourceKeysList, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'ResourceKeysList'", propertyName)
-			return
-		}
-		slice, err = UnmarshalResourceKeysListSlice(vSlice)
-	}
-	return
-}
-
-// RunReclamationActionOptions : The RunReclamationAction options.
-type RunReclamationActionOptions struct {
-	// The ID associated with the reclamation.
-	ID *string `json:"id" validate:"required"`
-
-	// The reclamation action name. Specify `reclaim` to delete a resource, or `restore` to restore a resource.
-	ActionName *string `json:"action_name" validate:"required"`
-
-	// The request initiator, if different from the request token.
-	RequestBy *string `json:"request_by,omitempty"`
-
-	// A comment to describe the action.
-	Comment *string `json:"comment,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewRunReclamationActionOptions : Instantiate RunReclamationActionOptions
-func (*ResourceControllerV2) NewRunReclamationActionOptions(id string, actionName string) *RunReclamationActionOptions {
-	return &RunReclamationActionOptions{
-		ID: core.StringPtr(id),
-		ActionName: core.StringPtr(actionName),
-	}
-}
-
-// SetID : Allow user to set ID
-func (options *RunReclamationActionOptions) SetID(id string) *RunReclamationActionOptions {
-	options.ID = core.StringPtr(id)
-	return options
-}
-
-// SetActionName : Allow user to set ActionName
-func (options *RunReclamationActionOptions) SetActionName(actionName string) *RunReclamationActionOptions {
-	options.ActionName = core.StringPtr(actionName)
-	return options
-}
-
-// SetRequestBy : Allow user to set RequestBy
-func (options *RunReclamationActionOptions) SetRequestBy(requestBy string) *RunReclamationActionOptions {
-	options.RequestBy = core.StringPtr(requestBy)
-	return options
-}
-
-// SetComment : Allow user to set Comment
-func (options *RunReclamationActionOptions) SetComment(comment string) *RunReclamationActionOptions {
-	options.Comment = core.StringPtr(comment)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *RunReclamationActionOptions) SetHeaders(param map[string]string) *RunReclamationActionOptions {
-	options.Headers = param
-	return options
-}
-
-// UpdateResourceAliasOptions : The UpdateResourceAlias options.
-type UpdateResourceAliasOptions struct {
-	// The short or long ID of the alias.
-	ID *string `json:"id" validate:"required"`
-
-	// The new name of the alias. Must be 180 characters or less and cannot include any special characters other than
-	// `(space) - . _ :`.
-	Name *string `json:"name" validate:"required"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewUpdateResourceAliasOptions : Instantiate UpdateResourceAliasOptions
-func (*ResourceControllerV2) NewUpdateResourceAliasOptions(id string, name string) *UpdateResourceAliasOptions {
-	return &UpdateResourceAliasOptions{
-		ID: core.StringPtr(id),
-		Name: core.StringPtr(name),
-	}
-}
-
-// SetID : Allow user to set ID
-func (options *UpdateResourceAliasOptions) SetID(id string) *UpdateResourceAliasOptions {
-	options.ID = core.StringPtr(id)
-	return options
-}
-
-// SetName : Allow user to set Name
-func (options *UpdateResourceAliasOptions) SetName(name string) *UpdateResourceAliasOptions {
-	options.Name = core.StringPtr(name)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *UpdateResourceAliasOptions) SetHeaders(param map[string]string) *UpdateResourceAliasOptions {
-	options.Headers = param
-	return options
-}
-
-// UpdateResourceBindingOptions : The UpdateResourceBinding options.
-type UpdateResourceBindingOptions struct {
-	// The short or long ID of the binding.
-	ID *string `json:"id" validate:"required"`
-
-	// The new name of the binding. Must be 180 characters or less and cannot include any special characters other than
-	// `(space) - . _ :`.
-	Name *string `json:"name" validate:"required"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewUpdateResourceBindingOptions : Instantiate UpdateResourceBindingOptions
-func (*ResourceControllerV2) NewUpdateResourceBindingOptions(id string, name string) *UpdateResourceBindingOptions {
-	return &UpdateResourceBindingOptions{
-		ID: core.StringPtr(id),
-		Name: core.StringPtr(name),
-	}
-}
-
-// SetID : Allow user to set ID
-func (options *UpdateResourceBindingOptions) SetID(id string) *UpdateResourceBindingOptions {
-	options.ID = core.StringPtr(id)
-	return options
-}
-
-// SetName : Allow user to set Name
-func (options *UpdateResourceBindingOptions) SetName(name string) *UpdateResourceBindingOptions {
-	options.Name = core.StringPtr(name)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *UpdateResourceBindingOptions) SetHeaders(param map[string]string) *UpdateResourceBindingOptions {
-	options.Headers = param
-	return options
-}
-
-// UpdateResourceInstanceOptions : The UpdateResourceInstance options.
-type UpdateResourceInstanceOptions struct {
-	// The short or long ID of the instance.
-	ID *string `json:"id" validate:"required"`
-
-	// The new name of the instance. Must be 180 characters or less and cannot include any special characters other than
-	// `(space) - . _ :`.
-	Name *string `json:"name,omitempty"`
-
-	// The new configuration options for the instance.
-	Parameters map[string]interface{} `json:"parameters,omitempty"`
-
-	// The unique ID of the plan associated with the offering. This value is provided by and stored in the global catalog.
-	ResourcePlanID *string `json:"resource_plan_id,omitempty"`
-
-	// A boolean that dictates if the resource instance should be deleted (cleaned up) during the processing of a region
-	// instance delete call.
-	AllowCleanup *bool `json:"allow_cleanup,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewUpdateResourceInstanceOptions : Instantiate UpdateResourceInstanceOptions
-func (*ResourceControllerV2) NewUpdateResourceInstanceOptions(id string) *UpdateResourceInstanceOptions {
-	return &UpdateResourceInstanceOptions{
-		ID: core.StringPtr(id),
-	}
-}
-
-// SetID : Allow user to set ID
-func (options *UpdateResourceInstanceOptions) SetID(id string) *UpdateResourceInstanceOptions {
-	options.ID = core.StringPtr(id)
-	return options
-}
-
-// SetName : Allow user to set Name
-func (options *UpdateResourceInstanceOptions) SetName(name string) *UpdateResourceInstanceOptions {
-	options.Name = core.StringPtr(name)
-	return options
-}
-
-// SetParameters : Allow user to set Parameters
-func (options *UpdateResourceInstanceOptions) SetParameters(parameters map[string]interface{}) *UpdateResourceInstanceOptions {
-	options.Parameters = parameters
-	return options
-}
-
-// SetResourcePlanID : Allow user to set ResourcePlanID
-func (options *UpdateResourceInstanceOptions) SetResourcePlanID(resourcePlanID string) *UpdateResourceInstanceOptions {
-	options.ResourcePlanID = core.StringPtr(resourcePlanID)
-	return options
-}
-
-// SetAllowCleanup : Allow user to set AllowCleanup
-func (options *UpdateResourceInstanceOptions) SetAllowCleanup(allowCleanup bool) *UpdateResourceInstanceOptions {
-	options.AllowCleanup = core.BoolPtr(allowCleanup)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *UpdateResourceInstanceOptions) SetHeaders(param map[string]string) *UpdateResourceInstanceOptions {
-	options.Headers = param
-	return options
-}
-
-// UpdateResourceKeyOptions : The UpdateResourceKey options.
-type UpdateResourceKeyOptions struct {
-	// The short or long ID of the key.
-	ID *string `json:"id" validate:"required"`
-
-	// The new name of the key. Must be 180 characters or less and cannot include any special characters other than
-	// `(space) - . _ :`.
-	Name *string `json:"name" validate:"required"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewUpdateResourceKeyOptions : Instantiate UpdateResourceKeyOptions
-func (*ResourceControllerV2) NewUpdateResourceKeyOptions(id string, name string) *UpdateResourceKeyOptions {
-	return &UpdateResourceKeyOptions{
-		ID: core.StringPtr(id),
-		Name: core.StringPtr(name),
-	}
-}
-
-// SetID : Allow user to set ID
-func (options *UpdateResourceKeyOptions) SetID(id string) *UpdateResourceKeyOptions {
-	options.ID = core.StringPtr(id)
-	return options
-}
-
-// SetName : Allow user to set Name
-func (options *UpdateResourceKeyOptions) SetName(name string) *UpdateResourceKeyOptions {
-	options.Name = core.StringPtr(name)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *UpdateResourceKeyOptions) SetHeaders(param map[string]string) *UpdateResourceKeyOptions {
-	options.Headers = param
-	return options
-}
diff --git a/resourcecontrollerv2/resource_controller_v2_integration_test.go b/resourcecontrollerv2/resource_controller_v2_integration_test.go
deleted file mode 100644
index 2f470d13..00000000
--- a/resourcecontrollerv2/resource_controller_v2_integration_test.go
+++ /dev/null
@@ -1,236 +0,0 @@
-// +build integrationSKIP
-
-package resourcecontrollerv2_test
-
-/**
- * Copyright 2020 IBM All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import (
-	"log"
-	"os"
-	"testing"
-	"time"
-
-	"github.com/IBM/go-sdk-core/v3/core"
-	"github.com/joho/godotenv"
-	"github.com/stretchr/testify/assert"
-	"github.ibm.com/ibmcloud/platform-services-go-sdk/resourcecontrollerv2"
-)
-
-var service *resourcecontrollerv2.ResourceControllerV2
-var serviceErr error
-
-func init() {
-	err := godotenv.Load("../.env")
-	if err != nil {
-		log.Fatal("Error loading .env file")
-	}
-
-	// Create the authenticator.
-	authenticator := &core.IamAuthenticator{
-		ApiKey: os.Getenv("IAMAPIKEY"),
-	}
-
-	service, serviceErr = resourcecontrollerv2.NewResourceControllerV2(
-		&resourcecontrollerv2.ResourceControllerV2Options{
-			Authenticator: authenticator,
-		})
-}
-
-func shouldSkipTest(t *testing.T) {
-	if service == nil {
-		t.Skip("Skipping test as service credentials are missing")
-	}
-}
-
-func TestResourceInstanceOperations(t *testing.T) {
-	shouldSkipTest(t)
-
-	// List of resource instances - Test 1
-	_, _, returnValueErr := service.ListResourceInstances(nil)
-	assert.NotNil(t, returnValueErr)
-
-	listResourceInstancesOptions := service.NewListResourceInstancesOptions()
-	listResourceInstancesOptions.SetGuid("")
-	listResourceInstancesOptions.SetName("")
-	listResourceInstancesOptions.SetResourceGroupID("")
-	listResourceInstancesOptions.SetResourceID("")
-	listResourceInstancesOptions.SetResourcePlanID("")
-
-	result, response, reqErr := service.ListResourceInstances(listResourceInstancesOptions)
-	assert.NotNil(t, result)
-	assert.NotNil(t, response)
-	assert.Equal(t, 200, response.GetStatusCode())
-	assert.Nil(t, reqErr)
-
-	// Create a new resource instance - Test 2
-	name := "test-integration-cos-instance"
-	target := "bluemix-global"
-	resourceGroup := os.Getenv("RESOURCE_GROUP")
-	resourcePlanID := os.Getenv("RESOURCE_PLAN_ID")
-
-	rcInstanceOptions := service.NewCreateResourceInstanceOptions(name, target, resourceGroup, resourcePlanID)
-	rcInstanceOptions.SetTags([]string{"integration-test"})
-	rcInstanceOptions.SetParameters(map[string]interface{}{})
-	rcInstanceOptions.SetHeaders(map[string]string{"Content-Type": "application/json"})
-
-	assert.NotNil(t, rcInstanceOptions)
-
-	resourceInstance, response, reqErr := service.CreateResourceInstance(rcInstanceOptions)
-	assert.Nil(t, reqErr)
-	assert.NotNil(t, resourceInstance)
-	assert.NotNil(t, response)
-	assert.Equal(t, 201, response.GetStatusCode())
-
-	// Get a resource by ID - Test 3
-	resourceID := resourceInstance.Guid
-
-	getResourceByIdOptions := service.NewGetResourceInstanceOptions(*resourceID)
-
-	resourceInstance, response, reqErr = service.GetResourceInstance(getResourceByIdOptions)
-	assert.Nil(t, reqErr)
-	assert.NotNil(t, resourceInstance)
-	assert.NotNil(t, response)
-	assert.Equal(t, 200, response.GetStatusCode())
-
-	// Update resource instance by ID - Test 4
-	name = "update-integration-cos-instance"
-	target = "bluemix-global"
-	resourcePlanID = os.Getenv("RESOURCE_PLAN_ID")
-
-	updateResourceInstaceOptions := service.NewUpdateResourceInstanceOptions(*resourceID)
-	updateResourceInstaceOptions.SetName(name)
-	updateResourceInstaceOptions.SetResourcePlanID(resourcePlanID)
-	updateResourceInstaceOptions.SetParameters(map[string]interface{}{})
-
-	resourceInstance, response, reqErr = service.UpdateResourceInstance(updateResourceInstaceOptions)
-	assert.Nil(t, reqErr)
-	assert.NotNil(t, resourceInstance)
-	assert.NotNil(t, response)
-	assert.Equal(t, 200, response.GetStatusCode())
-
-	updateName := resourceInstance.Name
-	assert.Equal(t, name, updateName)
-
-	// Delete resource instance - Test 5
-	time.Sleep(20 * time.Second) // Allows time for the update of the resource
-	deleteResourceInstanceOptions := service.NewDeleteResourceInstanceOptions(*resourceID)
-
-	resourceInstance, response, reqErr = service.DeleteResourceInstance(deleteResourceInstanceOptions)
-	assert.Nil(t, reqErr)
-	assert.NotNil(t, response)
-	
-	// Apparently, the DeleteResourceInstance operation could return either a 202 or a 204 status code.
-	// For 202, the API definition defines the response as a ResourceInstance.
-	// For 204, there is no response object.
-	// assert.Equal(t, 204, response.GetStatusCode())
-	if response.GetStatusCode() == 204 {
-		assert.Nil(t, resourceInstance)
-	} else {
-		assert.Equal(t, 202, response.GetStatusCode())
-		assert.NotNil(t, resourceInstance)
-	}
-}
-
-func TestResourceKeysOperations(t *testing.T) {
-	shouldSkipTest(t)
-
-	// List of resource instances - Test 1
-	_, _, returnValueErr := service.ListResourceKeys(nil)
-	assert.NotNil(t, returnValueErr)
-
-	listResourceKeysOptions := service.NewListResourceKeysOptions()
-	listResourceKeysOptions.SetGuid("")
-	listResourceKeysOptions.SetName("")
-	listResourceKeysOptions.SetResourceGroupID("")
-	listResourceKeysOptions.SetResourceID("")
-
-	result, response, reqErr := service.ListResourceKeys(listResourceKeysOptions)
-	assert.NotNil(t, result)
-	assert.NotNil(t, response)
-	assert.Equal(t, 200, response.GetStatusCode())
-	assert.Nil(t, reqErr)
-
-	// Create a new resource instance - Preq for Test 2
-	name := "test-integration-cos-instance"
-	target := "bluemix-global"
-	resourceGroup := os.Getenv("RESOURCE_GROUP")
-	resourcePlanID := os.Getenv("RESOURCE_PLAN_ID")
-
-	rcInstanceOptions := service.NewCreateResourceInstanceOptions(name, target, resourceGroup, resourcePlanID)
-	rcInstanceOptions.SetTags([]string{"integration-test"})
-
-	resourceInstance, response, reqErr := service.CreateResourceInstance(rcInstanceOptions)
-	assert.Nil(t, reqErr)
-	assert.NotNil(t, resourceInstance)
-	assert.NotNil(t, response)
-	assert.Equal(t, 201, response.GetStatusCode())
-
-	resourceID := resourceInstance.Guid
-	resourceCrn := resourceInstance.Crn
-	
-	roleCrn := "Writer"
-	name = "integration-test-key"
-
-	rcKeyOptions := service.NewCreateResourceKeyOptions(name, *resourceCrn)
-	rcKeyOptions.SetRole(roleCrn)
-
-	resourceKey, response, reqErr := service.CreateResourceKey(rcKeyOptions)
-	assert.Nil(t, reqErr)
-	assert.NotNil(t, resourceKey)
-	assert.NotNil(t, response)
-	assert.Equal(t, 201, response.GetStatusCode())
-
-	// Get resource key by ID - Test 3
-	resourceKeyID := resourceKey.Guid
-
-	getRCKeyOptions := service.NewGetResourceKeyOptions(*resourceKeyID)
-
-	resourceKey, response, reqErr = service.GetResourceKey(getRCKeyOptions)
-	assert.Nil(t, reqErr)
-	assert.NotNil(t, resourceKey)
-	assert.NotNil(t, response)
-	assert.Equal(t, 200, response.GetStatusCode())
-	assert.Equal(t, name, *resourceKey.Name)
-
-	// Update resource key by ID - Test 4
-	updateName := "update-test-key"
-	updateRCKeyOptions := service.NewUpdateResourceKeyOptions(*resourceKeyID, updateName)
-
-	resourceKey, response, reqErr = service.UpdateResourceKey(updateRCKeyOptions)
-	assert.Nil(t, reqErr)
-	assert.NotNil(t, resourceKey)
-	assert.NotNil(t, response)
-	assert.Equal(t, 200, response.GetStatusCode())
-	assert.Equal(t, updateName, *resourceKey.Name)
-
-	// Delete resource key - Test 5
-	deleteRCKeyOptions := service.NewDeleteResourceKeyOptions(*resourceKeyID)
-
-	response, reqErr = service.DeleteResourceKey(deleteRCKeyOptions)
-	assert.Nil(t, reqErr)
-	assert.NotNil(t, response)
-	assert.Equal(t, 204, response.GetStatusCode())
-
-	// Delete resource instance - Postreq
-	time.Sleep(20 * time.Second) // Allows time for the delete operation
-	deleteResourceInstanceOptions := service.NewDeleteResourceInstanceOptions(*resourceID)
-
-	resourceInstance, response, reqErr = service.DeleteResourceInstance(deleteResourceInstanceOptions)
-	assert.Nil(t, reqErr)
-	assert.NotNil(t, response)
-	assert.Equal(t, 204, response.GetStatusCode())
-}
diff --git a/resourcecontrollerv2/resource_controller_v2_suite_test.go b/resourcecontrollerv2/resource_controller_v2_suite_test.go
deleted file mode 100644
index cee526ea..00000000
--- a/resourcecontrollerv2/resource_controller_v2_suite_test.go
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * (C) Copyright IBM Corp. 2020.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package resourcecontrollerv2_test
-
-import (
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-	"testing"
-)
-
-func TestResourceControllerV2(t *testing.T) {
-	RegisterFailHandler(Fail)
-	RunSpecs(t, "ResourceControllerV2 Suite")
-}
diff --git a/resourcecontrollerv2/resource_controller_v2_test.go b/resourcecontrollerv2/resource_controller_v2_test.go
deleted file mode 100644
index 88f5d43e..00000000
--- a/resourcecontrollerv2/resource_controller_v2_test.go
+++ /dev/null
@@ -1,1231 +0,0 @@
-/**
- * (C) Copyright IBM Corp. 2020.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package resourcecontrollerv2_test
-
-import (
-	"bytes"
-	"fmt"
-	"github.com/IBM/go-sdk-core/v3/core"
-	"github.com/go-openapi/strfmt"
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-	"github.ibm.com/ibmcloud/platform-services-go-sdk/resourcecontrollerv2"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"net/http/httptest"
-	"time"
-)
-
-var _ = Describe(`ResourceControllerV2`, func() {
-	Describe(`ListResourceInstances(listResourceInstancesOptions *ListResourceInstancesOptions)`, func() {
-		bearerToken := "0ui9876453"
-		listResourceInstancesPath := "/resource_instances"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(listResourceInstancesPath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				Expect(req.URL.Query()["guid"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["name"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["resource_group_id"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["resource_id"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["resource_plan_id"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["type"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["sub_type"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["limit"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["updated_from"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["updated_to"]).To(Equal([]string{"testString"}))
-
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"next_url": "NextURL", "resources": [{"id": "ID", "guid": "Guid", "crn": "Crn", "url": "URL", "name": "Name", "account_id": "AccountID", "resource_group_id": "ResourceGroupID", "resource_group_crn": "ResourceGroupCrn", "resource_id": "ResourceID", "resource_plan_id": "ResourcePlanID", "target_crn": "TargetCrn", "state": "State", "type": "Type", "sub_type": "SubType", "allow_cleanup": true, "last_operation": {"mapKey": {"anyKey": "anyValue"}}, "dashboard_url": "DashboardURL", "plan_history": [{"resource_plan_id": "ResourcePlanID", "start_date": "2019-01-01T12:00:00"}], "resource_aliases_url": "ResourceAliasesURL", "resource_bindings_url": "ResourceBindingsURL", "resource_keys_url": "ResourceKeysURL", "created_at": "2019-01-01T12:00:00", "updated_at": "2019-01-01T12:00:00", "deleted_at": "2019-01-01T12:00:00"}], "rows_count": 9}`)
-			}))
-			It(`Invoke ListResourceInstances successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := resourcecontrollerv2.NewResourceControllerV2(&resourcecontrollerv2.ResourceControllerV2Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.ListResourceInstances(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the ListResourceInstancesOptions model
-				listResourceInstancesOptionsModel := new(resourcecontrollerv2.ListResourceInstancesOptions)
-				listResourceInstancesOptionsModel.Guid = core.StringPtr("testString")
-				listResourceInstancesOptionsModel.Name = core.StringPtr("testString")
-				listResourceInstancesOptionsModel.ResourceGroupID = core.StringPtr("testString")
-				listResourceInstancesOptionsModel.ResourceID = core.StringPtr("testString")
-				listResourceInstancesOptionsModel.ResourcePlanID = core.StringPtr("testString")
-				listResourceInstancesOptionsModel.Type = core.StringPtr("testString")
-				listResourceInstancesOptionsModel.SubType = core.StringPtr("testString")
-				listResourceInstancesOptionsModel.Limit = core.StringPtr("testString")
-				listResourceInstancesOptionsModel.UpdatedFrom = core.StringPtr("testString")
-				listResourceInstancesOptionsModel.UpdatedTo = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.ListResourceInstances(listResourceInstancesOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`CreateResourceInstance(createResourceInstanceOptions *CreateResourceInstanceOptions)`, func() {
-		bearerToken := "0ui9876453"
-		createResourceInstancePath := "/resource_instances"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(createResourceInstancePath))
-				Expect(req.Method).To(Equal("POST"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(201)
-				fmt.Fprintf(res, `{"id": "ID", "guid": "Guid", "crn": "Crn", "url": "URL", "name": "Name", "account_id": "AccountID", "resource_group_id": "ResourceGroupID", "resource_group_crn": "ResourceGroupCrn", "resource_id": "ResourceID", "resource_plan_id": "ResourcePlanID", "target_crn": "TargetCrn", "state": "State", "type": "Type", "sub_type": "SubType", "allow_cleanup": true, "last_operation": {"mapKey": {"anyKey": "anyValue"}}, "dashboard_url": "DashboardURL", "plan_history": [{"resource_plan_id": "ResourcePlanID", "start_date": "2019-01-01T12:00:00"}], "resource_aliases_url": "ResourceAliasesURL", "resource_bindings_url": "ResourceBindingsURL", "resource_keys_url": "ResourceKeysURL", "created_at": "2019-01-01T12:00:00", "updated_at": "2019-01-01T12:00:00", "deleted_at": "2019-01-01T12:00:00"}`)
-			}))
-			It(`Invoke CreateResourceInstance successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := resourcecontrollerv2.NewResourceControllerV2(&resourcecontrollerv2.ResourceControllerV2Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.CreateResourceInstance(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the CreateResourceInstanceOptions model
-				createResourceInstanceOptionsModel := new(resourcecontrollerv2.CreateResourceInstanceOptions)
-				createResourceInstanceOptionsModel.Name = core.StringPtr("my-instance")
-				createResourceInstanceOptionsModel.Target = core.StringPtr("bluemix-us-south")
-				createResourceInstanceOptionsModel.ResourceGroup = core.StringPtr("5c49eabc-f5e8-5881-a37e-2d100a33b3df")
-				createResourceInstanceOptionsModel.ResourcePlanID = core.StringPtr("cloudant-standard")
-				createResourceInstanceOptionsModel.Tags = []string{"testString"}
-				createResourceInstanceOptionsModel.AllowCleanup = core.BoolPtr(true)
-				createResourceInstanceOptionsModel.Parameters = CreateMockMap()
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.CreateResourceInstance(createResourceInstanceOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`GetResourceInstance(getResourceInstanceOptions *GetResourceInstanceOptions)`, func() {
-		bearerToken := "0ui9876453"
-		getResourceInstancePath := "/resource_instances/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(getResourceInstancePath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"id": "ID", "guid": "Guid", "crn": "Crn", "url": "URL", "name": "Name", "account_id": "AccountID", "resource_group_id": "ResourceGroupID", "resource_group_crn": "ResourceGroupCrn", "resource_id": "ResourceID", "resource_plan_id": "ResourcePlanID", "target_crn": "TargetCrn", "state": "State", "type": "Type", "sub_type": "SubType", "allow_cleanup": true, "last_operation": {"mapKey": {"anyKey": "anyValue"}}, "dashboard_url": "DashboardURL", "plan_history": [{"resource_plan_id": "ResourcePlanID", "start_date": "2019-01-01T12:00:00"}], "resource_aliases_url": "ResourceAliasesURL", "resource_bindings_url": "ResourceBindingsURL", "resource_keys_url": "ResourceKeysURL", "created_at": "2019-01-01T12:00:00", "updated_at": "2019-01-01T12:00:00", "deleted_at": "2019-01-01T12:00:00"}`)
-			}))
-			It(`Invoke GetResourceInstance successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := resourcecontrollerv2.NewResourceControllerV2(&resourcecontrollerv2.ResourceControllerV2Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.GetResourceInstance(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the GetResourceInstanceOptions model
-				getResourceInstanceOptionsModel := new(resourcecontrollerv2.GetResourceInstanceOptions)
-				getResourceInstanceOptionsModel.ID = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.GetResourceInstance(getResourceInstanceOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`DeleteResourceInstance(deleteResourceInstanceOptions *DeleteResourceInstanceOptions)`, func() {
-		bearerToken := "0ui9876453"
-		deleteResourceInstancePath := "/resource_instances/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(deleteResourceInstancePath))
-				Expect(req.Method).To(Equal("DELETE"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(202)
-				fmt.Fprintf(res, `{"id": "ID", "guid": "Guid", "crn": "Crn", "url": "URL", "name": "Name", "account_id": "AccountID", "resource_group_id": "ResourceGroupID", "resource_group_crn": "ResourceGroupCrn", "resource_id": "ResourceID", "resource_plan_id": "ResourcePlanID", "target_crn": "TargetCrn", "state": "State", "type": "Type", "sub_type": "SubType", "allow_cleanup": true, "last_operation": {"mapKey": {"anyKey": "anyValue"}}, "dashboard_url": "DashboardURL", "plan_history": [{"resource_plan_id": "ResourcePlanID", "start_date": "2019-01-01T12:00:00"}], "resource_aliases_url": "ResourceAliasesURL", "resource_bindings_url": "ResourceBindingsURL", "resource_keys_url": "ResourceKeysURL", "created_at": "2019-01-01T12:00:00", "updated_at": "2019-01-01T12:00:00", "deleted_at": "2019-01-01T12:00:00"}`)
-			}))
-			It(`Invoke DeleteResourceInstance successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := resourcecontrollerv2.NewResourceControllerV2(&resourcecontrollerv2.ResourceControllerV2Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.DeleteResourceInstance(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the DeleteResourceInstanceOptions model
-				deleteResourceInstanceOptionsModel := new(resourcecontrollerv2.DeleteResourceInstanceOptions)
-				deleteResourceInstanceOptionsModel.ID = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.DeleteResourceInstance(deleteResourceInstanceOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`UpdateResourceInstance(updateResourceInstanceOptions *UpdateResourceInstanceOptions)`, func() {
-		bearerToken := "0ui9876453"
-		updateResourceInstancePath := "/resource_instances/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(updateResourceInstancePath))
-				Expect(req.Method).To(Equal("PATCH"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"id": "ID", "guid": "Guid", "crn": "Crn", "url": "URL", "name": "Name", "account_id": "AccountID", "resource_group_id": "ResourceGroupID", "resource_group_crn": "ResourceGroupCrn", "resource_id": "ResourceID", "resource_plan_id": "ResourcePlanID", "target_crn": "TargetCrn", "state": "State", "type": "Type", "sub_type": "SubType", "allow_cleanup": true, "last_operation": {"mapKey": {"anyKey": "anyValue"}}, "dashboard_url": "DashboardURL", "plan_history": [{"resource_plan_id": "ResourcePlanID", "start_date": "2019-01-01T12:00:00"}], "resource_aliases_url": "ResourceAliasesURL", "resource_bindings_url": "ResourceBindingsURL", "resource_keys_url": "ResourceKeysURL", "created_at": "2019-01-01T12:00:00", "updated_at": "2019-01-01T12:00:00", "deleted_at": "2019-01-01T12:00:00"}`)
-			}))
-			It(`Invoke UpdateResourceInstance successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := resourcecontrollerv2.NewResourceControllerV2(&resourcecontrollerv2.ResourceControllerV2Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.UpdateResourceInstance(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the UpdateResourceInstanceOptions model
-				updateResourceInstanceOptionsModel := new(resourcecontrollerv2.UpdateResourceInstanceOptions)
-				updateResourceInstanceOptionsModel.ID = core.StringPtr("testString")
-				updateResourceInstanceOptionsModel.Name = core.StringPtr("my-new-instance-name")
-				updateResourceInstanceOptionsModel.Parameters = CreateMockMap()
-				updateResourceInstanceOptionsModel.ResourcePlanID = core.StringPtr("a8dff6d3-d287-4668-a81d-c87c55c2656d")
-				updateResourceInstanceOptionsModel.AllowCleanup = core.BoolPtr(true)
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.UpdateResourceInstance(updateResourceInstanceOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`ListResourceKeys(listResourceKeysOptions *ListResourceKeysOptions)`, func() {
-		bearerToken := "0ui9876453"
-		listResourceKeysPath := "/resource_keys"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(listResourceKeysPath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				Expect(req.URL.Query()["guid"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["name"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["resource_group_id"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["resource_id"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["limit"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["updated_from"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["updated_to"]).To(Equal([]string{"testString"}))
-
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"next_url": "NextURL", "resources": [{"id": "ID", "guid": "Guid", "crn": "Crn", "url": "URL", "name": "Name", "account_id": "AccountID", "resource_group_id": "ResourceGroupID", "source_crn": "SourceCrn", "state": "State", "credentials": {"apikey": "Apikey", "iam_apikey_description": "IamApikeyDescription", "iam_apikey_name": "IamApikeyName", "iam_role_crn": "IamRoleCrn", "iam_serviceid_crn": "IamServiceidCrn"}, "iam_compatible": false, "resource_instance_url": "ResourceInstanceURL", "created_at": "2019-01-01T12:00:00", "updated_at": "2019-01-01T12:00:00", "deleted_at": "2019-01-01T12:00:00"}], "rows_count": 9}`)
-			}))
-			It(`Invoke ListResourceKeys successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := resourcecontrollerv2.NewResourceControllerV2(&resourcecontrollerv2.ResourceControllerV2Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.ListResourceKeys(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the ListResourceKeysOptions model
-				listResourceKeysOptionsModel := new(resourcecontrollerv2.ListResourceKeysOptions)
-				listResourceKeysOptionsModel.Guid = core.StringPtr("testString")
-				listResourceKeysOptionsModel.Name = core.StringPtr("testString")
-				listResourceKeysOptionsModel.ResourceGroupID = core.StringPtr("testString")
-				listResourceKeysOptionsModel.ResourceID = core.StringPtr("testString")
-				listResourceKeysOptionsModel.Limit = core.StringPtr("testString")
-				listResourceKeysOptionsModel.UpdatedFrom = core.StringPtr("testString")
-				listResourceKeysOptionsModel.UpdatedTo = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.ListResourceKeys(listResourceKeysOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`CreateResourceKey(createResourceKeyOptions *CreateResourceKeyOptions)`, func() {
-		bearerToken := "0ui9876453"
-		createResourceKeyPath := "/resource_keys"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(createResourceKeyPath))
-				Expect(req.Method).To(Equal("POST"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(201)
-				fmt.Fprintf(res, `{"id": "ID", "guid": "Guid", "crn": "Crn", "url": "URL", "name": "Name", "account_id": "AccountID", "resource_group_id": "ResourceGroupID", "source_crn": "SourceCrn", "state": "State", "credentials": {"apikey": "Apikey", "iam_apikey_description": "IamApikeyDescription", "iam_apikey_name": "IamApikeyName", "iam_role_crn": "IamRoleCrn", "iam_serviceid_crn": "IamServiceidCrn"}, "iam_compatible": false, "resource_instance_url": "ResourceInstanceURL", "created_at": "2019-01-01T12:00:00", "updated_at": "2019-01-01T12:00:00", "deleted_at": "2019-01-01T12:00:00"}`)
-			}))
-			It(`Invoke CreateResourceKey successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := resourcecontrollerv2.NewResourceControllerV2(&resourcecontrollerv2.ResourceControllerV2Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.CreateResourceKey(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the ResourceKeyPostParameters model
-				resourceKeyPostParametersModel := new(resourcecontrollerv2.ResourceKeyPostParameters)
-				resourceKeyPostParametersModel.ServiceidCrn = core.StringPtr("crn:v1:bluemix:public:iam-identity::a/9fceaa56d1ab84893af6b9eec5ab81bb::serviceid:ServiceId-fe4c29b5-db13-410a-bacc-b5779a03d393")
-
-				// Construct an instance of the CreateResourceKeyOptions model
-				createResourceKeyOptionsModel := new(resourcecontrollerv2.CreateResourceKeyOptions)
-				createResourceKeyOptionsModel.Name = core.StringPtr("my-key")
-				createResourceKeyOptionsModel.Source = core.StringPtr("25eba2a9-beef-450b-82cf-f5ad5e36c6dd")
-				createResourceKeyOptionsModel.Parameters = resourceKeyPostParametersModel
-				createResourceKeyOptionsModel.Role = core.StringPtr("Writer")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.CreateResourceKey(createResourceKeyOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`GetResourceKey(getResourceKeyOptions *GetResourceKeyOptions)`, func() {
-		bearerToken := "0ui9876453"
-		getResourceKeyPath := "/resource_keys/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(getResourceKeyPath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"id": "ID", "guid": "Guid", "crn": "Crn", "url": "URL", "name": "Name", "account_id": "AccountID", "resource_group_id": "ResourceGroupID", "source_crn": "SourceCrn", "state": "State", "credentials": {"apikey": "Apikey", "iam_apikey_description": "IamApikeyDescription", "iam_apikey_name": "IamApikeyName", "iam_role_crn": "IamRoleCrn", "iam_serviceid_crn": "IamServiceidCrn"}, "iam_compatible": false, "resource_instance_url": "ResourceInstanceURL", "created_at": "2019-01-01T12:00:00", "updated_at": "2019-01-01T12:00:00", "deleted_at": "2019-01-01T12:00:00"}`)
-			}))
-			It(`Invoke GetResourceKey successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := resourcecontrollerv2.NewResourceControllerV2(&resourcecontrollerv2.ResourceControllerV2Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.GetResourceKey(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the GetResourceKeyOptions model
-				getResourceKeyOptionsModel := new(resourcecontrollerv2.GetResourceKeyOptions)
-				getResourceKeyOptionsModel.ID = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.GetResourceKey(getResourceKeyOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`DeleteResourceKey(deleteResourceKeyOptions *DeleteResourceKeyOptions)`, func() {
-		bearerToken := "0ui9876453"
-		deleteResourceKeyPath := "/resource_keys/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(deleteResourceKeyPath))
-				Expect(req.Method).To(Equal("DELETE"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.WriteHeader(204)
-			}))
-			It(`Invoke DeleteResourceKey successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := resourcecontrollerv2.NewResourceControllerV2(&resourcecontrollerv2.ResourceControllerV2Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				response, operationErr := testService.DeleteResourceKey(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-
-				// Construct an instance of the DeleteResourceKeyOptions model
-				deleteResourceKeyOptionsModel := new(resourcecontrollerv2.DeleteResourceKeyOptions)
-				deleteResourceKeyOptionsModel.ID = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				response, operationErr = testService.DeleteResourceKey(deleteResourceKeyOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`UpdateResourceKey(updateResourceKeyOptions *UpdateResourceKeyOptions)`, func() {
-		bearerToken := "0ui9876453"
-		updateResourceKeyPath := "/resource_keys/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(updateResourceKeyPath))
-				Expect(req.Method).To(Equal("PATCH"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"id": "ID", "guid": "Guid", "crn": "Crn", "url": "URL", "name": "Name", "account_id": "AccountID", "resource_group_id": "ResourceGroupID", "source_crn": "SourceCrn", "state": "State", "credentials": {"apikey": "Apikey", "iam_apikey_description": "IamApikeyDescription", "iam_apikey_name": "IamApikeyName", "iam_role_crn": "IamRoleCrn", "iam_serviceid_crn": "IamServiceidCrn"}, "iam_compatible": false, "resource_instance_url": "ResourceInstanceURL", "created_at": "2019-01-01T12:00:00", "updated_at": "2019-01-01T12:00:00", "deleted_at": "2019-01-01T12:00:00"}`)
-			}))
-			It(`Invoke UpdateResourceKey successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := resourcecontrollerv2.NewResourceControllerV2(&resourcecontrollerv2.ResourceControllerV2Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.UpdateResourceKey(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the UpdateResourceKeyOptions model
-				updateResourceKeyOptionsModel := new(resourcecontrollerv2.UpdateResourceKeyOptions)
-				updateResourceKeyOptionsModel.ID = core.StringPtr("testString")
-				updateResourceKeyOptionsModel.Name = core.StringPtr("my-new-key-name")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.UpdateResourceKey(updateResourceKeyOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`ListResourceBindings(listResourceBindingsOptions *ListResourceBindingsOptions)`, func() {
-		bearerToken := "0ui9876453"
-		listResourceBindingsPath := "/resource_bindings"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(listResourceBindingsPath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				Expect(req.URL.Query()["guid"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["name"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["resource_group_id"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["resource_id"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["region_binding_id"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["limit"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["updated_from"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["updated_to"]).To(Equal([]string{"testString"}))
-
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"next_url": "NextURL", "resources": [{"id": "ID", "guid": "Guid", "crn": "Crn", "url": "URL", "name": "Name", "account_id": "AccountID", "resource_group_id": "ResourceGroupID", "source_crn": "SourceCrn", "target_crn": "TargetCrn", "region_binding_id": "RegionBindingID", "state": "State", "credentials": {"apikey": "Apikey", "iam_apikey_description": "IamApikeyDescription", "iam_apikey_name": "IamApikeyName", "iam_role_crn": "IamRoleCrn", "iam_serviceid_crn": "IamServiceidCrn"}, "iam_compatible": false, "resource_alias_url": "ResourceAliasURL", "created_at": "2019-01-01T12:00:00", "updated_at": "2019-01-01T12:00:00", "deleted_at": "2019-01-01T12:00:00"}], "rows_count": 9}`)
-			}))
-			It(`Invoke ListResourceBindings successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := resourcecontrollerv2.NewResourceControllerV2(&resourcecontrollerv2.ResourceControllerV2Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.ListResourceBindings(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the ListResourceBindingsOptions model
-				listResourceBindingsOptionsModel := new(resourcecontrollerv2.ListResourceBindingsOptions)
-				listResourceBindingsOptionsModel.Guid = core.StringPtr("testString")
-				listResourceBindingsOptionsModel.Name = core.StringPtr("testString")
-				listResourceBindingsOptionsModel.ResourceGroupID = core.StringPtr("testString")
-				listResourceBindingsOptionsModel.ResourceID = core.StringPtr("testString")
-				listResourceBindingsOptionsModel.RegionBindingID = core.StringPtr("testString")
-				listResourceBindingsOptionsModel.Limit = core.StringPtr("testString")
-				listResourceBindingsOptionsModel.UpdatedFrom = core.StringPtr("testString")
-				listResourceBindingsOptionsModel.UpdatedTo = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.ListResourceBindings(listResourceBindingsOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`CreateResourceBinding(createResourceBindingOptions *CreateResourceBindingOptions)`, func() {
-		bearerToken := "0ui9876453"
-		createResourceBindingPath := "/resource_bindings"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(createResourceBindingPath))
-				Expect(req.Method).To(Equal("POST"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(201)
-				fmt.Fprintf(res, `{"id": "ID", "guid": "Guid", "crn": "Crn", "url": "URL", "name": "Name", "account_id": "AccountID", "resource_group_id": "ResourceGroupID", "source_crn": "SourceCrn", "target_crn": "TargetCrn", "region_binding_id": "RegionBindingID", "state": "State", "credentials": {"apikey": "Apikey", "iam_apikey_description": "IamApikeyDescription", "iam_apikey_name": "IamApikeyName", "iam_role_crn": "IamRoleCrn", "iam_serviceid_crn": "IamServiceidCrn"}, "iam_compatible": false, "resource_alias_url": "ResourceAliasURL", "created_at": "2019-01-01T12:00:00", "updated_at": "2019-01-01T12:00:00", "deleted_at": "2019-01-01T12:00:00"}`)
-			}))
-			It(`Invoke CreateResourceBinding successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := resourcecontrollerv2.NewResourceControllerV2(&resourcecontrollerv2.ResourceControllerV2Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.CreateResourceBinding(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the ResourceBindingPostParameters model
-				resourceBindingPostParametersModel := new(resourcecontrollerv2.ResourceBindingPostParameters)
-				resourceBindingPostParametersModel.ServiceidCrn = core.StringPtr("crn:v1:bluemix:public:iam-identity::a/9fceaa56d1ab84893af6b9eec5ab81bb::serviceid:ServiceId-fe4c29b5-db13-410a-bacc-b5779a03d393")
-
-				// Construct an instance of the CreateResourceBindingOptions model
-				createResourceBindingOptionsModel := new(resourcecontrollerv2.CreateResourceBindingOptions)
-				createResourceBindingOptionsModel.Source = core.StringPtr("25eba2a9-beef-450b-82cf-f5ad5e36c6dd")
-				createResourceBindingOptionsModel.Target = core.StringPtr("crn:v1:bluemix:public:bluemix:us-south:s/0ba4dba0-a120-4a1e-a124-5a249a904b76::cf-application:a1caa40b-2c24-4da8-8267-ac2c1a42ad0c")
-				createResourceBindingOptionsModel.Name = core.StringPtr("my-binding")
-				createResourceBindingOptionsModel.Parameters = resourceBindingPostParametersModel
-				createResourceBindingOptionsModel.Role = core.StringPtr("Writer")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.CreateResourceBinding(createResourceBindingOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`GetResourceBinding(getResourceBindingOptions *GetResourceBindingOptions)`, func() {
-		bearerToken := "0ui9876453"
-		getResourceBindingPath := "/resource_bindings/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(getResourceBindingPath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"id": "ID", "guid": "Guid", "crn": "Crn", "url": "URL", "name": "Name", "account_id": "AccountID", "resource_group_id": "ResourceGroupID", "source_crn": "SourceCrn", "target_crn": "TargetCrn", "region_binding_id": "RegionBindingID", "state": "State", "credentials": {"apikey": "Apikey", "iam_apikey_description": "IamApikeyDescription", "iam_apikey_name": "IamApikeyName", "iam_role_crn": "IamRoleCrn", "iam_serviceid_crn": "IamServiceidCrn"}, "iam_compatible": false, "resource_alias_url": "ResourceAliasURL", "created_at": "2019-01-01T12:00:00", "updated_at": "2019-01-01T12:00:00", "deleted_at": "2019-01-01T12:00:00"}`)
-			}))
-			It(`Invoke GetResourceBinding successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := resourcecontrollerv2.NewResourceControllerV2(&resourcecontrollerv2.ResourceControllerV2Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.GetResourceBinding(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the GetResourceBindingOptions model
-				getResourceBindingOptionsModel := new(resourcecontrollerv2.GetResourceBindingOptions)
-				getResourceBindingOptionsModel.ID = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.GetResourceBinding(getResourceBindingOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`DeleteResourceBinding(deleteResourceBindingOptions *DeleteResourceBindingOptions)`, func() {
-		bearerToken := "0ui9876453"
-		deleteResourceBindingPath := "/resource_bindings/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(deleteResourceBindingPath))
-				Expect(req.Method).To(Equal("DELETE"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.WriteHeader(204)
-			}))
-			It(`Invoke DeleteResourceBinding successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := resourcecontrollerv2.NewResourceControllerV2(&resourcecontrollerv2.ResourceControllerV2Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				response, operationErr := testService.DeleteResourceBinding(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-
-				// Construct an instance of the DeleteResourceBindingOptions model
-				deleteResourceBindingOptionsModel := new(resourcecontrollerv2.DeleteResourceBindingOptions)
-				deleteResourceBindingOptionsModel.ID = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				response, operationErr = testService.DeleteResourceBinding(deleteResourceBindingOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`UpdateResourceBinding(updateResourceBindingOptions *UpdateResourceBindingOptions)`, func() {
-		bearerToken := "0ui9876453"
-		updateResourceBindingPath := "/resource_bindings/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(updateResourceBindingPath))
-				Expect(req.Method).To(Equal("PATCH"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"id": "ID", "guid": "Guid", "crn": "Crn", "url": "URL", "name": "Name", "account_id": "AccountID", "resource_group_id": "ResourceGroupID", "source_crn": "SourceCrn", "target_crn": "TargetCrn", "region_binding_id": "RegionBindingID", "state": "State", "credentials": {"apikey": "Apikey", "iam_apikey_description": "IamApikeyDescription", "iam_apikey_name": "IamApikeyName", "iam_role_crn": "IamRoleCrn", "iam_serviceid_crn": "IamServiceidCrn"}, "iam_compatible": false, "resource_alias_url": "ResourceAliasURL", "created_at": "2019-01-01T12:00:00", "updated_at": "2019-01-01T12:00:00", "deleted_at": "2019-01-01T12:00:00"}`)
-			}))
-			It(`Invoke UpdateResourceBinding successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := resourcecontrollerv2.NewResourceControllerV2(&resourcecontrollerv2.ResourceControllerV2Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.UpdateResourceBinding(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the UpdateResourceBindingOptions model
-				updateResourceBindingOptionsModel := new(resourcecontrollerv2.UpdateResourceBindingOptions)
-				updateResourceBindingOptionsModel.ID = core.StringPtr("testString")
-				updateResourceBindingOptionsModel.Name = core.StringPtr("my-new-binding-name")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.UpdateResourceBinding(updateResourceBindingOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`ListResourceAliases(listResourceAliasesOptions *ListResourceAliasesOptions)`, func() {
-		bearerToken := "0ui9876453"
-		listResourceAliasesPath := "/resource_aliases"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(listResourceAliasesPath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				Expect(req.URL.Query()["guid"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["name"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["resource_instance_id"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["region_instance_id"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["resource_id"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["resource_group_id"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["limit"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["updated_from"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["updated_to"]).To(Equal([]string{"testString"}))
-
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"next_url": "NextURL", "resources": [{"id": "ID", "guid": "Guid", "crn": "Crn", "url": "URL", "name": "Name", "account_id": "AccountID", "resource_group_id": "ResourceGroupID", "resource_group_crn": "ResourceGroupCrn", "target_crn": "TargetCrn", "state": "State", "resource_instance_id": "ResourceInstanceID", "region_instance_id": "RegionInstanceID", "resource_instance_url": "ResourceInstanceURL", "resource_bindings_url": "ResourceBindingsURL", "resource_keys_url": "ResourceKeysURL", "created_at": "2019-01-01T12:00:00", "updated_at": "2019-01-01T12:00:00", "deleted_at": "2019-01-01T12:00:00"}], "rows_count": 9}`)
-			}))
-			It(`Invoke ListResourceAliases successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := resourcecontrollerv2.NewResourceControllerV2(&resourcecontrollerv2.ResourceControllerV2Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.ListResourceAliases(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the ListResourceAliasesOptions model
-				listResourceAliasesOptionsModel := new(resourcecontrollerv2.ListResourceAliasesOptions)
-				listResourceAliasesOptionsModel.Guid = core.StringPtr("testString")
-				listResourceAliasesOptionsModel.Name = core.StringPtr("testString")
-				listResourceAliasesOptionsModel.ResourceInstanceID = core.StringPtr("testString")
-				listResourceAliasesOptionsModel.RegionInstanceID = core.StringPtr("testString")
-				listResourceAliasesOptionsModel.ResourceID = core.StringPtr("testString")
-				listResourceAliasesOptionsModel.ResourceGroupID = core.StringPtr("testString")
-				listResourceAliasesOptionsModel.Limit = core.StringPtr("testString")
-				listResourceAliasesOptionsModel.UpdatedFrom = core.StringPtr("testString")
-				listResourceAliasesOptionsModel.UpdatedTo = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.ListResourceAliases(listResourceAliasesOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`CreateResourceAlias(createResourceAliasOptions *CreateResourceAliasOptions)`, func() {
-		bearerToken := "0ui9876453"
-		createResourceAliasPath := "/resource_aliases"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(createResourceAliasPath))
-				Expect(req.Method).To(Equal("POST"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(201)
-				fmt.Fprintf(res, `{"id": "ID", "guid": "Guid", "crn": "Crn", "url": "URL", "name": "Name", "account_id": "AccountID", "resource_group_id": "ResourceGroupID", "resource_group_crn": "ResourceGroupCrn", "target_crn": "TargetCrn", "state": "State", "resource_instance_id": "ResourceInstanceID", "region_instance_id": "RegionInstanceID", "resource_instance_url": "ResourceInstanceURL", "resource_bindings_url": "ResourceBindingsURL", "resource_keys_url": "ResourceKeysURL", "created_at": "2019-01-01T12:00:00", "updated_at": "2019-01-01T12:00:00", "deleted_at": "2019-01-01T12:00:00"}`)
-			}))
-			It(`Invoke CreateResourceAlias successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := resourcecontrollerv2.NewResourceControllerV2(&resourcecontrollerv2.ResourceControllerV2Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.CreateResourceAlias(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the CreateResourceAliasOptions model
-				createResourceAliasOptionsModel := new(resourcecontrollerv2.CreateResourceAliasOptions)
-				createResourceAliasOptionsModel.Name = core.StringPtr("my-alias")
-				createResourceAliasOptionsModel.Source = core.StringPtr("a8dff6d3-d287-4668-a81d-c87c55c2656d")
-				createResourceAliasOptionsModel.Target = core.StringPtr("crn:v1:staging:public:bluemix:us-south:o/5e939cd5-6377-4383-b9e0-9db22cd11753::cf-space:66c8b915-101a-406c-a784-e6636676e4f5")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.CreateResourceAlias(createResourceAliasOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`GetResourceAlias(getResourceAliasOptions *GetResourceAliasOptions)`, func() {
-		bearerToken := "0ui9876453"
-		getResourceAliasPath := "/resource_aliases/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(getResourceAliasPath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"id": "ID", "guid": "Guid", "crn": "Crn", "url": "URL", "name": "Name", "account_id": "AccountID", "resource_group_id": "ResourceGroupID", "resource_group_crn": "ResourceGroupCrn", "target_crn": "TargetCrn", "state": "State", "resource_instance_id": "ResourceInstanceID", "region_instance_id": "RegionInstanceID", "resource_instance_url": "ResourceInstanceURL", "resource_bindings_url": "ResourceBindingsURL", "resource_keys_url": "ResourceKeysURL", "created_at": "2019-01-01T12:00:00", "updated_at": "2019-01-01T12:00:00", "deleted_at": "2019-01-01T12:00:00"}`)
-			}))
-			It(`Invoke GetResourceAlias successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := resourcecontrollerv2.NewResourceControllerV2(&resourcecontrollerv2.ResourceControllerV2Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.GetResourceAlias(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the GetResourceAliasOptions model
-				getResourceAliasOptionsModel := new(resourcecontrollerv2.GetResourceAliasOptions)
-				getResourceAliasOptionsModel.ID = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.GetResourceAlias(getResourceAliasOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`DeleteResourceAlias(deleteResourceAliasOptions *DeleteResourceAliasOptions)`, func() {
-		bearerToken := "0ui9876453"
-		deleteResourceAliasPath := "/resource_aliases/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(deleteResourceAliasPath))
-				Expect(req.Method).To(Equal("DELETE"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.WriteHeader(204)
-			}))
-			It(`Invoke DeleteResourceAlias successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := resourcecontrollerv2.NewResourceControllerV2(&resourcecontrollerv2.ResourceControllerV2Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				response, operationErr := testService.DeleteResourceAlias(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-
-				// Construct an instance of the DeleteResourceAliasOptions model
-				deleteResourceAliasOptionsModel := new(resourcecontrollerv2.DeleteResourceAliasOptions)
-				deleteResourceAliasOptionsModel.ID = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				response, operationErr = testService.DeleteResourceAlias(deleteResourceAliasOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`UpdateResourceAlias(updateResourceAliasOptions *UpdateResourceAliasOptions)`, func() {
-		bearerToken := "0ui9876453"
-		updateResourceAliasPath := "/resource_aliases/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(updateResourceAliasPath))
-				Expect(req.Method).To(Equal("PATCH"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"id": "ID", "guid": "Guid", "crn": "Crn", "url": "URL", "name": "Name", "account_id": "AccountID", "resource_group_id": "ResourceGroupID", "resource_group_crn": "ResourceGroupCrn", "target_crn": "TargetCrn", "state": "State", "resource_instance_id": "ResourceInstanceID", "region_instance_id": "RegionInstanceID", "resource_instance_url": "ResourceInstanceURL", "resource_bindings_url": "ResourceBindingsURL", "resource_keys_url": "ResourceKeysURL", "created_at": "2019-01-01T12:00:00", "updated_at": "2019-01-01T12:00:00", "deleted_at": "2019-01-01T12:00:00"}`)
-			}))
-			It(`Invoke UpdateResourceAlias successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := resourcecontrollerv2.NewResourceControllerV2(&resourcecontrollerv2.ResourceControllerV2Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.UpdateResourceAlias(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the UpdateResourceAliasOptions model
-				updateResourceAliasOptionsModel := new(resourcecontrollerv2.UpdateResourceAliasOptions)
-				updateResourceAliasOptionsModel.ID = core.StringPtr("testString")
-				updateResourceAliasOptionsModel.Name = core.StringPtr("my-new-alias-name")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.UpdateResourceAlias(updateResourceAliasOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`ListReclamations(listReclamationsOptions *ListReclamationsOptions)`, func() {
-		bearerToken := "0ui9876453"
-		listReclamationsPath := "/v1/reclamations"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(listReclamationsPath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				Expect(req.URL.Query()["account_id"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["resource_instance_id"]).To(Equal([]string{"testString"}))
-
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"resources": [{"id": "ID", "entity_id": "EntityID", "entity_type_id": "EntityTypeID", "entity_crn": "EntityCrn", "resource_instance_id": {"anyKey": "anyValue"}, "resource_group_id": "ResourceGroupID", "account_id": "AccountID", "policy_id": "PolicyID", "state": "State", "target_time": "TargetTime", "custom_properties": "CustomProperties", "created_at": "2019-01-01T12:00:00", "created_by": "CreatedBy", "updated_at": "2019-01-01T12:00:00", "updated_by": "UpdatedBy"}]}`)
-			}))
-			It(`Invoke ListReclamations successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := resourcecontrollerv2.NewResourceControllerV2(&resourcecontrollerv2.ResourceControllerV2Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.ListReclamations(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the ListReclamationsOptions model
-				listReclamationsOptionsModel := new(resourcecontrollerv2.ListReclamationsOptions)
-				listReclamationsOptionsModel.AccountID = core.StringPtr("testString")
-				listReclamationsOptionsModel.ResourceInstanceID = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.ListReclamations(listReclamationsOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`RunReclamationAction(runReclamationActionOptions *RunReclamationActionOptions)`, func() {
-		bearerToken := "0ui9876453"
-		runReclamationActionPath := "/v1/reclamations/testString/actions/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(runReclamationActionPath))
-				Expect(req.Method).To(Equal("POST"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"id": "ID", "entity_id": "EntityID", "entity_type_id": "EntityTypeID", "entity_crn": "EntityCrn", "resource_instance_id": {"anyKey": "anyValue"}, "resource_group_id": "ResourceGroupID", "account_id": "AccountID", "policy_id": "PolicyID", "state": "State", "target_time": "TargetTime", "custom_properties": "CustomProperties", "created_at": "2019-01-01T12:00:00", "created_by": "CreatedBy", "updated_at": "2019-01-01T12:00:00", "updated_by": "UpdatedBy"}`)
-			}))
-			It(`Invoke RunReclamationAction successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := resourcecontrollerv2.NewResourceControllerV2(&resourcecontrollerv2.ResourceControllerV2Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.RunReclamationAction(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the RunReclamationActionOptions model
-				runReclamationActionOptionsModel := new(resourcecontrollerv2.RunReclamationActionOptions)
-				runReclamationActionOptionsModel.ID = core.StringPtr("testString")
-				runReclamationActionOptionsModel.ActionName = core.StringPtr("testString")
-				runReclamationActionOptionsModel.RequestBy = core.StringPtr("testString")
-				runReclamationActionOptionsModel.Comment = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.RunReclamationAction(runReclamationActionOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`Utility function tests`, func() {
-		It(`Invoke CreateMockMap() successfully`, func() {
-			mockMap := CreateMockMap()
-			Expect(mockMap).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockByteArray() successfully`, func() {
-			mockByteArray := CreateMockByteArray("This is a test")
-			Expect(mockByteArray).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockUUID() successfully`, func() {
-			mockUUID := CreateMockUUID("9fab83da-98cb-4f18-a7ba-b6f0435c9673")
-			Expect(mockUUID).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockReader() successfully`, func() {
-			mockReader := CreateMockReader("This is a test.")
-			Expect(mockReader).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockDate() successfully`, func() {
-			mockDate := CreateMockDate()
-			Expect(mockDate).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockDateTime() successfully`, func() {
-			mockDateTime := CreateMockDateTime()
-			Expect(mockDateTime).ToNot(BeNil())
-		})
-	})
-})
-
-//
-// Utility functions used by the generated test code
-//
-
-func CreateMockMap() map[string]interface{} {
-	m := make(map[string]interface{})
-	return m
-}
-
-func CreateMockByteArray(mockData string) *[]byte {
-	ba := make([]byte, len(mockData))
-	ba = append(ba, mockData...)
-	return &ba
-}
-
-func CreateMockUUID(mockData string) *strfmt.UUID {
-	uuid := strfmt.UUID(mockData)
-	return &uuid
-}
-
-func CreateMockReader(mockData string) io.ReadCloser {
-	return ioutil.NopCloser(bytes.NewReader([]byte(mockData)))
-}
-
-func CreateMockDate() *strfmt.Date {
-	d := strfmt.Date(time.Now())
-	return &d
-}
-
-func CreateMockDateTime() *strfmt.DateTime {
-	d := strfmt.DateTime(time.Now())
-	return &d
-}
diff --git a/resourcemanagerv2/resource_manager_v2.go b/resourcemanagerv2/resource_manager_v2.go
deleted file mode 100644
index f8a69bc7..00000000
--- a/resourcemanagerv2/resource_manager_v2.go
+++ /dev/null
@@ -1,1962 +0,0 @@
-/**
- * (C) Copyright IBM Corp. 2020.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// Package resourcemanagerv2 : Operations and models for the ResourceManagerV2 service
-package resourcemanagerv2
-
-import (
-	"fmt"
-	"github.com/IBM/go-sdk-core/v3/core"
-	common "github.ibm.com/ibmcloud/platform-services-go-sdk/common"
-)
-
-// ResourceManagerV2 : Manage lifecycle of your Cloud resource groups using Resource Manager APIs.
-//
-// Version: 2.0
-type ResourceManagerV2 struct {
-	Service *core.BaseService
-}
-
-// DefaultServiceURL is the default URL to make service requests to.
-const DefaultServiceURL = "https://resource-controller.test.cloud.ibm.com/v2"
-
-// DefaultServiceName is the default key used to find external configuration information.
-const DefaultServiceName = "resource_manager"
-
-// ResourceManagerV2Options : Service options
-type ResourceManagerV2Options struct {
-	ServiceName   string
-	URL           string
-	Authenticator core.Authenticator
-}
-
-// NewResourceManagerV2UsingExternalConfig : constructs an instance of ResourceManagerV2 with passed in options and external configuration.
-func NewResourceManagerV2UsingExternalConfig(options *ResourceManagerV2Options) (resourceManager *ResourceManagerV2, err error) {
-	if options.ServiceName == "" {
-		options.ServiceName = DefaultServiceName
-	}
-
-	if options.Authenticator == nil {
-		options.Authenticator, err = core.GetAuthenticatorFromEnvironment(options.ServiceName)
-		if err != nil {
-			return
-		}
-	}
-
-	resourceManager, err = NewResourceManagerV2(options)
-	if err != nil {
-		return
-	}
-
-	err = resourceManager.Service.ConfigureService(options.ServiceName)
-	if err != nil {
-		return
-	}
-
-	if options.URL != "" {
-		err = resourceManager.Service.SetServiceURL(options.URL)
-	}
-	return
-}
-
-// NewResourceManagerV2 : constructs an instance of ResourceManagerV2 with passed in options.
-func NewResourceManagerV2(options *ResourceManagerV2Options) (service *ResourceManagerV2, err error) {
-	serviceOptions := &core.ServiceOptions{
-		URL:           DefaultServiceURL,
-		Authenticator: options.Authenticator,
-	}
-
-	baseService, err := core.NewBaseService(serviceOptions)
-	if err != nil {
-		return
-	}
-
-	if options.URL != "" {
-		err = baseService.SetServiceURL(options.URL)
-		if err != nil {
-			return
-		}
-	}
-
-	service = &ResourceManagerV2{
-		Service: baseService,
-	}
-
-	return
-}
-
-// SetServiceURL sets the service URL
-func (resourceManager *ResourceManagerV2) SetServiceURL(url string) error {
-	return resourceManager.Service.SetServiceURL(url)
-}
-
-// GetAccountQuotaList : Retrieve a list of quotas in an account
-// Retrieve a list of all "merged" quota definition for the specified account.You can use the IAM service token or a
-// user token for authorization. To use this method, the requesting user or service ID must have at least the viewer,
-// editor, operator, or administrator role on the Resource Controller service. The merge operation takes the default
-// quota definition for each resource type, and if there is a delta override quota definition defined for the specified
-// account, the override values will replace any corresponding values in the default quota specification.
-func (resourceManager *ResourceManagerV2) GetAccountQuotaList(getAccountQuotaListOptions *GetAccountQuotaListOptions) (result *QuotaDefinitions, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(getAccountQuotaListOptions, "getAccountQuotaListOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(getAccountQuotaListOptions, "getAccountQuotaListOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"quota_definitions/accounts"}
-	pathParameters := []string{*getAccountQuotaListOptions.AccountID}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(resourceManager.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range getAccountQuotaListOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("resource_manager", "V2", "GetAccountQuotaList")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = resourceManager.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalQuotaDefinitions(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// GetResourceQuota : Retrieve a quota of a resource in an account
-// Retrieve a "merged" quota definition for the specified account and type of resource. You can use the IAM service
-// token or a user token for authorization. To use this method, the requesting user or service ID must have at least the
-// viewer, editor, operator, or administrator role on the Resource Controller service. The merge operation takes the
-// default quota definition for the specified resource type, and if there is a delta override quota definition defined
-// for the specified account, the override values will replace any corresponding values in the default quota
-// specification.
-func (resourceManager *ResourceManagerV2) GetResourceQuota(getResourceQuotaOptions *GetResourceQuotaOptions) (result *ResourceQuota, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(getResourceQuotaOptions, "getResourceQuotaOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(getResourceQuotaOptions, "getResourceQuotaOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"quota_definitions/accounts", "resource_types"}
-	pathParameters := []string{*getResourceQuotaOptions.AccountID, *getResourceQuotaOptions.ResourceType}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(resourceManager.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range getResourceQuotaOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("resource_manager", "V2", "GetResourceQuota")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = resourceManager.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalResourceQuota(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// UpdateResourceQuota : Update a quota for a resource in an account
-// Override a quota definition for a specified account and type of resource, replacing any previous quota definition
-// defined for the account and resource type. You can use the IAM service token or a user token for authorization. To
-// use this method, the requesting user or service ID must have at least editor or administrator role on the Resource
-// Controller service.
-func (resourceManager *ResourceManagerV2) UpdateResourceQuota(updateResourceQuotaOptions *UpdateResourceQuotaOptions) (result *ErrorCollection, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(updateResourceQuotaOptions, "updateResourceQuotaOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(updateResourceQuotaOptions, "updateResourceQuotaOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"quota_definitions/accounts", "resource_types"}
-	pathParameters := []string{*updateResourceQuotaOptions.AccountID, *updateResourceQuotaOptions.ResourceType}
-
-	builder := core.NewRequestBuilder(core.PUT)
-	_, err = builder.ConstructHTTPURL(resourceManager.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range updateResourceQuotaOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("resource_manager", "V2", "UpdateResourceQuota")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = resourceManager.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalErrorCollection(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// DeleteResourceQuota : Delete a quota for a resource in an account
-// Deletes a quota definition if one has been defined for a specified account and type of resource, the default quota
-// values for the resource type will still be effective. You can use the IAM service token or a user token for
-// authorization. To use this method, the requesting user or service ID must have administrator role on the Resource
-// Controller service.
-func (resourceManager *ResourceManagerV2) DeleteResourceQuota(deleteResourceQuotaOptions *DeleteResourceQuotaOptions) (result *ErrorCollection, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(deleteResourceQuotaOptions, "deleteResourceQuotaOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(deleteResourceQuotaOptions, "deleteResourceQuotaOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"quota_definitions/accounts", "resource_types"}
-	pathParameters := []string{*deleteResourceQuotaOptions.AccountID, *deleteResourceQuotaOptions.ResourceType}
-
-	builder := core.NewRequestBuilder(core.DELETE)
-	_, err = builder.ConstructHTTPURL(resourceManager.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range deleteResourceQuotaOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("resource_manager", "V2", "DeleteResourceQuota")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = resourceManager.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalErrorCollection(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// CreateDefaultResourceQuota : Create a default resource quota for a resource type
-// Create a default resource quota for a resource type. You can use the IAM service token or a user token for
-// authorization. To use this method, the requesting user or service ID must have at least editor or administrator role
-// on the Resource Controller service.
-func (resourceManager *ResourceManagerV2) CreateDefaultResourceQuota(createDefaultResourceQuotaOptions *CreateDefaultResourceQuotaOptions) (result *ErrorCollection, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(createDefaultResourceQuotaOptions, "createDefaultResourceQuotaOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(createDefaultResourceQuotaOptions, "createDefaultResourceQuotaOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"quota_definitions/resource_types"}
-	pathParameters := []string{*createDefaultResourceQuotaOptions.ResourceType}
-
-	builder := core.NewRequestBuilder(core.POST)
-	_, err = builder.ConstructHTTPURL(resourceManager.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range createDefaultResourceQuotaOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("resource_manager", "V2", "CreateDefaultResourceQuota")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = resourceManager.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalErrorCollection(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// CreateSchema : Create a schema for a resource type
-// Create a schema for a resource type. You can use the IAM service token or a user token for authorization. To use this
-// method, the requesting user or service ID must have at least editor or administrator role on the Resource Controller
-// service.
-func (resourceManager *ResourceManagerV2) CreateSchema(createSchemaOptions *CreateSchemaOptions) (result *ErrorCollection, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(createSchemaOptions, "createSchemaOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(createSchemaOptions, "createSchemaOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"quota_definitions/resource_types", "schemas"}
-	pathParameters := []string{*createSchemaOptions.ResourceType}
-
-	builder := core.NewRequestBuilder(core.POST)
-	_, err = builder.ConstructHTTPURL(resourceManager.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range createSchemaOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("resource_manager", "V2", "CreateSchema")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = resourceManager.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalErrorCollection(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// GetSchema : Retrieve a schema for a resource type
-// Retrieve a schema for a resource type. You can use the IAM service token or a user token for authorization. To use
-// this method, the requesting user or service ID must have at least editor or administrator role on the Resource
-// Controller service.
-func (resourceManager *ResourceManagerV2) GetSchema(getSchemaOptions *GetSchemaOptions) (result *ResourceQuota, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(getSchemaOptions, "getSchemaOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(getSchemaOptions, "getSchemaOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"quota_definitions/resource_types", "schemas"}
-	pathParameters := []string{*getSchemaOptions.ResourceType}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(resourceManager.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range getSchemaOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("resource_manager", "V2", "GetSchema")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = resourceManager.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalResourceQuota(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// ListQuotaDefinitions : Get a list of all quota definitions
-// Get a list of all quota definitions.
-func (resourceManager *ResourceManagerV2) ListQuotaDefinitions(listQuotaDefinitionsOptions *ListQuotaDefinitionsOptions) (result *QuotaDefinitionsList, response *core.DetailedResponse, err error) {
-	err = core.ValidateStruct(listQuotaDefinitionsOptions, "listQuotaDefinitionsOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"quota_definitions"}
-	pathParameters := []string{}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(resourceManager.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range listQuotaDefinitionsOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("resource_manager", "V2", "ListQuotaDefinitions")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = resourceManager.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalQuotaDefinitionsList(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// GetQuotaDefinition : Get a quota definition
-// Get a a quota definition.
-func (resourceManager *ResourceManagerV2) GetQuotaDefinition(getQuotaDefinitionOptions *GetQuotaDefinitionOptions) (result *QuotaDefinitions, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(getQuotaDefinitionOptions, "getQuotaDefinitionOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(getQuotaDefinitionOptions, "getQuotaDefinitionOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"quota_definitions"}
-	pathParameters := []string{*getQuotaDefinitionOptions.ID}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(resourceManager.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range getQuotaDefinitionOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("resource_manager", "V2", "GetQuotaDefinition")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = resourceManager.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalQuotaDefinitions(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// ListResourceGroups : Get a list of all resource groups
-// Get a list of all resource groups in an account.
-func (resourceManager *ResourceManagerV2) ListResourceGroups(listResourceGroupsOptions *ListResourceGroupsOptions) (result *ResourceGroupsList, response *core.DetailedResponse, err error) {
-	err = core.ValidateStruct(listResourceGroupsOptions, "listResourceGroupsOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"resource_groups"}
-	pathParameters := []string{}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(resourceManager.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range listResourceGroupsOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("resource_manager", "V2", "ListResourceGroups")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	if listResourceGroupsOptions.AccountID != nil {
-		builder.AddQuery("account_id", fmt.Sprint(*listResourceGroupsOptions.AccountID))
-	}
-	if listResourceGroupsOptions.Date != nil {
-		builder.AddQuery("date", fmt.Sprint(*listResourceGroupsOptions.Date))
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = resourceManager.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalResourceGroupsList(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// CreateResourceGroup : Create a new resource group
-// Create a new resource group in an account.
-func (resourceManager *ResourceManagerV2) CreateResourceGroup(createResourceGroupOptions *CreateResourceGroupOptions) (result *ResCreateResourceGroup, response *core.DetailedResponse, err error) {
-	err = core.ValidateStruct(createResourceGroupOptions, "createResourceGroupOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"resource_groups"}
-	pathParameters := []string{}
-
-	builder := core.NewRequestBuilder(core.POST)
-	_, err = builder.ConstructHTTPURL(resourceManager.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range createResourceGroupOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("resource_manager", "V2", "CreateResourceGroup")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-	builder.AddHeader("Content-Type", "application/json")
-
-	body := make(map[string]interface{})
-	if createResourceGroupOptions.Name != nil {
-		body["name"] = createResourceGroupOptions.Name
-	}
-	if createResourceGroupOptions.AccountID != nil {
-		body["account_id"] = createResourceGroupOptions.AccountID
-	}
-	_, err = builder.SetBodyContentJSON(body)
-	if err != nil {
-		return
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = resourceManager.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalResCreateResourceGroup(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// GetResourceGroup : Get a resource group
-// Retrieve a resource group by ID.
-func (resourceManager *ResourceManagerV2) GetResourceGroup(getResourceGroupOptions *GetResourceGroupOptions) (result *ResourceGroup, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(getResourceGroupOptions, "getResourceGroupOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(getResourceGroupOptions, "getResourceGroupOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"resource_groups"}
-	pathParameters := []string{*getResourceGroupOptions.ID}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(resourceManager.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range getResourceGroupOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("resource_manager", "V2", "GetResourceGroup")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = resourceManager.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalResourceGroup(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// UpdateResourceGroup : Update a resource group
-// Update a resource group by ID.
-func (resourceManager *ResourceManagerV2) UpdateResourceGroup(updateResourceGroupOptions *UpdateResourceGroupOptions) (result *ResourceGroup, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(updateResourceGroupOptions, "updateResourceGroupOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(updateResourceGroupOptions, "updateResourceGroupOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"resource_groups"}
-	pathParameters := []string{*updateResourceGroupOptions.ID}
-
-	builder := core.NewRequestBuilder(core.PATCH)
-	_, err = builder.ConstructHTTPURL(resourceManager.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range updateResourceGroupOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("resource_manager", "V2", "UpdateResourceGroup")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-	builder.AddHeader("Content-Type", "application/json")
-
-	body := make(map[string]interface{})
-	if updateResourceGroupOptions.Name != nil {
-		body["name"] = updateResourceGroupOptions.Name
-	}
-	if updateResourceGroupOptions.State != nil {
-		body["state"] = updateResourceGroupOptions.State
-	}
-	_, err = builder.SetBodyContentJSON(body)
-	if err != nil {
-		return
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = resourceManager.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalResourceGroup(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// DeleteResourceGroup : Delete a resource group
-// Delete a resource group by ID.
-func (resourceManager *ResourceManagerV2) DeleteResourceGroup(deleteResourceGroupOptions *DeleteResourceGroupOptions) (response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(deleteResourceGroupOptions, "deleteResourceGroupOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(deleteResourceGroupOptions, "deleteResourceGroupOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"resource_groups"}
-	pathParameters := []string{*deleteResourceGroupOptions.ID}
-
-	builder := core.NewRequestBuilder(core.DELETE)
-	_, err = builder.ConstructHTTPURL(resourceManager.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range deleteResourceGroupOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("resource_manager", "V2", "DeleteResourceGroup")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = resourceManager.Service.Request(request, nil)
-
-	return
-}
-
-// CreateDefaultResourceQuotaOptions : The CreateDefaultResourceQuota options.
-type CreateDefaultResourceQuotaOptions struct {
-	// The resource type.
-	ResourceType *string `json:"resource_type" validate:"required"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewCreateDefaultResourceQuotaOptions : Instantiate CreateDefaultResourceQuotaOptions
-func (*ResourceManagerV2) NewCreateDefaultResourceQuotaOptions(resourceType string) *CreateDefaultResourceQuotaOptions {
-	return &CreateDefaultResourceQuotaOptions{
-		ResourceType: core.StringPtr(resourceType),
-	}
-}
-
-// SetResourceType : Allow user to set ResourceType
-func (options *CreateDefaultResourceQuotaOptions) SetResourceType(resourceType string) *CreateDefaultResourceQuotaOptions {
-	options.ResourceType = core.StringPtr(resourceType)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *CreateDefaultResourceQuotaOptions) SetHeaders(param map[string]string) *CreateDefaultResourceQuotaOptions {
-	options.Headers = param
-	return options
-}
-
-// CreateResourceGroupOptions : The CreateResourceGroup options.
-type CreateResourceGroupOptions struct {
-	// The new name of the resource group.
-	Name *string `json:"name,omitempty"`
-
-	// The account id of the resource group.
-	AccountID *string `json:"account_id,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewCreateResourceGroupOptions : Instantiate CreateResourceGroupOptions
-func (*ResourceManagerV2) NewCreateResourceGroupOptions() *CreateResourceGroupOptions {
-	return &CreateResourceGroupOptions{}
-}
-
-// SetName : Allow user to set Name
-func (options *CreateResourceGroupOptions) SetName(name string) *CreateResourceGroupOptions {
-	options.Name = core.StringPtr(name)
-	return options
-}
-
-// SetAccountID : Allow user to set AccountID
-func (options *CreateResourceGroupOptions) SetAccountID(accountID string) *CreateResourceGroupOptions {
-	options.AccountID = core.StringPtr(accountID)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *CreateResourceGroupOptions) SetHeaders(param map[string]string) *CreateResourceGroupOptions {
-	options.Headers = param
-	return options
-}
-
-// CreateSchemaOptions : The CreateSchema options.
-type CreateSchemaOptions struct {
-	// The resource type.
-	ResourceType *string `json:"resource_type" validate:"required"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewCreateSchemaOptions : Instantiate CreateSchemaOptions
-func (*ResourceManagerV2) NewCreateSchemaOptions(resourceType string) *CreateSchemaOptions {
-	return &CreateSchemaOptions{
-		ResourceType: core.StringPtr(resourceType),
-	}
-}
-
-// SetResourceType : Allow user to set ResourceType
-func (options *CreateSchemaOptions) SetResourceType(resourceType string) *CreateSchemaOptions {
-	options.ResourceType = core.StringPtr(resourceType)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *CreateSchemaOptions) SetHeaders(param map[string]string) *CreateSchemaOptions {
-	options.Headers = param
-	return options
-}
-
-// DeleteResourceGroupOptions : The DeleteResourceGroup options.
-type DeleteResourceGroupOptions struct {
-	// The short or long ID of the alias.
-	ID *string `json:"id" validate:"required"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewDeleteResourceGroupOptions : Instantiate DeleteResourceGroupOptions
-func (*ResourceManagerV2) NewDeleteResourceGroupOptions(id string) *DeleteResourceGroupOptions {
-	return &DeleteResourceGroupOptions{
-		ID: core.StringPtr(id),
-	}
-}
-
-// SetID : Allow user to set ID
-func (options *DeleteResourceGroupOptions) SetID(id string) *DeleteResourceGroupOptions {
-	options.ID = core.StringPtr(id)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *DeleteResourceGroupOptions) SetHeaders(param map[string]string) *DeleteResourceGroupOptions {
-	options.Headers = param
-	return options
-}
-
-// DeleteResourceQuotaOptions : The DeleteResourceQuota options.
-type DeleteResourceQuotaOptions struct {
-	// The account ID.
-	AccountID *string `json:"account_id" validate:"required"`
-
-	// The type of resource.
-	ResourceType *string `json:"resource_type" validate:"required"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewDeleteResourceQuotaOptions : Instantiate DeleteResourceQuotaOptions
-func (*ResourceManagerV2) NewDeleteResourceQuotaOptions(accountID string, resourceType string) *DeleteResourceQuotaOptions {
-	return &DeleteResourceQuotaOptions{
-		AccountID: core.StringPtr(accountID),
-		ResourceType: core.StringPtr(resourceType),
-	}
-}
-
-// SetAccountID : Allow user to set AccountID
-func (options *DeleteResourceQuotaOptions) SetAccountID(accountID string) *DeleteResourceQuotaOptions {
-	options.AccountID = core.StringPtr(accountID)
-	return options
-}
-
-// SetResourceType : Allow user to set ResourceType
-func (options *DeleteResourceQuotaOptions) SetResourceType(resourceType string) *DeleteResourceQuotaOptions {
-	options.ResourceType = core.StringPtr(resourceType)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *DeleteResourceQuotaOptions) SetHeaders(param map[string]string) *DeleteResourceQuotaOptions {
-	options.Headers = param
-	return options
-}
-
-// ErrorCollection : Collection of errors.
-type ErrorCollection struct {
-	// The error code encountered.
-	ErrorCode *string `json:"error_code,omitempty"`
-
-	// The error message.
-	Message *string `json:"message,omitempty"`
-
-	// The status code.
-	StatusCode *string `json:"status_code,omitempty"`
-
-	// The transaction-id of the request.
-	TransactionID *string `json:"transaction_id,omitempty"`
-}
-
-
-// UnmarshalErrorCollection constructs an instance of ErrorCollection from the specified map.
-func UnmarshalErrorCollection(m map[string]interface{}) (result *ErrorCollection, err error) {
-	obj := new(ErrorCollection)
-	obj.ErrorCode, err = core.UnmarshalString(m, "error_code")
-	if err != nil {
-		return
-	}
-	obj.Message, err = core.UnmarshalString(m, "message")
-	if err != nil {
-		return
-	}
-	obj.StatusCode, err = core.UnmarshalString(m, "status_code")
-	if err != nil {
-		return
-	}
-	obj.TransactionID, err = core.UnmarshalString(m, "transaction_id")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalErrorCollectionSlice unmarshals a slice of ErrorCollection instances from the specified list of maps.
-func UnmarshalErrorCollectionSlice(s []interface{}) (slice []ErrorCollection, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'ErrorCollection'")
-			return
-		}
-		obj, e := UnmarshalErrorCollection(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalErrorCollectionAsProperty unmarshals an instance of ErrorCollection that is stored as a property
-// within the specified map.
-func UnmarshalErrorCollectionAsProperty(m map[string]interface{}, propertyName string) (result *ErrorCollection, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'ErrorCollection'", propertyName)
-			return
-		}
-		result, err = UnmarshalErrorCollection(objMap)
-	}
-	return
-}
-
-// UnmarshalErrorCollectionSliceAsProperty unmarshals a slice of ErrorCollection instances that are stored as a property
-// within the specified map.
-func UnmarshalErrorCollectionSliceAsProperty(m map[string]interface{}, propertyName string) (slice []ErrorCollection, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'ErrorCollection'", propertyName)
-			return
-		}
-		slice, err = UnmarshalErrorCollectionSlice(vSlice)
-	}
-	return
-}
-
-// GetAccountQuotaListOptions : The GetAccountQuotaList options.
-type GetAccountQuotaListOptions struct {
-	// The account ID.
-	AccountID *string `json:"account_id" validate:"required"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewGetAccountQuotaListOptions : Instantiate GetAccountQuotaListOptions
-func (*ResourceManagerV2) NewGetAccountQuotaListOptions(accountID string) *GetAccountQuotaListOptions {
-	return &GetAccountQuotaListOptions{
-		AccountID: core.StringPtr(accountID),
-	}
-}
-
-// SetAccountID : Allow user to set AccountID
-func (options *GetAccountQuotaListOptions) SetAccountID(accountID string) *GetAccountQuotaListOptions {
-	options.AccountID = core.StringPtr(accountID)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *GetAccountQuotaListOptions) SetHeaders(param map[string]string) *GetAccountQuotaListOptions {
-	options.Headers = param
-	return options
-}
-
-// GetQuotaDefinitionOptions : The GetQuotaDefinition options.
-type GetQuotaDefinitionOptions struct {
-	// The id of the quota.
-	ID *string `json:"id" validate:"required"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewGetQuotaDefinitionOptions : Instantiate GetQuotaDefinitionOptions
-func (*ResourceManagerV2) NewGetQuotaDefinitionOptions(id string) *GetQuotaDefinitionOptions {
-	return &GetQuotaDefinitionOptions{
-		ID: core.StringPtr(id),
-	}
-}
-
-// SetID : Allow user to set ID
-func (options *GetQuotaDefinitionOptions) SetID(id string) *GetQuotaDefinitionOptions {
-	options.ID = core.StringPtr(id)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *GetQuotaDefinitionOptions) SetHeaders(param map[string]string) *GetQuotaDefinitionOptions {
-	options.Headers = param
-	return options
-}
-
-// GetResourceGroupOptions : The GetResourceGroup options.
-type GetResourceGroupOptions struct {
-	// The short or long ID of the alias.
-	ID *string `json:"id" validate:"required"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewGetResourceGroupOptions : Instantiate GetResourceGroupOptions
-func (*ResourceManagerV2) NewGetResourceGroupOptions(id string) *GetResourceGroupOptions {
-	return &GetResourceGroupOptions{
-		ID: core.StringPtr(id),
-	}
-}
-
-// SetID : Allow user to set ID
-func (options *GetResourceGroupOptions) SetID(id string) *GetResourceGroupOptions {
-	options.ID = core.StringPtr(id)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *GetResourceGroupOptions) SetHeaders(param map[string]string) *GetResourceGroupOptions {
-	options.Headers = param
-	return options
-}
-
-// GetResourceQuotaOptions : The GetResourceQuota options.
-type GetResourceQuotaOptions struct {
-	// The account ID.
-	AccountID *string `json:"account_id" validate:"required"`
-
-	// The type of resource.
-	ResourceType *string `json:"resource_type" validate:"required"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewGetResourceQuotaOptions : Instantiate GetResourceQuotaOptions
-func (*ResourceManagerV2) NewGetResourceQuotaOptions(accountID string, resourceType string) *GetResourceQuotaOptions {
-	return &GetResourceQuotaOptions{
-		AccountID: core.StringPtr(accountID),
-		ResourceType: core.StringPtr(resourceType),
-	}
-}
-
-// SetAccountID : Allow user to set AccountID
-func (options *GetResourceQuotaOptions) SetAccountID(accountID string) *GetResourceQuotaOptions {
-	options.AccountID = core.StringPtr(accountID)
-	return options
-}
-
-// SetResourceType : Allow user to set ResourceType
-func (options *GetResourceQuotaOptions) SetResourceType(resourceType string) *GetResourceQuotaOptions {
-	options.ResourceType = core.StringPtr(resourceType)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *GetResourceQuotaOptions) SetHeaders(param map[string]string) *GetResourceQuotaOptions {
-	options.Headers = param
-	return options
-}
-
-// GetSchemaOptions : The GetSchema options.
-type GetSchemaOptions struct {
-	// The resource type.
-	ResourceType *string `json:"resource_type" validate:"required"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewGetSchemaOptions : Instantiate GetSchemaOptions
-func (*ResourceManagerV2) NewGetSchemaOptions(resourceType string) *GetSchemaOptions {
-	return &GetSchemaOptions{
-		ResourceType: core.StringPtr(resourceType),
-	}
-}
-
-// SetResourceType : Allow user to set ResourceType
-func (options *GetSchemaOptions) SetResourceType(resourceType string) *GetSchemaOptions {
-	options.ResourceType = core.StringPtr(resourceType)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *GetSchemaOptions) SetHeaders(param map[string]string) *GetSchemaOptions {
-	options.Headers = param
-	return options
-}
-
-// ListQuotaDefinitionsOptions : The ListQuotaDefinitions options.
-type ListQuotaDefinitionsOptions struct {
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewListQuotaDefinitionsOptions : Instantiate ListQuotaDefinitionsOptions
-func (*ResourceManagerV2) NewListQuotaDefinitionsOptions() *ListQuotaDefinitionsOptions {
-	return &ListQuotaDefinitionsOptions{}
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *ListQuotaDefinitionsOptions) SetHeaders(param map[string]string) *ListQuotaDefinitionsOptions {
-	options.Headers = param
-	return options
-}
-
-// ListResourceGroupsOptions : The ListResourceGroups options.
-type ListResourceGroupsOptions struct {
-	// The ID of the account that contains the resource groups that you want to get.
-	AccountID *string `json:"account_id,omitempty"`
-
-	// The date would be in a format of YYYY-MM which returns resource groups exclude the deleted ones before this month.
-	Date *string `json:"date,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewListResourceGroupsOptions : Instantiate ListResourceGroupsOptions
-func (*ResourceManagerV2) NewListResourceGroupsOptions() *ListResourceGroupsOptions {
-	return &ListResourceGroupsOptions{}
-}
-
-// SetAccountID : Allow user to set AccountID
-func (options *ListResourceGroupsOptions) SetAccountID(accountID string) *ListResourceGroupsOptions {
-	options.AccountID = core.StringPtr(accountID)
-	return options
-}
-
-// SetDate : Allow user to set Date
-func (options *ListResourceGroupsOptions) SetDate(date string) *ListResourceGroupsOptions {
-	options.Date = core.StringPtr(date)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *ListResourceGroupsOptions) SetHeaders(param map[string]string) *ListResourceGroupsOptions {
-	options.Headers = param
-	return options
-}
-
-// QuotaDefinitions : Returned quota definitions.
-type QuotaDefinitions struct {
-	// An alpha-numeric value identifying the quota.
-	ID *string `json:"id,omitempty"`
-
-	// The human-readable name of the quota.
-	Name *string `json:"name,omitempty"`
-
-	// The type of the quota.
-	Type *string `json:"type,omitempty"`
-
-	// The total app limit.
-	NumberOfApps *float64 `json:"number_of_apps,omitempty"`
-
-	// The total service instances limit per app.
-	NumberOfServiceInstances *float64 `json:"number_of_service_instances,omitempty"`
-
-	// Default number of instances per lite plan.
-	DefaultNumberOfInstancesPerLitePlan *float64 `json:"default_number_of_instances_per_lite_plan,omitempty"`
-
-	// The total instances limit per app.
-	InstancesPerApp *float64 `json:"instances_per_app,omitempty"`
-
-	// The total memory of app instance.
-	InstanceMemory *string `json:"instance_memory,omitempty"`
-
-	// The total app memory capacity.
-	TotalAppMemory *string `json:"total_app_memory,omitempty"`
-
-	// The VSI limit.
-	VsiLimit *float64 `json:"vsi_limit,omitempty"`
-
-	// Resource quota.
-	ResourceQuotas *ResourceQuota `json:"resource_quotas,omitempty"`
-
-	// The date when the quota was initially created.
-	CreatedAt *string `json:"created_at,omitempty"`
-
-	// The date when the quota was last updated.
-	UpdatedAt *string `json:"updated_at,omitempty"`
-}
-
-
-// UnmarshalQuotaDefinitions constructs an instance of QuotaDefinitions from the specified map.
-func UnmarshalQuotaDefinitions(m map[string]interface{}) (result *QuotaDefinitions, err error) {
-	obj := new(QuotaDefinitions)
-	obj.ID, err = core.UnmarshalString(m, "id")
-	if err != nil {
-		return
-	}
-	obj.Name, err = core.UnmarshalString(m, "name")
-	if err != nil {
-		return
-	}
-	obj.Type, err = core.UnmarshalString(m, "type")
-	if err != nil {
-		return
-	}
-	obj.NumberOfApps, err = core.UnmarshalFloat64(m, "number_of_apps")
-	if err != nil {
-		return
-	}
-	obj.NumberOfServiceInstances, err = core.UnmarshalFloat64(m, "number_of_service_instances")
-	if err != nil {
-		return
-	}
-	obj.DefaultNumberOfInstancesPerLitePlan, err = core.UnmarshalFloat64(m, "default_number_of_instances_per_lite_plan")
-	if err != nil {
-		return
-	}
-	obj.InstancesPerApp, err = core.UnmarshalFloat64(m, "instances_per_app")
-	if err != nil {
-		return
-	}
-	obj.InstanceMemory, err = core.UnmarshalString(m, "instance_memory")
-	if err != nil {
-		return
-	}
-	obj.TotalAppMemory, err = core.UnmarshalString(m, "total_app_memory")
-	if err != nil {
-		return
-	}
-	obj.VsiLimit, err = core.UnmarshalFloat64(m, "vsi_limit")
-	if err != nil {
-		return
-	}
-	obj.ResourceQuotas, err = UnmarshalResourceQuotaAsProperty(m, "resource_quotas")
-	if err != nil {
-		return
-	}
-	obj.CreatedAt, err = core.UnmarshalString(m, "created_at")
-	if err != nil {
-		return
-	}
-	obj.UpdatedAt, err = core.UnmarshalString(m, "updated_at")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalQuotaDefinitionsSlice unmarshals a slice of QuotaDefinitions instances from the specified list of maps.
-func UnmarshalQuotaDefinitionsSlice(s []interface{}) (slice []QuotaDefinitions, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'QuotaDefinitions'")
-			return
-		}
-		obj, e := UnmarshalQuotaDefinitions(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalQuotaDefinitionsAsProperty unmarshals an instance of QuotaDefinitions that is stored as a property
-// within the specified map.
-func UnmarshalQuotaDefinitionsAsProperty(m map[string]interface{}, propertyName string) (result *QuotaDefinitions, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'QuotaDefinitions'", propertyName)
-			return
-		}
-		result, err = UnmarshalQuotaDefinitions(objMap)
-	}
-	return
-}
-
-// UnmarshalQuotaDefinitionsSliceAsProperty unmarshals a slice of QuotaDefinitions instances that are stored as a property
-// within the specified map.
-func UnmarshalQuotaDefinitionsSliceAsProperty(m map[string]interface{}, propertyName string) (slice []QuotaDefinitions, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'QuotaDefinitions'", propertyName)
-			return
-		}
-		slice, err = UnmarshalQuotaDefinitionsSlice(vSlice)
-	}
-	return
-}
-
-// QuotaDefinitionsList : A list of quota definitions.
-type QuotaDefinitionsList struct {
-	// List of resources.
-	Resources []QuotaDefinitions `json:"resources" validate:"required"`
-}
-
-
-// UnmarshalQuotaDefinitionsList constructs an instance of QuotaDefinitionsList from the specified map.
-func UnmarshalQuotaDefinitionsList(m map[string]interface{}) (result *QuotaDefinitionsList, err error) {
-	obj := new(QuotaDefinitionsList)
-	obj.Resources, err = UnmarshalQuotaDefinitionsSliceAsProperty(m, "resources")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalQuotaDefinitionsListSlice unmarshals a slice of QuotaDefinitionsList instances from the specified list of maps.
-func UnmarshalQuotaDefinitionsListSlice(s []interface{}) (slice []QuotaDefinitionsList, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'QuotaDefinitionsList'")
-			return
-		}
-		obj, e := UnmarshalQuotaDefinitionsList(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalQuotaDefinitionsListAsProperty unmarshals an instance of QuotaDefinitionsList that is stored as a property
-// within the specified map.
-func UnmarshalQuotaDefinitionsListAsProperty(m map[string]interface{}, propertyName string) (result *QuotaDefinitionsList, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'QuotaDefinitionsList'", propertyName)
-			return
-		}
-		result, err = UnmarshalQuotaDefinitionsList(objMap)
-	}
-	return
-}
-
-// UnmarshalQuotaDefinitionsListSliceAsProperty unmarshals a slice of QuotaDefinitionsList instances that are stored as a property
-// within the specified map.
-func UnmarshalQuotaDefinitionsListSliceAsProperty(m map[string]interface{}, propertyName string) (slice []QuotaDefinitionsList, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'QuotaDefinitionsList'", propertyName)
-			return
-		}
-		slice, err = UnmarshalQuotaDefinitionsListSlice(vSlice)
-	}
-	return
-}
-
-// ResCreateResourceGroup : Create a resource group.
-type ResCreateResourceGroup struct {
-	// An alpha-numeric value identifying the resource group.
-	ID *string `json:"id,omitempty"`
-
-	// The full CRN (cloud resource name) associated with the resource group. For more on this format, see [Cloud Resource
-	// Names](https://cloud.ibm.com/docs/resources?topic=resources-crn).
-	Crn *string `json:"crn,omitempty"`
-}
-
-
-// UnmarshalResCreateResourceGroup constructs an instance of ResCreateResourceGroup from the specified map.
-func UnmarshalResCreateResourceGroup(m map[string]interface{}) (result *ResCreateResourceGroup, err error) {
-	obj := new(ResCreateResourceGroup)
-	obj.ID, err = core.UnmarshalString(m, "id")
-	if err != nil {
-		return
-	}
-	obj.Crn, err = core.UnmarshalString(m, "crn")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalResCreateResourceGroupSlice unmarshals a slice of ResCreateResourceGroup instances from the specified list of maps.
-func UnmarshalResCreateResourceGroupSlice(s []interface{}) (slice []ResCreateResourceGroup, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'ResCreateResourceGroup'")
-			return
-		}
-		obj, e := UnmarshalResCreateResourceGroup(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalResCreateResourceGroupAsProperty unmarshals an instance of ResCreateResourceGroup that is stored as a property
-// within the specified map.
-func UnmarshalResCreateResourceGroupAsProperty(m map[string]interface{}, propertyName string) (result *ResCreateResourceGroup, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'ResCreateResourceGroup'", propertyName)
-			return
-		}
-		result, err = UnmarshalResCreateResourceGroup(objMap)
-	}
-	return
-}
-
-// UnmarshalResCreateResourceGroupSliceAsProperty unmarshals a slice of ResCreateResourceGroup instances that are stored as a property
-// within the specified map.
-func UnmarshalResCreateResourceGroupSliceAsProperty(m map[string]interface{}, propertyName string) (slice []ResCreateResourceGroup, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'ResCreateResourceGroup'", propertyName)
-			return
-		}
-		slice, err = UnmarshalResCreateResourceGroupSlice(vSlice)
-	}
-	return
-}
-
-// ResourceGroup : A resource group.
-type ResourceGroup struct {
-	// An alpha-numeric value identifying the resource group.
-	ID *string `json:"id,omitempty"`
-
-	// The full CRN (cloud resource name) associated with the resource group. For more on this format, see [Cloud Resource
-	// Names](https://cloud.ibm.com/docs/resources?topic=resources-crn).
-	Crn *string `json:"crn,omitempty"`
-
-	// An alpha-numeric value identifying the account ID.
-	AccountID *string `json:"account_id,omitempty"`
-
-	// The human-readable name of the resource group.
-	Name *string `json:"name,omitempty"`
-
-	// The state of the resource group.
-	State *string `json:"state,omitempty"`
-
-	// Identify if this resource group is default of the account or not.
-	Default *bool `json:"default,omitempty"`
-
-	// An alpha-numeric value identifying the quota ID associated with the resource group.
-	QuotaID *string `json:"quota_id,omitempty"`
-
-	// The URL to access the quota details that associated with the resource group.
-	QuotaURL *string `json:"quota_url,omitempty"`
-
-	// The URL to access the payment methods details that associated with the resource group.
-	PaymentMethodsURL *string `json:"payment_methods_url,omitempty"`
-
-	// An array of the resources that linked to the resource group.
-	ResourceLinkages []interface{} `json:"resource_linkages,omitempty"`
-
-	// The URL to access the team details that associated with the resource group.
-	TeamsURL *string `json:"teams_url,omitempty"`
-
-	// The date when the resource group was initially created.
-	CreatedAt *string `json:"created_at,omitempty"`
-
-	// The date when the resource group was last updated.
-	UpdatedAt *string `json:"updated_at,omitempty"`
-}
-
-
-// UnmarshalResourceGroup constructs an instance of ResourceGroup from the specified map.
-func UnmarshalResourceGroup(m map[string]interface{}) (result *ResourceGroup, err error) {
-	obj := new(ResourceGroup)
-	obj.ID, err = core.UnmarshalString(m, "id")
-	if err != nil {
-		return
-	}
-	obj.Crn, err = core.UnmarshalString(m, "crn")
-	if err != nil {
-		return
-	}
-	obj.AccountID, err = core.UnmarshalString(m, "account_id")
-	if err != nil {
-		return
-	}
-	obj.Name, err = core.UnmarshalString(m, "name")
-	if err != nil {
-		return
-	}
-	obj.State, err = core.UnmarshalString(m, "state")
-	if err != nil {
-		return
-	}
-	obj.Default, err = core.UnmarshalBool(m, "default")
-	if err != nil {
-		return
-	}
-	obj.QuotaID, err = core.UnmarshalString(m, "quota_id")
-	if err != nil {
-		return
-	}
-	obj.QuotaURL, err = core.UnmarshalString(m, "quota_url")
-	if err != nil {
-		return
-	}
-	obj.PaymentMethodsURL, err = core.UnmarshalString(m, "payment_methods_url")
-	if err != nil {
-		return
-	}
-	obj.ResourceLinkages, err = core.UnmarshalAnySlice(m, "resource_linkages")
-	if err != nil {
-		return
-	}
-	obj.TeamsURL, err = core.UnmarshalString(m, "teams_url")
-	if err != nil {
-		return
-	}
-	obj.CreatedAt, err = core.UnmarshalString(m, "created_at")
-	if err != nil {
-		return
-	}
-	obj.UpdatedAt, err = core.UnmarshalString(m, "updated_at")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalResourceGroupSlice unmarshals a slice of ResourceGroup instances from the specified list of maps.
-func UnmarshalResourceGroupSlice(s []interface{}) (slice []ResourceGroup, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'ResourceGroup'")
-			return
-		}
-		obj, e := UnmarshalResourceGroup(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalResourceGroupAsProperty unmarshals an instance of ResourceGroup that is stored as a property
-// within the specified map.
-func UnmarshalResourceGroupAsProperty(m map[string]interface{}, propertyName string) (result *ResourceGroup, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'ResourceGroup'", propertyName)
-			return
-		}
-		result, err = UnmarshalResourceGroup(objMap)
-	}
-	return
-}
-
-// UnmarshalResourceGroupSliceAsProperty unmarshals a slice of ResourceGroup instances that are stored as a property
-// within the specified map.
-func UnmarshalResourceGroupSliceAsProperty(m map[string]interface{}, propertyName string) (slice []ResourceGroup, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'ResourceGroup'", propertyName)
-			return
-		}
-		slice, err = UnmarshalResourceGroupSlice(vSlice)
-	}
-	return
-}
-
-// ResourceGroupsList : A list of resource groups.
-type ResourceGroupsList struct {
-	// List of resources.
-	Resources []ResourceGroup `json:"resources" validate:"required"`
-}
-
-
-// UnmarshalResourceGroupsList constructs an instance of ResourceGroupsList from the specified map.
-func UnmarshalResourceGroupsList(m map[string]interface{}) (result *ResourceGroupsList, err error) {
-	obj := new(ResourceGroupsList)
-	obj.Resources, err = UnmarshalResourceGroupSliceAsProperty(m, "resources")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalResourceGroupsListSlice unmarshals a slice of ResourceGroupsList instances from the specified list of maps.
-func UnmarshalResourceGroupsListSlice(s []interface{}) (slice []ResourceGroupsList, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'ResourceGroupsList'")
-			return
-		}
-		obj, e := UnmarshalResourceGroupsList(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalResourceGroupsListAsProperty unmarshals an instance of ResourceGroupsList that is stored as a property
-// within the specified map.
-func UnmarshalResourceGroupsListAsProperty(m map[string]interface{}, propertyName string) (result *ResourceGroupsList, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'ResourceGroupsList'", propertyName)
-			return
-		}
-		result, err = UnmarshalResourceGroupsList(objMap)
-	}
-	return
-}
-
-// UnmarshalResourceGroupsListSliceAsProperty unmarshals a slice of ResourceGroupsList instances that are stored as a property
-// within the specified map.
-func UnmarshalResourceGroupsListSliceAsProperty(m map[string]interface{}, propertyName string) (slice []ResourceGroupsList, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'ResourceGroupsList'", propertyName)
-			return
-		}
-		slice, err = UnmarshalResourceGroupsListSlice(vSlice)
-	}
-	return
-}
-
-// ResourceQuota : Resource quota.
-type ResourceQuota struct {
-	// An alpha-numeric value identifying the quota.
-	ID *string `json:"_id,omitempty"`
-
-	// The human-readable name of the quota.
-	ResourceID *string `json:"resource_id,omitempty"`
-
-	// The full CRN (cloud resource name) associated with the quota. For more on this format, see
-	// https://console.bluemix.net/docs/overview/crn.html#crn.
-	Crn *string `json:"crn,omitempty"`
-
-	// The limit number of this resource.
-	Limit *float64 `json:"limit,omitempty"`
-}
-
-
-// UnmarshalResourceQuota constructs an instance of ResourceQuota from the specified map.
-func UnmarshalResourceQuota(m map[string]interface{}) (result *ResourceQuota, err error) {
-	obj := new(ResourceQuota)
-	obj.ID, err = core.UnmarshalString(m, "_id")
-	if err != nil {
-		return
-	}
-	obj.ResourceID, err = core.UnmarshalString(m, "resource_id")
-	if err != nil {
-		return
-	}
-	obj.Crn, err = core.UnmarshalString(m, "crn")
-	if err != nil {
-		return
-	}
-	obj.Limit, err = core.UnmarshalFloat64(m, "limit")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalResourceQuotaSlice unmarshals a slice of ResourceQuota instances from the specified list of maps.
-func UnmarshalResourceQuotaSlice(s []interface{}) (slice []ResourceQuota, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'ResourceQuota'")
-			return
-		}
-		obj, e := UnmarshalResourceQuota(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalResourceQuotaAsProperty unmarshals an instance of ResourceQuota that is stored as a property
-// within the specified map.
-func UnmarshalResourceQuotaAsProperty(m map[string]interface{}, propertyName string) (result *ResourceQuota, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'ResourceQuota'", propertyName)
-			return
-		}
-		result, err = UnmarshalResourceQuota(objMap)
-	}
-	return
-}
-
-// UnmarshalResourceQuotaSliceAsProperty unmarshals a slice of ResourceQuota instances that are stored as a property
-// within the specified map.
-func UnmarshalResourceQuotaSliceAsProperty(m map[string]interface{}, propertyName string) (slice []ResourceQuota, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'ResourceQuota'", propertyName)
-			return
-		}
-		slice, err = UnmarshalResourceQuotaSlice(vSlice)
-	}
-	return
-}
-
-// UpdateResourceGroupOptions : The UpdateResourceGroup options.
-type UpdateResourceGroupOptions struct {
-	// The short or long ID of the alias.
-	ID *string `json:"id" validate:"required"`
-
-	// The new name of the resource group.
-	Name *string `json:"name,omitempty"`
-
-	// The state of the resource group.
-	State *string `json:"state,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewUpdateResourceGroupOptions : Instantiate UpdateResourceGroupOptions
-func (*ResourceManagerV2) NewUpdateResourceGroupOptions(id string) *UpdateResourceGroupOptions {
-	return &UpdateResourceGroupOptions{
-		ID: core.StringPtr(id),
-	}
-}
-
-// SetID : Allow user to set ID
-func (options *UpdateResourceGroupOptions) SetID(id string) *UpdateResourceGroupOptions {
-	options.ID = core.StringPtr(id)
-	return options
-}
-
-// SetName : Allow user to set Name
-func (options *UpdateResourceGroupOptions) SetName(name string) *UpdateResourceGroupOptions {
-	options.Name = core.StringPtr(name)
-	return options
-}
-
-// SetState : Allow user to set State
-func (options *UpdateResourceGroupOptions) SetState(state string) *UpdateResourceGroupOptions {
-	options.State = core.StringPtr(state)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *UpdateResourceGroupOptions) SetHeaders(param map[string]string) *UpdateResourceGroupOptions {
-	options.Headers = param
-	return options
-}
-
-// UpdateResourceQuotaOptions : The UpdateResourceQuota options.
-type UpdateResourceQuotaOptions struct {
-	// The account ID.
-	AccountID *string `json:"account_id" validate:"required"`
-
-	// The type of resource.
-	ResourceType *string `json:"resource_type" validate:"required"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewUpdateResourceQuotaOptions : Instantiate UpdateResourceQuotaOptions
-func (*ResourceManagerV2) NewUpdateResourceQuotaOptions(accountID string, resourceType string) *UpdateResourceQuotaOptions {
-	return &UpdateResourceQuotaOptions{
-		AccountID: core.StringPtr(accountID),
-		ResourceType: core.StringPtr(resourceType),
-	}
-}
-
-// SetAccountID : Allow user to set AccountID
-func (options *UpdateResourceQuotaOptions) SetAccountID(accountID string) *UpdateResourceQuotaOptions {
-	options.AccountID = core.StringPtr(accountID)
-	return options
-}
-
-// SetResourceType : Allow user to set ResourceType
-func (options *UpdateResourceQuotaOptions) SetResourceType(resourceType string) *UpdateResourceQuotaOptions {
-	options.ResourceType = core.StringPtr(resourceType)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *UpdateResourceQuotaOptions) SetHeaders(param map[string]string) *UpdateResourceQuotaOptions {
-	options.Headers = param
-	return options
-}
diff --git a/resourcemanagerv2/resource_manager_v2_suite_test.go b/resourcemanagerv2/resource_manager_v2_suite_test.go
deleted file mode 100644
index 7568682b..00000000
--- a/resourcemanagerv2/resource_manager_v2_suite_test.go
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * (C) Copyright IBM Corp. 2020.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package resourcemanagerv2_test
-
-import (
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-	"testing"
-)
-
-func TestResourceManagerV2(t *testing.T) {
-	RegisterFailHandler(Fail)
-	RunSpecs(t, "ResourceManagerV2 Suite")
-}
diff --git a/resourcemanagerv2/resource_manager_v2_test.go b/resourcemanagerv2/resource_manager_v2_test.go
deleted file mode 100644
index d66c9a3f..00000000
--- a/resourcemanagerv2/resource_manager_v2_test.go
+++ /dev/null
@@ -1,745 +0,0 @@
-/**
- * (C) Copyright IBM Corp. 2020.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package resourcemanagerv2_test
-
-import (
-	"bytes"
-	"fmt"
-	"github.com/IBM/go-sdk-core/v3/core"
-	"github.com/go-openapi/strfmt"
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-	"github.ibm.com/ibmcloud/platform-services-go-sdk/resourcemanagerv2"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"net/http/httptest"
-	"time"
-)
-
-var _ = Describe(`ResourceManagerV2`, func() {
-	Describe(`GetAccountQuotaList(getAccountQuotaListOptions *GetAccountQuotaListOptions)`, func() {
-		bearerToken := "0ui9876453"
-		getAccountQuotaListPath := "/quota_definitions/accounts/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(getAccountQuotaListPath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"id": "ID", "name": "Name", "type": "Type", "number_of_apps": 12, "number_of_service_instances": 24, "default_number_of_instances_per_lite_plan": 35, "instances_per_app": 15, "instance_memory": "InstanceMemory", "total_app_memory": "TotalAppMemory", "vsi_limit": 8, "resource_quotas": {"_id": "ID", "resource_id": "ResourceID", "crn": "Crn", "limit": 5}, "created_at": "CreatedAt", "updated_at": "UpdatedAt"}`)
-			}))
-			It(`Invoke GetAccountQuotaList successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := resourcemanagerv2.NewResourceManagerV2(&resourcemanagerv2.ResourceManagerV2Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.GetAccountQuotaList(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the GetAccountQuotaListOptions model
-				getAccountQuotaListOptionsModel := new(resourcemanagerv2.GetAccountQuotaListOptions)
-				getAccountQuotaListOptionsModel.AccountID = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.GetAccountQuotaList(getAccountQuotaListOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`GetResourceQuota(getResourceQuotaOptions *GetResourceQuotaOptions)`, func() {
-		bearerToken := "0ui9876453"
-		getResourceQuotaPath := "/quota_definitions/accounts/testString/resource_types/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(getResourceQuotaPath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"_id": "ID", "resource_id": "ResourceID", "crn": "Crn", "limit": 5}`)
-			}))
-			It(`Invoke GetResourceQuota successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := resourcemanagerv2.NewResourceManagerV2(&resourcemanagerv2.ResourceManagerV2Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.GetResourceQuota(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the GetResourceQuotaOptions model
-				getResourceQuotaOptionsModel := new(resourcemanagerv2.GetResourceQuotaOptions)
-				getResourceQuotaOptionsModel.AccountID = core.StringPtr("testString")
-				getResourceQuotaOptionsModel.ResourceType = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.GetResourceQuota(getResourceQuotaOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`UpdateResourceQuota(updateResourceQuotaOptions *UpdateResourceQuotaOptions)`, func() {
-		bearerToken := "0ui9876453"
-		updateResourceQuotaPath := "/quota_definitions/accounts/testString/resource_types/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(updateResourceQuotaPath))
-				Expect(req.Method).To(Equal("PUT"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"error_code": "RG-CloudResourceGroupErrorResponse", "message": "Message", "status_code": "StatusCode", "transaction_id": "TransactionID"}`)
-			}))
-			It(`Invoke UpdateResourceQuota successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := resourcemanagerv2.NewResourceManagerV2(&resourcemanagerv2.ResourceManagerV2Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.UpdateResourceQuota(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the UpdateResourceQuotaOptions model
-				updateResourceQuotaOptionsModel := new(resourcemanagerv2.UpdateResourceQuotaOptions)
-				updateResourceQuotaOptionsModel.AccountID = core.StringPtr("testString")
-				updateResourceQuotaOptionsModel.ResourceType = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.UpdateResourceQuota(updateResourceQuotaOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`DeleteResourceQuota(deleteResourceQuotaOptions *DeleteResourceQuotaOptions)`, func() {
-		bearerToken := "0ui9876453"
-		deleteResourceQuotaPath := "/quota_definitions/accounts/testString/resource_types/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(deleteResourceQuotaPath))
-				Expect(req.Method).To(Equal("DELETE"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"error_code": "RG-CloudResourceGroupErrorResponse", "message": "Message", "status_code": "StatusCode", "transaction_id": "TransactionID"}`)
-			}))
-			It(`Invoke DeleteResourceQuota successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := resourcemanagerv2.NewResourceManagerV2(&resourcemanagerv2.ResourceManagerV2Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.DeleteResourceQuota(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the DeleteResourceQuotaOptions model
-				deleteResourceQuotaOptionsModel := new(resourcemanagerv2.DeleteResourceQuotaOptions)
-				deleteResourceQuotaOptionsModel.AccountID = core.StringPtr("testString")
-				deleteResourceQuotaOptionsModel.ResourceType = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.DeleteResourceQuota(deleteResourceQuotaOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`CreateDefaultResourceQuota(createDefaultResourceQuotaOptions *CreateDefaultResourceQuotaOptions)`, func() {
-		bearerToken := "0ui9876453"
-		createDefaultResourceQuotaPath := "/quota_definitions/resource_types/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(createDefaultResourceQuotaPath))
-				Expect(req.Method).To(Equal("POST"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"error_code": "RG-CloudResourceGroupErrorResponse", "message": "Message", "status_code": "StatusCode", "transaction_id": "TransactionID"}`)
-			}))
-			It(`Invoke CreateDefaultResourceQuota successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := resourcemanagerv2.NewResourceManagerV2(&resourcemanagerv2.ResourceManagerV2Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.CreateDefaultResourceQuota(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the CreateDefaultResourceQuotaOptions model
-				createDefaultResourceQuotaOptionsModel := new(resourcemanagerv2.CreateDefaultResourceQuotaOptions)
-				createDefaultResourceQuotaOptionsModel.ResourceType = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.CreateDefaultResourceQuota(createDefaultResourceQuotaOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`CreateSchema(createSchemaOptions *CreateSchemaOptions)`, func() {
-		bearerToken := "0ui9876453"
-		createSchemaPath := "/quota_definitions/resource_types/testString/schemas"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(createSchemaPath))
-				Expect(req.Method).To(Equal("POST"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"error_code": "RG-CloudResourceGroupErrorResponse", "message": "Message", "status_code": "StatusCode", "transaction_id": "TransactionID"}`)
-			}))
-			It(`Invoke CreateSchema successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := resourcemanagerv2.NewResourceManagerV2(&resourcemanagerv2.ResourceManagerV2Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.CreateSchema(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the CreateSchemaOptions model
-				createSchemaOptionsModel := new(resourcemanagerv2.CreateSchemaOptions)
-				createSchemaOptionsModel.ResourceType = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.CreateSchema(createSchemaOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`GetSchema(getSchemaOptions *GetSchemaOptions)`, func() {
-		bearerToken := "0ui9876453"
-		getSchemaPath := "/quota_definitions/resource_types/testString/schemas"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(getSchemaPath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"_id": "ID", "resource_id": "ResourceID", "crn": "Crn", "limit": 5}`)
-			}))
-			It(`Invoke GetSchema successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := resourcemanagerv2.NewResourceManagerV2(&resourcemanagerv2.ResourceManagerV2Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.GetSchema(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the GetSchemaOptions model
-				getSchemaOptionsModel := new(resourcemanagerv2.GetSchemaOptions)
-				getSchemaOptionsModel.ResourceType = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.GetSchema(getSchemaOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`ListQuotaDefinitions(listQuotaDefinitionsOptions *ListQuotaDefinitionsOptions)`, func() {
-		bearerToken := "0ui9876453"
-		listQuotaDefinitionsPath := "/quota_definitions"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(listQuotaDefinitionsPath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"resources": [{"id": "ID", "name": "Name", "type": "Type", "number_of_apps": 12, "number_of_service_instances": 24, "default_number_of_instances_per_lite_plan": 35, "instances_per_app": 15, "instance_memory": "InstanceMemory", "total_app_memory": "TotalAppMemory", "vsi_limit": 8, "resource_quotas": {"_id": "ID", "resource_id": "ResourceID", "crn": "Crn", "limit": 5}, "created_at": "CreatedAt", "updated_at": "UpdatedAt"}]}`)
-			}))
-			It(`Invoke ListQuotaDefinitions successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := resourcemanagerv2.NewResourceManagerV2(&resourcemanagerv2.ResourceManagerV2Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.ListQuotaDefinitions(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the ListQuotaDefinitionsOptions model
-				listQuotaDefinitionsOptionsModel := new(resourcemanagerv2.ListQuotaDefinitionsOptions)
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.ListQuotaDefinitions(listQuotaDefinitionsOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`GetQuotaDefinition(getQuotaDefinitionOptions *GetQuotaDefinitionOptions)`, func() {
-		bearerToken := "0ui9876453"
-		getQuotaDefinitionPath := "/quota_definitions/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(getQuotaDefinitionPath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"id": "ID", "name": "Name", "type": "Type", "number_of_apps": 12, "number_of_service_instances": 24, "default_number_of_instances_per_lite_plan": 35, "instances_per_app": 15, "instance_memory": "InstanceMemory", "total_app_memory": "TotalAppMemory", "vsi_limit": 8, "resource_quotas": {"_id": "ID", "resource_id": "ResourceID", "crn": "Crn", "limit": 5}, "created_at": "CreatedAt", "updated_at": "UpdatedAt"}`)
-			}))
-			It(`Invoke GetQuotaDefinition successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := resourcemanagerv2.NewResourceManagerV2(&resourcemanagerv2.ResourceManagerV2Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.GetQuotaDefinition(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the GetQuotaDefinitionOptions model
-				getQuotaDefinitionOptionsModel := new(resourcemanagerv2.GetQuotaDefinitionOptions)
-				getQuotaDefinitionOptionsModel.ID = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.GetQuotaDefinition(getQuotaDefinitionOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`ListResourceGroups(listResourceGroupsOptions *ListResourceGroupsOptions)`, func() {
-		bearerToken := "0ui9876453"
-		listResourceGroupsPath := "/resource_groups"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(listResourceGroupsPath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				Expect(req.URL.Query()["account_id"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["date"]).To(Equal([]string{"testString"}))
-
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"resources": [{"id": "ID", "crn": "Crn", "account_id": "AccountID", "name": "Name", "state": "State", "default": false, "quota_id": "QuotaID", "quota_url": "QuotaURL", "payment_methods_url": "PaymentMethodsURL", "resource_linkages": [{"anyKey": "anyValue"}], "teams_url": "TeamsURL", "created_at": "CreatedAt", "updated_at": "UpdatedAt"}]}`)
-			}))
-			It(`Invoke ListResourceGroups successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := resourcemanagerv2.NewResourceManagerV2(&resourcemanagerv2.ResourceManagerV2Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.ListResourceGroups(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the ListResourceGroupsOptions model
-				listResourceGroupsOptionsModel := new(resourcemanagerv2.ListResourceGroupsOptions)
-				listResourceGroupsOptionsModel.AccountID = core.StringPtr("testString")
-				listResourceGroupsOptionsModel.Date = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.ListResourceGroups(listResourceGroupsOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`CreateResourceGroup(createResourceGroupOptions *CreateResourceGroupOptions)`, func() {
-		bearerToken := "0ui9876453"
-		createResourceGroupPath := "/resource_groups"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(createResourceGroupPath))
-				Expect(req.Method).To(Equal("POST"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(201)
-				fmt.Fprintf(res, `{"id": "ID", "crn": "Crn"}`)
-			}))
-			It(`Invoke CreateResourceGroup successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := resourcemanagerv2.NewResourceManagerV2(&resourcemanagerv2.ResourceManagerV2Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.CreateResourceGroup(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the CreateResourceGroupOptions model
-				createResourceGroupOptionsModel := new(resourcemanagerv2.CreateResourceGroupOptions)
-				createResourceGroupOptionsModel.Name = core.StringPtr("test1")
-				createResourceGroupOptionsModel.AccountID = core.StringPtr("25eba2a9-beef-450b-82cf-f5ad5e36c6dd")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.CreateResourceGroup(createResourceGroupOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`GetResourceGroup(getResourceGroupOptions *GetResourceGroupOptions)`, func() {
-		bearerToken := "0ui9876453"
-		getResourceGroupPath := "/resource_groups/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(getResourceGroupPath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"id": "ID", "crn": "Crn", "account_id": "AccountID", "name": "Name", "state": "State", "default": false, "quota_id": "QuotaID", "quota_url": "QuotaURL", "payment_methods_url": "PaymentMethodsURL", "resource_linkages": [{"anyKey": "anyValue"}], "teams_url": "TeamsURL", "created_at": "CreatedAt", "updated_at": "UpdatedAt"}`)
-			}))
-			It(`Invoke GetResourceGroup successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := resourcemanagerv2.NewResourceManagerV2(&resourcemanagerv2.ResourceManagerV2Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.GetResourceGroup(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the GetResourceGroupOptions model
-				getResourceGroupOptionsModel := new(resourcemanagerv2.GetResourceGroupOptions)
-				getResourceGroupOptionsModel.ID = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.GetResourceGroup(getResourceGroupOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`UpdateResourceGroup(updateResourceGroupOptions *UpdateResourceGroupOptions)`, func() {
-		bearerToken := "0ui9876453"
-		updateResourceGroupPath := "/resource_groups/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(updateResourceGroupPath))
-				Expect(req.Method).To(Equal("PATCH"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"id": "ID", "crn": "Crn", "account_id": "AccountID", "name": "Name", "state": "State", "default": false, "quota_id": "QuotaID", "quota_url": "QuotaURL", "payment_methods_url": "PaymentMethodsURL", "resource_linkages": [{"anyKey": "anyValue"}], "teams_url": "TeamsURL", "created_at": "CreatedAt", "updated_at": "UpdatedAt"}`)
-			}))
-			It(`Invoke UpdateResourceGroup successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := resourcemanagerv2.NewResourceManagerV2(&resourcemanagerv2.ResourceManagerV2Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.UpdateResourceGroup(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the UpdateResourceGroupOptions model
-				updateResourceGroupOptionsModel := new(resourcemanagerv2.UpdateResourceGroupOptions)
-				updateResourceGroupOptionsModel.ID = core.StringPtr("testString")
-				updateResourceGroupOptionsModel.Name = core.StringPtr("testString")
-				updateResourceGroupOptionsModel.State = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.UpdateResourceGroup(updateResourceGroupOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`DeleteResourceGroup(deleteResourceGroupOptions *DeleteResourceGroupOptions)`, func() {
-		bearerToken := "0ui9876453"
-		deleteResourceGroupPath := "/resource_groups/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(deleteResourceGroupPath))
-				Expect(req.Method).To(Equal("DELETE"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.WriteHeader(204)
-			}))
-			It(`Invoke DeleteResourceGroup successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := resourcemanagerv2.NewResourceManagerV2(&resourcemanagerv2.ResourceManagerV2Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				response, operationErr := testService.DeleteResourceGroup(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-
-				// Construct an instance of the DeleteResourceGroupOptions model
-				deleteResourceGroupOptionsModel := new(resourcemanagerv2.DeleteResourceGroupOptions)
-				deleteResourceGroupOptionsModel.ID = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				response, operationErr = testService.DeleteResourceGroup(deleteResourceGroupOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`Utility function tests`, func() {
-		It(`Invoke CreateMockMap() successfully`, func() {
-			mockMap := CreateMockMap()
-			Expect(mockMap).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockByteArray() successfully`, func() {
-			mockByteArray := CreateMockByteArray("This is a test")
-			Expect(mockByteArray).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockUUID() successfully`, func() {
-			mockUUID := CreateMockUUID("9fab83da-98cb-4f18-a7ba-b6f0435c9673")
-			Expect(mockUUID).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockReader() successfully`, func() {
-			mockReader := CreateMockReader("This is a test.")
-			Expect(mockReader).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockDate() successfully`, func() {
-			mockDate := CreateMockDate()
-			Expect(mockDate).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockDateTime() successfully`, func() {
-			mockDateTime := CreateMockDateTime()
-			Expect(mockDateTime).ToNot(BeNil())
-		})
-	})
-})
-
-//
-// Utility functions used by the generated test code
-//
-
-func CreateMockMap() map[string]interface{} {
-	m := make(map[string]interface{})
-	return m
-}
-
-func CreateMockByteArray(mockData string) *[]byte {
-	ba := make([]byte, len(mockData))
-	ba = append(ba, mockData...)
-	return &ba
-}
-
-func CreateMockUUID(mockData string) *strfmt.UUID {
-	uuid := strfmt.UUID(mockData)
-	return &uuid
-}
-
-func CreateMockReader(mockData string) io.ReadCloser {
-	return ioutil.NopCloser(bytes.NewReader([]byte(mockData)))
-}
-
-func CreateMockDate() *strfmt.Date {
-	d := strfmt.Date(time.Now())
-	return &d
-}
-
-func CreateMockDateTime() *strfmt.DateTime {
-	d := strfmt.DateTime(time.Now())
-	return &d
-}
diff --git a/usagemeteringv4/usage_metering_v4.go b/usagemeteringv4/usage_metering_v4.go
deleted file mode 100644
index 8088307a..00000000
--- a/usagemeteringv4/usage_metering_v4.go
+++ /dev/null
@@ -1,801 +0,0 @@
-/**
- * (C) Copyright IBM Corp. 2020.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// Package usagemeteringv4 : Operations and models for the UsageMeteringV4 service
-package usagemeteringv4
-
-import (
-	"fmt"
-	"github.com/IBM/go-sdk-core/v3/core"
-	common "github.ibm.com/ibmcloud/platform-services-go-sdk/common"
-)
-
-// UsageMeteringV4 : IBM Cloud Usage Metering is a platform service that enables service providers to submit metrics
-// collected for  resource instances provisioned by IBM Cloud users. IBM and third-party service providers that are
-// delivering  an integrated billing service in IBM Cloud are required to submit usage for all active service instances
-// every hour.  This is important because inability to report usage can lead to loss of revenue collection for IBM,  in
-// turn causing loss of revenue share for the service providers.
-//
-// Version: 4.0.8
-type UsageMeteringV4 struct {
-	Service *core.BaseService
-}
-
-// DefaultServiceURL is the default URL to make service requests to.
-const DefaultServiceURL = "https://billing.cloud.ibm.com"
-
-// DefaultServiceName is the default key used to find external configuration information.
-const DefaultServiceName = "usage_metering"
-
-// UsageMeteringV4Options : Service options
-type UsageMeteringV4Options struct {
-	ServiceName   string
-	URL           string
-	Authenticator core.Authenticator
-}
-
-// NewUsageMeteringV4UsingExternalConfig : constructs an instance of UsageMeteringV4 with passed in options and external configuration.
-func NewUsageMeteringV4UsingExternalConfig(options *UsageMeteringV4Options) (usageMetering *UsageMeteringV4, err error) {
-	if options.ServiceName == "" {
-		options.ServiceName = DefaultServiceName
-	}
-
-	if options.Authenticator == nil {
-		options.Authenticator, err = core.GetAuthenticatorFromEnvironment(options.ServiceName)
-		if err != nil {
-			return
-		}
-	}
-
-	usageMetering, err = NewUsageMeteringV4(options)
-	if err != nil {
-		return
-	}
-
-	err = usageMetering.Service.ConfigureService(options.ServiceName)
-	if err != nil {
-		return
-	}
-
-	if options.URL != "" {
-		err = usageMetering.Service.SetServiceURL(options.URL)
-	}
-	return
-}
-
-// NewUsageMeteringV4 : constructs an instance of UsageMeteringV4 with passed in options.
-func NewUsageMeteringV4(options *UsageMeteringV4Options) (service *UsageMeteringV4, err error) {
-	serviceOptions := &core.ServiceOptions{
-		URL:           DefaultServiceURL,
-		Authenticator: options.Authenticator,
-	}
-
-	baseService, err := core.NewBaseService(serviceOptions)
-	if err != nil {
-		return
-	}
-
-	if options.URL != "" {
-		err = baseService.SetServiceURL(options.URL)
-		if err != nil {
-			return
-		}
-	}
-
-	service = &UsageMeteringV4{
-		Service: baseService,
-	}
-
-	return
-}
-
-// SetServiceURL sets the service URL
-func (usageMetering *UsageMeteringV4) SetServiceURL(url string) error {
-	return usageMetering.Service.SetServiceURL(url)
-}
-
-// ReportResourceUsage : Report Resource Controller resource usage
-// Report usage for resource instances that were provisioned through the resource controller.
-func (usageMetering *UsageMeteringV4) ReportResourceUsage(reportResourceUsageOptions *ReportResourceUsageOptions) (result *ResponseAccepted, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(reportResourceUsageOptions, "reportResourceUsageOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(reportResourceUsageOptions, "reportResourceUsageOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v4/metering/resources", "usage"}
-	pathParameters := []string{*reportResourceUsageOptions.ResourceID}
-
-	builder := core.NewRequestBuilder(core.POST)
-	_, err = builder.ConstructHTTPURL(usageMetering.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range reportResourceUsageOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("usage_metering", "V4", "ReportResourceUsage")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-	builder.AddHeader("Content-Type", "application/json")
-
-	_, err = builder.SetBodyContentJSON(reportResourceUsageOptions.ResourceInstanceUsage)
-	if err != nil {
-		return
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = usageMetering.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalResponseAccepted(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// ReportCfresourceUsage : Report Cloud Foundry resource usage
-// Report usage for resource instances that were provisioned by using the Cloud Foundry provisioning broker.
-func (usageMetering *UsageMeteringV4) ReportCfresourceUsage(reportCfresourceUsageOptions *ReportCfresourceUsageOptions) (result *ResponseAccepted, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(reportCfresourceUsageOptions, "reportCfresourceUsageOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(reportCfresourceUsageOptions, "reportCfresourceUsageOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v1/metering/resources", "usage"}
-	pathParameters := []string{*reportCfresourceUsageOptions.ResourceID}
-
-	builder := core.NewRequestBuilder(core.POST)
-	_, err = builder.ConstructHTTPURL(usageMetering.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range reportCfresourceUsageOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("usage_metering", "V4", "ReportCfresourceUsage")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-	builder.AddHeader("Content-Type", "application/json")
-
-	_, err = builder.SetBodyContentJSON(reportCfresourceUsageOptions.CfResourceInstanceUsage)
-	if err != nil {
-		return
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = usageMetering.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalResponseAccepted(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// ReportCfresourceUsageOptions : The ReportCfresourceUsage options.
-type ReportCfresourceUsageOptions struct {
-	// The resource for which the usage is submitted.
-	ResourceID *string `json:"resource_id" validate:"required"`
-
-	// An array of usage records.
-	CfResourceInstanceUsage []CfResourceInstanceUsage `json:"CfResourceInstanceUsage" validate:"required"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewReportCfresourceUsageOptions : Instantiate ReportCfresourceUsageOptions
-func (*UsageMeteringV4) NewReportCfresourceUsageOptions(resourceID string, cfResourceInstanceUsage []CfResourceInstanceUsage) *ReportCfresourceUsageOptions {
-	return &ReportCfresourceUsageOptions{
-		ResourceID: core.StringPtr(resourceID),
-		CfResourceInstanceUsage: cfResourceInstanceUsage,
-	}
-}
-
-// SetResourceID : Allow user to set ResourceID
-func (options *ReportCfresourceUsageOptions) SetResourceID(resourceID string) *ReportCfresourceUsageOptions {
-	options.ResourceID = core.StringPtr(resourceID)
-	return options
-}
-
-// SetCfResourceInstanceUsage : Allow user to set CfResourceInstanceUsage
-func (options *ReportCfresourceUsageOptions) SetCfResourceInstanceUsage(cfResourceInstanceUsage []CfResourceInstanceUsage) *ReportCfresourceUsageOptions {
-	options.CfResourceInstanceUsage = cfResourceInstanceUsage
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *ReportCfresourceUsageOptions) SetHeaders(param map[string]string) *ReportCfresourceUsageOptions {
-	options.Headers = param
-	return options
-}
-
-// ReportResourceUsageOptions : The ReportResourceUsage options.
-type ReportResourceUsageOptions struct {
-	// The resource for which the usage is submitted.
-	ResourceID *string `json:"resource_id" validate:"required"`
-
-	// Array of usage records.
-	ResourceInstanceUsage []ResourceInstanceUsage `json:"ResourceInstanceUsage" validate:"required"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewReportResourceUsageOptions : Instantiate ReportResourceUsageOptions
-func (*UsageMeteringV4) NewReportResourceUsageOptions(resourceID string, resourceInstanceUsage []ResourceInstanceUsage) *ReportResourceUsageOptions {
-	return &ReportResourceUsageOptions{
-		ResourceID: core.StringPtr(resourceID),
-		ResourceInstanceUsage: resourceInstanceUsage,
-	}
-}
-
-// SetResourceID : Allow user to set ResourceID
-func (options *ReportResourceUsageOptions) SetResourceID(resourceID string) *ReportResourceUsageOptions {
-	options.ResourceID = core.StringPtr(resourceID)
-	return options
-}
-
-// SetResourceInstanceUsage : Allow user to set ResourceInstanceUsage
-func (options *ReportResourceUsageOptions) SetResourceInstanceUsage(resourceInstanceUsage []ResourceInstanceUsage) *ReportResourceUsageOptions {
-	options.ResourceInstanceUsage = resourceInstanceUsage
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *ReportResourceUsageOptions) SetHeaders(param map[string]string) *ReportResourceUsageOptions {
-	options.Headers = param
-	return options
-}
-
-// CfResourceInstanceUsage : Usage information for a Cloud Foundry resource instance.
-type CfResourceInstanceUsage struct {
-	// The ID of the orgnization to which the instance belongs. If the usage is for the instance is in a public cloud
-	// region, then the organization ID format is `{mccp_region_name}:{guid}`. If the usage is for a syndicated instance,
-	// then the organization ID format is `{mccp_region_id}:{guid}`.
-	OrganizationID *string `json:"organization_id" validate:"required"`
-
-	// The ID of the space under which the instance is provisioned.
-	SpaceID *string `json:"space_id" validate:"required"`
-
-	// The ID of the instance provisioned using the Cloud Foundry service controller.
-	ResourceInstanceID *string `json:"resource_instance_id" validate:"required"`
-
-	// The plan to meter the instance's usage with.
-	PlanID *string `json:"plan_id" validate:"required"`
-
-	// The pricing region for the usage. For public regions, the region parameter value is the mccp region name in which
-	// the organization is present. For syndicated usage, use `us-south`.
-	Region *string `json:"region" validate:"required"`
-
-	// The time from which the resource instance was metered in the format milliseconds since epoch.
-	Start *int64 `json:"start" validate:"required"`
-
-	// The time until which the resource instance was metered in the format milliseconds since epoch. This value is the
-	// same as start value for event-based submissions.
-	End *int64 `json:"end" validate:"required"`
-
-	// Usage measurements for the resource instance.
-	MeasuredUsage []MeasureAndQuantity `json:"measured_usage" validate:"required"`
-
-	// If an instance's usage should be aggregated at the consumer level, specify the ID of the consumer. Usage is
-	// accumulated to instance-consumer combination.
-	ConsumerID *string `json:"consumer_id,omitempty"`
-}
-
-
-// NewCfResourceInstanceUsage : Instantiate CfResourceInstanceUsage (Generic Model Constructor)
-func (*UsageMeteringV4) NewCfResourceInstanceUsage(organizationID string, spaceID string, resourceInstanceID string, planID string, region string, start int64, end int64, measuredUsage []MeasureAndQuantity) (model *CfResourceInstanceUsage, err error) {
-	model = &CfResourceInstanceUsage{
-		OrganizationID: core.StringPtr(organizationID),
-		SpaceID: core.StringPtr(spaceID),
-		ResourceInstanceID: core.StringPtr(resourceInstanceID),
-		PlanID: core.StringPtr(planID),
-		Region: core.StringPtr(region),
-		Start: core.Int64Ptr(start),
-		End: core.Int64Ptr(end),
-		MeasuredUsage: measuredUsage,
-	}
-	err = core.ValidateStruct(model, "required parameters")
-	return
-}
-
-// UnmarshalCfResourceInstanceUsage constructs an instance of CfResourceInstanceUsage from the specified map.
-func UnmarshalCfResourceInstanceUsage(m map[string]interface{}) (result *CfResourceInstanceUsage, err error) {
-	obj := new(CfResourceInstanceUsage)
-	obj.OrganizationID, err = core.UnmarshalString(m, "organization_id")
-	if err != nil {
-		return
-	}
-	obj.SpaceID, err = core.UnmarshalString(m, "space_id")
-	if err != nil {
-		return
-	}
-	obj.ResourceInstanceID, err = core.UnmarshalString(m, "resource_instance_id")
-	if err != nil {
-		return
-	}
-	obj.PlanID, err = core.UnmarshalString(m, "plan_id")
-	if err != nil {
-		return
-	}
-	obj.Region, err = core.UnmarshalString(m, "region")
-	if err != nil {
-		return
-	}
-	obj.Start, err = core.UnmarshalInt64(m, "start")
-	if err != nil {
-		return
-	}
-	obj.End, err = core.UnmarshalInt64(m, "end")
-	if err != nil {
-		return
-	}
-	obj.MeasuredUsage, err = UnmarshalMeasureAndQuantitySliceAsProperty(m, "measured_usage")
-	if err != nil {
-		return
-	}
-	obj.ConsumerID, err = core.UnmarshalString(m, "consumer_id")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalCfResourceInstanceUsageSlice unmarshals a slice of CfResourceInstanceUsage instances from the specified list of maps.
-func UnmarshalCfResourceInstanceUsageSlice(s []interface{}) (slice []CfResourceInstanceUsage, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'CfResourceInstanceUsage'")
-			return
-		}
-		obj, e := UnmarshalCfResourceInstanceUsage(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalCfResourceInstanceUsageAsProperty unmarshals an instance of CfResourceInstanceUsage that is stored as a property
-// within the specified map.
-func UnmarshalCfResourceInstanceUsageAsProperty(m map[string]interface{}, propertyName string) (result *CfResourceInstanceUsage, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'CfResourceInstanceUsage'", propertyName)
-			return
-		}
-		result, err = UnmarshalCfResourceInstanceUsage(objMap)
-	}
-	return
-}
-
-// UnmarshalCfResourceInstanceUsageSliceAsProperty unmarshals a slice of CfResourceInstanceUsage instances that are stored as a property
-// within the specified map.
-func UnmarshalCfResourceInstanceUsageSliceAsProperty(m map[string]interface{}, propertyName string) (slice []CfResourceInstanceUsage, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'CfResourceInstanceUsage'", propertyName)
-			return
-		}
-		slice, err = UnmarshalCfResourceInstanceUsageSlice(vSlice)
-	}
-	return
-}
-
-// MeasureAndQuantity : A usage measurement.
-type MeasureAndQuantity struct {
-	// The name of the measure.
-	Measure *string `json:"measure" validate:"required"`
-
-	// For consumption-based submissions, `quantity` can be a double or integer value. For event-based submissions that do
-	// not have binary states, previous and current values are required, such as `{ "previous": 1, "current": 2 }`.
-	Quantity interface{} `json:"quantity" validate:"required"`
-}
-
-
-// NewMeasureAndQuantity : Instantiate MeasureAndQuantity (Generic Model Constructor)
-func (*UsageMeteringV4) NewMeasureAndQuantity(measure string, quantity interface{}) (model *MeasureAndQuantity, err error) {
-	model = &MeasureAndQuantity{
-		Measure: core.StringPtr(measure),
-		Quantity: quantity,
-	}
-	err = core.ValidateStruct(model, "required parameters")
-	return
-}
-
-// UnmarshalMeasureAndQuantity constructs an instance of MeasureAndQuantity from the specified map.
-func UnmarshalMeasureAndQuantity(m map[string]interface{}) (result *MeasureAndQuantity, err error) {
-	obj := new(MeasureAndQuantity)
-	obj.Measure, err = core.UnmarshalString(m, "measure")
-	if err != nil {
-		return
-	}
-	obj.Quantity, err = core.UnmarshalAny(m, "quantity")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalMeasureAndQuantitySlice unmarshals a slice of MeasureAndQuantity instances from the specified list of maps.
-func UnmarshalMeasureAndQuantitySlice(s []interface{}) (slice []MeasureAndQuantity, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'MeasureAndQuantity'")
-			return
-		}
-		obj, e := UnmarshalMeasureAndQuantity(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalMeasureAndQuantityAsProperty unmarshals an instance of MeasureAndQuantity that is stored as a property
-// within the specified map.
-func UnmarshalMeasureAndQuantityAsProperty(m map[string]interface{}, propertyName string) (result *MeasureAndQuantity, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'MeasureAndQuantity'", propertyName)
-			return
-		}
-		result, err = UnmarshalMeasureAndQuantity(objMap)
-	}
-	return
-}
-
-// UnmarshalMeasureAndQuantitySliceAsProperty unmarshals a slice of MeasureAndQuantity instances that are stored as a property
-// within the specified map.
-func UnmarshalMeasureAndQuantitySliceAsProperty(m map[string]interface{}, propertyName string) (slice []MeasureAndQuantity, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'MeasureAndQuantity'", propertyName)
-			return
-		}
-		slice, err = UnmarshalMeasureAndQuantitySlice(vSlice)
-	}
-	return
-}
-
-// ResourceInstanceUsage : Usage information for a resource instance.
-type ResourceInstanceUsage struct {
-	// The ID of the instance that incurred the usage. The ID is a CRN for instances that are provisioned with the resource
-	// controller.
-	ResourceInstanceID *string `json:"resource_instance_id" validate:"required"`
-
-	// The plan with which the instance's usage should be metered.
-	PlanID *string `json:"plan_id" validate:"required"`
-
-	// The pricing region to which the usage must be aggregated. This field is required if the ID is not a CRN or if the
-	// CRN does not have a region.
-	Region *string `json:"region,omitempty"`
-
-	// The time from which the resource instance was metered in the format milliseconds since epoch.
-	Start *int64 `json:"start" validate:"required"`
-
-	// The time until which the resource instance was metered in the format milliseconds since epoch. This value is the
-	// same as start value for event-based submissions.
-	End *int64 `json:"end" validate:"required"`
-
-	// Usage measurements for the resource instance.
-	MeasuredUsage []MeasureAndQuantity `json:"measured_usage" validate:"required"`
-
-	// If an instance's usage should be aggregated at the consumer level, specify the ID of the consumer. Usage is
-	// accumulated to the instance-consumer combination.
-	ConsumerID *string `json:"consumer_id,omitempty"`
-}
-
-
-// NewResourceInstanceUsage : Instantiate ResourceInstanceUsage (Generic Model Constructor)
-func (*UsageMeteringV4) NewResourceInstanceUsage(resourceInstanceID string, planID string, start int64, end int64, measuredUsage []MeasureAndQuantity) (model *ResourceInstanceUsage, err error) {
-	model = &ResourceInstanceUsage{
-		ResourceInstanceID: core.StringPtr(resourceInstanceID),
-		PlanID: core.StringPtr(planID),
-		Start: core.Int64Ptr(start),
-		End: core.Int64Ptr(end),
-		MeasuredUsage: measuredUsage,
-	}
-	err = core.ValidateStruct(model, "required parameters")
-	return
-}
-
-// UnmarshalResourceInstanceUsage constructs an instance of ResourceInstanceUsage from the specified map.
-func UnmarshalResourceInstanceUsage(m map[string]interface{}) (result *ResourceInstanceUsage, err error) {
-	obj := new(ResourceInstanceUsage)
-	obj.ResourceInstanceID, err = core.UnmarshalString(m, "resource_instance_id")
-	if err != nil {
-		return
-	}
-	obj.PlanID, err = core.UnmarshalString(m, "plan_id")
-	if err != nil {
-		return
-	}
-	obj.Region, err = core.UnmarshalString(m, "region")
-	if err != nil {
-		return
-	}
-	obj.Start, err = core.UnmarshalInt64(m, "start")
-	if err != nil {
-		return
-	}
-	obj.End, err = core.UnmarshalInt64(m, "end")
-	if err != nil {
-		return
-	}
-	obj.MeasuredUsage, err = UnmarshalMeasureAndQuantitySliceAsProperty(m, "measured_usage")
-	if err != nil {
-		return
-	}
-	obj.ConsumerID, err = core.UnmarshalString(m, "consumer_id")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalResourceInstanceUsageSlice unmarshals a slice of ResourceInstanceUsage instances from the specified list of maps.
-func UnmarshalResourceInstanceUsageSlice(s []interface{}) (slice []ResourceInstanceUsage, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'ResourceInstanceUsage'")
-			return
-		}
-		obj, e := UnmarshalResourceInstanceUsage(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalResourceInstanceUsageAsProperty unmarshals an instance of ResourceInstanceUsage that is stored as a property
-// within the specified map.
-func UnmarshalResourceInstanceUsageAsProperty(m map[string]interface{}, propertyName string) (result *ResourceInstanceUsage, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'ResourceInstanceUsage'", propertyName)
-			return
-		}
-		result, err = UnmarshalResourceInstanceUsage(objMap)
-	}
-	return
-}
-
-// UnmarshalResourceInstanceUsageSliceAsProperty unmarshals a slice of ResourceInstanceUsage instances that are stored as a property
-// within the specified map.
-func UnmarshalResourceInstanceUsageSliceAsProperty(m map[string]interface{}, propertyName string) (slice []ResourceInstanceUsage, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'ResourceInstanceUsage'", propertyName)
-			return
-		}
-		slice, err = UnmarshalResourceInstanceUsageSlice(vSlice)
-	}
-	return
-}
-
-// ResourceUsageDetails : Resource usage details.
-type ResourceUsageDetails struct {
-	// A response code similar to HTTP status codes.
-	Status *float64 `json:"status" validate:"required"`
-
-	// The location of the usage.
-	Location *string `json:"location" validate:"required"`
-
-	// The error code that was encountered.
-	Code *string `json:"code,omitempty"`
-
-	// A description of the error.
-	Message *string `json:"message,omitempty"`
-}
-
-
-// UnmarshalResourceUsageDetails constructs an instance of ResourceUsageDetails from the specified map.
-func UnmarshalResourceUsageDetails(m map[string]interface{}) (result *ResourceUsageDetails, err error) {
-	obj := new(ResourceUsageDetails)
-	obj.Status, err = core.UnmarshalFloat64(m, "status")
-	if err != nil {
-		return
-	}
-	obj.Location, err = core.UnmarshalString(m, "location")
-	if err != nil {
-		return
-	}
-	obj.Code, err = core.UnmarshalString(m, "code")
-	if err != nil {
-		return
-	}
-	obj.Message, err = core.UnmarshalString(m, "message")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalResourceUsageDetailsSlice unmarshals a slice of ResourceUsageDetails instances from the specified list of maps.
-func UnmarshalResourceUsageDetailsSlice(s []interface{}) (slice []ResourceUsageDetails, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'ResourceUsageDetails'")
-			return
-		}
-		obj, e := UnmarshalResourceUsageDetails(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalResourceUsageDetailsAsProperty unmarshals an instance of ResourceUsageDetails that is stored as a property
-// within the specified map.
-func UnmarshalResourceUsageDetailsAsProperty(m map[string]interface{}, propertyName string) (result *ResourceUsageDetails, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'ResourceUsageDetails'", propertyName)
-			return
-		}
-		result, err = UnmarshalResourceUsageDetails(objMap)
-	}
-	return
-}
-
-// UnmarshalResourceUsageDetailsSliceAsProperty unmarshals a slice of ResourceUsageDetails instances that are stored as a property
-// within the specified map.
-func UnmarshalResourceUsageDetailsSliceAsProperty(m map[string]interface{}, propertyName string) (slice []ResourceUsageDetails, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'ResourceUsageDetails'", propertyName)
-			return
-		}
-		slice, err = UnmarshalResourceUsageDetailsSlice(vSlice)
-	}
-	return
-}
-
-// ResponseAccepted : Response when usage submitted is accepted.
-type ResponseAccepted struct {
-	// Response body that contains the status of each submitted usage record.
-	Resources []ResourceUsageDetails `json:"resources" validate:"required"`
-}
-
-
-// UnmarshalResponseAccepted constructs an instance of ResponseAccepted from the specified map.
-func UnmarshalResponseAccepted(m map[string]interface{}) (result *ResponseAccepted, err error) {
-	obj := new(ResponseAccepted)
-	obj.Resources, err = UnmarshalResourceUsageDetailsSliceAsProperty(m, "resources")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalResponseAcceptedSlice unmarshals a slice of ResponseAccepted instances from the specified list of maps.
-func UnmarshalResponseAcceptedSlice(s []interface{}) (slice []ResponseAccepted, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'ResponseAccepted'")
-			return
-		}
-		obj, e := UnmarshalResponseAccepted(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalResponseAcceptedAsProperty unmarshals an instance of ResponseAccepted that is stored as a property
-// within the specified map.
-func UnmarshalResponseAcceptedAsProperty(m map[string]interface{}, propertyName string) (result *ResponseAccepted, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'ResponseAccepted'", propertyName)
-			return
-		}
-		result, err = UnmarshalResponseAccepted(objMap)
-	}
-	return
-}
-
-// UnmarshalResponseAcceptedSliceAsProperty unmarshals a slice of ResponseAccepted instances that are stored as a property
-// within the specified map.
-func UnmarshalResponseAcceptedSliceAsProperty(m map[string]interface{}, propertyName string) (slice []ResponseAccepted, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'ResponseAccepted'", propertyName)
-			return
-		}
-		slice, err = UnmarshalResponseAcceptedSlice(vSlice)
-	}
-	return
-}
diff --git a/usagemeteringv4/usage_metering_v4_suite_test.go b/usagemeteringv4/usage_metering_v4_suite_test.go
deleted file mode 100644
index e895bad9..00000000
--- a/usagemeteringv4/usage_metering_v4_suite_test.go
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * (C) Copyright IBM Corp. 2020.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package usagemeteringv4_test
-
-import (
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-	"testing"
-)
-
-func TestUsageMeteringV4(t *testing.T) {
-	RegisterFailHandler(Fail)
-	RunSpecs(t, "UsageMeteringV4 Suite")
-}
diff --git a/usagemeteringv4/usage_metering_v4_test.go b/usagemeteringv4/usage_metering_v4_test.go
deleted file mode 100644
index e2bad073..00000000
--- a/usagemeteringv4/usage_metering_v4_test.go
+++ /dev/null
@@ -1,258 +0,0 @@
-/**
- * (C) Copyright IBM Corp. 2020.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package usagemeteringv4_test
-
-import (
-	"bytes"
-	"fmt"
-	"github.com/IBM/go-sdk-core/v3/core"
-	"github.com/go-openapi/strfmt"
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-	"github.ibm.com/ibmcloud/platform-services-go-sdk/usagemeteringv4"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"net/http/httptest"
-	"time"
-)
-
-var _ = Describe(`UsageMeteringV4`, func() {
-	Describe(`ReportResourceUsage(reportResourceUsageOptions *ReportResourceUsageOptions)`, func() {
-		bearerToken := "0ui9876453"
-		reportResourceUsagePath := "/v4/metering/resources/testString/usage"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(reportResourceUsagePath))
-				Expect(req.Method).To(Equal("POST"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(202)
-				fmt.Fprintf(res, `{"resources": [{"status": 6, "location": "Location", "code": "Code", "message": "Message"}]}`)
-			}))
-			It(`Invoke ReportResourceUsage successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := usagemeteringv4.NewUsageMeteringV4(&usagemeteringv4.UsageMeteringV4Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.ReportResourceUsage(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the MeasureAndQuantity model
-				measureAndQuantityModel := new(usagemeteringv4.MeasureAndQuantity)
-				measureAndQuantityModel.Measure = core.StringPtr("STORAGE")
-				measureAndQuantityModel.Quantity = CreateMockMap()
-
-				// Construct an instance of the ResourceInstanceUsage model
-				resourceInstanceUsageModel := new(usagemeteringv4.ResourceInstanceUsage)
-				resourceInstanceUsageModel.ResourceInstanceID = core.StringPtr("crn:v1:bluemix:public:database-service:us-south:a/1c8ae972c35e470d994b6faff9494ce1:793ff3d3-9fe3-4329-9ea0-404703a3c371::")
-				resourceInstanceUsageModel.PlanID = core.StringPtr("database-lite")
-				resourceInstanceUsageModel.Region = core.StringPtr("us-south")
-				resourceInstanceUsageModel.Start = core.Int64Ptr(int64(1485907200000))
-				resourceInstanceUsageModel.End = core.Int64Ptr(int64(1485907200000))
-				resourceInstanceUsageModel.MeasuredUsage = []usagemeteringv4.MeasureAndQuantity{*measureAndQuantityModel}
-				resourceInstanceUsageModel.ConsumerID = core.StringPtr("cf-application:ed20abbe-8870-44e6-90f7-56d764c21127")
-
-				// Construct an instance of the ReportResourceUsageOptions model
-				reportResourceUsageOptionsModel := new(usagemeteringv4.ReportResourceUsageOptions)
-				reportResourceUsageOptionsModel.ResourceID = core.StringPtr("testString")
-				reportResourceUsageOptionsModel.ResourceInstanceUsage = []usagemeteringv4.ResourceInstanceUsage{*resourceInstanceUsageModel}
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.ReportResourceUsage(reportResourceUsageOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`ReportCfresourceUsage(reportCfresourceUsageOptions *ReportCfresourceUsageOptions)`, func() {
-		bearerToken := "0ui9876453"
-		reportCfresourceUsagePath := "/v1/metering/resources/testString/usage"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(reportCfresourceUsagePath))
-				Expect(req.Method).To(Equal("POST"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(202)
-				fmt.Fprintf(res, `{"resources": [{"status": 6, "location": "Location", "code": "Code", "message": "Message"}]}`)
-			}))
-			It(`Invoke ReportCfresourceUsage successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := usagemeteringv4.NewUsageMeteringV4(&usagemeteringv4.UsageMeteringV4Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.ReportCfresourceUsage(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the MeasureAndQuantity model
-				measureAndQuantityModel := new(usagemeteringv4.MeasureAndQuantity)
-				measureAndQuantityModel.Measure = core.StringPtr("STORAGE")
-				measureAndQuantityModel.Quantity = CreateMockMap()
-
-				// Construct an instance of the CfResourceInstanceUsage model
-				cfResourceInstanceUsageModel := new(usagemeteringv4.CfResourceInstanceUsage)
-				cfResourceInstanceUsageModel.OrganizationID = core.StringPtr("Public: us-south:102d9527-315a-4a71-afc2-068b1db6d68e Syndicated: ibm:dys0:us-south:e2566380-89cf-4c38-9290-7eb48cfca8f9")
-				cfResourceInstanceUsageModel.SpaceID = core.StringPtr("89f0839a-812c-4180-8494-a453514c55e6")
-				cfResourceInstanceUsageModel.ResourceInstanceID = core.StringPtr("5ca426de-5091-4f2f-8d87-28d37e7ff711")
-				cfResourceInstanceUsageModel.PlanID = core.StringPtr("database-lite")
-				cfResourceInstanceUsageModel.Region = core.StringPtr("us-south")
-				cfResourceInstanceUsageModel.Start = core.Int64Ptr(int64(1485907200000))
-				cfResourceInstanceUsageModel.End = core.Int64Ptr(int64(1485907200000))
-				cfResourceInstanceUsageModel.MeasuredUsage = []usagemeteringv4.MeasureAndQuantity{*measureAndQuantityModel}
-				cfResourceInstanceUsageModel.ConsumerID = core.StringPtr("cf-application:ed20abbe-8870-44e6-90f7-56d764c21127")
-
-				// Construct an instance of the ReportCfresourceUsageOptions model
-				reportCfresourceUsageOptionsModel := new(usagemeteringv4.ReportCfresourceUsageOptions)
-				reportCfresourceUsageOptionsModel.ResourceID = core.StringPtr("testString")
-				reportCfresourceUsageOptionsModel.CfResourceInstanceUsage = []usagemeteringv4.CfResourceInstanceUsage{*cfResourceInstanceUsageModel}
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.ReportCfresourceUsage(reportCfresourceUsageOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`Model constructor tests`, func() {
-		Context(`Using a sample service client instance`, func() {
-			testService, _ := usagemeteringv4.NewUsageMeteringV4(&usagemeteringv4.UsageMeteringV4Options{
-				URL:           "http://usagemeteringv4modelgenerator.com",
-				Authenticator: &core.NoAuthAuthenticator{},
-			})
-			It(`Invoke NewCfResourceInstanceUsage successfully`, func() {
-				organizationID := "Public: us-south:102d9527-315a-4a71-afc2-068b1db6d68e Syndicated: ibm:dys0:us-south:e2566380-89cf-4c38-9290-7eb48cfca8f9"
-				spaceID := "89f0839a-812c-4180-8494-a453514c55e6"
-				resourceInstanceID := "5ca426de-5091-4f2f-8d87-28d37e7ff711"
-				planID := "database-lite"
-				region := "us-south"
-				start := int64(1485907200000)
-				end := int64(1485907200000)
-				measuredUsage := []usagemeteringv4.MeasureAndQuantity{}
-				model, err := testService.NewCfResourceInstanceUsage(organizationID, spaceID, resourceInstanceID, planID, region, start, end, measuredUsage)
-				Expect(model).ToNot(BeNil())
-				Expect(err).To(BeNil())
-			})
-			It(`Invoke NewMeasureAndQuantity successfully`, func() {
-				measure := "STORAGE"
-				var quantity interface{} = nil
-				_, err := testService.NewMeasureAndQuantity(measure, quantity)
-				Expect(err).ToNot(BeNil())
-			})
-			It(`Invoke NewResourceInstanceUsage successfully`, func() {
-				resourceInstanceID := "crn:v1:bluemix:public:database-service:us-south:a/1c8ae972c35e470d994b6faff9494ce1:793ff3d3-9fe3-4329-9ea0-404703a3c371::"
-				planID := "database-lite"
-				start := int64(1485907200000)
-				end := int64(1485907200000)
-				measuredUsage := []usagemeteringv4.MeasureAndQuantity{}
-				model, err := testService.NewResourceInstanceUsage(resourceInstanceID, planID, start, end, measuredUsage)
-				Expect(model).ToNot(BeNil())
-				Expect(err).To(BeNil())
-			})
-		})
-	})
-	Describe(`Utility function tests`, func() {
-		It(`Invoke CreateMockMap() successfully`, func() {
-			mockMap := CreateMockMap()
-			Expect(mockMap).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockByteArray() successfully`, func() {
-			mockByteArray := CreateMockByteArray("This is a test")
-			Expect(mockByteArray).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockUUID() successfully`, func() {
-			mockUUID := CreateMockUUID("9fab83da-98cb-4f18-a7ba-b6f0435c9673")
-			Expect(mockUUID).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockReader() successfully`, func() {
-			mockReader := CreateMockReader("This is a test.")
-			Expect(mockReader).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockDate() successfully`, func() {
-			mockDate := CreateMockDate()
-			Expect(mockDate).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockDateTime() successfully`, func() {
-			mockDateTime := CreateMockDateTime()
-			Expect(mockDateTime).ToNot(BeNil())
-		})
-	})
-})
-
-//
-// Utility functions used by the generated test code
-//
-
-func CreateMockMap() map[string]interface{} {
-	m := make(map[string]interface{})
-	return m
-}
-
-func CreateMockByteArray(mockData string) *[]byte {
-	ba := make([]byte, len(mockData))
-	ba = append(ba, mockData...)
-	return &ba
-}
-
-func CreateMockUUID(mockData string) *strfmt.UUID {
-	uuid := strfmt.UUID(mockData)
-	return &uuid
-}
-
-func CreateMockReader(mockData string) io.ReadCloser {
-	return ioutil.NopCloser(bytes.NewReader([]byte(mockData)))
-}
-
-func CreateMockDate() *strfmt.Date {
-	d := strfmt.Date(time.Now())
-	return &d
-}
-
-func CreateMockDateTime() *strfmt.DateTime {
-	d := strfmt.DateTime(time.Now())
-	return &d
-}
diff --git a/usagereportsv4/usage_reports_v4.go b/usagereportsv4/usage_reports_v4.go
deleted file mode 100644
index 9dad640e..00000000
--- a/usagereportsv4/usage_reports_v4.go
+++ /dev/null
@@ -1,2650 +0,0 @@
-/**
- * (C) Copyright IBM Corp. 2020.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// Package usagereportsv4 : Operations and models for the UsageReportsV4 service
-package usagereportsv4
-
-import (
-	"fmt"
-	"github.com/IBM/go-sdk-core/v3/core"
-	"github.com/go-openapi/strfmt"
-	common "github.ibm.com/ibmcloud/platform-services-go-sdk/common"
-)
-
-// UsageReportsV4 : Usage reports for IBM Cloud accounts
-//
-// Version: 4.0.2
-type UsageReportsV4 struct {
-	Service *core.BaseService
-}
-
-// DefaultServiceURL is the default URL to make service requests to.
-const DefaultServiceURL = "https://metering-reporting.ng.bluemix.net"
-
-// DefaultServiceName is the default key used to find external configuration information.
-const DefaultServiceName = "usage_reports"
-
-// UsageReportsV4Options : Service options
-type UsageReportsV4Options struct {
-	ServiceName   string
-	URL           string
-	Authenticator core.Authenticator
-}
-
-// NewUsageReportsV4UsingExternalConfig : constructs an instance of UsageReportsV4 with passed in options and external configuration.
-func NewUsageReportsV4UsingExternalConfig(options *UsageReportsV4Options) (usageReports *UsageReportsV4, err error) {
-	if options.ServiceName == "" {
-		options.ServiceName = DefaultServiceName
-	}
-
-	if options.Authenticator == nil {
-		options.Authenticator, err = core.GetAuthenticatorFromEnvironment(options.ServiceName)
-		if err != nil {
-			return
-		}
-	}
-
-	usageReports, err = NewUsageReportsV4(options)
-	if err != nil {
-		return
-	}
-
-	err = usageReports.Service.ConfigureService(options.ServiceName)
-	if err != nil {
-		return
-	}
-
-	if options.URL != "" {
-		err = usageReports.Service.SetServiceURL(options.URL)
-	}
-	return
-}
-
-// NewUsageReportsV4 : constructs an instance of UsageReportsV4 with passed in options.
-func NewUsageReportsV4(options *UsageReportsV4Options) (service *UsageReportsV4, err error) {
-	serviceOptions := &core.ServiceOptions{
-		URL:           DefaultServiceURL,
-		Authenticator: options.Authenticator,
-	}
-
-	baseService, err := core.NewBaseService(serviceOptions)
-	if err != nil {
-		return
-	}
-
-	if options.URL != "" {
-		err = baseService.SetServiceURL(options.URL)
-		if err != nil {
-			return
-		}
-	}
-
-	service = &UsageReportsV4{
-		Service: baseService,
-	}
-
-	return
-}
-
-// SetServiceURL sets the service URL
-func (usageReports *UsageReportsV4) SetServiceURL(url string) error {
-	return usageReports.Service.SetServiceURL(url)
-}
-
-// GetAccountSummary : Get account billing summary
-// Returns the billing summary for the account for a given month. Users with the Administrator role on the Billing
-// service can access this report.
-func (usageReports *UsageReportsV4) GetAccountSummary(getAccountSummaryOptions *GetAccountSummaryOptions) (result *AccountSummary, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(getAccountSummaryOptions, "getAccountSummaryOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(getAccountSummaryOptions, "getAccountSummaryOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v4/accounts", "summary"}
-	pathParameters := []string{*getAccountSummaryOptions.AccountID, *getAccountSummaryOptions.Billingmonth}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(usageReports.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range getAccountSummaryOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("usage_reports", "V4", "GetAccountSummary")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = usageReports.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalAccountSummary(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// GetAccountUsage : Get account usage
-// Returns aggregated usage for all of the resources and plans in an account in a given month. Users with the
-// Administrator role on the Billing service can access this report.
-func (usageReports *UsageReportsV4) GetAccountUsage(getAccountUsageOptions *GetAccountUsageOptions) (result *AccountUsage, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(getAccountUsageOptions, "getAccountUsageOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(getAccountUsageOptions, "getAccountUsageOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v4/accounts", "usage"}
-	pathParameters := []string{*getAccountUsageOptions.AccountID, *getAccountUsageOptions.Billingmonth}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(usageReports.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range getAccountUsageOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("usage_reports", "V4", "GetAccountUsage")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = usageReports.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalAccountUsage(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// GetResourceGroupUsage : Get resource group usage
-// Returns aggregated usage for all of the resources and plans in a resource group in a given month. Users with the
-// Administrator role on the Billing service can access this report.
-func (usageReports *UsageReportsV4) GetResourceGroupUsage(getResourceGroupUsageOptions *GetResourceGroupUsageOptions) (result *ResourceGroupUsage, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(getResourceGroupUsageOptions, "getResourceGroupUsageOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(getResourceGroupUsageOptions, "getResourceGroupUsageOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v4/accounts", "resource_groups", "usage"}
-	pathParameters := []string{*getResourceGroupUsageOptions.AccountID, *getResourceGroupUsageOptions.ResourceGroupID, *getResourceGroupUsageOptions.Billingmonth}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(usageReports.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range getResourceGroupUsageOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("usage_reports", "V4", "GetResourceGroupUsage")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = usageReports.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalResourceGroupUsage(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// GetOrganizationUsage : Get Cloud Foundry org usage
-// Returns aggregated usage for all the resources and plans in a Cloud Foundry organization in a given month. Users with
-// the Administrator role on the Billing service or the Billing Manager role on the Cloud Foundry org can access this
-// report.
-func (usageReports *UsageReportsV4) GetOrganizationUsage(getOrganizationUsageOptions *GetOrganizationUsageOptions) (result *OrganizationUsage, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(getOrganizationUsageOptions, "getOrganizationUsageOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(getOrganizationUsageOptions, "getOrganizationUsageOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v4/accounts", "organizations", "usage"}
-	pathParameters := []string{*getOrganizationUsageOptions.AccountID, *getOrganizationUsageOptions.OrganizationID, *getOrganizationUsageOptions.Billingmonth}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(usageReports.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range getOrganizationUsageOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("usage_reports", "V4", "GetOrganizationUsage")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = usageReports.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalOrganizationUsage(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// GetAccountInstancesUsage : Get resource instance usage in an account
-// Returns instance-level usage for resources in an account. Filter the results with query parameters. Users with the
-// Administrator role on the Billing service can access this report.
-func (usageReports *UsageReportsV4) GetAccountInstancesUsage(getAccountInstancesUsageOptions *GetAccountInstancesUsageOptions) (result *InstancesUsage, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(getAccountInstancesUsageOptions, "getAccountInstancesUsageOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(getAccountInstancesUsageOptions, "getAccountInstancesUsageOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v4/accounts", "resource_instances/usage"}
-	pathParameters := []string{*getAccountInstancesUsageOptions.AccountID, *getAccountInstancesUsageOptions.Billingmonth}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(usageReports.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range getAccountInstancesUsageOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("usage_reports", "V4", "GetAccountInstancesUsage")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	if getAccountInstancesUsageOptions.Limit != nil {
-		builder.AddQuery("_limit", fmt.Sprint(*getAccountInstancesUsageOptions.Limit))
-	}
-	if getAccountInstancesUsageOptions.Start != nil {
-		builder.AddQuery("_start", fmt.Sprint(*getAccountInstancesUsageOptions.Start))
-	}
-	if getAccountInstancesUsageOptions.ResourceGroupID != nil {
-		builder.AddQuery("resource_group_id", fmt.Sprint(*getAccountInstancesUsageOptions.ResourceGroupID))
-	}
-	if getAccountInstancesUsageOptions.OrganizationID != nil {
-		builder.AddQuery("organization_id", fmt.Sprint(*getAccountInstancesUsageOptions.OrganizationID))
-	}
-	if getAccountInstancesUsageOptions.ResourceInstanceID != nil {
-		builder.AddQuery("resource_instance_id", fmt.Sprint(*getAccountInstancesUsageOptions.ResourceInstanceID))
-	}
-	if getAccountInstancesUsageOptions.ResourceID != nil {
-		builder.AddQuery("resource_id", fmt.Sprint(*getAccountInstancesUsageOptions.ResourceID))
-	}
-	if getAccountInstancesUsageOptions.PlanID != nil {
-		builder.AddQuery("plan_id", fmt.Sprint(*getAccountInstancesUsageOptions.PlanID))
-	}
-	if getAccountInstancesUsageOptions.Region != nil {
-		builder.AddQuery("region", fmt.Sprint(*getAccountInstancesUsageOptions.Region))
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = usageReports.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalInstancesUsage(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// GetResourceGroupInstancesUsage : Get resource instance usage in a resource group
-// Returns instance-level usage for resources in a resource group. Filter the results with query parameters. Users with
-// the Administrator role on the  Billing service can access this report.
-func (usageReports *UsageReportsV4) GetResourceGroupInstancesUsage(getResourceGroupInstancesUsageOptions *GetResourceGroupInstancesUsageOptions) (result *InstancesUsage, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(getResourceGroupInstancesUsageOptions, "getResourceGroupInstancesUsageOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(getResourceGroupInstancesUsageOptions, "getResourceGroupInstancesUsageOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v4/accounts", "resource_groups", "resource_instances/usage"}
-	pathParameters := []string{*getResourceGroupInstancesUsageOptions.AccountID, *getResourceGroupInstancesUsageOptions.ResourceGroupID, *getResourceGroupInstancesUsageOptions.Billingmonth}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(usageReports.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range getResourceGroupInstancesUsageOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("usage_reports", "V4", "GetResourceGroupInstancesUsage")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	if getResourceGroupInstancesUsageOptions.Limit != nil {
-		builder.AddQuery("_limit", fmt.Sprint(*getResourceGroupInstancesUsageOptions.Limit))
-	}
-	if getResourceGroupInstancesUsageOptions.Start != nil {
-		builder.AddQuery("_start", fmt.Sprint(*getResourceGroupInstancesUsageOptions.Start))
-	}
-	if getResourceGroupInstancesUsageOptions.ResourceInstanceID != nil {
-		builder.AddQuery("resource_instance_id", fmt.Sprint(*getResourceGroupInstancesUsageOptions.ResourceInstanceID))
-	}
-	if getResourceGroupInstancesUsageOptions.ResourceID != nil {
-		builder.AddQuery("resource_id", fmt.Sprint(*getResourceGroupInstancesUsageOptions.ResourceID))
-	}
-	if getResourceGroupInstancesUsageOptions.PlanID != nil {
-		builder.AddQuery("plan_id", fmt.Sprint(*getResourceGroupInstancesUsageOptions.PlanID))
-	}
-	if getResourceGroupInstancesUsageOptions.Region != nil {
-		builder.AddQuery("region", fmt.Sprint(*getResourceGroupInstancesUsageOptions.Region))
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = usageReports.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalInstancesUsage(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// GetOrganizationInstancesUsage : Get resource instance usage in a Cloud Foundry org
-// Returns instance-level usage for resources in a Cloud Foundry organization. Filter the results with query parameters.
-// Users with the Administrator role on the Billing service or the Billing Manager role on the Cloud Foundry org can
-// access this report.
-func (usageReports *UsageReportsV4) GetOrganizationInstancesUsage(getOrganizationInstancesUsageOptions *GetOrganizationInstancesUsageOptions) (result *InstancesUsage, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(getOrganizationInstancesUsageOptions, "getOrganizationInstancesUsageOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(getOrganizationInstancesUsageOptions, "getOrganizationInstancesUsageOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v4/accounts", "organizations", "resource_instances/usage"}
-	pathParameters := []string{*getOrganizationInstancesUsageOptions.AccountID, *getOrganizationInstancesUsageOptions.OrganizationID, *getOrganizationInstancesUsageOptions.Billingmonth}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(usageReports.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range getOrganizationInstancesUsageOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("usage_reports", "V4", "GetOrganizationInstancesUsage")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	if getOrganizationInstancesUsageOptions.Limit != nil {
-		builder.AddQuery("_limit", fmt.Sprint(*getOrganizationInstancesUsageOptions.Limit))
-	}
-	if getOrganizationInstancesUsageOptions.Start != nil {
-		builder.AddQuery("_start", fmt.Sprint(*getOrganizationInstancesUsageOptions.Start))
-	}
-	if getOrganizationInstancesUsageOptions.ResourceInstanceID != nil {
-		builder.AddQuery("resource_instance_id", fmt.Sprint(*getOrganizationInstancesUsageOptions.ResourceInstanceID))
-	}
-	if getOrganizationInstancesUsageOptions.ResourceID != nil {
-		builder.AddQuery("resource_id", fmt.Sprint(*getOrganizationInstancesUsageOptions.ResourceID))
-	}
-	if getOrganizationInstancesUsageOptions.PlanID != nil {
-		builder.AddQuery("plan_id", fmt.Sprint(*getOrganizationInstancesUsageOptions.PlanID))
-	}
-	if getOrganizationInstancesUsageOptions.Region != nil {
-		builder.AddQuery("region", fmt.Sprint(*getOrganizationInstancesUsageOptions.Region))
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = usageReports.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalInstancesUsage(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// AccountResources : A summary of resource usage.
-type AccountResources struct {
-	// Billable charges for all cloud resources used in the account.
-	BillableCost *float64 `json:"billable_cost" validate:"required"`
-
-	// Non-billable charges for all cloud resources used in the account.
-	NonBillableCost *float64 `json:"non_billable_cost" validate:"required"`
-}
-
-
-// UnmarshalAccountResources constructs an instance of AccountResources from the specified map.
-func UnmarshalAccountResources(m map[string]interface{}) (result *AccountResources, err error) {
-	obj := new(AccountResources)
-	obj.BillableCost, err = core.UnmarshalFloat64(m, "billable_cost")
-	if err != nil {
-		return
-	}
-	obj.NonBillableCost, err = core.UnmarshalFloat64(m, "non_billable_cost")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalAccountResourcesSlice unmarshals a slice of AccountResources instances from the specified list of maps.
-func UnmarshalAccountResourcesSlice(s []interface{}) (slice []AccountResources, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'AccountResources'")
-			return
-		}
-		obj, e := UnmarshalAccountResources(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalAccountResourcesAsProperty unmarshals an instance of AccountResources that is stored as a property
-// within the specified map.
-func UnmarshalAccountResourcesAsProperty(m map[string]interface{}, propertyName string) (result *AccountResources, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'AccountResources'", propertyName)
-			return
-		}
-		result, err = UnmarshalAccountResources(objMap)
-	}
-	return
-}
-
-// UnmarshalAccountResourcesSliceAsProperty unmarshals a slice of AccountResources instances that are stored as a property
-// within the specified map.
-func UnmarshalAccountResourcesSliceAsProperty(m map[string]interface{}, propertyName string) (slice []AccountResources, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'AccountResources'", propertyName)
-			return
-		}
-		slice, err = UnmarshalAccountResourcesSlice(vSlice)
-	}
-	return
-}
-
-// AccountSummary : Summary for the account for a given month.
-type AccountSummary struct {
-	// The ID of the account.
-	AccountID *string `json:"account_id" validate:"required"`
-
-	// Month in which usages were incurred in `yyyy-mm` format.
-	BillingMonth *string `json:"billing_month" validate:"required"`
-
-	// Country.
-	BillingCountryCode *string `json:"billing_country_code" validate:"required"`
-
-	// Currency in which the account is billed.
-	BillingCurrencyCode *string `json:"billing_currency_code" validate:"required"`
-
-	// A summary of resource usage.
-	Resources *AccountResources `json:"resources" validate:"required"`
-
-	// List of offers applicable for the account for the month.
-	Offers []Offer `json:"offers" validate:"required"`
-
-	// Subscription information for an account.
-	Subscription *SubscriptionInfo `json:"subscription" validate:"required"`
-
-	// Account support information.
-	Support []SupportInfo `json:"support" validate:"required"`
-}
-
-
-// UnmarshalAccountSummary constructs an instance of AccountSummary from the specified map.
-func UnmarshalAccountSummary(m map[string]interface{}) (result *AccountSummary, err error) {
-	obj := new(AccountSummary)
-	obj.AccountID, err = core.UnmarshalString(m, "account_id")
-	if err != nil {
-		return
-	}
-	obj.BillingMonth, err = core.UnmarshalString(m, "billing_month")
-	if err != nil {
-		return
-	}
-	obj.BillingCountryCode, err = core.UnmarshalString(m, "billing_country_code")
-	if err != nil {
-		return
-	}
-	obj.BillingCurrencyCode, err = core.UnmarshalString(m, "billing_currency_code")
-	if err != nil {
-		return
-	}
-	obj.Resources, err = UnmarshalAccountResourcesAsProperty(m, "resources")
-	if err != nil {
-		return
-	}
-	obj.Offers, err = UnmarshalOfferSliceAsProperty(m, "offers")
-	if err != nil {
-		return
-	}
-	obj.Subscription, err = UnmarshalSubscriptionInfoAsProperty(m, "subscription")
-	if err != nil {
-		return
-	}
-	obj.Support, err = UnmarshalSupportInfoSliceAsProperty(m, "support")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalAccountSummarySlice unmarshals a slice of AccountSummary instances from the specified list of maps.
-func UnmarshalAccountSummarySlice(s []interface{}) (slice []AccountSummary, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'AccountSummary'")
-			return
-		}
-		obj, e := UnmarshalAccountSummary(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalAccountSummaryAsProperty unmarshals an instance of AccountSummary that is stored as a property
-// within the specified map.
-func UnmarshalAccountSummaryAsProperty(m map[string]interface{}, propertyName string) (result *AccountSummary, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'AccountSummary'", propertyName)
-			return
-		}
-		result, err = UnmarshalAccountSummary(objMap)
-	}
-	return
-}
-
-// UnmarshalAccountSummarySliceAsProperty unmarshals a slice of AccountSummary instances that are stored as a property
-// within the specified map.
-func UnmarshalAccountSummarySliceAsProperty(m map[string]interface{}, propertyName string) (slice []AccountSummary, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'AccountSummary'", propertyName)
-			return
-		}
-		slice, err = UnmarshalAccountSummarySlice(vSlice)
-	}
-	return
-}
-
-// AccountUsage : Aggregated usage and charges for all the plans in the account.
-type AccountUsage struct {
-	// ID of the account.
-	AccountID *string `json:"account_id" validate:"required"`
-
-	// The country to use for pricing.
-	PricingCountry *string `json:"pricing_country" validate:"required"`
-
-	// The currency for the cost fields in the resources, plans, and metrics.
-	CurrencyCode *string `json:"currency_code" validate:"required"`
-
-	// The month of the reported usage and charges in `yyyy-mm` format.
-	Month *string `json:"month" validate:"required"`
-
-	// All the resource used in the account.
-	Resources []Resource `json:"resources" validate:"required"`
-}
-
-
-// UnmarshalAccountUsage constructs an instance of AccountUsage from the specified map.
-func UnmarshalAccountUsage(m map[string]interface{}) (result *AccountUsage, err error) {
-	obj := new(AccountUsage)
-	obj.AccountID, err = core.UnmarshalString(m, "account_id")
-	if err != nil {
-		return
-	}
-	obj.PricingCountry, err = core.UnmarshalString(m, "pricing_country")
-	if err != nil {
-		return
-	}
-	obj.CurrencyCode, err = core.UnmarshalString(m, "currency_code")
-	if err != nil {
-		return
-	}
-	obj.Month, err = core.UnmarshalString(m, "month")
-	if err != nil {
-		return
-	}
-	obj.Resources, err = UnmarshalResourceSliceAsProperty(m, "resources")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalAccountUsageSlice unmarshals a slice of AccountUsage instances from the specified list of maps.
-func UnmarshalAccountUsageSlice(s []interface{}) (slice []AccountUsage, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'AccountUsage'")
-			return
-		}
-		obj, e := UnmarshalAccountUsage(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalAccountUsageAsProperty unmarshals an instance of AccountUsage that is stored as a property
-// within the specified map.
-func UnmarshalAccountUsageAsProperty(m map[string]interface{}, propertyName string) (result *AccountUsage, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'AccountUsage'", propertyName)
-			return
-		}
-		result, err = UnmarshalAccountUsage(objMap)
-	}
-	return
-}
-
-// UnmarshalAccountUsageSliceAsProperty unmarshals a slice of AccountUsage instances that are stored as a property
-// within the specified map.
-func UnmarshalAccountUsageSliceAsProperty(m map[string]interface{}, propertyName string) (slice []AccountUsage, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'AccountUsage'", propertyName)
-			return
-		}
-		slice, err = UnmarshalAccountUsageSlice(vSlice)
-	}
-	return
-}
-
-// Credits : Credits.
-type Credits struct {
-	// Total credit available for the term.
-	Total *float64 `json:"total,omitempty"`
-
-	// Credit available in the offer at the beginning of the month.
-	StartingBalance *float64 `json:"starting_balance" validate:"required"`
-
-	// Credit used in this month.
-	Used *float64 `json:"used" validate:"required"`
-
-	// Remaining credit in the offer.
-	Balance *float64 `json:"balance" validate:"required"`
-}
-
-
-// UnmarshalCredits constructs an instance of Credits from the specified map.
-func UnmarshalCredits(m map[string]interface{}) (result *Credits, err error) {
-	obj := new(Credits)
-	obj.Total, err = core.UnmarshalFloat64(m, "total")
-	if err != nil {
-		return
-	}
-	obj.StartingBalance, err = core.UnmarshalFloat64(m, "starting_balance")
-	if err != nil {
-		return
-	}
-	obj.Used, err = core.UnmarshalFloat64(m, "used")
-	if err != nil {
-		return
-	}
-	obj.Balance, err = core.UnmarshalFloat64(m, "balance")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalCreditsSlice unmarshals a slice of Credits instances from the specified list of maps.
-func UnmarshalCreditsSlice(s []interface{}) (slice []Credits, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'Credits'")
-			return
-		}
-		obj, e := UnmarshalCredits(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalCreditsAsProperty unmarshals an instance of Credits that is stored as a property
-// within the specified map.
-func UnmarshalCreditsAsProperty(m map[string]interface{}, propertyName string) (result *Credits, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'Credits'", propertyName)
-			return
-		}
-		result, err = UnmarshalCredits(objMap)
-	}
-	return
-}
-
-// UnmarshalCreditsSliceAsProperty unmarshals a slice of Credits instances that are stored as a property
-// within the specified map.
-func UnmarshalCreditsSliceAsProperty(m map[string]interface{}, propertyName string) (slice []Credits, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'Credits'", propertyName)
-			return
-		}
-		slice, err = UnmarshalCreditsSlice(vSlice)
-	}
-	return
-}
-
-// GetAccountInstancesUsageOptions : The GetAccountInstancesUsage options.
-type GetAccountInstancesUsageOptions struct {
-	// Account ID to which the resource instances belong to.
-	AccountID *string `json:"account_id" validate:"required"`
-
-	// Month for which the usage is requested.
-	Billingmonth *string `json:"billingmonth" validate:"required"`
-
-	// Number of usage records returned. The default value is 10. Maximum value is 20.
-	Limit *int64 `json:"_limit,omitempty"`
-
-	// The offset from which the records must be fetched. Offset information is included in the response.
-	Start *string `json:"_start,omitempty"`
-
-	// Filter by resource group.
-	ResourceGroupID *string `json:"resource_group_id,omitempty"`
-
-	// Filter by organization_id.
-	OrganizationID *string `json:"organization_id,omitempty"`
-
-	// Filter by resource instance id.
-	ResourceInstanceID *string `json:"resource_instance_id,omitempty"`
-
-	// Filter by resource_id.
-	ResourceID *string `json:"resource_id,omitempty"`
-
-	// Filter by plan_id.
-	PlanID *string `json:"plan_id,omitempty"`
-
-	// Region in which the resource instance is provisioned.
-	Region *string `json:"region,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewGetAccountInstancesUsageOptions : Instantiate GetAccountInstancesUsageOptions
-func (*UsageReportsV4) NewGetAccountInstancesUsageOptions(accountID string, billingmonth string) *GetAccountInstancesUsageOptions {
-	return &GetAccountInstancesUsageOptions{
-		AccountID: core.StringPtr(accountID),
-		Billingmonth: core.StringPtr(billingmonth),
-	}
-}
-
-// SetAccountID : Allow user to set AccountID
-func (options *GetAccountInstancesUsageOptions) SetAccountID(accountID string) *GetAccountInstancesUsageOptions {
-	options.AccountID = core.StringPtr(accountID)
-	return options
-}
-
-// SetBillingmonth : Allow user to set Billingmonth
-func (options *GetAccountInstancesUsageOptions) SetBillingmonth(billingmonth string) *GetAccountInstancesUsageOptions {
-	options.Billingmonth = core.StringPtr(billingmonth)
-	return options
-}
-
-// SetLimit : Allow user to set Limit
-func (options *GetAccountInstancesUsageOptions) SetLimit(limit int64) *GetAccountInstancesUsageOptions {
-	options.Limit = core.Int64Ptr(limit)
-	return options
-}
-
-// SetStart : Allow user to set Start
-func (options *GetAccountInstancesUsageOptions) SetStart(start string) *GetAccountInstancesUsageOptions {
-	options.Start = core.StringPtr(start)
-	return options
-}
-
-// SetResourceGroupID : Allow user to set ResourceGroupID
-func (options *GetAccountInstancesUsageOptions) SetResourceGroupID(resourceGroupID string) *GetAccountInstancesUsageOptions {
-	options.ResourceGroupID = core.StringPtr(resourceGroupID)
-	return options
-}
-
-// SetOrganizationID : Allow user to set OrganizationID
-func (options *GetAccountInstancesUsageOptions) SetOrganizationID(organizationID string) *GetAccountInstancesUsageOptions {
-	options.OrganizationID = core.StringPtr(organizationID)
-	return options
-}
-
-// SetResourceInstanceID : Allow user to set ResourceInstanceID
-func (options *GetAccountInstancesUsageOptions) SetResourceInstanceID(resourceInstanceID string) *GetAccountInstancesUsageOptions {
-	options.ResourceInstanceID = core.StringPtr(resourceInstanceID)
-	return options
-}
-
-// SetResourceID : Allow user to set ResourceID
-func (options *GetAccountInstancesUsageOptions) SetResourceID(resourceID string) *GetAccountInstancesUsageOptions {
-	options.ResourceID = core.StringPtr(resourceID)
-	return options
-}
-
-// SetPlanID : Allow user to set PlanID
-func (options *GetAccountInstancesUsageOptions) SetPlanID(planID string) *GetAccountInstancesUsageOptions {
-	options.PlanID = core.StringPtr(planID)
-	return options
-}
-
-// SetRegion : Allow user to set Region
-func (options *GetAccountInstancesUsageOptions) SetRegion(region string) *GetAccountInstancesUsageOptions {
-	options.Region = core.StringPtr(region)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *GetAccountInstancesUsageOptions) SetHeaders(param map[string]string) *GetAccountInstancesUsageOptions {
-	options.Headers = param
-	return options
-}
-
-// GetAccountSummaryOptions : The GetAccountSummary options.
-type GetAccountSummaryOptions struct {
-	// Account ID for which the summary is requested.
-	AccountID *string `json:"account_id" validate:"required"`
-
-	// Billing month for which the summary is requested in `yyyy-mm` format.
-	Billingmonth *string `json:"billingmonth" validate:"required"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewGetAccountSummaryOptions : Instantiate GetAccountSummaryOptions
-func (*UsageReportsV4) NewGetAccountSummaryOptions(accountID string, billingmonth string) *GetAccountSummaryOptions {
-	return &GetAccountSummaryOptions{
-		AccountID: core.StringPtr(accountID),
-		Billingmonth: core.StringPtr(billingmonth),
-	}
-}
-
-// SetAccountID : Allow user to set AccountID
-func (options *GetAccountSummaryOptions) SetAccountID(accountID string) *GetAccountSummaryOptions {
-	options.AccountID = core.StringPtr(accountID)
-	return options
-}
-
-// SetBillingmonth : Allow user to set Billingmonth
-func (options *GetAccountSummaryOptions) SetBillingmonth(billingmonth string) *GetAccountSummaryOptions {
-	options.Billingmonth = core.StringPtr(billingmonth)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *GetAccountSummaryOptions) SetHeaders(param map[string]string) *GetAccountSummaryOptions {
-	options.Headers = param
-	return options
-}
-
-// GetAccountUsageOptions : The GetAccountUsage options.
-type GetAccountUsageOptions struct {
-	// Account ID for which the usage is requested.
-	AccountID *string `json:"account_id" validate:"required"`
-
-	// Month for which the usage is requested.
-	Billingmonth *string `json:"billingmonth" validate:"required"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewGetAccountUsageOptions : Instantiate GetAccountUsageOptions
-func (*UsageReportsV4) NewGetAccountUsageOptions(accountID string, billingmonth string) *GetAccountUsageOptions {
-	return &GetAccountUsageOptions{
-		AccountID: core.StringPtr(accountID),
-		Billingmonth: core.StringPtr(billingmonth),
-	}
-}
-
-// SetAccountID : Allow user to set AccountID
-func (options *GetAccountUsageOptions) SetAccountID(accountID string) *GetAccountUsageOptions {
-	options.AccountID = core.StringPtr(accountID)
-	return options
-}
-
-// SetBillingmonth : Allow user to set Billingmonth
-func (options *GetAccountUsageOptions) SetBillingmonth(billingmonth string) *GetAccountUsageOptions {
-	options.Billingmonth = core.StringPtr(billingmonth)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *GetAccountUsageOptions) SetHeaders(param map[string]string) *GetAccountUsageOptions {
-	options.Headers = param
-	return options
-}
-
-// GetOrganizationInstancesUsageOptions : The GetOrganizationInstancesUsage options.
-type GetOrganizationInstancesUsageOptions struct {
-	// ID of the account under which the organization is present.
-	AccountID *string `json:"account_id" validate:"required"`
-
-	// ID of the organization.
-	OrganizationID *string `json:"organization_id" validate:"required"`
-
-	// Month for which the usage is requested.
-	Billingmonth *string `json:"billingmonth" validate:"required"`
-
-	// Number of usage records returned. The default value is 10. Maximum value is 20.
-	Limit *int64 `json:"_limit,omitempty"`
-
-	// The offset from which the records must be fetched. Offset information is included in the response.
-	Start *string `json:"_start,omitempty"`
-
-	// Filter by resource instance id.
-	ResourceInstanceID *string `json:"resource_instance_id,omitempty"`
-
-	// Filter by resource_id.
-	ResourceID *string `json:"resource_id,omitempty"`
-
-	// Filter by plan_id.
-	PlanID *string `json:"plan_id,omitempty"`
-
-	// Region in which the resource instance is provisioned.
-	Region *string `json:"region,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewGetOrganizationInstancesUsageOptions : Instantiate GetOrganizationInstancesUsageOptions
-func (*UsageReportsV4) NewGetOrganizationInstancesUsageOptions(accountID string, organizationID string, billingmonth string) *GetOrganizationInstancesUsageOptions {
-	return &GetOrganizationInstancesUsageOptions{
-		AccountID: core.StringPtr(accountID),
-		OrganizationID: core.StringPtr(organizationID),
-		Billingmonth: core.StringPtr(billingmonth),
-	}
-}
-
-// SetAccountID : Allow user to set AccountID
-func (options *GetOrganizationInstancesUsageOptions) SetAccountID(accountID string) *GetOrganizationInstancesUsageOptions {
-	options.AccountID = core.StringPtr(accountID)
-	return options
-}
-
-// SetOrganizationID : Allow user to set OrganizationID
-func (options *GetOrganizationInstancesUsageOptions) SetOrganizationID(organizationID string) *GetOrganizationInstancesUsageOptions {
-	options.OrganizationID = core.StringPtr(organizationID)
-	return options
-}
-
-// SetBillingmonth : Allow user to set Billingmonth
-func (options *GetOrganizationInstancesUsageOptions) SetBillingmonth(billingmonth string) *GetOrganizationInstancesUsageOptions {
-	options.Billingmonth = core.StringPtr(billingmonth)
-	return options
-}
-
-// SetLimit : Allow user to set Limit
-func (options *GetOrganizationInstancesUsageOptions) SetLimit(limit int64) *GetOrganizationInstancesUsageOptions {
-	options.Limit = core.Int64Ptr(limit)
-	return options
-}
-
-// SetStart : Allow user to set Start
-func (options *GetOrganizationInstancesUsageOptions) SetStart(start string) *GetOrganizationInstancesUsageOptions {
-	options.Start = core.StringPtr(start)
-	return options
-}
-
-// SetResourceInstanceID : Allow user to set ResourceInstanceID
-func (options *GetOrganizationInstancesUsageOptions) SetResourceInstanceID(resourceInstanceID string) *GetOrganizationInstancesUsageOptions {
-	options.ResourceInstanceID = core.StringPtr(resourceInstanceID)
-	return options
-}
-
-// SetResourceID : Allow user to set ResourceID
-func (options *GetOrganizationInstancesUsageOptions) SetResourceID(resourceID string) *GetOrganizationInstancesUsageOptions {
-	options.ResourceID = core.StringPtr(resourceID)
-	return options
-}
-
-// SetPlanID : Allow user to set PlanID
-func (options *GetOrganizationInstancesUsageOptions) SetPlanID(planID string) *GetOrganizationInstancesUsageOptions {
-	options.PlanID = core.StringPtr(planID)
-	return options
-}
-
-// SetRegion : Allow user to set Region
-func (options *GetOrganizationInstancesUsageOptions) SetRegion(region string) *GetOrganizationInstancesUsageOptions {
-	options.Region = core.StringPtr(region)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *GetOrganizationInstancesUsageOptions) SetHeaders(param map[string]string) *GetOrganizationInstancesUsageOptions {
-	options.Headers = param
-	return options
-}
-
-// GetOrganizationUsageOptions : The GetOrganizationUsage options.
-type GetOrganizationUsageOptions struct {
-	// ID of the account containing the organization.
-	AccountID *string `json:"account_id" validate:"required"`
-
-	// ID of the organization.
-	OrganizationID *string `json:"organization_id" validate:"required"`
-
-	// Month for which the usage is requested.
-	Billingmonth *string `json:"billingmonth" validate:"required"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewGetOrganizationUsageOptions : Instantiate GetOrganizationUsageOptions
-func (*UsageReportsV4) NewGetOrganizationUsageOptions(accountID string, organizationID string, billingmonth string) *GetOrganizationUsageOptions {
-	return &GetOrganizationUsageOptions{
-		AccountID: core.StringPtr(accountID),
-		OrganizationID: core.StringPtr(organizationID),
-		Billingmonth: core.StringPtr(billingmonth),
-	}
-}
-
-// SetAccountID : Allow user to set AccountID
-func (options *GetOrganizationUsageOptions) SetAccountID(accountID string) *GetOrganizationUsageOptions {
-	options.AccountID = core.StringPtr(accountID)
-	return options
-}
-
-// SetOrganizationID : Allow user to set OrganizationID
-func (options *GetOrganizationUsageOptions) SetOrganizationID(organizationID string) *GetOrganizationUsageOptions {
-	options.OrganizationID = core.StringPtr(organizationID)
-	return options
-}
-
-// SetBillingmonth : Allow user to set Billingmonth
-func (options *GetOrganizationUsageOptions) SetBillingmonth(billingmonth string) *GetOrganizationUsageOptions {
-	options.Billingmonth = core.StringPtr(billingmonth)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *GetOrganizationUsageOptions) SetHeaders(param map[string]string) *GetOrganizationUsageOptions {
-	options.Headers = param
-	return options
-}
-
-// GetResourceGroupInstancesUsageOptions : The GetResourceGroupInstancesUsage options.
-type GetResourceGroupInstancesUsageOptions struct {
-	// ID of the account in which the resource group is present.
-	AccountID *string `json:"account_id" validate:"required"`
-
-	// ID of the resource group.
-	ResourceGroupID *string `json:"resource_group_id" validate:"required"`
-
-	// Month for which the usage is requested.
-	Billingmonth *string `json:"billingmonth" validate:"required"`
-
-	// Number of usage records returned. The default value is 10. Maximum value is 20.
-	Limit *int64 `json:"_limit,omitempty"`
-
-	// The offset from which the records must be fetched. Offset information is included in the response.
-	Start *string `json:"_start,omitempty"`
-
-	// Filter by resource instance id.
-	ResourceInstanceID *string `json:"resource_instance_id,omitempty"`
-
-	// Filter by resource_id.
-	ResourceID *string `json:"resource_id,omitempty"`
-
-	// Filter by plan_id.
-	PlanID *string `json:"plan_id,omitempty"`
-
-	// Region in which the resource instance is provisioned.
-	Region *string `json:"region,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewGetResourceGroupInstancesUsageOptions : Instantiate GetResourceGroupInstancesUsageOptions
-func (*UsageReportsV4) NewGetResourceGroupInstancesUsageOptions(accountID string, resourceGroupID string, billingmonth string) *GetResourceGroupInstancesUsageOptions {
-	return &GetResourceGroupInstancesUsageOptions{
-		AccountID: core.StringPtr(accountID),
-		ResourceGroupID: core.StringPtr(resourceGroupID),
-		Billingmonth: core.StringPtr(billingmonth),
-	}
-}
-
-// SetAccountID : Allow user to set AccountID
-func (options *GetResourceGroupInstancesUsageOptions) SetAccountID(accountID string) *GetResourceGroupInstancesUsageOptions {
-	options.AccountID = core.StringPtr(accountID)
-	return options
-}
-
-// SetResourceGroupID : Allow user to set ResourceGroupID
-func (options *GetResourceGroupInstancesUsageOptions) SetResourceGroupID(resourceGroupID string) *GetResourceGroupInstancesUsageOptions {
-	options.ResourceGroupID = core.StringPtr(resourceGroupID)
-	return options
-}
-
-// SetBillingmonth : Allow user to set Billingmonth
-func (options *GetResourceGroupInstancesUsageOptions) SetBillingmonth(billingmonth string) *GetResourceGroupInstancesUsageOptions {
-	options.Billingmonth = core.StringPtr(billingmonth)
-	return options
-}
-
-// SetLimit : Allow user to set Limit
-func (options *GetResourceGroupInstancesUsageOptions) SetLimit(limit int64) *GetResourceGroupInstancesUsageOptions {
-	options.Limit = core.Int64Ptr(limit)
-	return options
-}
-
-// SetStart : Allow user to set Start
-func (options *GetResourceGroupInstancesUsageOptions) SetStart(start string) *GetResourceGroupInstancesUsageOptions {
-	options.Start = core.StringPtr(start)
-	return options
-}
-
-// SetResourceInstanceID : Allow user to set ResourceInstanceID
-func (options *GetResourceGroupInstancesUsageOptions) SetResourceInstanceID(resourceInstanceID string) *GetResourceGroupInstancesUsageOptions {
-	options.ResourceInstanceID = core.StringPtr(resourceInstanceID)
-	return options
-}
-
-// SetResourceID : Allow user to set ResourceID
-func (options *GetResourceGroupInstancesUsageOptions) SetResourceID(resourceID string) *GetResourceGroupInstancesUsageOptions {
-	options.ResourceID = core.StringPtr(resourceID)
-	return options
-}
-
-// SetPlanID : Allow user to set PlanID
-func (options *GetResourceGroupInstancesUsageOptions) SetPlanID(planID string) *GetResourceGroupInstancesUsageOptions {
-	options.PlanID = core.StringPtr(planID)
-	return options
-}
-
-// SetRegion : Allow user to set Region
-func (options *GetResourceGroupInstancesUsageOptions) SetRegion(region string) *GetResourceGroupInstancesUsageOptions {
-	options.Region = core.StringPtr(region)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *GetResourceGroupInstancesUsageOptions) SetHeaders(param map[string]string) *GetResourceGroupInstancesUsageOptions {
-	options.Headers = param
-	return options
-}
-
-// GetResourceGroupUsageOptions : The GetResourceGroupUsage options.
-type GetResourceGroupUsageOptions struct {
-	// Account ID containing the resource group.
-	AccountID *string `json:"account_id" validate:"required"`
-
-	// Resource group for which the usage is requested.
-	ResourceGroupID *string `json:"resource_group_id" validate:"required"`
-
-	// Month for which the usage is requested.
-	Billingmonth *string `json:"billingmonth" validate:"required"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewGetResourceGroupUsageOptions : Instantiate GetResourceGroupUsageOptions
-func (*UsageReportsV4) NewGetResourceGroupUsageOptions(accountID string, resourceGroupID string, billingmonth string) *GetResourceGroupUsageOptions {
-	return &GetResourceGroupUsageOptions{
-		AccountID: core.StringPtr(accountID),
-		ResourceGroupID: core.StringPtr(resourceGroupID),
-		Billingmonth: core.StringPtr(billingmonth),
-	}
-}
-
-// SetAccountID : Allow user to set AccountID
-func (options *GetResourceGroupUsageOptions) SetAccountID(accountID string) *GetResourceGroupUsageOptions {
-	options.AccountID = core.StringPtr(accountID)
-	return options
-}
-
-// SetResourceGroupID : Allow user to set ResourceGroupID
-func (options *GetResourceGroupUsageOptions) SetResourceGroupID(resourceGroupID string) *GetResourceGroupUsageOptions {
-	options.ResourceGroupID = core.StringPtr(resourceGroupID)
-	return options
-}
-
-// SetBillingmonth : Allow user to set Billingmonth
-func (options *GetResourceGroupUsageOptions) SetBillingmonth(billingmonth string) *GetResourceGroupUsageOptions {
-	options.Billingmonth = core.StringPtr(billingmonth)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *GetResourceGroupUsageOptions) SetHeaders(param map[string]string) *GetResourceGroupUsageOptions {
-	options.Headers = param
-	return options
-}
-
-// InstanceUsage : Aggregated usage and charges for an instance.
-type InstanceUsage struct {
-	// ID of the account.
-	AccountID *string `json:"account_id" validate:"required"`
-
-	// The ID of the resource instance.
-	ResourceInstanceID *string `json:"resource_instance_id" validate:"required"`
-
-	// The ID of the resource.
-	ResourceID *string `json:"resource_id" validate:"required"`
-
-	// ID of the resource group.
-	ResourceGroupID *string `json:"resource_group_id,omitempty"`
-
-	// The ID of the organization.
-	OrganizationID *string `json:"organization_id,omitempty"`
-
-	// The ID of the space.
-	Space *string `json:"space,omitempty"`
-
-	// The ID of the consumer.
-	ConsumerID *string `json:"consumer_id,omitempty"`
-
-	// The region in which the instance was provisioned.
-	Region *string `json:"region,omitempty"`
-
-	// The pricing region in which the usage submitted was rated.
-	PricingRegion *string `json:"pricing_region,omitempty"`
-
-	// The country to use for pricing.
-	PricingCountry *string `json:"pricing_country" validate:"required"`
-
-	// The currency for the cost fields in the resources, plans, and metrics.
-	CurrencyCode *string `json:"currency_code" validate:"required"`
-
-	// Whether the cost is charged to the account.
-	Billable *bool `json:"billable" validate:"required"`
-
-	// The ID of the plan with which the instance was provisioned and rated.
-	PlanID *string `json:"plan_id" validate:"required"`
-
-	// The month of the reported usage and charges in `yyyy-mm` format.
-	Month *string `json:"month" validate:"required"`
-
-	// All of the resources used in the account.
-	Usage []Metric `json:"usage" validate:"required"`
-}
-
-
-// UnmarshalInstanceUsage constructs an instance of InstanceUsage from the specified map.
-func UnmarshalInstanceUsage(m map[string]interface{}) (result *InstanceUsage, err error) {
-	obj := new(InstanceUsage)
-	obj.AccountID, err = core.UnmarshalString(m, "account_id")
-	if err != nil {
-		return
-	}
-	obj.ResourceInstanceID, err = core.UnmarshalString(m, "resource_instance_id")
-	if err != nil {
-		return
-	}
-	obj.ResourceID, err = core.UnmarshalString(m, "resource_id")
-	if err != nil {
-		return
-	}
-	obj.ResourceGroupID, err = core.UnmarshalString(m, "resource_group_id")
-	if err != nil {
-		return
-	}
-	obj.OrganizationID, err = core.UnmarshalString(m, "organization_id")
-	if err != nil {
-		return
-	}
-	obj.Space, err = core.UnmarshalString(m, "space")
-	if err != nil {
-		return
-	}
-	obj.ConsumerID, err = core.UnmarshalString(m, "consumer_id")
-	if err != nil {
-		return
-	}
-	obj.Region, err = core.UnmarshalString(m, "region")
-	if err != nil {
-		return
-	}
-	obj.PricingRegion, err = core.UnmarshalString(m, "pricing_region")
-	if err != nil {
-		return
-	}
-	obj.PricingCountry, err = core.UnmarshalString(m, "pricing_country")
-	if err != nil {
-		return
-	}
-	obj.CurrencyCode, err = core.UnmarshalString(m, "currency_code")
-	if err != nil {
-		return
-	}
-	obj.Billable, err = core.UnmarshalBool(m, "billable")
-	if err != nil {
-		return
-	}
-	obj.PlanID, err = core.UnmarshalString(m, "plan_id")
-	if err != nil {
-		return
-	}
-	obj.Month, err = core.UnmarshalString(m, "month")
-	if err != nil {
-		return
-	}
-	obj.Usage, err = UnmarshalMetricSliceAsProperty(m, "usage")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalInstanceUsageSlice unmarshals a slice of InstanceUsage instances from the specified list of maps.
-func UnmarshalInstanceUsageSlice(s []interface{}) (slice []InstanceUsage, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'InstanceUsage'")
-			return
-		}
-		obj, e := UnmarshalInstanceUsage(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalInstanceUsageAsProperty unmarshals an instance of InstanceUsage that is stored as a property
-// within the specified map.
-func UnmarshalInstanceUsageAsProperty(m map[string]interface{}, propertyName string) (result *InstanceUsage, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'InstanceUsage'", propertyName)
-			return
-		}
-		result, err = UnmarshalInstanceUsage(objMap)
-	}
-	return
-}
-
-// UnmarshalInstanceUsageSliceAsProperty unmarshals a slice of InstanceUsage instances that are stored as a property
-// within the specified map.
-func UnmarshalInstanceUsageSliceAsProperty(m map[string]interface{}, propertyName string) (slice []InstanceUsage, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'InstanceUsage'", propertyName)
-			return
-		}
-		slice, err = UnmarshalInstanceUsageSlice(vSlice)
-	}
-	return
-}
-
-// InstancesUsage : List of instnace usage reports.
-type InstancesUsage struct {
-	// The maximum number of reports in the response.
-	Limit *int64 `json:"limit,omitempty"`
-
-	// The number of reports in the response.
-	Count *int64 `json:"count,omitempty"`
-
-	// Link to the first page of the search query.
-	First *PageLink `json:"first,omitempty"`
-
-	// Link to the next page of the search query.
-	Next *PageLink `json:"next,omitempty"`
-
-	// The list of instance usage reports.
-	Resources []InstanceUsage `json:"resources,omitempty"`
-}
-
-
-// UnmarshalInstancesUsage constructs an instance of InstancesUsage from the specified map.
-func UnmarshalInstancesUsage(m map[string]interface{}) (result *InstancesUsage, err error) {
-	obj := new(InstancesUsage)
-	obj.Limit, err = core.UnmarshalInt64(m, "limit")
-	if err != nil {
-		return
-	}
-	obj.Count, err = core.UnmarshalInt64(m, "count")
-	if err != nil {
-		return
-	}
-	obj.First, err = UnmarshalPageLinkAsProperty(m, "first")
-	if err != nil {
-		return
-	}
-	obj.Next, err = UnmarshalPageLinkAsProperty(m, "next")
-	if err != nil {
-		return
-	}
-	obj.Resources, err = UnmarshalInstanceUsageSliceAsProperty(m, "resources")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalInstancesUsageSlice unmarshals a slice of InstancesUsage instances from the specified list of maps.
-func UnmarshalInstancesUsageSlice(s []interface{}) (slice []InstancesUsage, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'InstancesUsage'")
-			return
-		}
-		obj, e := UnmarshalInstancesUsage(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalInstancesUsageAsProperty unmarshals an instance of InstancesUsage that is stored as a property
-// within the specified map.
-func UnmarshalInstancesUsageAsProperty(m map[string]interface{}, propertyName string) (result *InstancesUsage, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'InstancesUsage'", propertyName)
-			return
-		}
-		result, err = UnmarshalInstancesUsage(objMap)
-	}
-	return
-}
-
-// UnmarshalInstancesUsageSliceAsProperty unmarshals a slice of InstancesUsage instances that are stored as a property
-// within the specified map.
-func UnmarshalInstancesUsageSliceAsProperty(m map[string]interface{}, propertyName string) (slice []InstancesUsage, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'InstancesUsage'", propertyName)
-			return
-		}
-		slice, err = UnmarshalInstancesUsageSlice(vSlice)
-	}
-	return
-}
-
-// Metric : Metric for reporting usage.
-type Metric struct {
-	// Name of the metric.
-	Metric *string `json:"metric" validate:"required"`
-
-	// Aggregated value for the metric.
-	Quantity *float64 `json:"quantity" validate:"required"`
-
-	// Quantity that is used for calculating charges.
-	RateableQuantity *float64 `json:"rateable_quantity,omitempty"`
-
-	// Cost incurred by the metric.
-	Cost *float64 `json:"cost" validate:"required"`
-
-	// The price with which cost was calculated.
-	Price []map[string]interface{} `json:"price,omitempty"`
-
-	// Unit qualifying the quantity.
-	Unit *string `json:"unit,omitempty"`
-
-	// When set to `true`, the cost is for informational purpose and is not included while calculating the plan charges.
-	NonChargeable *bool `json:"non_chargeable,omitempty"`
-}
-
-
-// UnmarshalMetric constructs an instance of Metric from the specified map.
-func UnmarshalMetric(m map[string]interface{}) (result *Metric, err error) {
-	obj := new(Metric)
-	obj.Metric, err = core.UnmarshalString(m, "metric")
-	if err != nil {
-		return
-	}
-	obj.Quantity, err = core.UnmarshalFloat64(m, "quantity")
-	if err != nil {
-		return
-	}
-	obj.RateableQuantity, err = core.UnmarshalFloat64(m, "rateable_quantity")
-	if err != nil {
-		return
-	}
-	obj.Cost, err = core.UnmarshalFloat64(m, "cost")
-	if err != nil {
-		return
-	}
-	obj.Unit, err = core.UnmarshalString(m, "unit")
-	if err != nil {
-		return
-	}
-	obj.NonChargeable, err = core.UnmarshalBool(m, "non_chargeable")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalMetricSlice unmarshals a slice of Metric instances from the specified list of maps.
-func UnmarshalMetricSlice(s []interface{}) (slice []Metric, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'Metric'")
-			return
-		}
-		obj, e := UnmarshalMetric(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalMetricAsProperty unmarshals an instance of Metric that is stored as a property
-// within the specified map.
-func UnmarshalMetricAsProperty(m map[string]interface{}, propertyName string) (result *Metric, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'Metric'", propertyName)
-			return
-		}
-		result, err = UnmarshalMetric(objMap)
-	}
-	return
-}
-
-// UnmarshalMetricSliceAsProperty unmarshals a slice of Metric instances that are stored as a property
-// within the specified map.
-func UnmarshalMetricSliceAsProperty(m map[string]interface{}, propertyName string) (slice []Metric, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'Metric'", propertyName)
-			return
-		}
-		slice, err = UnmarshalMetricSlice(vSlice)
-	}
-	return
-}
-
-// Offer : Offer.
-type Offer struct {
-	// ID of the offer.
-	OfferID *string `json:"offer_id" validate:"required"`
-
-	// Total credits before applying the offer.
-	CreditsTotal *float64 `json:"credits_total" validate:"required"`
-
-	// Template with which the offer was generated.
-	OfferTemplate *string `json:"offer_template" validate:"required"`
-
-	// Date from which the offer is valid.
-	ValidFrom *strfmt.DateTime `json:"valid_from" validate:"required"`
-
-	// Date until which the offer is valid.
-	ExpiresOn *strfmt.DateTime `json:"expires_on" validate:"required"`
-
-	// Credits.
-	Credits *Credits `json:"credits" validate:"required"`
-}
-
-
-// UnmarshalOffer constructs an instance of Offer from the specified map.
-func UnmarshalOffer(m map[string]interface{}) (result *Offer, err error) {
-	obj := new(Offer)
-	obj.OfferID, err = core.UnmarshalString(m, "offer_id")
-	if err != nil {
-		return
-	}
-	obj.CreditsTotal, err = core.UnmarshalFloat64(m, "credits_total")
-	if err != nil {
-		return
-	}
-	obj.OfferTemplate, err = core.UnmarshalString(m, "offer_template")
-	if err != nil {
-		return
-	}
-	obj.ValidFrom, err = core.UnmarshalDateTime(m, "valid_from")
-	if err != nil {
-		return
-	}
-	obj.ExpiresOn, err = core.UnmarshalDateTime(m, "expires_on")
-	if err != nil {
-		return
-	}
-	obj.Credits, err = UnmarshalCreditsAsProperty(m, "credits")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalOfferSlice unmarshals a slice of Offer instances from the specified list of maps.
-func UnmarshalOfferSlice(s []interface{}) (slice []Offer, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'Offer'")
-			return
-		}
-		obj, e := UnmarshalOffer(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalOfferAsProperty unmarshals an instance of Offer that is stored as a property
-// within the specified map.
-func UnmarshalOfferAsProperty(m map[string]interface{}, propertyName string) (result *Offer, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'Offer'", propertyName)
-			return
-		}
-		result, err = UnmarshalOffer(objMap)
-	}
-	return
-}
-
-// UnmarshalOfferSliceAsProperty unmarshals a slice of Offer instances that are stored as a property
-// within the specified map.
-func UnmarshalOfferSliceAsProperty(m map[string]interface{}, propertyName string) (slice []Offer, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'Offer'", propertyName)
-			return
-		}
-		slice, err = UnmarshalOfferSlice(vSlice)
-	}
-	return
-}
-
-// OrganizationUsage : Aggregated usage and charges for all the plans in the org.
-type OrganizationUsage struct {
-	// ID of the account.
-	AccountID *string `json:"account_id" validate:"required"`
-
-	// ID of the organization.
-	OrganizationID *string `json:"organization_id" validate:"required"`
-
-	// The country to use for pricing.
-	PricingCountry *string `json:"pricing_country" validate:"required"`
-
-	// The currency for the cost fields in the resources, plans, and metrics.
-	CurrencyCode *string `json:"currency_code" validate:"required"`
-
-	// The month of the reported usage and charges in `yyyy-mm` format.
-	Month *string `json:"month" validate:"required"`
-
-	// All the resource used in the account.
-	Resources []Resource `json:"resources" validate:"required"`
-}
-
-
-// UnmarshalOrganizationUsage constructs an instance of OrganizationUsage from the specified map.
-func UnmarshalOrganizationUsage(m map[string]interface{}) (result *OrganizationUsage, err error) {
-	obj := new(OrganizationUsage)
-	obj.AccountID, err = core.UnmarshalString(m, "account_id")
-	if err != nil {
-		return
-	}
-	obj.OrganizationID, err = core.UnmarshalString(m, "organization_id")
-	if err != nil {
-		return
-	}
-	obj.PricingCountry, err = core.UnmarshalString(m, "pricing_country")
-	if err != nil {
-		return
-	}
-	obj.CurrencyCode, err = core.UnmarshalString(m, "currency_code")
-	if err != nil {
-		return
-	}
-	obj.Month, err = core.UnmarshalString(m, "month")
-	if err != nil {
-		return
-	}
-	obj.Resources, err = UnmarshalResourceSliceAsProperty(m, "resources")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalOrganizationUsageSlice unmarshals a slice of OrganizationUsage instances from the specified list of maps.
-func UnmarshalOrganizationUsageSlice(s []interface{}) (slice []OrganizationUsage, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'OrganizationUsage'")
-			return
-		}
-		obj, e := UnmarshalOrganizationUsage(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalOrganizationUsageAsProperty unmarshals an instance of OrganizationUsage that is stored as a property
-// within the specified map.
-func UnmarshalOrganizationUsageAsProperty(m map[string]interface{}, propertyName string) (result *OrganizationUsage, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'OrganizationUsage'", propertyName)
-			return
-		}
-		result, err = UnmarshalOrganizationUsage(objMap)
-	}
-	return
-}
-
-// UnmarshalOrganizationUsageSliceAsProperty unmarshals a slice of OrganizationUsage instances that are stored as a property
-// within the specified map.
-func UnmarshalOrganizationUsageSliceAsProperty(m map[string]interface{}, propertyName string) (slice []OrganizationUsage, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'OrganizationUsage'", propertyName)
-			return
-		}
-		slice, err = UnmarshalOrganizationUsageSlice(vSlice)
-	}
-	return
-}
-
-// PageLink : Link to a page of a paginated list.
-type PageLink struct {
-	// The URL for the page.
-	Href *string `json:"href,omitempty"`
-
-	// The value of the `_start` query parameter to fetch the page.
-	Offset *string `json:"offset,omitempty"`
-}
-
-
-// UnmarshalPageLink constructs an instance of PageLink from the specified map.
-func UnmarshalPageLink(m map[string]interface{}) (result *PageLink, err error) {
-	obj := new(PageLink)
-	obj.Href, err = core.UnmarshalString(m, "href")
-	if err != nil {
-		return
-	}
-	obj.Offset, err = core.UnmarshalString(m, "offset")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalPageLinkSlice unmarshals a slice of PageLink instances from the specified list of maps.
-func UnmarshalPageLinkSlice(s []interface{}) (slice []PageLink, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'PageLink'")
-			return
-		}
-		obj, e := UnmarshalPageLink(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalPageLinkAsProperty unmarshals an instance of PageLink that is stored as a property
-// within the specified map.
-func UnmarshalPageLinkAsProperty(m map[string]interface{}, propertyName string) (result *PageLink, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'PageLink'", propertyName)
-			return
-		}
-		result, err = UnmarshalPageLink(objMap)
-	}
-	return
-}
-
-// UnmarshalPageLinkSliceAsProperty unmarshals a slice of PageLink instances that are stored as a property
-// within the specified map.
-func UnmarshalPageLinkSliceAsProperty(m map[string]interface{}, propertyName string) (slice []PageLink, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'PageLink'", propertyName)
-			return
-		}
-		slice, err = UnmarshalPageLinkSlice(vSlice)
-	}
-	return
-}
-
-// Plan : Aggregated values for the plan.
-type Plan struct {
-	// The ID of the plan.
-	PlanID *string `json:"plan_id" validate:"required"`
-
-	// The pricing region for the plan.
-	PricingRegion *string `json:"pricing_region,omitempty"`
-
-	// Whether the plan charges are billed to the customer.
-	Billable *bool `json:"billable" validate:"required"`
-
-	// Total cost incurred by the plan.
-	Cost *float64 `json:"cost" validate:"required"`
-
-	// All of the metrics in the plan.
-	Usage []Metric `json:"usage" validate:"required"`
-}
-
-
-// UnmarshalPlan constructs an instance of Plan from the specified map.
-func UnmarshalPlan(m map[string]interface{}) (result *Plan, err error) {
-	obj := new(Plan)
-	obj.PlanID, err = core.UnmarshalString(m, "plan_id")
-	if err != nil {
-		return
-	}
-	obj.PricingRegion, err = core.UnmarshalString(m, "pricing_region")
-	if err != nil {
-		return
-	}
-	obj.Billable, err = core.UnmarshalBool(m, "billable")
-	if err != nil {
-		return
-	}
-	obj.Cost, err = core.UnmarshalFloat64(m, "cost")
-	if err != nil {
-		return
-	}
-	obj.Usage, err = UnmarshalMetricSliceAsProperty(m, "usage")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalPlanSlice unmarshals a slice of Plan instances from the specified list of maps.
-func UnmarshalPlanSlice(s []interface{}) (slice []Plan, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'Plan'")
-			return
-		}
-		obj, e := UnmarshalPlan(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalPlanAsProperty unmarshals an instance of Plan that is stored as a property
-// within the specified map.
-func UnmarshalPlanAsProperty(m map[string]interface{}, propertyName string) (result *Plan, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'Plan'", propertyName)
-			return
-		}
-		result, err = UnmarshalPlan(objMap)
-	}
-	return
-}
-
-// UnmarshalPlanSliceAsProperty unmarshals a slice of Plan instances that are stored as a property
-// within the specified map.
-func UnmarshalPlanSliceAsProperty(m map[string]interface{}, propertyName string) (slice []Plan, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'Plan'", propertyName)
-			return
-		}
-		slice, err = UnmarshalPlanSlice(vSlice)
-	}
-	return
-}
-
-// Resource : Container for all the plans in the resource.
-type Resource struct {
-	// ID of the resource.
-	ResourceID *string `json:"resource_id" validate:"required"`
-
-	// The billable charges for the account.
-	BillableCost *float64 `json:"billable_cost" validate:"required"`
-
-	// The non billable charges for the account.
-	NonBillableCost *float64 `json:"non_billable_cost" validate:"required"`
-
-	// All the plans in the resource.
-	Plans []Plan `json:"plans" validate:"required"`
-}
-
-
-// UnmarshalResource constructs an instance of Resource from the specified map.
-func UnmarshalResource(m map[string]interface{}) (result *Resource, err error) {
-	obj := new(Resource)
-	obj.ResourceID, err = core.UnmarshalString(m, "resource_id")
-	if err != nil {
-		return
-	}
-	obj.BillableCost, err = core.UnmarshalFloat64(m, "billable_cost")
-	if err != nil {
-		return
-	}
-	obj.NonBillableCost, err = core.UnmarshalFloat64(m, "non_billable_cost")
-	if err != nil {
-		return
-	}
-	obj.Plans, err = UnmarshalPlanSliceAsProperty(m, "plans")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalResourceSlice unmarshals a slice of Resource instances from the specified list of maps.
-func UnmarshalResourceSlice(s []interface{}) (slice []Resource, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'Resource'")
-			return
-		}
-		obj, e := UnmarshalResource(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalResourceAsProperty unmarshals an instance of Resource that is stored as a property
-// within the specified map.
-func UnmarshalResourceAsProperty(m map[string]interface{}, propertyName string) (result *Resource, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'Resource'", propertyName)
-			return
-		}
-		result, err = UnmarshalResource(objMap)
-	}
-	return
-}
-
-// UnmarshalResourceSliceAsProperty unmarshals a slice of Resource instances that are stored as a property
-// within the specified map.
-func UnmarshalResourceSliceAsProperty(m map[string]interface{}, propertyName string) (slice []Resource, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'Resource'", propertyName)
-			return
-		}
-		slice, err = UnmarshalResourceSlice(vSlice)
-	}
-	return
-}
-
-// ResourceGroupUsage : Aggregated usage and charges for all the plans in the resource group.
-type ResourceGroupUsage struct {
-	// ID of the account.
-	AccountID *string `json:"account_id" validate:"required"`
-
-	// ID of the resource group.
-	ResourceGroupID *string `json:"resource_group_id" validate:"required"`
-
-	// The country to use for pricing.
-	PricingCountry *string `json:"pricing_country" validate:"required"`
-
-	// The currency for the cost fields in the resources, plans, and metrics.
-	CurrencyCode *string `json:"currency_code" validate:"required"`
-
-	// The month of the reported usage and charges in `yyyy-mm` format.
-	Month *string `json:"month" validate:"required"`
-
-	// All of the resources used in the account.
-	Resources []Resource `json:"resources" validate:"required"`
-}
-
-
-// UnmarshalResourceGroupUsage constructs an instance of ResourceGroupUsage from the specified map.
-func UnmarshalResourceGroupUsage(m map[string]interface{}) (result *ResourceGroupUsage, err error) {
-	obj := new(ResourceGroupUsage)
-	obj.AccountID, err = core.UnmarshalString(m, "account_id")
-	if err != nil {
-		return
-	}
-	obj.ResourceGroupID, err = core.UnmarshalString(m, "resource_group_id")
-	if err != nil {
-		return
-	}
-	obj.PricingCountry, err = core.UnmarshalString(m, "pricing_country")
-	if err != nil {
-		return
-	}
-	obj.CurrencyCode, err = core.UnmarshalString(m, "currency_code")
-	if err != nil {
-		return
-	}
-	obj.Month, err = core.UnmarshalString(m, "month")
-	if err != nil {
-		return
-	}
-	obj.Resources, err = UnmarshalResourceSliceAsProperty(m, "resources")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalResourceGroupUsageSlice unmarshals a slice of ResourceGroupUsage instances from the specified list of maps.
-func UnmarshalResourceGroupUsageSlice(s []interface{}) (slice []ResourceGroupUsage, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'ResourceGroupUsage'")
-			return
-		}
-		obj, e := UnmarshalResourceGroupUsage(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalResourceGroupUsageAsProperty unmarshals an instance of ResourceGroupUsage that is stored as a property
-// within the specified map.
-func UnmarshalResourceGroupUsageAsProperty(m map[string]interface{}, propertyName string) (result *ResourceGroupUsage, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'ResourceGroupUsage'", propertyName)
-			return
-		}
-		result, err = UnmarshalResourceGroupUsage(objMap)
-	}
-	return
-}
-
-// UnmarshalResourceGroupUsageSliceAsProperty unmarshals a slice of ResourceGroupUsage instances that are stored as a property
-// within the specified map.
-func UnmarshalResourceGroupUsageSliceAsProperty(m map[string]interface{}, propertyName string) (slice []ResourceGroupUsage, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'ResourceGroupUsage'", propertyName)
-			return
-		}
-		slice, err = UnmarshalResourceGroupUsageSlice(vSlice)
-	}
-	return
-}
-
-// Subscription : Subscription information.
-type Subscription struct {
-	// ID of the subscription.
-	SubscriptionID *string `json:"subscription_id" validate:"required"`
-
-	// Charge agreement number of the subsciption.
-	ChargeAgreementNumber *string `json:"charge_agreement_number" validate:"required"`
-
-	// Type of the subscription.
-	Type *string `json:"type" validate:"required"`
-
-	// Credit available in the subscription for the month.
-	SubscriptionAmount *float64 `json:"subscription_amount" validate:"required"`
-
-	// Date from which the subscription was active.
-	Start *strfmt.DateTime `json:"start" validate:"required"`
-
-	// The date until which the subscription is active. This date does not apply to Pay-As-You-Go accounts.
-	End *strfmt.DateTime `json:"end,omitempty"`
-
-	// Total credit available in the subscription.
-	CreditsTotal *float64 `json:"credits_total" validate:"required"`
-
-	// Separate periods of time within the overall subscription term. Longer subscriptions might be divided into multiple
-	// terms.
-	Terms []Terms `json:"terms" validate:"required"`
-}
-
-
-// UnmarshalSubscription constructs an instance of Subscription from the specified map.
-func UnmarshalSubscription(m map[string]interface{}) (result *Subscription, err error) {
-	obj := new(Subscription)
-	obj.SubscriptionID, err = core.UnmarshalString(m, "subscription_id")
-	if err != nil {
-		return
-	}
-	obj.ChargeAgreementNumber, err = core.UnmarshalString(m, "charge_agreement_number")
-	if err != nil {
-		return
-	}
-	obj.Type, err = core.UnmarshalString(m, "type")
-	if err != nil {
-		return
-	}
-	obj.SubscriptionAmount, err = core.UnmarshalFloat64(m, "subscription_amount")
-	if err != nil {
-		return
-	}
-	obj.Start, err = core.UnmarshalDateTime(m, "start")
-	if err != nil {
-		return
-	}
-	obj.End, err = core.UnmarshalDateTime(m, "end")
-	if err != nil {
-		return
-	}
-	obj.CreditsTotal, err = core.UnmarshalFloat64(m, "credits_total")
-	if err != nil {
-		return
-	}
-	obj.Terms, err = UnmarshalTermsSliceAsProperty(m, "terms")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalSubscriptionSlice unmarshals a slice of Subscription instances from the specified list of maps.
-func UnmarshalSubscriptionSlice(s []interface{}) (slice []Subscription, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'Subscription'")
-			return
-		}
-		obj, e := UnmarshalSubscription(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalSubscriptionAsProperty unmarshals an instance of Subscription that is stored as a property
-// within the specified map.
-func UnmarshalSubscriptionAsProperty(m map[string]interface{}, propertyName string) (result *Subscription, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'Subscription'", propertyName)
-			return
-		}
-		result, err = UnmarshalSubscription(objMap)
-	}
-	return
-}
-
-// UnmarshalSubscriptionSliceAsProperty unmarshals a slice of Subscription instances that are stored as a property
-// within the specified map.
-func UnmarshalSubscriptionSliceAsProperty(m map[string]interface{}, propertyName string) (slice []Subscription, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'Subscription'", propertyName)
-			return
-		}
-		slice, err = UnmarshalSubscriptionSlice(vSlice)
-	}
-	return
-}
-
-// SubscriptionInfo : Subscription information for an account.
-type SubscriptionInfo struct {
-	// Charges for usage that exceeds the available credit from subscriptions or offers.
-	Overage *float64 `json:"overage,omitempty"`
-
-	// List of subscriptions that applied to the month.
-	Subscriptions []Subscription `json:"subscriptions,omitempty"`
-}
-
-
-// UnmarshalSubscriptionInfo constructs an instance of SubscriptionInfo from the specified map.
-func UnmarshalSubscriptionInfo(m map[string]interface{}) (result *SubscriptionInfo, err error) {
-	obj := new(SubscriptionInfo)
-	obj.Overage, err = core.UnmarshalFloat64(m, "overage")
-	if err != nil {
-		return
-	}
-	obj.Subscriptions, err = UnmarshalSubscriptionSliceAsProperty(m, "subscriptions")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalSubscriptionInfoSlice unmarshals a slice of SubscriptionInfo instances from the specified list of maps.
-func UnmarshalSubscriptionInfoSlice(s []interface{}) (slice []SubscriptionInfo, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'SubscriptionInfo'")
-			return
-		}
-		obj, e := UnmarshalSubscriptionInfo(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalSubscriptionInfoAsProperty unmarshals an instance of SubscriptionInfo that is stored as a property
-// within the specified map.
-func UnmarshalSubscriptionInfoAsProperty(m map[string]interface{}, propertyName string) (result *SubscriptionInfo, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'SubscriptionInfo'", propertyName)
-			return
-		}
-		result, err = UnmarshalSubscriptionInfo(objMap)
-	}
-	return
-}
-
-// UnmarshalSubscriptionInfoSliceAsProperty unmarshals a slice of SubscriptionInfo instances that are stored as a property
-// within the specified map.
-func UnmarshalSubscriptionInfoSliceAsProperty(m map[string]interface{}, propertyName string) (slice []SubscriptionInfo, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'SubscriptionInfo'", propertyName)
-			return
-		}
-		slice, err = UnmarshalSubscriptionInfoSlice(vSlice)
-	}
-	return
-}
-
-// SupportInfo : Account support information.
-type SupportInfo struct {
-	// Monthly support cost.
-	Cost *float64 `json:"cost" validate:"required"`
-
-	// Type of support.
-	Type *string `json:"type" validate:"required"`
-
-	// Additional support cost for the month.
-	Overage *float64 `json:"overage" validate:"required"`
-}
-
-
-// UnmarshalSupportInfo constructs an instance of SupportInfo from the specified map.
-func UnmarshalSupportInfo(m map[string]interface{}) (result *SupportInfo, err error) {
-	obj := new(SupportInfo)
-	obj.Cost, err = core.UnmarshalFloat64(m, "cost")
-	if err != nil {
-		return
-	}
-	obj.Type, err = core.UnmarshalString(m, "type")
-	if err != nil {
-		return
-	}
-	obj.Overage, err = core.UnmarshalFloat64(m, "overage")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalSupportInfoSlice unmarshals a slice of SupportInfo instances from the specified list of maps.
-func UnmarshalSupportInfoSlice(s []interface{}) (slice []SupportInfo, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'SupportInfo'")
-			return
-		}
-		obj, e := UnmarshalSupportInfo(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalSupportInfoAsProperty unmarshals an instance of SupportInfo that is stored as a property
-// within the specified map.
-func UnmarshalSupportInfoAsProperty(m map[string]interface{}, propertyName string) (result *SupportInfo, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'SupportInfo'", propertyName)
-			return
-		}
-		result, err = UnmarshalSupportInfo(objMap)
-	}
-	return
-}
-
-// UnmarshalSupportInfoSliceAsProperty unmarshals a slice of SupportInfo instances that are stored as a property
-// within the specified map.
-func UnmarshalSupportInfoSliceAsProperty(m map[string]interface{}, propertyName string) (slice []SupportInfo, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'SupportInfo'", propertyName)
-			return
-		}
-		slice, err = UnmarshalSupportInfoSlice(vSlice)
-	}
-	return
-}
-
-// Terms : Terms.
-type Terms struct {
-	// Start date of the term.
-	Start *strfmt.DateTime `json:"start" validate:"required"`
-
-	// End date of the term.
-	End *strfmt.DateTime `json:"end" validate:"required"`
-
-	// Credits.
-	Credits *Credits `json:"credits" validate:"required"`
-}
-
-
-// UnmarshalTerms constructs an instance of Terms from the specified map.
-func UnmarshalTerms(m map[string]interface{}) (result *Terms, err error) {
-	obj := new(Terms)
-	obj.Start, err = core.UnmarshalDateTime(m, "start")
-	if err != nil {
-		return
-	}
-	obj.End, err = core.UnmarshalDateTime(m, "end")
-	if err != nil {
-		return
-	}
-	obj.Credits, err = UnmarshalCreditsAsProperty(m, "credits")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalTermsSlice unmarshals a slice of Terms instances from the specified list of maps.
-func UnmarshalTermsSlice(s []interface{}) (slice []Terms, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'Terms'")
-			return
-		}
-		obj, e := UnmarshalTerms(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalTermsAsProperty unmarshals an instance of Terms that is stored as a property
-// within the specified map.
-func UnmarshalTermsAsProperty(m map[string]interface{}, propertyName string) (result *Terms, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'Terms'", propertyName)
-			return
-		}
-		result, err = UnmarshalTerms(objMap)
-	}
-	return
-}
-
-// UnmarshalTermsSliceAsProperty unmarshals a slice of Terms instances that are stored as a property
-// within the specified map.
-func UnmarshalTermsSliceAsProperty(m map[string]interface{}, propertyName string) (slice []Terms, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'Terms'", propertyName)
-			return
-		}
-		slice, err = UnmarshalTermsSlice(vSlice)
-	}
-	return
-}
diff --git a/usagereportsv4/usage_reports_v4_integration_test.go b/usagereportsv4/usage_reports_v4_integration_test.go
deleted file mode 100644
index e7489be2..00000000
--- a/usagereportsv4/usage_reports_v4_integration_test.go
+++ /dev/null
@@ -1,171 +0,0 @@
-// +build integrationSKIP
-
-package usagereportsv4_test
-
-/**
- * (C) Copyright IBM Corp. 2020.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import (
-	"log"
-	"net/http"
-	"os"
-	"testing"
-
-	"github.com/joho/godotenv"
-	"github.com/stretchr/testify/assert"
-	"github.com/IBM/go-sdk-core/v3/core"
-	"github.ibm.com/ibmcloud/platform-services-go-sdk/usagereportsv4"
-)
-
-var service *usagereportsv4.UsageReportsV4
-var serviceErr error
-
-func init() {
-	err := godotenv.Load("../.env")
-	if err != nil {
-		log.Fatal("Error while loading .env file")
-	}
-
-	// Create the authenticator.
-	authenticator := &core.IamAuthenticator{
-		ApiKey: os.Getenv("IAMAPIKEY"),
-	}
-
-	service, serviceErr = usagereportsv4.NewUsageReportsV4(&usagereportsv4.UsageReportsV4Options{
-		Authenticator: authenticator,
-	})
-
-	if serviceErr == nil {
-		customHeaders := http.Header{}
-		customHeaders.Add("X-Watson-Learning-Opt-Out", "1")
-		customHeaders.Add("X-Watson-Test", "1")
-		service.Service.SetDefaultHeaders(customHeaders)
-	}
-}
-
-func shouldSkipTest(t *testing.T) {
-	if service == nil {
-		t.Skip("Skipping test as service credentials are missing")
-	}
-}
-
-func TestGetAccountSummary(t *testing.T) {
-	shouldSkipTest(t)
-	//tokenType := "BEARER"
-	//accountID := "91631433ee674cd9ab0ef150b8e7030f"
-	accountID := "a5d2a90b46ac45089fa28d0cb74c49af"
-	billingmonth := "2019-05"
-
-	getAccountSummaryOptions := service.NewGetAccountSummaryOptions(accountID, billingmonth)
-	accountSummary, returnValue, returnValueErr := service.GetAccountSummary(getAccountSummaryOptions)
-
-	assert.Nil(t, returnValueErr)
-	assert.NotNil(t, accountSummary)
-	assert.NotNil(t, returnValue)
-	assert.Equal(t, 200, returnValue.StatusCode)
-}
-
-func TestGetAccountUsage(t *testing.T) {
-	shouldSkipTest(t)
-	//accountID := "91631433ee674cd9ab0ef150b8e7030f"
-	accountID := "a5d2a90b46ac45089fa28d0cb74c49af"
-	billingmonth := "2019-05"
-
-	getAccountUsageOptions := service.NewGetAccountUsageOptions(accountID, billingmonth)
-	accountUsage, returnValue, returnValueErr := service.GetAccountUsage(getAccountUsageOptions)
-
-	assert.Nil(t, returnValueErr)
-	assert.NotNil(t, accountUsage)
-	assert.NotNil(t, returnValue)
-	assert.Equal(t, 200, returnValue.StatusCode)
-}
-
-func TestGetResourceGroupUsage(t *testing.T) {
-	shouldSkipTest(t)
-	accountID := "91631433ee674cd9ab0ef150b8e7030f"
-	resourceGroupID := "96714c6a77b04bd39d042a265428aea4"
-	billingmonth := "2019-05"
-
-	getResourceGroupUsageOptions := service.NewGetResourceGroupUsageOptions(accountID, resourceGroupID, billingmonth)
-	resGrpUsage, returnValue, returnValueErr := service.GetResourceGroupUsage(getResourceGroupUsageOptions)
-	assert.Nil(t, returnValueErr)
-	assert.NotNil(t, resGrpUsage)
-	assert.NotNil(t, returnValue)
-	assert.Equal(t, 200, returnValue.StatusCode)
-}
-
-func TestGetOrganizationUsage(t *testing.T) {
-	shouldSkipTest(t)
-	//accountID := "91631433ee674cd9ab0ef150b8e7030f"
-	accountID := "a5d2a90b46ac45089fa28d0cb74c49af"
-	//organizationID := "96714c6a77b04bd39d042a265428aea4"
-	organizationID := "us-south:c9d7aff6-a1ae-4916-912d-42fbc25e0e1d"
-	//organizationID := "a5d2a90b46ac45089fa28d0cb74c49af"
-	billingmonth := "2019-05"
-
-	getOrganizationUsageOptions := service.NewGetOrganizationUsageOptions(accountID, organizationID, billingmonth)
-	orgUsage, returnValue, returnValueErr := service.GetOrganizationUsage(getOrganizationUsageOptions)
-	assert.Nil(t, returnValueErr)
-	assert.NotNil(t, orgUsage)
-	assert.NotNil(t, returnValue)
-	assert.Equal(t, 200, returnValue.StatusCode)
-}
-
-func TestGetAccountInstancesUsage(t *testing.T) {
-	shouldSkipTest(t)
-	//accountID := "91631433ee674cd9ab0ef150b8e7030f"
-	accountID := "a5d2a90b46ac45089fa28d0cb74c49af"
-	//organizationID := "96714c6a77b04bd39d042a265428aea4"
-	billingmonth := "2019-05"
-
-	getAccountInstancesUsageOptions := service.NewGetAccountInstancesUsageOptions(accountID, billingmonth)
-	acctUsage, returnValue, returnValueErr := service.GetAccountInstancesUsage(getAccountInstancesUsageOptions)
-	assert.Nil(t, returnValueErr)
-	assert.NotNil(t, acctUsage)
-	assert.NotNil(t, returnValue)
-	assert.Equal(t, 200, returnValue.StatusCode)
-}
-
-func TestGetResourceGroupInstancesUsage(t *testing.T) {
-	shouldSkipTest(t)
-	//accountID := "91631433ee674cd9ab0ef150b8e7030f"
-	accountID := "91631433ee674cd9ab0ef150b8e7030f"
-	resourceGroupID := "96714c6a77b04bd39d042a265428aea4"
-	billingmonth := "2019-05"
-
-	getResourceGroupInstancesUsageOptions := service.NewGetResourceGroupInstancesUsageOptions(accountID, resourceGroupID, billingmonth)
-	resGrpUsage, returnValue, returnValueErr := service.GetResourceGroupInstancesUsage(getResourceGroupInstancesUsageOptions)
-	assert.Nil(t, returnValueErr)
-	assert.NotNil(t, resGrpUsage)
-	assert.NotNil(t, returnValue)
-	assert.Equal(t, 200, returnValue.StatusCode)
-}
-
-func TestGetOrganizationInstancesUsage(t *testing.T) {
-	shouldSkipTest(t)
-	//accountID := "91631433ee674cd9ab0ef150b8e7030f"
-	accountID := "a5d2a90b46ac45089fa28d0cb74c49af"
-	//organizationID := "96714c6a77b04bd39d042a265428aea4"
-	organizationID := "us-south:c9d7aff6-a1ae-4916-912d-42fbc25e0e1d"
-	billingmonth := "2019-05"
-
-	getOrganizationInstancesUsageOptions := service.NewGetOrganizationInstancesUsageOptions(accountID, organizationID, billingmonth)
-	orgUsage, returnValue, returnValueErr := service.GetOrganizationInstancesUsage(getOrganizationInstancesUsageOptions)
-	assert.Nil(t, returnValueErr)
-	assert.NotNil(t, orgUsage)
-	assert.NotNil(t, returnValue)
-	assert.Equal(t, 200, returnValue.StatusCode)
-}
diff --git a/usagereportsv4/usage_reports_v4_suite_test.go b/usagereportsv4/usage_reports_v4_suite_test.go
deleted file mode 100644
index b761ed08..00000000
--- a/usagereportsv4/usage_reports_v4_suite_test.go
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * (C) Copyright IBM Corp. 2020.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package usagereportsv4_test
-
-import (
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-	"testing"
-)
-
-func TestUsageReportsV4(t *testing.T) {
-	RegisterFailHandler(Fail)
-	RunSpecs(t, "UsageReportsV4 Suite")
-}
diff --git a/usagereportsv4/usage_reports_v4_test.go b/usagereportsv4/usage_reports_v4_test.go
deleted file mode 100644
index 9f4cbdbe..00000000
--- a/usagereportsv4/usage_reports_v4_test.go
+++ /dev/null
@@ -1,488 +0,0 @@
-/**
- * (C) Copyright IBM Corp. 2020.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package usagereportsv4_test
-
-import (
-	"bytes"
-	"fmt"
-	"github.com/IBM/go-sdk-core/v3/core"
-	"github.com/go-openapi/strfmt"
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-	"github.ibm.com/ibmcloud/platform-services-go-sdk/usagereportsv4"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"net/http/httptest"
-	"time"
-)
-
-var _ = Describe(`UsageReportsV4`, func() {
-	Describe(`GetAccountSummary(getAccountSummaryOptions *GetAccountSummaryOptions)`, func() {
-		bearerToken := "0ui9876453"
-		getAccountSummaryPath := "/v4/accounts/testString/summary/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(getAccountSummaryPath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"account_id": "AccountID", "billing_month": "BillingMonth", "billing_country_code": "BillingCountryCode", "billing_currency_code": "BillingCurrencyCode", "resources": {"billable_cost": 12, "non_billable_cost": 15}, "offers": [{"offer_id": "OfferID", "credits_total": 12, "offer_template": "OfferTemplate", "valid_from": "2019-01-01T12:00:00", "expires_on": "2019-01-01T12:00:00", "credits": {"total": 5, "starting_balance": 15, "used": 4, "balance": 7}}], "subscription": {"overage": 7, "subscriptions": [{"subscription_id": "SubscriptionID", "charge_agreement_number": "ChargeAgreementNumber", "type": "Type", "subscription_amount": 18, "start": "2019-01-01T12:00:00", "end": "2019-01-01T12:00:00", "credits_total": 12, "terms": [{"start": "2019-01-01T12:00:00", "end": "2019-01-01T12:00:00", "credits": {"total": 5, "starting_balance": 15, "used": 4, "balance": 7}}]}]}, "support": [{"cost": 4, "type": "Type", "overage": 7}]}`)
-			}))
-			It(`Invoke GetAccountSummary successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := usagereportsv4.NewUsageReportsV4(&usagereportsv4.UsageReportsV4Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.GetAccountSummary(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the GetAccountSummaryOptions model
-				getAccountSummaryOptionsModel := new(usagereportsv4.GetAccountSummaryOptions)
-				getAccountSummaryOptionsModel.AccountID = core.StringPtr("testString")
-				getAccountSummaryOptionsModel.Billingmonth = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.GetAccountSummary(getAccountSummaryOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`GetAccountUsage(getAccountUsageOptions *GetAccountUsageOptions)`, func() {
-		bearerToken := "0ui9876453"
-		getAccountUsagePath := "/v4/accounts/testString/usage/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(getAccountUsagePath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"account_id": "AccountID", "pricing_country": "USA", "currency_code": "USD", "month": "2017-08", "resources": [{"resource_id": "ResourceID", "billable_cost": 12, "non_billable_cost": 15, "plans": [{"plan_id": "PlanID", "pricing_region": "PricingRegion", "billable": true, "cost": 4, "usage": [{"metric": "UP-TIME", "quantity": 711.11, "rateable_quantity": 700, "cost": 123.45, "price": [{"mapKey": {"anyKey": "anyValue"}}], "unit": "HOURS", "non_chargeable": true}]}]}]}`)
-			}))
-			It(`Invoke GetAccountUsage successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := usagereportsv4.NewUsageReportsV4(&usagereportsv4.UsageReportsV4Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.GetAccountUsage(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the GetAccountUsageOptions model
-				getAccountUsageOptionsModel := new(usagereportsv4.GetAccountUsageOptions)
-				getAccountUsageOptionsModel.AccountID = core.StringPtr("testString")
-				getAccountUsageOptionsModel.Billingmonth = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.GetAccountUsage(getAccountUsageOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`GetResourceGroupUsage(getResourceGroupUsageOptions *GetResourceGroupUsageOptions)`, func() {
-		bearerToken := "0ui9876453"
-		getResourceGroupUsagePath := "/v4/accounts/testString/resource_groups/testString/usage/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(getResourceGroupUsagePath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"account_id": "AccountID", "resource_group_id": "ResourceGroupID", "pricing_country": "USA", "currency_code": "USD", "month": "2017-08", "resources": [{"resource_id": "ResourceID", "billable_cost": 12, "non_billable_cost": 15, "plans": [{"plan_id": "PlanID", "pricing_region": "PricingRegion", "billable": true, "cost": 4, "usage": [{"metric": "UP-TIME", "quantity": 711.11, "rateable_quantity": 700, "cost": 123.45, "price": [{"mapKey": {"anyKey": "anyValue"}}], "unit": "HOURS", "non_chargeable": true}]}]}]}`)
-			}))
-			It(`Invoke GetResourceGroupUsage successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := usagereportsv4.NewUsageReportsV4(&usagereportsv4.UsageReportsV4Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.GetResourceGroupUsage(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the GetResourceGroupUsageOptions model
-				getResourceGroupUsageOptionsModel := new(usagereportsv4.GetResourceGroupUsageOptions)
-				getResourceGroupUsageOptionsModel.AccountID = core.StringPtr("testString")
-				getResourceGroupUsageOptionsModel.ResourceGroupID = core.StringPtr("testString")
-				getResourceGroupUsageOptionsModel.Billingmonth = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.GetResourceGroupUsage(getResourceGroupUsageOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`GetOrganizationUsage(getOrganizationUsageOptions *GetOrganizationUsageOptions)`, func() {
-		bearerToken := "0ui9876453"
-		getOrganizationUsagePath := "/v4/accounts/testString/organizations/testString/usage/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(getOrganizationUsagePath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"account_id": "AccountID", "organization_id": "OrganizationID", "pricing_country": "USA", "currency_code": "USD", "month": "2017-08", "resources": [{"resource_id": "ResourceID", "billable_cost": 12, "non_billable_cost": 15, "plans": [{"plan_id": "PlanID", "pricing_region": "PricingRegion", "billable": true, "cost": 4, "usage": [{"metric": "UP-TIME", "quantity": 711.11, "rateable_quantity": 700, "cost": 123.45, "price": [{"mapKey": {"anyKey": "anyValue"}}], "unit": "HOURS", "non_chargeable": true}]}]}]}`)
-			}))
-			It(`Invoke GetOrganizationUsage successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := usagereportsv4.NewUsageReportsV4(&usagereportsv4.UsageReportsV4Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.GetOrganizationUsage(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the GetOrganizationUsageOptions model
-				getOrganizationUsageOptionsModel := new(usagereportsv4.GetOrganizationUsageOptions)
-				getOrganizationUsageOptionsModel.AccountID = core.StringPtr("testString")
-				getOrganizationUsageOptionsModel.OrganizationID = core.StringPtr("testString")
-				getOrganizationUsageOptionsModel.Billingmonth = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.GetOrganizationUsage(getOrganizationUsageOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`GetAccountInstancesUsage(getAccountInstancesUsageOptions *GetAccountInstancesUsageOptions)`, func() {
-		bearerToken := "0ui9876453"
-		getAccountInstancesUsagePath := "/v4/accounts/testString/resource_instances/usage/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(getAccountInstancesUsagePath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				Expect(req.URL.Query()["_limit"]).To(Equal([]string{fmt.Sprint(int64(38))}))
-
-				Expect(req.URL.Query()["_start"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["resource_group_id"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["organization_id"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["resource_instance_id"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["resource_id"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["plan_id"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["region"]).To(Equal([]string{"testString"}))
-
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"limit": 5, "count": 5, "first": {"href": "Href", "offset": "Offset"}, "next": {"href": "Href", "offset": "Offset"}, "resources": [{"account_id": "AccountID", "resource_instance_id": "ResourceInstanceID", "resource_id": "ResourceID", "resource_group_id": "ResourceGroupID", "organization_id": "OrganizationID", "space": "Space", "consumer_id": "ConsumerID", "region": "Region", "pricing_region": "PricingRegion", "pricing_country": "USA", "currency_code": "USD", "billable": true, "plan_id": "PlanID", "month": "2017-08", "usage": [{"metric": "UP-TIME", "quantity": 711.11, "rateable_quantity": 700, "cost": 123.45, "price": [{"mapKey": {"anyKey": "anyValue"}}], "unit": "HOURS", "non_chargeable": true}]}]}`)
-			}))
-			It(`Invoke GetAccountInstancesUsage successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := usagereportsv4.NewUsageReportsV4(&usagereportsv4.UsageReportsV4Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.GetAccountInstancesUsage(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the GetAccountInstancesUsageOptions model
-				getAccountInstancesUsageOptionsModel := new(usagereportsv4.GetAccountInstancesUsageOptions)
-				getAccountInstancesUsageOptionsModel.AccountID = core.StringPtr("testString")
-				getAccountInstancesUsageOptionsModel.Billingmonth = core.StringPtr("testString")
-				getAccountInstancesUsageOptionsModel.Limit = core.Int64Ptr(int64(38))
-				getAccountInstancesUsageOptionsModel.Start = core.StringPtr("testString")
-				getAccountInstancesUsageOptionsModel.ResourceGroupID = core.StringPtr("testString")
-				getAccountInstancesUsageOptionsModel.OrganizationID = core.StringPtr("testString")
-				getAccountInstancesUsageOptionsModel.ResourceInstanceID = core.StringPtr("testString")
-				getAccountInstancesUsageOptionsModel.ResourceID = core.StringPtr("testString")
-				getAccountInstancesUsageOptionsModel.PlanID = core.StringPtr("testString")
-				getAccountInstancesUsageOptionsModel.Region = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.GetAccountInstancesUsage(getAccountInstancesUsageOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`GetResourceGroupInstancesUsage(getResourceGroupInstancesUsageOptions *GetResourceGroupInstancesUsageOptions)`, func() {
-		bearerToken := "0ui9876453"
-		getResourceGroupInstancesUsagePath := "/v4/accounts/testString/resource_groups/testString/resource_instances/usage/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(getResourceGroupInstancesUsagePath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				Expect(req.URL.Query()["_limit"]).To(Equal([]string{fmt.Sprint(int64(38))}))
-
-				Expect(req.URL.Query()["_start"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["resource_instance_id"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["resource_id"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["plan_id"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["region"]).To(Equal([]string{"testString"}))
-
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"limit": 5, "count": 5, "first": {"href": "Href", "offset": "Offset"}, "next": {"href": "Href", "offset": "Offset"}, "resources": [{"account_id": "AccountID", "resource_instance_id": "ResourceInstanceID", "resource_id": "ResourceID", "resource_group_id": "ResourceGroupID", "organization_id": "OrganizationID", "space": "Space", "consumer_id": "ConsumerID", "region": "Region", "pricing_region": "PricingRegion", "pricing_country": "USA", "currency_code": "USD", "billable": true, "plan_id": "PlanID", "month": "2017-08", "usage": [{"metric": "UP-TIME", "quantity": 711.11, "rateable_quantity": 700, "cost": 123.45, "price": [{"mapKey": {"anyKey": "anyValue"}}], "unit": "HOURS", "non_chargeable": true}]}]}`)
-			}))
-			It(`Invoke GetResourceGroupInstancesUsage successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := usagereportsv4.NewUsageReportsV4(&usagereportsv4.UsageReportsV4Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.GetResourceGroupInstancesUsage(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the GetResourceGroupInstancesUsageOptions model
-				getResourceGroupInstancesUsageOptionsModel := new(usagereportsv4.GetResourceGroupInstancesUsageOptions)
-				getResourceGroupInstancesUsageOptionsModel.AccountID = core.StringPtr("testString")
-				getResourceGroupInstancesUsageOptionsModel.ResourceGroupID = core.StringPtr("testString")
-				getResourceGroupInstancesUsageOptionsModel.Billingmonth = core.StringPtr("testString")
-				getResourceGroupInstancesUsageOptionsModel.Limit = core.Int64Ptr(int64(38))
-				getResourceGroupInstancesUsageOptionsModel.Start = core.StringPtr("testString")
-				getResourceGroupInstancesUsageOptionsModel.ResourceInstanceID = core.StringPtr("testString")
-				getResourceGroupInstancesUsageOptionsModel.ResourceID = core.StringPtr("testString")
-				getResourceGroupInstancesUsageOptionsModel.PlanID = core.StringPtr("testString")
-				getResourceGroupInstancesUsageOptionsModel.Region = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.GetResourceGroupInstancesUsage(getResourceGroupInstancesUsageOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`GetOrganizationInstancesUsage(getOrganizationInstancesUsageOptions *GetOrganizationInstancesUsageOptions)`, func() {
-		bearerToken := "0ui9876453"
-		getOrganizationInstancesUsagePath := "/v4/accounts/testString/organizations/testString/resource_instances/usage/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(getOrganizationInstancesUsagePath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				Expect(req.URL.Query()["_limit"]).To(Equal([]string{fmt.Sprint(int64(38))}))
-
-				Expect(req.URL.Query()["_start"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["resource_instance_id"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["resource_id"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["plan_id"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["region"]).To(Equal([]string{"testString"}))
-
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"limit": 5, "count": 5, "first": {"href": "Href", "offset": "Offset"}, "next": {"href": "Href", "offset": "Offset"}, "resources": [{"account_id": "AccountID", "resource_instance_id": "ResourceInstanceID", "resource_id": "ResourceID", "resource_group_id": "ResourceGroupID", "organization_id": "OrganizationID", "space": "Space", "consumer_id": "ConsumerID", "region": "Region", "pricing_region": "PricingRegion", "pricing_country": "USA", "currency_code": "USD", "billable": true, "plan_id": "PlanID", "month": "2017-08", "usage": [{"metric": "UP-TIME", "quantity": 711.11, "rateable_quantity": 700, "cost": 123.45, "price": [{"mapKey": {"anyKey": "anyValue"}}], "unit": "HOURS", "non_chargeable": true}]}]}`)
-			}))
-			It(`Invoke GetOrganizationInstancesUsage successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := usagereportsv4.NewUsageReportsV4(&usagereportsv4.UsageReportsV4Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.GetOrganizationInstancesUsage(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the GetOrganizationInstancesUsageOptions model
-				getOrganizationInstancesUsageOptionsModel := new(usagereportsv4.GetOrganizationInstancesUsageOptions)
-				getOrganizationInstancesUsageOptionsModel.AccountID = core.StringPtr("testString")
-				getOrganizationInstancesUsageOptionsModel.OrganizationID = core.StringPtr("testString")
-				getOrganizationInstancesUsageOptionsModel.Billingmonth = core.StringPtr("testString")
-				getOrganizationInstancesUsageOptionsModel.Limit = core.Int64Ptr(int64(38))
-				getOrganizationInstancesUsageOptionsModel.Start = core.StringPtr("testString")
-				getOrganizationInstancesUsageOptionsModel.ResourceInstanceID = core.StringPtr("testString")
-				getOrganizationInstancesUsageOptionsModel.ResourceID = core.StringPtr("testString")
-				getOrganizationInstancesUsageOptionsModel.PlanID = core.StringPtr("testString")
-				getOrganizationInstancesUsageOptionsModel.Region = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.GetOrganizationInstancesUsage(getOrganizationInstancesUsageOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`Utility function tests`, func() {
-		It(`Invoke CreateMockMap() successfully`, func() {
-			mockMap := CreateMockMap()
-			Expect(mockMap).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockByteArray() successfully`, func() {
-			mockByteArray := CreateMockByteArray("This is a test")
-			Expect(mockByteArray).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockUUID() successfully`, func() {
-			mockUUID := CreateMockUUID("9fab83da-98cb-4f18-a7ba-b6f0435c9673")
-			Expect(mockUUID).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockReader() successfully`, func() {
-			mockReader := CreateMockReader("This is a test.")
-			Expect(mockReader).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockDate() successfully`, func() {
-			mockDate := CreateMockDate()
-			Expect(mockDate).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockDateTime() successfully`, func() {
-			mockDateTime := CreateMockDateTime()
-			Expect(mockDateTime).ToNot(BeNil())
-		})
-	})
-})
-
-//
-// Utility functions used by the generated test code
-//
-
-func CreateMockMap() map[string]interface{} {
-	m := make(map[string]interface{})
-	return m
-}
-
-func CreateMockByteArray(mockData string) *[]byte {
-	ba := make([]byte, len(mockData))
-	ba = append(ba, mockData...)
-	return &ba
-}
-
-func CreateMockUUID(mockData string) *strfmt.UUID {
-	uuid := strfmt.UUID(mockData)
-	return &uuid
-}
-
-func CreateMockReader(mockData string) io.ReadCloser {
-	return ioutil.NopCloser(bytes.NewReader([]byte(mockData)))
-}
-
-func CreateMockDate() *strfmt.Date {
-	d := strfmt.Date(time.Now())
-	return &d
-}
-
-func CreateMockDateTime() *strfmt.DateTime {
-	d := strfmt.DateTime(time.Now())
-	return &d
-}
diff --git a/usermanagementv1/user_management_v1.go b/usermanagementv1/user_management_v1.go
deleted file mode 100644
index 1dfc411e..00000000
--- a/usermanagementv1/user_management_v1.go
+++ /dev/null
@@ -1,2173 +0,0 @@
-/**
- * (C) Copyright IBM Corp. 2020.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// Package usermanagementv1 : Operations and models for the UserManagementV1 service
-package usermanagementv1
-
-import (
-	"fmt"
-	"github.com/IBM/go-sdk-core/v3/core"
-	common "github.ibm.com/ibmcloud/platform-services-go-sdk/common"
-)
-
-// UserManagementV1 : Manage lifecycle of your cloud users using User Management APIs.
-//
-// Version: 1.0
-type UserManagementV1 struct {
-	Service *core.BaseService
-}
-
-// DefaultServiceURL is the default URL to make service requests to.
-const DefaultServiceURL = "https://user-management.cloud.ibm.com"
-
-// DefaultServiceName is the default key used to find external configuration information.
-const DefaultServiceName = "user_management"
-
-// UserManagementV1Options : Service options
-type UserManagementV1Options struct {
-	ServiceName   string
-	URL           string
-	Authenticator core.Authenticator
-}
-
-// NewUserManagementV1UsingExternalConfig : constructs an instance of UserManagementV1 with passed in options and external configuration.
-func NewUserManagementV1UsingExternalConfig(options *UserManagementV1Options) (userManagement *UserManagementV1, err error) {
-	if options.ServiceName == "" {
-		options.ServiceName = DefaultServiceName
-	}
-
-	if options.Authenticator == nil {
-		options.Authenticator, err = core.GetAuthenticatorFromEnvironment(options.ServiceName)
-		if err != nil {
-			return
-		}
-	}
-
-	userManagement, err = NewUserManagementV1(options)
-	if err != nil {
-		return
-	}
-
-	err = userManagement.Service.ConfigureService(options.ServiceName)
-	if err != nil {
-		return
-	}
-
-	if options.URL != "" {
-		err = userManagement.Service.SetServiceURL(options.URL)
-	}
-	return
-}
-
-// NewUserManagementV1 : constructs an instance of UserManagementV1 with passed in options.
-func NewUserManagementV1(options *UserManagementV1Options) (service *UserManagementV1, err error) {
-	serviceOptions := &core.ServiceOptions{
-		URL:           DefaultServiceURL,
-		Authenticator: options.Authenticator,
-	}
-
-	baseService, err := core.NewBaseService(serviceOptions)
-	if err != nil {
-		return
-	}
-
-	if options.URL != "" {
-		err = baseService.SetServiceURL(options.URL)
-		if err != nil {
-			return
-		}
-	}
-
-	service = &UserManagementV1{
-		Service: baseService,
-	}
-
-	return
-}
-
-// SetServiceURL sets the service URL
-func (userManagement *UserManagementV1) SetServiceURL(url string) error {
-	return userManagement.Service.SetServiceURL(url)
-}
-
-// GetUserLinkages : Get user linkages
-// Retrieve a user's linkages by user's iam id.
-func (userManagement *UserManagementV1) GetUserLinkages(getUserLinkagesOptions *GetUserLinkagesOptions) (result *UserLinkages, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(getUserLinkagesOptions, "getUserLinkagesOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(getUserLinkagesOptions, "getUserLinkagesOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v2/accounts", "users", "linkages"}
-	pathParameters := []string{*getUserLinkagesOptions.AccountID, *getUserLinkagesOptions.IamID}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(userManagement.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range getUserLinkagesOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("user_management", "V1", "GetUserLinkages")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = userManagement.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalUserLinkages(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// CreateUserLinkages : create user linkages
-// create a linakge for user by user's iam id.It's a system operation, only with System role/policy can invoke this api.
-func (userManagement *UserManagementV1) CreateUserLinkages(createUserLinkagesOptions *CreateUserLinkagesOptions) (response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(createUserLinkagesOptions, "createUserLinkagesOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(createUserLinkagesOptions, "createUserLinkagesOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v2/accounts", "users", "linkages", ""}
-	pathParameters := []string{*createUserLinkagesOptions.AccountID, *createUserLinkagesOptions.IamID, *createUserLinkagesOptions.Origin, *createUserLinkagesOptions.IdFromOrigin}
-
-	builder := core.NewRequestBuilder(core.PUT)
-	_, err = builder.ConstructHTTPURL(userManagement.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range createUserLinkagesOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("user_management", "V1", "CreateUserLinkages")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = userManagement.Service.Request(request, nil)
-
-	return
-}
-
-// RemoveUserLinkages : remove a user linkages
-// remove a user's linkage by user's iam id.It's a system operation, only with System role/policy can invoke this api.
-func (userManagement *UserManagementV1) RemoveUserLinkages(removeUserLinkagesOptions *RemoveUserLinkagesOptions) (response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(removeUserLinkagesOptions, "removeUserLinkagesOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(removeUserLinkagesOptions, "removeUserLinkagesOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v2/accounts", "users", "linkages", ""}
-	pathParameters := []string{*removeUserLinkagesOptions.AccountID, *removeUserLinkagesOptions.IamID, *removeUserLinkagesOptions.Origin, *removeUserLinkagesOptions.IdFromOrigin}
-
-	builder := core.NewRequestBuilder(core.DELETE)
-	_, err = builder.ConstructHTTPURL(userManagement.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range removeUserLinkagesOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("user_management", "V1", "RemoveUserLinkages")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = userManagement.Service.Request(request, nil)
-
-	return
-}
-
-// GetUserProfile : Get user profile
-// Retrieve a user profile by user's iam id or cloudant guid.
-func (userManagement *UserManagementV1) GetUserProfile(getUserProfileOptions *GetUserProfileOptions) (result *UserProfile, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(getUserProfileOptions, "getUserProfileOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(getUserProfileOptions, "getUserProfileOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v2/accounts", "users"}
-	pathParameters := []string{*getUserProfileOptions.AccountID, *getUserProfileOptions.IamID}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(userManagement.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range getUserProfileOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("user_management", "V1", "GetUserProfile")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	if getUserProfileOptions.IncludeLinkages != nil {
-		builder.AddQuery("include_linkages", fmt.Sprint(*getUserProfileOptions.IncludeLinkages))
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = userManagement.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalUserProfile(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// CreateUserProfile : create or replace user profile
-// Create a new user or replace user if user already exist by user's iam id.We enforce schema validation, some fields
-// are required.Only allow System to call to create user and sync user as a whole object. User update need to use
-// Partial update user profile.
-func (userManagement *UserManagementV1) CreateUserProfile(createUserProfileOptions *CreateUserProfileOptions) (response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(createUserProfileOptions, "createUserProfileOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(createUserProfileOptions, "createUserProfileOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v2/accounts", "users"}
-	pathParameters := []string{*createUserProfileOptions.AccountID, *createUserProfileOptions.IamID}
-
-	builder := core.NewRequestBuilder(core.PUT)
-	_, err = builder.ConstructHTTPURL(userManagement.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range createUserProfileOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("user_management", "V1", "CreateUserProfile")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Content-Type", "application/json")
-
-	body := make(map[string]interface{})
-	if createUserProfileOptions.Realm != nil {
-		body["realm"] = createUserProfileOptions.Realm
-	}
-	if createUserProfileOptions.UserID != nil {
-		body["user_id"] = createUserProfileOptions.UserID
-	}
-	if createUserProfileOptions.Firstname != nil {
-		body["firstname"] = createUserProfileOptions.Firstname
-	}
-	if createUserProfileOptions.Lastname != nil {
-		body["lastname"] = createUserProfileOptions.Lastname
-	}
-	if createUserProfileOptions.State != nil {
-		body["state"] = createUserProfileOptions.State
-	}
-	if createUserProfileOptions.Email != nil {
-		body["email"] = createUserProfileOptions.Email
-	}
-	if createUserProfileOptions.Phonenumber != nil {
-		body["phonenumber"] = createUserProfileOptions.Phonenumber
-	}
-	if createUserProfileOptions.Altphonenumber != nil {
-		body["altphonenumber"] = createUserProfileOptions.Altphonenumber
-	}
-	if createUserProfileOptions.Photo != nil {
-		body["photo"] = createUserProfileOptions.Photo
-	}
-	_, err = builder.SetBodyContentJSON(body)
-	if err != nil {
-		return
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = userManagement.Service.Request(request, nil)
-
-	return
-}
-
-// UpdateUserProfile : partial update user profile
-// Partial update a user's profile by user's iam id.We enforce schema validations.User can disable/activate another
-// user, as long as the user has user-management access, but user can not change state to "PROCESSING" or "PENDING",
-// which are system states.
-func (userManagement *UserManagementV1) UpdateUserProfile(updateUserProfileOptions *UpdateUserProfileOptions) (response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(updateUserProfileOptions, "updateUserProfileOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(updateUserProfileOptions, "updateUserProfileOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v2/accounts", "users"}
-	pathParameters := []string{*updateUserProfileOptions.AccountID, *updateUserProfileOptions.IamID}
-
-	builder := core.NewRequestBuilder(core.PATCH)
-	_, err = builder.ConstructHTTPURL(userManagement.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range updateUserProfileOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("user_management", "V1", "UpdateUserProfile")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Content-Type", "application/json")
-
-	body := make(map[string]interface{})
-	if updateUserProfileOptions.UserID != nil {
-		body["user_id"] = updateUserProfileOptions.UserID
-	}
-	if updateUserProfileOptions.Firstname != nil {
-		body["firstname"] = updateUserProfileOptions.Firstname
-	}
-	if updateUserProfileOptions.Lastname != nil {
-		body["lastname"] = updateUserProfileOptions.Lastname
-	}
-	if updateUserProfileOptions.State != nil {
-		body["state"] = updateUserProfileOptions.State
-	}
-	if updateUserProfileOptions.Email != nil {
-		body["email"] = updateUserProfileOptions.Email
-	}
-	if updateUserProfileOptions.Phonenumber != nil {
-		body["phonenumber"] = updateUserProfileOptions.Phonenumber
-	}
-	if updateUserProfileOptions.Altphonenumber != nil {
-		body["altphonenumber"] = updateUserProfileOptions.Altphonenumber
-	}
-	if updateUserProfileOptions.Photo != nil {
-		body["photo"] = updateUserProfileOptions.Photo
-	}
-	_, err = builder.SetBodyContentJSON(body)
-	if err != nil {
-		return
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = userManagement.Service.Request(request, nil)
-
-	return
-}
-
-// GetUserSettings : Get user settings
-// Retrieve a user's settings by user's iam id.
-func (userManagement *UserManagementV1) GetUserSettings(getUserSettingsOptions *GetUserSettingsOptions) (result *UserSettings, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(getUserSettingsOptions, "getUserSettingsOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(getUserSettingsOptions, "getUserSettingsOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v2/accounts", "users", "settings"}
-	pathParameters := []string{*getUserSettingsOptions.AccountID, *getUserSettingsOptions.IamID}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(userManagement.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range getUserSettingsOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("user_management", "V1", "GetUserSettings")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = userManagement.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalUserSettings(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// UpdateUserSettings : Partial update user settings
-// Update a user's settings by user's iam id.User can update "language", "notification_language" and can update
-// "allowed_ip_addresses" if "self_manage" is true, but user can not update "allowed_ip_addresses" if "self_manage" is
-// false.And Update "self_manage" requires user-management policy.
-func (userManagement *UserManagementV1) UpdateUserSettings(updateUserSettingsOptions *UpdateUserSettingsOptions) (response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(updateUserSettingsOptions, "updateUserSettingsOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(updateUserSettingsOptions, "updateUserSettingsOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v2/accounts", "users", "settings"}
-	pathParameters := []string{*updateUserSettingsOptions.AccountID, *updateUserSettingsOptions.IamID}
-
-	builder := core.NewRequestBuilder(core.PATCH)
-	_, err = builder.ConstructHTTPURL(userManagement.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range updateUserSettingsOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("user_management", "V1", "UpdateUserSettings")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Content-Type", "application/json")
-
-	body := make(map[string]interface{})
-	if updateUserSettingsOptions.Language != nil {
-		body["language"] = updateUserSettingsOptions.Language
-	}
-	if updateUserSettingsOptions.NotificationLanguage != nil {
-		body["notification_language"] = updateUserSettingsOptions.NotificationLanguage
-	}
-	if updateUserSettingsOptions.AllowedIpAddresses != nil {
-		body["allowed_ip_addresses"] = updateUserSettingsOptions.AllowedIpAddresses
-	}
-	if updateUserSettingsOptions.SelfManage != nil {
-		body["self_manage"] = updateUserSettingsOptions.SelfManage
-	}
-	_, err = builder.SetBodyContentJSON(body)
-	if err != nil {
-		return
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = userManagement.Service.Request(request, nil)
-
-	return
-}
-
-// RemoveUserFromAccount : remove user from account
-// IAM user management policy is required to perform this action.If the caller does not have proper IAM user management
-// policy, then if the user is a decendent of the caller in IMS heirarchy, then allow as well.Do not support self
-// delete.
-func (userManagement *UserManagementV1) RemoveUserFromAccount(removeUserFromAccountOptions *RemoveUserFromAccountOptions) (response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(removeUserFromAccountOptions, "removeUserFromAccountOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(removeUserFromAccountOptions, "removeUserFromAccountOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v2/accounts", "users"}
-	pathParameters := []string{*removeUserFromAccountOptions.AccountID, *removeUserFromAccountOptions.IamID}
-
-	builder := core.NewRequestBuilder(core.DELETE)
-	_, err = builder.ConstructHTTPURL(userManagement.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range removeUserFromAccountOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("user_management", "V1", "RemoveUserFromAccount")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = userManagement.Service.Request(request, nil)
-
-	return
-}
-
-// ListUsers : Get users
-// Retrieve users in the account.If team directory enabled, return all users in the account.If team directory disbaled,
-// and user has IAM viewer role on user-management service, then return all users in the account.If team directory
-// disabled, and user does not have IAM viewer role on user-management service, then return only current user.
-func (userManagement *UserManagementV1) ListUsers(listUsersOptions *ListUsersOptions) (result *UserList, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(listUsersOptions, "listUsersOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(listUsersOptions, "listUsersOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v2/accounts", "users"}
-	pathParameters := []string{*listUsersOptions.AccountID}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(userManagement.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range listUsersOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("user_management", "V1", "ListUsers")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	if listUsersOptions.IAMid != nil {
-		builder.AddQuery("IAMid", fmt.Sprint(*listUsersOptions.IAMid))
-	}
-	if listUsersOptions.Firstname != nil {
-		builder.AddQuery("firstname", fmt.Sprint(*listUsersOptions.Firstname))
-	}
-	if listUsersOptions.Lastname != nil {
-		builder.AddQuery("lastname", fmt.Sprint(*listUsersOptions.Lastname))
-	}
-	if listUsersOptions.Email != nil {
-		builder.AddQuery("email", fmt.Sprint(*listUsersOptions.Email))
-	}
-	if listUsersOptions.State != nil {
-		builder.AddQuery("state", fmt.Sprint(*listUsersOptions.State))
-	}
-	if listUsersOptions.Realm != nil {
-		builder.AddQuery("realm", fmt.Sprint(*listUsersOptions.Realm))
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = userManagement.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalUserList(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// InviteUsers : Invite users
-// Invite users to the account.
-func (userManagement *UserManagementV1) InviteUsers(inviteUsersOptions *InviteUsersOptions) (response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(inviteUsersOptions, "inviteUsersOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(inviteUsersOptions, "inviteUsersOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v2/accounts", "users"}
-	pathParameters := []string{*inviteUsersOptions.AccountID}
-
-	builder := core.NewRequestBuilder(core.POST)
-	_, err = builder.ConstructHTTPURL(userManagement.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range inviteUsersOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("user_management", "V1", "InviteUsers")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Content-Type", "application/json")
-
-	body := make(map[string]interface{})
-	if inviteUsersOptions.Users != nil {
-		body["users"] = inviteUsersOptions.Users
-	}
-	_, err = builder.SetBodyContentJSON(body)
-	if err != nil {
-		return
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = userManagement.Service.Request(request, nil)
-
-	return
-}
-
-// GetImsUsers : Get users in account and filtering results based on IMS user heirarchy
-// Retrieve a user profile by user's iam id or cloudant guid.
-func (userManagement *UserManagementV1) GetImsUsers(getImsUsersOptions *GetImsUsersOptions) (result *UserList, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(getImsUsersOptions, "getImsUsersOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(getImsUsersOptions, "getImsUsersOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v2/accounts", "ims/users"}
-	pathParameters := []string{*getImsUsersOptions.AccountID}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(userManagement.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range getImsUsersOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("user_management", "V1", "GetImsUsers")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	if getImsUsersOptions.IAMid != nil {
-		builder.AddQuery("IAMid", fmt.Sprint(*getImsUsersOptions.IAMid))
-	}
-	if getImsUsersOptions.Firstname != nil {
-		builder.AddQuery("firstname", fmt.Sprint(*getImsUsersOptions.Firstname))
-	}
-	if getImsUsersOptions.Lastname != nil {
-		builder.AddQuery("lastname", fmt.Sprint(*getImsUsersOptions.Lastname))
-	}
-	if getImsUsersOptions.Email != nil {
-		builder.AddQuery("email", fmt.Sprint(*getImsUsersOptions.Email))
-	}
-	if getImsUsersOptions.State != nil {
-		builder.AddQuery("state", fmt.Sprint(*getImsUsersOptions.State))
-	}
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = userManagement.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalUserList(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// GetCfUsers : Get users
-// Get CF organizations Users in account organization.
-func (userManagement *UserManagementV1) GetCfUsers(getCfUsersOptions *GetCfUsersOptions) (result *UserList, response *core.DetailedResponse, err error) {
-	err = core.ValidateNotNil(getCfUsersOptions, "getCfUsersOptions cannot be nil")
-	if err != nil {
-		return
-	}
-	err = core.ValidateStruct(getCfUsersOptions, "getCfUsersOptions")
-	if err != nil {
-		return
-	}
-
-	pathSegments := []string{"v2/accounts", "organizations", "users"}
-	pathParameters := []string{*getCfUsersOptions.AccountID, *getCfUsersOptions.OrganizationGuid}
-
-	builder := core.NewRequestBuilder(core.GET)
-	_, err = builder.ConstructHTTPURL(userManagement.Service.Options.URL, pathSegments, pathParameters)
-	if err != nil {
-		return
-	}
-
-	for headerName, headerValue := range getCfUsersOptions.Headers {
-		builder.AddHeader(headerName, headerValue)
-	}
-
-	sdkHeaders := common.GetSdkHeaders("user_management", "V1", "GetCfUsers")
-	for headerName, headerValue := range sdkHeaders {
-		builder.AddHeader(headerName, headerValue)
-	}
-	builder.AddHeader("Accept", "application/json")
-
-	request, err := builder.Build()
-	if err != nil {
-		return
-	}
-
-	response, err = userManagement.Service.Request(request, make(map[string]interface{}))
-	if err == nil {
-		m, ok := response.Result.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("an error occurred while processing the operation response")
-			return
-		}
-		result, err = UnmarshalUserList(m)
-		response.Result = result
-	}
-
-	return
-}
-
-// CreateUserLinkagesOptions : The CreateUserLinkages options.
-type CreateUserLinkagesOptions struct {
-	// The account id.
-	AccountID *string `json:"account_id" validate:"required"`
-
-	// The user's iam id.
-	IamID *string `json:"iam_id" validate:"required"`
-
-	// origin is "IMS" OR "UAA".
-	Origin *string `json:"origin" validate:"required"`
-
-	// An alpha-numeric value identifying the origin.
-	IdFromOrigin *string `json:"id_from_origin" validate:"required"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewCreateUserLinkagesOptions : Instantiate CreateUserLinkagesOptions
-func (*UserManagementV1) NewCreateUserLinkagesOptions(accountID string, iamID string, origin string, idFromOrigin string) *CreateUserLinkagesOptions {
-	return &CreateUserLinkagesOptions{
-		AccountID: core.StringPtr(accountID),
-		IamID: core.StringPtr(iamID),
-		Origin: core.StringPtr(origin),
-		IdFromOrigin: core.StringPtr(idFromOrigin),
-	}
-}
-
-// SetAccountID : Allow user to set AccountID
-func (options *CreateUserLinkagesOptions) SetAccountID(accountID string) *CreateUserLinkagesOptions {
-	options.AccountID = core.StringPtr(accountID)
-	return options
-}
-
-// SetIamID : Allow user to set IamID
-func (options *CreateUserLinkagesOptions) SetIamID(iamID string) *CreateUserLinkagesOptions {
-	options.IamID = core.StringPtr(iamID)
-	return options
-}
-
-// SetOrigin : Allow user to set Origin
-func (options *CreateUserLinkagesOptions) SetOrigin(origin string) *CreateUserLinkagesOptions {
-	options.Origin = core.StringPtr(origin)
-	return options
-}
-
-// SetIdFromOrigin : Allow user to set IdFromOrigin
-func (options *CreateUserLinkagesOptions) SetIdFromOrigin(idFromOrigin string) *CreateUserLinkagesOptions {
-	options.IdFromOrigin = core.StringPtr(idFromOrigin)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *CreateUserLinkagesOptions) SetHeaders(param map[string]string) *CreateUserLinkagesOptions {
-	options.Headers = param
-	return options
-}
-
-// CreateUserProfileOptions : The CreateUserProfile options.
-type CreateUserProfileOptions struct {
-	// The account id.
-	AccountID *string `json:"account_id" validate:"required"`
-
-	// The user's iam id.
-	IamID *string `json:"iam_id" validate:"required"`
-
-	// The real of the user, only for new user, this field can not be updated.
-	Realm *string `json:"realm,omitempty"`
-
-	// The user id of the user.
-	UserID *string `json:"user_id,omitempty"`
-
-	// The first name of the user.
-	Firstname *string `json:"firstname,omitempty"`
-
-	// The last name of the user.
-	Lastname *string `json:"lastname,omitempty"`
-
-	// The state of the user,Possible values "PROCESSING" | "PENDING" | "ACTIVE" | "DISABLED" | "VPN_ONLY".
-	State *string `json:"state,omitempty"`
-
-	// The email of the user.
-	Email *string `json:"email,omitempty"`
-
-	// The phone number of the user.
-	Phonenumber *string `json:"phonenumber,omitempty"`
-
-	// The altphonenumber of the user, new field to add (optional).
-	Altphonenumber *string `json:"altphonenumber,omitempty"`
-
-	// The phone link of the user.
-	Photo *string `json:"photo,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewCreateUserProfileOptions : Instantiate CreateUserProfileOptions
-func (*UserManagementV1) NewCreateUserProfileOptions(accountID string, iamID string) *CreateUserProfileOptions {
-	return &CreateUserProfileOptions{
-		AccountID: core.StringPtr(accountID),
-		IamID: core.StringPtr(iamID),
-	}
-}
-
-// SetAccountID : Allow user to set AccountID
-func (options *CreateUserProfileOptions) SetAccountID(accountID string) *CreateUserProfileOptions {
-	options.AccountID = core.StringPtr(accountID)
-	return options
-}
-
-// SetIamID : Allow user to set IamID
-func (options *CreateUserProfileOptions) SetIamID(iamID string) *CreateUserProfileOptions {
-	options.IamID = core.StringPtr(iamID)
-	return options
-}
-
-// SetRealm : Allow user to set Realm
-func (options *CreateUserProfileOptions) SetRealm(realm string) *CreateUserProfileOptions {
-	options.Realm = core.StringPtr(realm)
-	return options
-}
-
-// SetUserID : Allow user to set UserID
-func (options *CreateUserProfileOptions) SetUserID(userID string) *CreateUserProfileOptions {
-	options.UserID = core.StringPtr(userID)
-	return options
-}
-
-// SetFirstname : Allow user to set Firstname
-func (options *CreateUserProfileOptions) SetFirstname(firstname string) *CreateUserProfileOptions {
-	options.Firstname = core.StringPtr(firstname)
-	return options
-}
-
-// SetLastname : Allow user to set Lastname
-func (options *CreateUserProfileOptions) SetLastname(lastname string) *CreateUserProfileOptions {
-	options.Lastname = core.StringPtr(lastname)
-	return options
-}
-
-// SetState : Allow user to set State
-func (options *CreateUserProfileOptions) SetState(state string) *CreateUserProfileOptions {
-	options.State = core.StringPtr(state)
-	return options
-}
-
-// SetEmail : Allow user to set Email
-func (options *CreateUserProfileOptions) SetEmail(email string) *CreateUserProfileOptions {
-	options.Email = core.StringPtr(email)
-	return options
-}
-
-// SetPhonenumber : Allow user to set Phonenumber
-func (options *CreateUserProfileOptions) SetPhonenumber(phonenumber string) *CreateUserProfileOptions {
-	options.Phonenumber = core.StringPtr(phonenumber)
-	return options
-}
-
-// SetAltphonenumber : Allow user to set Altphonenumber
-func (options *CreateUserProfileOptions) SetAltphonenumber(altphonenumber string) *CreateUserProfileOptions {
-	options.Altphonenumber = core.StringPtr(altphonenumber)
-	return options
-}
-
-// SetPhoto : Allow user to set Photo
-func (options *CreateUserProfileOptions) SetPhoto(photo string) *CreateUserProfileOptions {
-	options.Photo = core.StringPtr(photo)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *CreateUserProfileOptions) SetHeaders(param map[string]string) *CreateUserProfileOptions {
-	options.Headers = param
-	return options
-}
-
-// GetCfUsersOptions : The GetCfUsers options.
-type GetCfUsersOptions struct {
-	// The account id.
-	AccountID *string `json:"account_id" validate:"required"`
-
-	// The organization id.
-	OrganizationGuid *string `json:"organization_guid" validate:"required"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewGetCfUsersOptions : Instantiate GetCfUsersOptions
-func (*UserManagementV1) NewGetCfUsersOptions(accountID string, organizationGuid string) *GetCfUsersOptions {
-	return &GetCfUsersOptions{
-		AccountID: core.StringPtr(accountID),
-		OrganizationGuid: core.StringPtr(organizationGuid),
-	}
-}
-
-// SetAccountID : Allow user to set AccountID
-func (options *GetCfUsersOptions) SetAccountID(accountID string) *GetCfUsersOptions {
-	options.AccountID = core.StringPtr(accountID)
-	return options
-}
-
-// SetOrganizationGuid : Allow user to set OrganizationGuid
-func (options *GetCfUsersOptions) SetOrganizationGuid(organizationGuid string) *GetCfUsersOptions {
-	options.OrganizationGuid = core.StringPtr(organizationGuid)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *GetCfUsersOptions) SetHeaders(param map[string]string) *GetCfUsersOptions {
-	options.Headers = param
-	return options
-}
-
-// GetImsUsersOptions : The GetImsUsers options.
-type GetImsUsersOptions struct {
-	// The account id.
-	AccountID *string `json:"account_id" validate:"required"`
-
-	// The realm of the user.
-	IAMid *string `json:"IAMid,omitempty"`
-
-	// The firstname of user.
-	Firstname *string `json:"firstname,omitempty"`
-
-	// The lastname of user.
-	Lastname *string `json:"lastname,omitempty"`
-
-	// The email of user.
-	Email *string `json:"email,omitempty"`
-
-	// The state.
-	State *string `json:"state,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewGetImsUsersOptions : Instantiate GetImsUsersOptions
-func (*UserManagementV1) NewGetImsUsersOptions(accountID string) *GetImsUsersOptions {
-	return &GetImsUsersOptions{
-		AccountID: core.StringPtr(accountID),
-	}
-}
-
-// SetAccountID : Allow user to set AccountID
-func (options *GetImsUsersOptions) SetAccountID(accountID string) *GetImsUsersOptions {
-	options.AccountID = core.StringPtr(accountID)
-	return options
-}
-
-// SetIAMid : Allow user to set IAMid
-func (options *GetImsUsersOptions) SetIAMid(iAMid string) *GetImsUsersOptions {
-	options.IAMid = core.StringPtr(iAMid)
-	return options
-}
-
-// SetFirstname : Allow user to set Firstname
-func (options *GetImsUsersOptions) SetFirstname(firstname string) *GetImsUsersOptions {
-	options.Firstname = core.StringPtr(firstname)
-	return options
-}
-
-// SetLastname : Allow user to set Lastname
-func (options *GetImsUsersOptions) SetLastname(lastname string) *GetImsUsersOptions {
-	options.Lastname = core.StringPtr(lastname)
-	return options
-}
-
-// SetEmail : Allow user to set Email
-func (options *GetImsUsersOptions) SetEmail(email string) *GetImsUsersOptions {
-	options.Email = core.StringPtr(email)
-	return options
-}
-
-// SetState : Allow user to set State
-func (options *GetImsUsersOptions) SetState(state string) *GetImsUsersOptions {
-	options.State = core.StringPtr(state)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *GetImsUsersOptions) SetHeaders(param map[string]string) *GetImsUsersOptions {
-	options.Headers = param
-	return options
-}
-
-// GetUserLinkagesOptions : The GetUserLinkages options.
-type GetUserLinkagesOptions struct {
-	// The account id.
-	AccountID *string `json:"account_id" validate:"required"`
-
-	// The user's iam id.
-	IamID *string `json:"iam_id" validate:"required"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewGetUserLinkagesOptions : Instantiate GetUserLinkagesOptions
-func (*UserManagementV1) NewGetUserLinkagesOptions(accountID string, iamID string) *GetUserLinkagesOptions {
-	return &GetUserLinkagesOptions{
-		AccountID: core.StringPtr(accountID),
-		IamID: core.StringPtr(iamID),
-	}
-}
-
-// SetAccountID : Allow user to set AccountID
-func (options *GetUserLinkagesOptions) SetAccountID(accountID string) *GetUserLinkagesOptions {
-	options.AccountID = core.StringPtr(accountID)
-	return options
-}
-
-// SetIamID : Allow user to set IamID
-func (options *GetUserLinkagesOptions) SetIamID(iamID string) *GetUserLinkagesOptions {
-	options.IamID = core.StringPtr(iamID)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *GetUserLinkagesOptions) SetHeaders(param map[string]string) *GetUserLinkagesOptions {
-	options.Headers = param
-	return options
-}
-
-// GetUserProfileOptions : The GetUserProfile options.
-type GetUserProfileOptions struct {
-	// The account id.
-	AccountID *string `json:"account_id" validate:"required"`
-
-	// The user's iam id.
-	IamID *string `json:"iam_id" validate:"required"`
-
-	// Indicate include linkages.
-	IncludeLinkages *bool `json:"include_linkages,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewGetUserProfileOptions : Instantiate GetUserProfileOptions
-func (*UserManagementV1) NewGetUserProfileOptions(accountID string, iamID string) *GetUserProfileOptions {
-	return &GetUserProfileOptions{
-		AccountID: core.StringPtr(accountID),
-		IamID: core.StringPtr(iamID),
-	}
-}
-
-// SetAccountID : Allow user to set AccountID
-func (options *GetUserProfileOptions) SetAccountID(accountID string) *GetUserProfileOptions {
-	options.AccountID = core.StringPtr(accountID)
-	return options
-}
-
-// SetIamID : Allow user to set IamID
-func (options *GetUserProfileOptions) SetIamID(iamID string) *GetUserProfileOptions {
-	options.IamID = core.StringPtr(iamID)
-	return options
-}
-
-// SetIncludeLinkages : Allow user to set IncludeLinkages
-func (options *GetUserProfileOptions) SetIncludeLinkages(includeLinkages bool) *GetUserProfileOptions {
-	options.IncludeLinkages = core.BoolPtr(includeLinkages)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *GetUserProfileOptions) SetHeaders(param map[string]string) *GetUserProfileOptions {
-	options.Headers = param
-	return options
-}
-
-// GetUserSettingsOptions : The GetUserSettings options.
-type GetUserSettingsOptions struct {
-	// The account id.
-	AccountID *string `json:"account_id" validate:"required"`
-
-	// The user's iam id.
-	IamID *string `json:"iam_id" validate:"required"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewGetUserSettingsOptions : Instantiate GetUserSettingsOptions
-func (*UserManagementV1) NewGetUserSettingsOptions(accountID string, iamID string) *GetUserSettingsOptions {
-	return &GetUserSettingsOptions{
-		AccountID: core.StringPtr(accountID),
-		IamID: core.StringPtr(iamID),
-	}
-}
-
-// SetAccountID : Allow user to set AccountID
-func (options *GetUserSettingsOptions) SetAccountID(accountID string) *GetUserSettingsOptions {
-	options.AccountID = core.StringPtr(accountID)
-	return options
-}
-
-// SetIamID : Allow user to set IamID
-func (options *GetUserSettingsOptions) SetIamID(iamID string) *GetUserSettingsOptions {
-	options.IamID = core.StringPtr(iamID)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *GetUserSettingsOptions) SetHeaders(param map[string]string) *GetUserSettingsOptions {
-	options.Headers = param
-	return options
-}
-
-// InviteUsersOptions : The InviteUsers options.
-type InviteUsersOptions struct {
-	// The account id.
-	AccountID *string `json:"account_id" validate:"required"`
-
-	// list of users to be invited.
-	Users []InviteUser `json:"users,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewInviteUsersOptions : Instantiate InviteUsersOptions
-func (*UserManagementV1) NewInviteUsersOptions(accountID string) *InviteUsersOptions {
-	return &InviteUsersOptions{
-		AccountID: core.StringPtr(accountID),
-	}
-}
-
-// SetAccountID : Allow user to set AccountID
-func (options *InviteUsersOptions) SetAccountID(accountID string) *InviteUsersOptions {
-	options.AccountID = core.StringPtr(accountID)
-	return options
-}
-
-// SetUsers : Allow user to set Users
-func (options *InviteUsersOptions) SetUsers(users []InviteUser) *InviteUsersOptions {
-	options.Users = users
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *InviteUsersOptions) SetHeaders(param map[string]string) *InviteUsersOptions {
-	options.Headers = param
-	return options
-}
-
-// ListUsersOptions : The ListUsers options.
-type ListUsersOptions struct {
-	// The account id.
-	AccountID *string `json:"account_id" validate:"required"`
-
-	// The realm of the user.
-	IAMid *string `json:"IAMid,omitempty"`
-
-	// The firstname of user.
-	Firstname *string `json:"firstname,omitempty"`
-
-	// The lastname of user.
-	Lastname *string `json:"lastname,omitempty"`
-
-	// The email of user.
-	Email *string `json:"email,omitempty"`
-
-	// The state.
-	State *string `json:"state,omitempty"`
-
-	// The realm of the user.
-	Realm *string `json:"realm,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewListUsersOptions : Instantiate ListUsersOptions
-func (*UserManagementV1) NewListUsersOptions(accountID string) *ListUsersOptions {
-	return &ListUsersOptions{
-		AccountID: core.StringPtr(accountID),
-	}
-}
-
-// SetAccountID : Allow user to set AccountID
-func (options *ListUsersOptions) SetAccountID(accountID string) *ListUsersOptions {
-	options.AccountID = core.StringPtr(accountID)
-	return options
-}
-
-// SetIAMid : Allow user to set IAMid
-func (options *ListUsersOptions) SetIAMid(iAMid string) *ListUsersOptions {
-	options.IAMid = core.StringPtr(iAMid)
-	return options
-}
-
-// SetFirstname : Allow user to set Firstname
-func (options *ListUsersOptions) SetFirstname(firstname string) *ListUsersOptions {
-	options.Firstname = core.StringPtr(firstname)
-	return options
-}
-
-// SetLastname : Allow user to set Lastname
-func (options *ListUsersOptions) SetLastname(lastname string) *ListUsersOptions {
-	options.Lastname = core.StringPtr(lastname)
-	return options
-}
-
-// SetEmail : Allow user to set Email
-func (options *ListUsersOptions) SetEmail(email string) *ListUsersOptions {
-	options.Email = core.StringPtr(email)
-	return options
-}
-
-// SetState : Allow user to set State
-func (options *ListUsersOptions) SetState(state string) *ListUsersOptions {
-	options.State = core.StringPtr(state)
-	return options
-}
-
-// SetRealm : Allow user to set Realm
-func (options *ListUsersOptions) SetRealm(realm string) *ListUsersOptions {
-	options.Realm = core.StringPtr(realm)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *ListUsersOptions) SetHeaders(param map[string]string) *ListUsersOptions {
-	options.Headers = param
-	return options
-}
-
-// RemoveUserFromAccountOptions : The RemoveUserFromAccount options.
-type RemoveUserFromAccountOptions struct {
-	// The account id.
-	AccountID *string `json:"account_id" validate:"required"`
-
-	// The user's iam id.
-	IamID *string `json:"iam_id" validate:"required"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewRemoveUserFromAccountOptions : Instantiate RemoveUserFromAccountOptions
-func (*UserManagementV1) NewRemoveUserFromAccountOptions(accountID string, iamID string) *RemoveUserFromAccountOptions {
-	return &RemoveUserFromAccountOptions{
-		AccountID: core.StringPtr(accountID),
-		IamID: core.StringPtr(iamID),
-	}
-}
-
-// SetAccountID : Allow user to set AccountID
-func (options *RemoveUserFromAccountOptions) SetAccountID(accountID string) *RemoveUserFromAccountOptions {
-	options.AccountID = core.StringPtr(accountID)
-	return options
-}
-
-// SetIamID : Allow user to set IamID
-func (options *RemoveUserFromAccountOptions) SetIamID(iamID string) *RemoveUserFromAccountOptions {
-	options.IamID = core.StringPtr(iamID)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *RemoveUserFromAccountOptions) SetHeaders(param map[string]string) *RemoveUserFromAccountOptions {
-	options.Headers = param
-	return options
-}
-
-// RemoveUserLinkagesOptions : The RemoveUserLinkages options.
-type RemoveUserLinkagesOptions struct {
-	// The account id.
-	AccountID *string `json:"account_id" validate:"required"`
-
-	// The user's iam id.
-	IamID *string `json:"iam_id" validate:"required"`
-
-	// origin is "IMS" OR "UAA".
-	Origin *string `json:"origin" validate:"required"`
-
-	// An alpha-numeric value identifying the origin.
-	IdFromOrigin *string `json:"id_from_origin" validate:"required"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewRemoveUserLinkagesOptions : Instantiate RemoveUserLinkagesOptions
-func (*UserManagementV1) NewRemoveUserLinkagesOptions(accountID string, iamID string, origin string, idFromOrigin string) *RemoveUserLinkagesOptions {
-	return &RemoveUserLinkagesOptions{
-		AccountID: core.StringPtr(accountID),
-		IamID: core.StringPtr(iamID),
-		Origin: core.StringPtr(origin),
-		IdFromOrigin: core.StringPtr(idFromOrigin),
-	}
-}
-
-// SetAccountID : Allow user to set AccountID
-func (options *RemoveUserLinkagesOptions) SetAccountID(accountID string) *RemoveUserLinkagesOptions {
-	options.AccountID = core.StringPtr(accountID)
-	return options
-}
-
-// SetIamID : Allow user to set IamID
-func (options *RemoveUserLinkagesOptions) SetIamID(iamID string) *RemoveUserLinkagesOptions {
-	options.IamID = core.StringPtr(iamID)
-	return options
-}
-
-// SetOrigin : Allow user to set Origin
-func (options *RemoveUserLinkagesOptions) SetOrigin(origin string) *RemoveUserLinkagesOptions {
-	options.Origin = core.StringPtr(origin)
-	return options
-}
-
-// SetIdFromOrigin : Allow user to set IdFromOrigin
-func (options *RemoveUserLinkagesOptions) SetIdFromOrigin(idFromOrigin string) *RemoveUserLinkagesOptions {
-	options.IdFromOrigin = core.StringPtr(idFromOrigin)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *RemoveUserLinkagesOptions) SetHeaders(param map[string]string) *RemoveUserLinkagesOptions {
-	options.Headers = param
-	return options
-}
-
-// UpdateUserProfileOptions : The UpdateUserProfile options.
-type UpdateUserProfileOptions struct {
-	// The account id.
-	AccountID *string `json:"account_id" validate:"required"`
-
-	// The user's iam id.
-	IamID *string `json:"iam_id" validate:"required"`
-
-	// The user id of the user.
-	UserID *string `json:"user_id,omitempty"`
-
-	// The first name of the user.
-	Firstname *string `json:"firstname,omitempty"`
-
-	// The last name of the user.
-	Lastname *string `json:"lastname,omitempty"`
-
-	// The state of the user,Possible values "PROCESSING" | "PENDING" | "ACTIVE" | "DISABLED" | "VPN_ONLY".
-	State *string `json:"state,omitempty"`
-
-	// The email of the user.
-	Email *string `json:"email,omitempty"`
-
-	// The phone number of the user.
-	Phonenumber *string `json:"phonenumber,omitempty"`
-
-	// The altphonenumber of the user, new field to add (optional).
-	Altphonenumber *string `json:"altphonenumber,omitempty"`
-
-	// The phone link of the user.
-	Photo *string `json:"photo,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewUpdateUserProfileOptions : Instantiate UpdateUserProfileOptions
-func (*UserManagementV1) NewUpdateUserProfileOptions(accountID string, iamID string) *UpdateUserProfileOptions {
-	return &UpdateUserProfileOptions{
-		AccountID: core.StringPtr(accountID),
-		IamID: core.StringPtr(iamID),
-	}
-}
-
-// SetAccountID : Allow user to set AccountID
-func (options *UpdateUserProfileOptions) SetAccountID(accountID string) *UpdateUserProfileOptions {
-	options.AccountID = core.StringPtr(accountID)
-	return options
-}
-
-// SetIamID : Allow user to set IamID
-func (options *UpdateUserProfileOptions) SetIamID(iamID string) *UpdateUserProfileOptions {
-	options.IamID = core.StringPtr(iamID)
-	return options
-}
-
-// SetUserID : Allow user to set UserID
-func (options *UpdateUserProfileOptions) SetUserID(userID string) *UpdateUserProfileOptions {
-	options.UserID = core.StringPtr(userID)
-	return options
-}
-
-// SetFirstname : Allow user to set Firstname
-func (options *UpdateUserProfileOptions) SetFirstname(firstname string) *UpdateUserProfileOptions {
-	options.Firstname = core.StringPtr(firstname)
-	return options
-}
-
-// SetLastname : Allow user to set Lastname
-func (options *UpdateUserProfileOptions) SetLastname(lastname string) *UpdateUserProfileOptions {
-	options.Lastname = core.StringPtr(lastname)
-	return options
-}
-
-// SetState : Allow user to set State
-func (options *UpdateUserProfileOptions) SetState(state string) *UpdateUserProfileOptions {
-	options.State = core.StringPtr(state)
-	return options
-}
-
-// SetEmail : Allow user to set Email
-func (options *UpdateUserProfileOptions) SetEmail(email string) *UpdateUserProfileOptions {
-	options.Email = core.StringPtr(email)
-	return options
-}
-
-// SetPhonenumber : Allow user to set Phonenumber
-func (options *UpdateUserProfileOptions) SetPhonenumber(phonenumber string) *UpdateUserProfileOptions {
-	options.Phonenumber = core.StringPtr(phonenumber)
-	return options
-}
-
-// SetAltphonenumber : Allow user to set Altphonenumber
-func (options *UpdateUserProfileOptions) SetAltphonenumber(altphonenumber string) *UpdateUserProfileOptions {
-	options.Altphonenumber = core.StringPtr(altphonenumber)
-	return options
-}
-
-// SetPhoto : Allow user to set Photo
-func (options *UpdateUserProfileOptions) SetPhoto(photo string) *UpdateUserProfileOptions {
-	options.Photo = core.StringPtr(photo)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *UpdateUserProfileOptions) SetHeaders(param map[string]string) *UpdateUserProfileOptions {
-	options.Headers = param
-	return options
-}
-
-// UpdateUserSettingsOptions : The UpdateUserSettings options.
-type UpdateUserSettingsOptions struct {
-	// The account id.
-	AccountID *string `json:"account_id" validate:"required"`
-
-	// The user's iam id.
-	IamID *string `json:"iam_id" validate:"required"`
-
-	// UI language, default value empty.
-	Language *string `json:"language,omitempty"`
-
-	// For email, phone notification, default value empty.
-	NotificationLanguage *string `json:"notification_language,omitempty"`
-
-	// Ip address string use comma to separate string.
-	AllowedIpAddresses *string `json:"allowed_ip_addresses,omitempty"`
-
-	// a field set for user be able to self manage or not, default false.
-	SelfManage *bool `json:"self_manage,omitempty"`
-
-	// Allows users to set headers on API requests
-	Headers map[string]string
-}
-
-// NewUpdateUserSettingsOptions : Instantiate UpdateUserSettingsOptions
-func (*UserManagementV1) NewUpdateUserSettingsOptions(accountID string, iamID string) *UpdateUserSettingsOptions {
-	return &UpdateUserSettingsOptions{
-		AccountID: core.StringPtr(accountID),
-		IamID: core.StringPtr(iamID),
-	}
-}
-
-// SetAccountID : Allow user to set AccountID
-func (options *UpdateUserSettingsOptions) SetAccountID(accountID string) *UpdateUserSettingsOptions {
-	options.AccountID = core.StringPtr(accountID)
-	return options
-}
-
-// SetIamID : Allow user to set IamID
-func (options *UpdateUserSettingsOptions) SetIamID(iamID string) *UpdateUserSettingsOptions {
-	options.IamID = core.StringPtr(iamID)
-	return options
-}
-
-// SetLanguage : Allow user to set Language
-func (options *UpdateUserSettingsOptions) SetLanguage(language string) *UpdateUserSettingsOptions {
-	options.Language = core.StringPtr(language)
-	return options
-}
-
-// SetNotificationLanguage : Allow user to set NotificationLanguage
-func (options *UpdateUserSettingsOptions) SetNotificationLanguage(notificationLanguage string) *UpdateUserSettingsOptions {
-	options.NotificationLanguage = core.StringPtr(notificationLanguage)
-	return options
-}
-
-// SetAllowedIpAddresses : Allow user to set AllowedIpAddresses
-func (options *UpdateUserSettingsOptions) SetAllowedIpAddresses(allowedIpAddresses string) *UpdateUserSettingsOptions {
-	options.AllowedIpAddresses = core.StringPtr(allowedIpAddresses)
-	return options
-}
-
-// SetSelfManage : Allow user to set SelfManage
-func (options *UpdateUserSettingsOptions) SetSelfManage(selfManage bool) *UpdateUserSettingsOptions {
-	options.SelfManage = core.BoolPtr(selfManage)
-	return options
-}
-
-// SetHeaders : Allow user to set Headers
-func (options *UpdateUserSettingsOptions) SetHeaders(param map[string]string) *UpdateUserSettingsOptions {
-	options.Headers = param
-	return options
-}
-
-// UserLinkages : The returned list of user linkages.
-type UserLinkages struct {
-	// shows the origin of the user and id of that origin.
-	Linkages []Linkage `json:"linkages,omitempty"`
-}
-
-
-// UnmarshalUserLinkages constructs an instance of UserLinkages from the specified map.
-func UnmarshalUserLinkages(m map[string]interface{}) (result *UserLinkages, err error) {
-	obj := new(UserLinkages)
-	obj.Linkages, err = UnmarshalLinkageSliceAsProperty(m, "linkages")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalUserLinkagesSlice unmarshals a slice of UserLinkages instances from the specified list of maps.
-func UnmarshalUserLinkagesSlice(s []interface{}) (slice []UserLinkages, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'UserLinkages'")
-			return
-		}
-		obj, e := UnmarshalUserLinkages(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalUserLinkagesAsProperty unmarshals an instance of UserLinkages that is stored as a property
-// within the specified map.
-func UnmarshalUserLinkagesAsProperty(m map[string]interface{}, propertyName string) (result *UserLinkages, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'UserLinkages'", propertyName)
-			return
-		}
-		result, err = UnmarshalUserLinkages(objMap)
-	}
-	return
-}
-
-// UnmarshalUserLinkagesSliceAsProperty unmarshals a slice of UserLinkages instances that are stored as a property
-// within the specified map.
-func UnmarshalUserLinkagesSliceAsProperty(m map[string]interface{}, propertyName string) (slice []UserLinkages, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'UserLinkages'", propertyName)
-			return
-		}
-		slice, err = UnmarshalUserLinkagesSlice(vSlice)
-	}
-	return
-}
-
-// UserList : The returned list of users.
-type UserList struct {
-	// the number of users returned.
-	TotalResults *float64 `json:"total_results,omitempty"`
-
-	// limit of the users returned in a page.
-	Limit *float64 `json:"limit,omitempty"`
-
-	// the first url of the get users api.
-	FirstURL *string `json:"first_url,omitempty"`
-
-	// the next url of the get users api.
-	NextURL *string `json:"next_url,omitempty"`
-
-	// shows the users in the account.
-	Resources []UserProfile `json:"resources,omitempty"`
-}
-
-
-// UnmarshalUserList constructs an instance of UserList from the specified map.
-func UnmarshalUserList(m map[string]interface{}) (result *UserList, err error) {
-	obj := new(UserList)
-	obj.TotalResults, err = core.UnmarshalFloat64(m, "total_results")
-	if err != nil {
-		return
-	}
-	obj.Limit, err = core.UnmarshalFloat64(m, "limit")
-	if err != nil {
-		return
-	}
-	obj.FirstURL, err = core.UnmarshalString(m, "first_url")
-	if err != nil {
-		return
-	}
-	obj.NextURL, err = core.UnmarshalString(m, "next_url")
-	if err != nil {
-		return
-	}
-	obj.Resources, err = UnmarshalUserProfileSliceAsProperty(m, "resources")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalUserListSlice unmarshals a slice of UserList instances from the specified list of maps.
-func UnmarshalUserListSlice(s []interface{}) (slice []UserList, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'UserList'")
-			return
-		}
-		obj, e := UnmarshalUserList(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalUserListAsProperty unmarshals an instance of UserList that is stored as a property
-// within the specified map.
-func UnmarshalUserListAsProperty(m map[string]interface{}, propertyName string) (result *UserList, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'UserList'", propertyName)
-			return
-		}
-		result, err = UnmarshalUserList(objMap)
-	}
-	return
-}
-
-// UnmarshalUserListSliceAsProperty unmarshals a slice of UserList instances that are stored as a property
-// within the specified map.
-func UnmarshalUserListSliceAsProperty(m map[string]interface{}, propertyName string) (slice []UserList, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'UserList'", propertyName)
-			return
-		}
-		slice, err = UnmarshalUserListSlice(vSlice)
-	}
-	return
-}
-
-// UserProfile : The returned user profile.
-type UserProfile struct {
-	// An alpha-numeric value identifying the user profile.
-	ID *string `json:"id,omitempty"`
-
-	// An alpha-numeric value identifying the user's iam id.
-	IamID *string `json:"iam_id,omitempty"`
-
-	// The value would be IBMid or SL.
-	Realm *string `json:"realm,omitempty"`
-
-	// The user id used for login.
-	UserID *string `json:"user_id,omitempty"`
-
-	// The first name of the user.
-	Firstname *string `json:"firstname,omitempty"`
-
-	// The last name of the user.
-	Lastname *string `json:"lastname,omitempty"`
-
-	// The state of the user, Possible value:"PROCESSING" | "PENDING" | "ACTIVE" | "DISABLED" | "VPN_ONLY".
-	State *string `json:"state,omitempty"`
-
-	// The email of the user.
-	Email *string `json:"email,omitempty"`
-
-	// The phone for the user.
-	Phonenumber *string `json:"phonenumber,omitempty"`
-
-	// The altphonenumber of the user.
-	Altphonenumber *string `json:"altphonenumber,omitempty"`
-
-	// The link of the photo of user.
-	Photo *string `json:"photo,omitempty"`
-
-	// An alpha-numeric value identifying the account ID.
-	AccountID *string `json:"account_id,omitempty"`
-
-	// shows the origin of the user and id of that origin.
-	Linkages []Linkage `json:"linkages,omitempty"`
-}
-
-
-// UnmarshalUserProfile constructs an instance of UserProfile from the specified map.
-func UnmarshalUserProfile(m map[string]interface{}) (result *UserProfile, err error) {
-	obj := new(UserProfile)
-	obj.ID, err = core.UnmarshalString(m, "id")
-	if err != nil {
-		return
-	}
-	obj.IamID, err = core.UnmarshalString(m, "iam_id")
-	if err != nil {
-		return
-	}
-	obj.Realm, err = core.UnmarshalString(m, "realm")
-	if err != nil {
-		return
-	}
-	obj.UserID, err = core.UnmarshalString(m, "user_id")
-	if err != nil {
-		return
-	}
-	obj.Firstname, err = core.UnmarshalString(m, "firstname")
-	if err != nil {
-		return
-	}
-	obj.Lastname, err = core.UnmarshalString(m, "lastname")
-	if err != nil {
-		return
-	}
-	obj.State, err = core.UnmarshalString(m, "state")
-	if err != nil {
-		return
-	}
-	obj.Email, err = core.UnmarshalString(m, "email")
-	if err != nil {
-		return
-	}
-	obj.Phonenumber, err = core.UnmarshalString(m, "phonenumber")
-	if err != nil {
-		return
-	}
-	obj.Altphonenumber, err = core.UnmarshalString(m, "altphonenumber")
-	if err != nil {
-		return
-	}
-	obj.Photo, err = core.UnmarshalString(m, "photo")
-	if err != nil {
-		return
-	}
-	obj.AccountID, err = core.UnmarshalString(m, "account_id")
-	if err != nil {
-		return
-	}
-	obj.Linkages, err = UnmarshalLinkageSliceAsProperty(m, "linkages")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalUserProfileSlice unmarshals a slice of UserProfile instances from the specified list of maps.
-func UnmarshalUserProfileSlice(s []interface{}) (slice []UserProfile, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'UserProfile'")
-			return
-		}
-		obj, e := UnmarshalUserProfile(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalUserProfileAsProperty unmarshals an instance of UserProfile that is stored as a property
-// within the specified map.
-func UnmarshalUserProfileAsProperty(m map[string]interface{}, propertyName string) (result *UserProfile, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'UserProfile'", propertyName)
-			return
-		}
-		result, err = UnmarshalUserProfile(objMap)
-	}
-	return
-}
-
-// UnmarshalUserProfileSliceAsProperty unmarshals a slice of UserProfile instances that are stored as a property
-// within the specified map.
-func UnmarshalUserProfileSliceAsProperty(m map[string]interface{}, propertyName string) (slice []UserProfile, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'UserProfile'", propertyName)
-			return
-		}
-		slice, err = UnmarshalUserProfileSlice(vSlice)
-	}
-	return
-}
-
-// UserSettings : The returned user settings.
-type UserSettings struct {
-	// UI language, default value empty.
-	Language *string `json:"language,omitempty"`
-
-	// For email, phone notification, default value empty.
-	NotificationLanguage *string `json:"notification_language,omitempty"`
-
-	// Ip address string use comma to separate string.
-	AllowedIpAddresses *string `json:"allowed_ip_addresses,omitempty"`
-
-	// a field set for user be able to self manage or not, default false.
-	SelfManage *bool `json:"self_manage,omitempty"`
-}
-
-
-// UnmarshalUserSettings constructs an instance of UserSettings from the specified map.
-func UnmarshalUserSettings(m map[string]interface{}) (result *UserSettings, err error) {
-	obj := new(UserSettings)
-	obj.Language, err = core.UnmarshalString(m, "language")
-	if err != nil {
-		return
-	}
-	obj.NotificationLanguage, err = core.UnmarshalString(m, "notification_language")
-	if err != nil {
-		return
-	}
-	obj.AllowedIpAddresses, err = core.UnmarshalString(m, "allowed_ip_addresses")
-	if err != nil {
-		return
-	}
-	obj.SelfManage, err = core.UnmarshalBool(m, "self_manage")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalUserSettingsSlice unmarshals a slice of UserSettings instances from the specified list of maps.
-func UnmarshalUserSettingsSlice(s []interface{}) (slice []UserSettings, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'UserSettings'")
-			return
-		}
-		obj, e := UnmarshalUserSettings(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalUserSettingsAsProperty unmarshals an instance of UserSettings that is stored as a property
-// within the specified map.
-func UnmarshalUserSettingsAsProperty(m map[string]interface{}, propertyName string) (result *UserSettings, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'UserSettings'", propertyName)
-			return
-		}
-		result, err = UnmarshalUserSettings(objMap)
-	}
-	return
-}
-
-// UnmarshalUserSettingsSliceAsProperty unmarshals a slice of UserSettings instances that are stored as a property
-// within the specified map.
-func UnmarshalUserSettingsSliceAsProperty(m map[string]interface{}, propertyName string) (slice []UserSettings, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'UserSettings'", propertyName)
-			return
-		}
-		slice, err = UnmarshalUserSettingsSlice(vSlice)
-	}
-	return
-}
-
-// InviteUser : Invite a user.
-type InviteUser struct {
-	// An email of the user to be invited.
-	Email *string `json:"email,omitempty"`
-}
-
-
-// UnmarshalInviteUser constructs an instance of InviteUser from the specified map.
-func UnmarshalInviteUser(m map[string]interface{}) (result *InviteUser, err error) {
-	obj := new(InviteUser)
-	obj.Email, err = core.UnmarshalString(m, "email")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalInviteUserSlice unmarshals a slice of InviteUser instances from the specified list of maps.
-func UnmarshalInviteUserSlice(s []interface{}) (slice []InviteUser, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'InviteUser'")
-			return
-		}
-		obj, e := UnmarshalInviteUser(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalInviteUserAsProperty unmarshals an instance of InviteUser that is stored as a property
-// within the specified map.
-func UnmarshalInviteUserAsProperty(m map[string]interface{}, propertyName string) (result *InviteUser, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'InviteUser'", propertyName)
-			return
-		}
-		result, err = UnmarshalInviteUser(objMap)
-	}
-	return
-}
-
-// UnmarshalInviteUserSliceAsProperty unmarshals a slice of InviteUser instances that are stored as a property
-// within the specified map.
-func UnmarshalInviteUserSliceAsProperty(m map[string]interface{}, propertyName string) (slice []InviteUser, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'InviteUser'", propertyName)
-			return
-		}
-		slice, err = UnmarshalInviteUserSlice(vSlice)
-	}
-	return
-}
-
-// Linkage : Origin of the user and its id.
-type Linkage struct {
-	// A string shows the name of the origin.
-	Origin *string `json:"origin,omitempty"`
-
-	// An alpha-numeric value identifying the origin.
-	ID *string `json:"id,omitempty"`
-}
-
-
-// UnmarshalLinkage constructs an instance of Linkage from the specified map.
-func UnmarshalLinkage(m map[string]interface{}) (result *Linkage, err error) {
-	obj := new(Linkage)
-	obj.Origin, err = core.UnmarshalString(m, "origin")
-	if err != nil {
-		return
-	}
-	obj.ID, err = core.UnmarshalString(m, "id")
-	if err != nil {
-		return
-	}
-	result = obj
-	return
-}
-
-// UnmarshalLinkageSlice unmarshals a slice of Linkage instances from the specified list of maps.
-func UnmarshalLinkageSlice(s []interface{}) (slice []Linkage, err error) {
-	for _, v := range s {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("slice element should be a map containing an instance of 'Linkage'")
-			return
-		}
-		obj, e := UnmarshalLinkage(objMap)
-		if e != nil {
-			err = e
-			return
-		}
-		slice = append(slice, *obj)
-	}
-	return
-}
-
-// UnmarshalLinkageAsProperty unmarshals an instance of Linkage that is stored as a property
-// within the specified map.
-func UnmarshalLinkageAsProperty(m map[string]interface{}, propertyName string) (result *Linkage, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		objMap, ok := v.(map[string]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a map containing an instance of 'Linkage'", propertyName)
-			return
-		}
-		result, err = UnmarshalLinkage(objMap)
-	}
-	return
-}
-
-// UnmarshalLinkageSliceAsProperty unmarshals a slice of Linkage instances that are stored as a property
-// within the specified map.
-func UnmarshalLinkageSliceAsProperty(m map[string]interface{}, propertyName string) (slice []Linkage, err error) {
-	v, foundIt := m[propertyName]
-	if foundIt {
-		vSlice, ok := v.([]interface{})
-		if !ok {
-			err = fmt.Errorf("map property '%s' should be a slice of maps, each containing an instance of 'Linkage'", propertyName)
-			return
-		}
-		slice, err = UnmarshalLinkageSlice(vSlice)
-	}
-	return
-}
diff --git a/usermanagementv1/user_management_v1_suite_test.go b/usermanagementv1/user_management_v1_suite_test.go
deleted file mode 100644
index b9c7fad1..00000000
--- a/usermanagementv1/user_management_v1_suite_test.go
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * (C) Copyright IBM Corp. 2020.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package usermanagementv1_test
-
-import (
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-	"testing"
-)
-
-func TestUserManagementV1(t *testing.T) {
-	RegisterFailHandler(Fail)
-	RunSpecs(t, "UserManagementV1 Suite")
-}
diff --git a/usermanagementv1/user_management_v1_test.go b/usermanagementv1/user_management_v1_test.go
deleted file mode 100644
index 4086ff70..00000000
--- a/usermanagementv1/user_management_v1_test.go
+++ /dev/null
@@ -1,742 +0,0 @@
-/**
- * (C) Copyright IBM Corp. 2020.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package usermanagementv1_test
-
-import (
-	"bytes"
-	"fmt"
-	"github.com/IBM/go-sdk-core/v3/core"
-	"github.com/go-openapi/strfmt"
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-	"github.ibm.com/ibmcloud/platform-services-go-sdk/usermanagementv1"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"net/http/httptest"
-	"time"
-)
-
-var _ = Describe(`UserManagementV1`, func() {
-	Describe(`GetUserLinkages(getUserLinkagesOptions *GetUserLinkagesOptions)`, func() {
-		bearerToken := "0ui9876453"
-		getUserLinkagesPath := "/v2/accounts/testString/users/testString/linkages"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(getUserLinkagesPath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"linkages": [{"origin": "Origin", "id": "ID"}]}`)
-			}))
-			It(`Invoke GetUserLinkages successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := usermanagementv1.NewUserManagementV1(&usermanagementv1.UserManagementV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.GetUserLinkages(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the GetUserLinkagesOptions model
-				getUserLinkagesOptionsModel := new(usermanagementv1.GetUserLinkagesOptions)
-				getUserLinkagesOptionsModel.AccountID = core.StringPtr("testString")
-				getUserLinkagesOptionsModel.IamID = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.GetUserLinkages(getUserLinkagesOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`CreateUserLinkages(createUserLinkagesOptions *CreateUserLinkagesOptions)`, func() {
-		bearerToken := "0ui9876453"
-		createUserLinkagesPath := "/v2/accounts/testString/users/testString/linkages/testString/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(createUserLinkagesPath))
-				Expect(req.Method).To(Equal("PUT"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.WriteHeader(204)
-			}))
-			It(`Invoke CreateUserLinkages successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := usermanagementv1.NewUserManagementV1(&usermanagementv1.UserManagementV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				response, operationErr := testService.CreateUserLinkages(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-
-				// Construct an instance of the CreateUserLinkagesOptions model
-				createUserLinkagesOptionsModel := new(usermanagementv1.CreateUserLinkagesOptions)
-				createUserLinkagesOptionsModel.AccountID = core.StringPtr("testString")
-				createUserLinkagesOptionsModel.IamID = core.StringPtr("testString")
-				createUserLinkagesOptionsModel.Origin = core.StringPtr("testString")
-				createUserLinkagesOptionsModel.IdFromOrigin = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				response, operationErr = testService.CreateUserLinkages(createUserLinkagesOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`RemoveUserLinkages(removeUserLinkagesOptions *RemoveUserLinkagesOptions)`, func() {
-		bearerToken := "0ui9876453"
-		removeUserLinkagesPath := "/v2/accounts/testString/users/testString/linkages/testString/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(removeUserLinkagesPath))
-				Expect(req.Method).To(Equal("DELETE"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.WriteHeader(204)
-			}))
-			It(`Invoke RemoveUserLinkages successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := usermanagementv1.NewUserManagementV1(&usermanagementv1.UserManagementV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				response, operationErr := testService.RemoveUserLinkages(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-
-				// Construct an instance of the RemoveUserLinkagesOptions model
-				removeUserLinkagesOptionsModel := new(usermanagementv1.RemoveUserLinkagesOptions)
-				removeUserLinkagesOptionsModel.AccountID = core.StringPtr("testString")
-				removeUserLinkagesOptionsModel.IamID = core.StringPtr("testString")
-				removeUserLinkagesOptionsModel.Origin = core.StringPtr("testString")
-				removeUserLinkagesOptionsModel.IdFromOrigin = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				response, operationErr = testService.RemoveUserLinkages(removeUserLinkagesOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`GetUserProfile(getUserProfileOptions *GetUserProfileOptions)`, func() {
-		bearerToken := "0ui9876453"
-		getUserProfilePath := "/v2/accounts/testString/users/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(getUserProfilePath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-
-				// TODO: Add check for include_linkages query parameter
-
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"id": "ID", "iam_id": "IamID", "realm": "Realm", "user_id": "UserID", "firstname": "Firstname", "lastname": "Lastname", "state": "State", "email": "Email", "phonenumber": "Phonenumber", "altphonenumber": "Altphonenumber", "photo": "Photo", "account_id": "AccountID", "linkages": [{"origin": "Origin", "id": "ID"}]}`)
-			}))
-			It(`Invoke GetUserProfile successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := usermanagementv1.NewUserManagementV1(&usermanagementv1.UserManagementV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.GetUserProfile(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the GetUserProfileOptions model
-				getUserProfileOptionsModel := new(usermanagementv1.GetUserProfileOptions)
-				getUserProfileOptionsModel.AccountID = core.StringPtr("testString")
-				getUserProfileOptionsModel.IamID = core.StringPtr("testString")
-				getUserProfileOptionsModel.IncludeLinkages = core.BoolPtr(true)
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.GetUserProfile(getUserProfileOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`CreateUserProfile(createUserProfileOptions *CreateUserProfileOptions)`, func() {
-		bearerToken := "0ui9876453"
-		createUserProfilePath := "/v2/accounts/testString/users/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(createUserProfilePath))
-				Expect(req.Method).To(Equal("PUT"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.WriteHeader(204)
-			}))
-			It(`Invoke CreateUserProfile successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := usermanagementv1.NewUserManagementV1(&usermanagementv1.UserManagementV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				response, operationErr := testService.CreateUserProfile(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-
-				// Construct an instance of the CreateUserProfileOptions model
-				createUserProfileOptionsModel := new(usermanagementv1.CreateUserProfileOptions)
-				createUserProfileOptionsModel.AccountID = core.StringPtr("testString")
-				createUserProfileOptionsModel.IamID = core.StringPtr("testString")
-				createUserProfileOptionsModel.Realm = core.StringPtr("IBMid")
-				createUserProfileOptionsModel.UserID = core.StringPtr("example@ibm.com")
-				createUserProfileOptionsModel.Firstname = core.StringPtr("testString")
-				createUserProfileOptionsModel.Lastname = core.StringPtr("testString")
-				createUserProfileOptionsModel.State = core.StringPtr("testString")
-				createUserProfileOptionsModel.Email = core.StringPtr("testString")
-				createUserProfileOptionsModel.Phonenumber = core.StringPtr("testString")
-				createUserProfileOptionsModel.Altphonenumber = core.StringPtr("testString")
-				createUserProfileOptionsModel.Photo = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				response, operationErr = testService.CreateUserProfile(createUserProfileOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`UpdateUserProfile(updateUserProfileOptions *UpdateUserProfileOptions)`, func() {
-		bearerToken := "0ui9876453"
-		updateUserProfilePath := "/v2/accounts/testString/users/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(updateUserProfilePath))
-				Expect(req.Method).To(Equal("PATCH"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.WriteHeader(204)
-			}))
-			It(`Invoke UpdateUserProfile successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := usermanagementv1.NewUserManagementV1(&usermanagementv1.UserManagementV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				response, operationErr := testService.UpdateUserProfile(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-
-				// Construct an instance of the UpdateUserProfileOptions model
-				updateUserProfileOptionsModel := new(usermanagementv1.UpdateUserProfileOptions)
-				updateUserProfileOptionsModel.AccountID = core.StringPtr("testString")
-				updateUserProfileOptionsModel.IamID = core.StringPtr("testString")
-				updateUserProfileOptionsModel.UserID = core.StringPtr("testString")
-				updateUserProfileOptionsModel.Firstname = core.StringPtr("testString")
-				updateUserProfileOptionsModel.Lastname = core.StringPtr("testString")
-				updateUserProfileOptionsModel.State = core.StringPtr("testString")
-				updateUserProfileOptionsModel.Email = core.StringPtr("testString")
-				updateUserProfileOptionsModel.Phonenumber = core.StringPtr("testString")
-				updateUserProfileOptionsModel.Altphonenumber = core.StringPtr("testString")
-				updateUserProfileOptionsModel.Photo = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				response, operationErr = testService.UpdateUserProfile(updateUserProfileOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`GetUserSettings(getUserSettingsOptions *GetUserSettingsOptions)`, func() {
-		bearerToken := "0ui9876453"
-		getUserSettingsPath := "/v2/accounts/testString/users/testString/settings"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(getUserSettingsPath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"language": "Language", "notification_language": "NotificationLanguage", "allowed_ip_addresses": "32.96.110.50,172.16.254.1", "self_manage": true}`)
-			}))
-			It(`Invoke GetUserSettings successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := usermanagementv1.NewUserManagementV1(&usermanagementv1.UserManagementV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.GetUserSettings(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the GetUserSettingsOptions model
-				getUserSettingsOptionsModel := new(usermanagementv1.GetUserSettingsOptions)
-				getUserSettingsOptionsModel.AccountID = core.StringPtr("testString")
-				getUserSettingsOptionsModel.IamID = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.GetUserSettings(getUserSettingsOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`UpdateUserSettings(updateUserSettingsOptions *UpdateUserSettingsOptions)`, func() {
-		bearerToken := "0ui9876453"
-		updateUserSettingsPath := "/v2/accounts/testString/users/testString/settings"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(updateUserSettingsPath))
-				Expect(req.Method).To(Equal("PATCH"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.WriteHeader(204)
-			}))
-			It(`Invoke UpdateUserSettings successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := usermanagementv1.NewUserManagementV1(&usermanagementv1.UserManagementV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				response, operationErr := testService.UpdateUserSettings(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-
-				// Construct an instance of the UpdateUserSettingsOptions model
-				updateUserSettingsOptionsModel := new(usermanagementv1.UpdateUserSettingsOptions)
-				updateUserSettingsOptionsModel.AccountID = core.StringPtr("testString")
-				updateUserSettingsOptionsModel.IamID = core.StringPtr("testString")
-				updateUserSettingsOptionsModel.Language = core.StringPtr("testString")
-				updateUserSettingsOptionsModel.NotificationLanguage = core.StringPtr("testString")
-				updateUserSettingsOptionsModel.AllowedIpAddresses = core.StringPtr("32.96.110.50,172.16.254.1")
-				updateUserSettingsOptionsModel.SelfManage = core.BoolPtr(true)
-
-				// Invoke operation with valid options model (positive test)
-				response, operationErr = testService.UpdateUserSettings(updateUserSettingsOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`RemoveUserFromAccount(removeUserFromAccountOptions *RemoveUserFromAccountOptions)`, func() {
-		bearerToken := "0ui9876453"
-		removeUserFromAccountPath := "/v2/accounts/testString/users/testString"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(removeUserFromAccountPath))
-				Expect(req.Method).To(Equal("DELETE"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.WriteHeader(204)
-			}))
-			It(`Invoke RemoveUserFromAccount successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := usermanagementv1.NewUserManagementV1(&usermanagementv1.UserManagementV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				response, operationErr := testService.RemoveUserFromAccount(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-
-				// Construct an instance of the RemoveUserFromAccountOptions model
-				removeUserFromAccountOptionsModel := new(usermanagementv1.RemoveUserFromAccountOptions)
-				removeUserFromAccountOptionsModel.AccountID = core.StringPtr("testString")
-				removeUserFromAccountOptionsModel.IamID = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				response, operationErr = testService.RemoveUserFromAccount(removeUserFromAccountOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`ListUsers(listUsersOptions *ListUsersOptions)`, func() {
-		bearerToken := "0ui9876453"
-		listUsersPath := "/v2/accounts/testString/users"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(listUsersPath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				Expect(req.URL.Query()["IAMid"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["firstname"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["lastname"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["email"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["state"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["realm"]).To(Equal([]string{"testString"}))
-
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"total_results": 12, "limit": 5, "first_url": "FirstURL", "next_url": "NextURL", "resources": [{"id": "ID", "iam_id": "IamID", "realm": "Realm", "user_id": "UserID", "firstname": "Firstname", "lastname": "Lastname", "state": "State", "email": "Email", "phonenumber": "Phonenumber", "altphonenumber": "Altphonenumber", "photo": "Photo", "account_id": "AccountID", "linkages": [{"origin": "Origin", "id": "ID"}]}]}`)
-			}))
-			It(`Invoke ListUsers successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := usermanagementv1.NewUserManagementV1(&usermanagementv1.UserManagementV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.ListUsers(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the ListUsersOptions model
-				listUsersOptionsModel := new(usermanagementv1.ListUsersOptions)
-				listUsersOptionsModel.AccountID = core.StringPtr("testString")
-				listUsersOptionsModel.IAMid = core.StringPtr("testString")
-				listUsersOptionsModel.Firstname = core.StringPtr("testString")
-				listUsersOptionsModel.Lastname = core.StringPtr("testString")
-				listUsersOptionsModel.Email = core.StringPtr("testString")
-				listUsersOptionsModel.State = core.StringPtr("testString")
-				listUsersOptionsModel.Realm = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.ListUsers(listUsersOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`InviteUsers(inviteUsersOptions *InviteUsersOptions)`, func() {
-		bearerToken := "0ui9876453"
-		inviteUsersPath := "/v2/accounts/testString/users"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(inviteUsersPath))
-				Expect(req.Method).To(Equal("POST"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.WriteHeader(202)
-			}))
-			It(`Invoke InviteUsers successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := usermanagementv1.NewUserManagementV1(&usermanagementv1.UserManagementV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				response, operationErr := testService.InviteUsers(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-
-				// Construct an instance of the InviteUser model
-				inviteUserModel := new(usermanagementv1.InviteUser)
-				inviteUserModel.Email = core.StringPtr("testString")
-
-				// Construct an instance of the InviteUsersOptions model
-				inviteUsersOptionsModel := new(usermanagementv1.InviteUsersOptions)
-				inviteUsersOptionsModel.AccountID = core.StringPtr("testString")
-				inviteUsersOptionsModel.Users = []usermanagementv1.InviteUser{*inviteUserModel}
-
-				// Invoke operation with valid options model (positive test)
-				response, operationErr = testService.InviteUsers(inviteUsersOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`GetImsUsers(getImsUsersOptions *GetImsUsersOptions)`, func() {
-		bearerToken := "0ui9876453"
-		getImsUsersPath := "/v2/accounts/testString/ims/users"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(getImsUsersPath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				Expect(req.URL.Query()["IAMid"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["firstname"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["lastname"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["email"]).To(Equal([]string{"testString"}))
-
-				Expect(req.URL.Query()["state"]).To(Equal([]string{"testString"}))
-
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"total_results": 12, "limit": 5, "first_url": "FirstURL", "next_url": "NextURL", "resources": [{"id": "ID", "iam_id": "IamID", "realm": "Realm", "user_id": "UserID", "firstname": "Firstname", "lastname": "Lastname", "state": "State", "email": "Email", "phonenumber": "Phonenumber", "altphonenumber": "Altphonenumber", "photo": "Photo", "account_id": "AccountID", "linkages": [{"origin": "Origin", "id": "ID"}]}]}`)
-			}))
-			It(`Invoke GetImsUsers successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := usermanagementv1.NewUserManagementV1(&usermanagementv1.UserManagementV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.GetImsUsers(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the GetImsUsersOptions model
-				getImsUsersOptionsModel := new(usermanagementv1.GetImsUsersOptions)
-				getImsUsersOptionsModel.AccountID = core.StringPtr("testString")
-				getImsUsersOptionsModel.IAMid = core.StringPtr("testString")
-				getImsUsersOptionsModel.Firstname = core.StringPtr("testString")
-				getImsUsersOptionsModel.Lastname = core.StringPtr("testString")
-				getImsUsersOptionsModel.Email = core.StringPtr("testString")
-				getImsUsersOptionsModel.State = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.GetImsUsers(getImsUsersOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`GetCfUsers(getCfUsersOptions *GetCfUsersOptions)`, func() {
-		bearerToken := "0ui9876453"
-		getCfUsersPath := "/v2/accounts/testString/organizations/testString/users"
-		Context(`Using mock server endpoint`, func() {
-			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
-				defer GinkgoRecover()
-
-				// Verify the contents of the request
-				Expect(req.URL.Path).To(Equal(getCfUsersPath))
-				Expect(req.Method).To(Equal("GET"))
-				Expect(req.Header["Authorization"]).ToNot(BeNil())
-				Expect(req.Header["Authorization"][0]).To(Equal("Bearer " + bearerToken))
-				res.Header().Set("Content-type", "application/json")
-				res.WriteHeader(200)
-				fmt.Fprintf(res, `{"total_results": 12, "limit": 5, "first_url": "FirstURL", "next_url": "NextURL", "resources": [{"id": "ID", "iam_id": "IamID", "realm": "Realm", "user_id": "UserID", "firstname": "Firstname", "lastname": "Lastname", "state": "State", "email": "Email", "phonenumber": "Phonenumber", "altphonenumber": "Altphonenumber", "photo": "Photo", "account_id": "AccountID", "linkages": [{"origin": "Origin", "id": "ID"}]}]}`)
-			}))
-			It(`Invoke GetCfUsers successfully`, func() {
-				defer testServer.Close()
-
-				testService, testServiceErr := usermanagementv1.NewUserManagementV1(&usermanagementv1.UserManagementV1Options{
-					URL:           testServer.URL,
-					Authenticator: &core.BearerTokenAuthenticator{
-						BearerToken: bearerToken,
-					},
-				})
-				Expect(testServiceErr).To(BeNil())
-				Expect(testService).ToNot(BeNil())
-
-				// Invoke operation with nil options model (negative test)
-				result, response, operationErr := testService.GetCfUsers(nil)
-				Expect(operationErr).NotTo(BeNil())
-				Expect(response).To(BeNil())
-				Expect(result).To(BeNil())
-
-				// Construct an instance of the GetCfUsersOptions model
-				getCfUsersOptionsModel := new(usermanagementv1.GetCfUsersOptions)
-				getCfUsersOptionsModel.AccountID = core.StringPtr("testString")
-				getCfUsersOptionsModel.OrganizationGuid = core.StringPtr("testString")
-
-				// Invoke operation with valid options model (positive test)
-				result, response, operationErr = testService.GetCfUsers(getCfUsersOptionsModel)
-				Expect(operationErr).To(BeNil())
-				Expect(response).ToNot(BeNil())
-				Expect(result).ToNot(BeNil())
-			})
-		})
-	})
-	Describe(`Utility function tests`, func() {
-		It(`Invoke CreateMockMap() successfully`, func() {
-			mockMap := CreateMockMap()
-			Expect(mockMap).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockByteArray() successfully`, func() {
-			mockByteArray := CreateMockByteArray("This is a test")
-			Expect(mockByteArray).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockUUID() successfully`, func() {
-			mockUUID := CreateMockUUID("9fab83da-98cb-4f18-a7ba-b6f0435c9673")
-			Expect(mockUUID).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockReader() successfully`, func() {
-			mockReader := CreateMockReader("This is a test.")
-			Expect(mockReader).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockDate() successfully`, func() {
-			mockDate := CreateMockDate()
-			Expect(mockDate).ToNot(BeNil())
-		})
-		It(`Invoke CreateMockDateTime() successfully`, func() {
-			mockDateTime := CreateMockDateTime()
-			Expect(mockDateTime).ToNot(BeNil())
-		})
-	})
-})
-
-//
-// Utility functions used by the generated test code
-//
-
-func CreateMockMap() map[string]interface{} {
-	m := make(map[string]interface{})
-	return m
-}
-
-func CreateMockByteArray(mockData string) *[]byte {
-	ba := make([]byte, len(mockData))
-	ba = append(ba, mockData...)
-	return &ba
-}
-
-func CreateMockUUID(mockData string) *strfmt.UUID {
-	uuid := strfmt.UUID(mockData)
-	return &uuid
-}
-
-func CreateMockReader(mockData string) io.ReadCloser {
-	return ioutil.NopCloser(bytes.NewReader([]byte(mockData)))
-}
-
-func CreateMockDate() *strfmt.Date {
-	d := strfmt.Date(time.Now())
-	return &d
-}
-
-func CreateMockDateTime() *strfmt.DateTime {
-	d := strfmt.DateTime(time.Now())
-	return &d
-}