diff --git a/.openapi-generator-ignore b/.openapi-generator-ignore
index bde5b6f6..25f592d4 100644
--- a/.openapi-generator-ignore
+++ b/.openapi-generator-ignore
@@ -7,24 +7,19 @@
 **/.openapi-generator-ignore
 **/.openapi-generator
 **/git_push.sh
-**/.travis.yml
 **/build.gradle
 **/build.sbt
 **/gradle.properties
 **/gradlew
 **/gradlew.bat
 **/settings.gradle
-**/git_push.sh
 **/gradlew.bat
 **/src/test/**
 **/.gradle/*
 **/.project
 **/.settings/*
-**/build.gradle
-**/build.sbt
-**/gradle.properties
 **/gradle/**/*
-**/gradlew
-**/gradlew.bat
-**/settings.gradle
-**/.classpath
\ No newline at end of file
+**/.classpath
+**/go.mod
+**/go.sum
+**/api
\ No newline at end of file
diff --git a/.openapi/registry-instance.json b/.openapi/registry-instance.json
index 751e18a2..248a37cf 100644
--- a/.openapi/registry-instance.json
+++ b/.openapi/registry-instance.json
@@ -1,9 +1,9 @@
 {
   "openapi": "3.0.2",
   "info": {
-    "title": "Service Registry API",
+    "title": "Apicurio Registry API [v2]",
     "version": "2.2.5.Final",
-    "description": "Service Registry Instance API \nNOTE: This API cannot be called directly from the portal.",
+    "description": "Apicurio Registry is a datastore for standard event schemas and API designs. Apicurio Registry enables developers to manage and share the structure of their data using a REST interface. For example, client applications can dynamically push or pull the latest updates to or from the registry without needing to redeploy. Apicurio Registry also enables developers to create rules that govern how registry content can evolve over time. For example, this includes rules for content validation and version compatibility.\n\nThe Apicurio Registry REST API enables client applications to manage the artifacts in the registry. This API provides create, read, update, and delete operations for schema and API artifacts, rules, versions, and metadata. \n\nThe supported artifact types include:\n- Apache Avro schema\n- AsyncAPI specification\n- Google protocol buffers\n- GraphQL schema\n- JSON Schema\n- Kafka Connect schema\n- OpenAPI specification\n- Web Services Description Language\n- XML Schema Definition\n\n\n**Important**: The Apicurio Registry REST API is available from `https://MY-REGISTRY-URL/apis/registry/v2` by default. Therefore you must prefix all API operation paths with `../apis/registry/v2` in this case. For example: `../apis/registry/v2/ids/globalIds/{globalId}`.\n",
     "contact": {
       "name": "Apicurio",
       "url": "https://github.com/apicurio/apicurio-registry",
@@ -679,6 +679,13 @@
           "Admin"
         ],
         "parameters": [
+          {
+            "in": "header",
+            "name": "Accept",
+            "schema": {
+              "type": "string"
+            }
+          },
           {
             "name": "forBrowser",
             "description": "Indicates if the operation is done for a browser.  If true, the response will be a JSON payload with a property called `href`.  This `href` will be a single-use, naked download link suitable for use by a web browser to download the content.",
@@ -2022,7 +2029,10 @@
           "description": "The content of the artifact being created. This is often, but not always, JSON data\nrepresenting one of the supported artifact types:\n\n* Avro (`AVRO`)\n* Protobuf (`PROTOBUF`)\n* JSON Schema (`JSON`)\n* Kafka Connect (`KCONNECT`)\n* OpenAPI (`OPENAPI`)\n* AsyncAPI (`ASYNCAPI`)\n* GraphQL (`GRAPHQL`)\n* Web Services Description Language (`WSDL`)\n* XML Schema (`XSD`)\n",
           "content": {
             "*/*": {
-              "schema": {},
+              "schema": {
+                "format": "binary",
+                "type": "string"
+              },
               "examples": {
                 "OpenAPI Example": {
                   "value": {
diff --git a/app-services-sdk-go/accountmgmt/apiv1/api_client.go b/app-services-sdk-go/accountmgmt/apiv1/api_client.go
index 89b8e7b7..ae2845b3 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/api_client.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/api_client.go
@@ -1,9 +1,9 @@
 package accountmgmt
 
 import (
-	"github.com/redhat-developer/app-services-sdk-go/core"
+	"github.com/jackdelahunt/app-services-sdk-core/app-services-sdk-go/core"
 
-	apiv1 "github.com/redhat-developer/app-services-sdk-go/accountmgmt/apiv1/client"
+	apiv1 "github.com/jackdelahunt/app-services-sdk-core/app-services-sdk-go/accountmgmt/apiv1/client"
 )
 
 // APIConfig defines the available configuration options
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/.openapi-generator/FILES b/app-services-sdk-go/accountmgmt/apiv1/client/.openapi-generator/FILES
index 013b9776..5a0bccc9 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/.openapi-generator/FILES
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/.openapi-generator/FILES
@@ -122,7 +122,6 @@ docs/QuotaRulesAllOf.md
 docs/QuotaRulesList.md
 docs/QuotaRulesListAllOf.md
 docs/Registry.md
-docs/RegistryAddressValue.md
 docs/RegistryAllOf.md
 docs/RegistryCreateRequest.md
 docs/RegistryCredential.md
@@ -320,7 +319,6 @@ model_quota_rules_all_of.go
 model_quota_rules_list.go
 model_quota_rules_list_all_of.go
 model_registry.go
-model_registry_address_value.go
 model_registry_all_of.go
 model_registry_create_request.go
 model_registry_credential.go
@@ -403,6 +401,4 @@ model_terms_review_response.go
 model_token_authorization_request.go
 model_token_authorization_response.go
 response.go
-test/api_app_services_test.go
-test/api_default_test.go
 utils.go
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/.openapi-generator/VERSION b/app-services-sdk-go/accountmgmt/apiv1/client/.openapi-generator/VERSION
index 0df17dd0..7cbea073 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/.openapi-generator/VERSION
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/.openapi-generator/VERSION
@@ -1 +1 @@
-6.2.1
\ No newline at end of file
+5.2.0
\ No newline at end of file
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/README.md b/app-services-sdk-go/accountmgmt/apiv1/client/README.md
index 14036caf..c89f6d74 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/README.md
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/README.md
@@ -22,7 +22,7 @@ go get golang.org/x/net/context
 Put the package under your project folder and add the following in import:
 
 ```golang
-import accountmgmtclient "github.com/GIT_USER_ID/GIT_REPO_ID"
+import sw "./accountmgmtclient"
 ```
 
 To use a proxy, set the environment variable `HTTP_PROXY`:
@@ -40,7 +40,7 @@ Default configuration comes with `Servers` field that contains server objects as
 For using other server than the one defined on index 0 set context value `sw.ContextServerIndex` of type `int`.
 
 ```golang
-ctx := context.WithValue(context.Background(), accountmgmtclient.ContextServerIndex, 1)
+ctx := context.WithValue(context.Background(), sw.ContextServerIndex, 1)
 ```
 
 ### Templated Server URL
@@ -48,7 +48,7 @@ ctx := context.WithValue(context.Background(), accountmgmtclient.ContextServerIn
 Templated server URL is formatted using default variables from configuration or from context value `sw.ContextServerVariables` of type `map[string]string`.
 
 ```golang
-ctx := context.WithValue(context.Background(), accountmgmtclient.ContextServerVariables, map[string]string{
+ctx := context.WithValue(context.Background(), sw.ContextServerVariables, map[string]string{
 	"basePath": "v2",
 })
 ```
@@ -58,14 +58,14 @@ Note, enum values are always validated and all unused variables are silently ign
 ### URLs Configuration per Operation
 
 Each operation can use different server URL defined using `OperationServers` map in the `Configuration`.
-An operation is uniquely identified by `"{classname}Service.{nickname}"` string.
+An operation is uniquely identifield by `"{classname}Service.{nickname}"` string.
 Similar rules for overriding default operation server index and variables applies by using `sw.ContextOperationServerIndices` and `sw.ContextOperationServerVariables` context maps.
 
-```golang
-ctx := context.WithValue(context.Background(), accountmgmtclient.ContextOperationServerIndices, map[string]int{
+```
+ctx := context.WithValue(context.Background(), sw.ContextOperationServerIndices, map[string]int{
 	"{classname}Service.{nickname}": 2,
 })
-ctx = context.WithValue(context.Background(), accountmgmtclient.ContextOperationServerVariables, map[string]map[string]string{
+ctx = context.WithValue(context.Background(), sw.ContextOperationServerVariables, map[string]map[string]string{
 	"{classname}Service.{nickname}": {
 		"port": "8443",
 	},
@@ -328,7 +328,6 @@ Class | Method | HTTP request | Description
  - [QuotaRulesList](docs/QuotaRulesList.md)
  - [QuotaRulesListAllOf](docs/QuotaRulesListAllOf.md)
  - [Registry](docs/Registry.md)
- - [RegistryAddressValue](docs/RegistryAddressValue.md)
  - [RegistryAllOf](docs/RegistryAllOf.md)
  - [RegistryCreateRequest](docs/RegistryCreateRequest.md)
  - [RegistryCredential](docs/RegistryCredential.md)
@@ -432,7 +431,7 @@ Note, each API key must be added to a map of `map[string]APIKey` where the key i
 Example
 
 ```golang
-auth := context.WithValue(context.Background(), sw.ContextAccessToken, "BEARER_TOKEN_STRING")
+auth := context.WithValue(context.Background(), sw.ContextAccessToken, "BEARERTOKENSTRING")
 r, err := client.Service.Operation(auth, args)
 ```
 
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/api/openapi.yaml b/app-services-sdk-go/accountmgmt/apiv1/client/api/openapi.yaml
index 0f14dfc6..08d0f7e6 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/api/openapi.yaml
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/api/openapi.yaml
@@ -148,8 +148,8 @@ paths:
         schema:
           type: string
         style: form
-      - description: "If true, includes the labels on a subscription/organization/account\
-          \ in the output. Could slow request response time."
+      - description: If true, includes the labels on a subscription/organization/account
+          in the output. Could slow request response time.
         explode: true
         in: query
         name: fetchLabels
@@ -157,8 +157,8 @@ paths:
         schema:
           type: boolean
         style: form
-      - description: "If true, includes the capabilities on a subscription in the\
-          \ output. Could slow request response time."
+      - description: If true, includes the capabilities on a subscription in the output.
+          Could slow request response time.
         explode: true
         in: query
         name: fetchCapabilities
@@ -196,8 +196,8 @@ paths:
       summary: Returns a list of accounts
     post:
       parameters:
-      - description: "If true, instructs API to avoid making any changes, but rather\
-          \ run through validations only."
+      - description: If true, instructs API to avoid making any changes, but rather
+          run through validations only.
         explode: true
         in: query
         name: dryRun
@@ -269,8 +269,8 @@ paths:
         schema:
           type: string
         style: simple
-      - description: "If true, includes the labels on a subscription/organization/account\
-          \ in the output. Could slow request response time."
+      - description: If true, includes the labels on a subscription/organization/account
+          in the output. Could slow request response time.
         explode: true
         in: query
         name: fetchLabels
@@ -278,8 +278,8 @@ paths:
         schema:
           type: boolean
         style: form
-      - description: "If true, includes the capabilities on a subscription in the\
-          \ output. Could slow request response time."
+      - description: If true, includes the capabilities on a subscription in the output.
+          Could slow request response time.
         explode: true
         in: query
         name: fetchCapabilities
@@ -287,8 +287,8 @@ paths:
         schema:
           type: boolean
         style: form
-      - description: "If true, includes the RHIT account_id in the output. Could slow\
-          \ request response time."
+      - description: If true, includes the RHIT account_id in the output. Could slow
+          request response time.
         explode: true
         in: query
         name: fetchRhit
@@ -1061,8 +1061,8 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/ClusterAuthorizationResponse'
-          description: "The authorization is successful, the requested cluster has\
-            \ a valid subscription and is within resource limits."
+          description: The authorization is successful, the requested cluster has
+            a valid subscription and is within resource limits.
         "400":
           content:
             application/json:
@@ -1124,9 +1124,9 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/ClusterRegistrationResponse'
-          description: "No cluster with the specified cluster exists, one was successfully\
-            \ created and associated with the account with the specified registry\
-            \ credential token"
+          description: No cluster with the specified cluster exists, one was successfully
+            created and associated with the account with the specified registry credential
+            token
         "400":
           content:
             application/json:
@@ -1646,8 +1646,8 @@ paths:
   /api/accounts_mgmt/v1/current_account:
     get:
       parameters:
-      - description: "If true, includes the labels on a subscription/organization/account\
-          \ in the output. Could slow request response time."
+      - description: If true, includes the labels on a subscription/organization/account
+          in the output. Could slow request response time.
         explode: true
         in: query
         name: fetchLabels
@@ -2161,9 +2161,9 @@ paths:
           application/json:
             schema:
               $ref: '#/components/schemas/NotificationRequest'
-        description: "The contents of the notification to send to the owner of a cluster/subscription\
-          \ in addition to the set of template parameters which are sent automatically\
-          \ ACCOUNT_USERNAME, FIRST_NAME, LAST_NAME, ORGANIZATION_NAME, ORGANIZATION_EXTERNAL_ID"
+        description: The contents of the notification to send to the owner of a cluster/subscription
+          in addition to the set of template parameters which are sent automatically
+          ACCOUNT_USERNAME, FIRST_NAME, LAST_NAME, ORGANIZATION_NAME, ORGANIZATION_EXTERNAL_ID
         required: true
       responses:
         "202":
@@ -2272,8 +2272,8 @@ paths:
         schema:
           type: string
         style: form
-      - description: "If true, includes the labels on a subscription/organization/account\
-          \ in the output. Could slow request response time."
+      - description: If true, includes the labels on a subscription/organization/account
+          in the output. Could slow request response time.
         explode: true
         in: query
         name: fetchLabels
@@ -2281,8 +2281,8 @@ paths:
         schema:
           type: boolean
         style: form
-      - description: "If true, includes the capabilities on a subscription in the\
-          \ output. Could slow request response time."
+      - description: If true, includes the capabilities on a subscription in the output.
+          Could slow request response time.
         explode: true
         in: query
         name: fetchCapabilities
@@ -2393,8 +2393,8 @@ paths:
         schema:
           type: string
         style: simple
-      - description: "If true, includes the labels on a subscription/organization/account\
-          \ in the output. Could slow request response time."
+      - description: If true, includes the labels on a subscription/organization/account
+          in the output. Could slow request response time.
         explode: true
         in: query
         name: fetchLabels
@@ -2402,8 +2402,8 @@ paths:
         schema:
           type: boolean
         style: form
-      - description: "If true, includes the capabilities on a subscription in the\
-          \ output. Could slow request response time."
+      - description: If true, includes the capabilities on a subscription in the output.
+          Could slow request response time.
         explode: true
         in: query
         name: fetchCapabilities
@@ -3520,7 +3520,7 @@ paths:
         schema:
           type: string
         style: simple
-      - description: "If true, includes that ConsumedQuota should be recalculated."
+      - description: If true, includes that ConsumedQuota should be recalculated.
         explode: true
         in: query
         name: forceRecalc
@@ -3601,8 +3601,8 @@ paths:
         schema:
           type: string
         style: form
-      - description: "If true, includes the related resources in the output. Could\
-          \ slow request response time."
+      - description: If true, includes the related resources in the output. Could
+          slow request response time.
         explode: true
         in: query
         name: fetchRelatedResources
@@ -3610,7 +3610,7 @@ paths:
         schema:
           type: boolean
         style: form
-      - description: "If true, includes that ConsumedQuota should be recalculated."
+      - description: If true, includes that ConsumedQuota should be recalculated.
         explode: true
         in: query
         name: forceRecalc
@@ -3618,8 +3618,8 @@ paths:
         schema:
           type: boolean
         style: form
-      - description: "If true, includes the marketplace cloud accounts in the output.\
-          \ Could slow request response time."
+      - description: If true, includes the marketplace cloud accounts in the output.
+          Could slow request response time.
         explode: true
         in: query
         name: fetchCloudAccounts
@@ -4240,8 +4240,8 @@ paths:
         schema:
           type: string
         style: form
-      - description: "If true, includes the related resources in the output. Could\
-          \ slow request response time."
+      - description: If true, includes the related resources in the output. Could
+          slow request response time.
         explode: true
         in: query
         name: fetchRelatedResources
@@ -4249,8 +4249,8 @@ paths:
         schema:
           type: boolean
         style: form
-      - description: "If true, includes the marketplace cloud accounts in the output.\
-          \ Could slow request response time."
+      - description: If true, includes the marketplace cloud accounts in the output.
+          Could slow request response time.
         explode: true
         in: query
         name: fetchCloudAccounts
@@ -5708,8 +5708,8 @@ paths:
   /api/accounts_mgmt/v1/self_entitlement/{product}:
     post:
       parameters:
-      - description: "The product for self_entitlement. The supported products are\
-          \ [rosa]."
+      - description: The product for self_entitlement. The supported products are
+          [rosa].
         explode: false
         in: path
         name: product
@@ -6171,8 +6171,8 @@ paths:
         schema:
           type: string
         style: form
-      - description: "If true, includes the account reference information in the output.\
-          \ Could slow request response time."
+      - description: If true, includes the account reference information in the output.
+          Could slow request response time.
         explode: true
         in: query
         name: fetchAccounts
@@ -6180,8 +6180,8 @@ paths:
         schema:
           type: boolean
         style: form
-      - description: "If true, includes the labels on a subscription/organization/account\
-          \ in the output. Could slow request response time."
+      - description: If true, includes the labels on a subscription/organization/account
+          in the output. Could slow request response time.
         explode: true
         in: query
         name: fetchLabels
@@ -6189,8 +6189,8 @@ paths:
         schema:
           type: boolean
         style: form
-      - description: "If true, includes the capabilities on a subscription in the\
-          \ output. Could slow request response time."
+      - description: If true, includes the capabilities on a subscription in the output.
+          Could slow request response time.
         explode: true
         in: query
         name: fetchCapabilities
@@ -6387,8 +6387,8 @@ paths:
         schema:
           type: string
         style: simple
-      - description: "If true, includes the account reference information in the output.\
-          \ Could slow request response time."
+      - description: If true, includes the account reference information in the output.
+          Could slow request response time.
         explode: true
         in: query
         name: fetchAccounts
@@ -6396,8 +6396,8 @@ paths:
         schema:
           type: boolean
         style: form
-      - description: "If true, includes the labels on a subscription/organization/account\
-          \ in the output. Could slow request response time."
+      - description: If true, includes the labels on a subscription/organization/account
+          in the output. Could slow request response time.
         explode: true
         in: query
         name: fetchLabels
@@ -6405,8 +6405,8 @@ paths:
         schema:
           type: boolean
         style: form
-      - description: "If true, includes the capabilities on a subscription in the\
-          \ output. Could slow request response time."
+      - description: If true, includes the capabilities on a subscription in the output.
+          Could slow request response time.
         explode: true
         in: query
         name: fetchCapabilities
@@ -6414,9 +6414,9 @@ paths:
         schema:
           type: boolean
         style: form
-      - description: "If true, fetches, from the clusters service, the total numbers\
-          \ of CPU's and sockets under an obligation, and includes in the output.\
-          \ Could slow request response time."
+      - description: If true, fetches, from the clusters service, the total numbers
+          of CPU's and sockets under an obligation, and includes in the output. Could
+          slow request response time.
         explode: true
         in: query
         name: fetchCpuAndSocket
@@ -6948,9 +6948,9 @@ paths:
           application/json:
             schema:
               $ref: '#/components/schemas/NotificationRequest'
-        description: "The contents of the notification to send to the owner of a subscription\
-          \ in addition to the set of template parameters which are sent automatically\
-          \ ACCOUNT_USERNAME, FIRST_NAME, LAST_NAME, ORGANIZATION_NAME, ORGANIZATION_EXTERNAL_ID"
+        description: The contents of the notification to send to the owner of a subscription
+          in addition to the set of template parameters which are sent automatically
+          ACCOUNT_USERNAME, FIRST_NAME, LAST_NAME, ORGANIZATION_NAME, ORGANIZATION_EXTERNAL_ID
         required: true
       responses:
         "202":
@@ -7640,8 +7640,8 @@ paths:
         schema:
           type: string
         style: form
-      - description: "If true, includes the account reference information in the output.\
-          \ Could slow request response time."
+      - description: If true, includes the account reference information in the output.
+          Could slow request response time.
         explode: true
         in: query
         name: fetchAccounts
@@ -7655,7 +7655,7 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/SubscriptionRoleBindingList'
-          description: "Subscription role bindings found, or none exist"
+          description: Subscription role bindings found, or none exist
         "401":
           content:
             application/json:
@@ -8011,8 +8011,8 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/Error'
-          description: "Unsupported action, non-existent resource type, or non-existent\
-            \ account"
+          description: Unsupported action, non-existent resource type, or non-existent
+            account
         "500":
           content:
             application/json:
@@ -8158,9 +8158,9 @@ paths:
     post:
       deprecated: true
       parameters:
-      - description: "If true, When returning a list of cluster_ids/cluster_uuids/subscription_ids,\
-          \ if those are already included in one of the organizations provided in\
-          \ organization_ids, do not include it in the list."
+      - description: If true, When returning a list of cluster_ids/cluster_uuids/subscription_ids,
+          if those are already included in one of the organizations provided in organization_ids,
+          do not include it in the list.
         explode: true
         in: query
         name: reduceClusterList
@@ -8214,8 +8214,8 @@ paths:
           description: Unexpected error occurred while generating access review
       security:
       - Bearer: []
-      summary: "Obtain resource ids for resources an account may perform the specified\
-        \ action upon. Resource ids returned as [\"*\"] is shorthand for all ids."
+      summary: Obtain resource ids for resources an account may perform the specified
+        action upon. Resource ids returned as ["*"] is shorthand for all ids.
   /api/authorizations/v1/self_access_review:
     post:
       requestBody:
@@ -8312,9 +8312,9 @@ paths:
   /api/authorizations/v1/self_resource_review:
     post:
       parameters:
-      - description: "If true, When returning a list of cluster_ids/cluster_uuids/subscription_ids,\
-          \ if those are already included in one of the organizations provided in\
-          \ organization_ids, do not include it in the list."
+      - description: If true, When returning a list of cluster_ids/cluster_uuids/subscription_ids,
+          if those are already included in one of the organizations provided in organization_ids,
+          do not include it in the list.
         explode: true
         in: query
         name: reduceClusterList
@@ -8368,8 +8368,8 @@ paths:
           description: Unexpected error occurred while generating access review
       security:
       - Bearer: []
-      summary: "Obtain resource ids for resources you may perform the specified action\
-        \ upon. Resource ids returned as [\"*\"] is shorthand for all ids."
+      summary: Obtain resource ids for resources you may perform the specified action
+        upon. Resource ids returned as ["*"] is shorthand for all ids.
   /api/authorizations/v1/self_terms_review:
     post:
       requestBody:
@@ -8460,8 +8460,8 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/Error'
-          description: "Unsupported action, non-existent resource type, or non-existent\
-            \ account"
+          description: Unsupported action, non-existent resource type, or non-existent
+            account
         "500":
           content:
             application/json:
@@ -8510,8 +8510,8 @@ components:
         type: string
       style: simple
     dryRun:
-      description: "If true, instructs API to avoid making any changes, but rather\
-        \ run through validations only."
+      description: If true, instructs API to avoid making any changes, but rather
+        run through validations only.
       explode: true
       in: query
       name: dryRun
@@ -8529,8 +8529,8 @@ components:
         type: string
       style: simple
     fetchAccounts:
-      description: "If true, includes the account reference information in the output.\
-        \ Could slow request response time."
+      description: If true, includes the account reference information in the output.
+        Could slow request response time.
       explode: true
       in: query
       name: fetchAccounts
@@ -8539,8 +8539,8 @@ components:
         type: boolean
       style: form
     fetchCapabilities:
-      description: "If true, includes the capabilities on a subscription in the output.\
-        \ Could slow request response time."
+      description: If true, includes the capabilities on a subscription in the output.
+        Could slow request response time.
       explode: true
       in: query
       name: fetchCapabilities
@@ -8549,8 +8549,8 @@ components:
         type: boolean
       style: form
     fetchCloudAccounts:
-      description: "If true, includes the marketplace cloud accounts in the output.\
-        \ Could slow request response time."
+      description: If true, includes the marketplace cloud accounts in the output.
+        Could slow request response time.
       explode: true
       in: query
       name: fetchCloudAccounts
@@ -8559,9 +8559,9 @@ components:
         type: boolean
       style: form
     fetchCpuAndSocket:
-      description: "If true, fetches, from the clusters service, the total numbers\
-        \ of CPU's and sockets under an obligation, and includes in the output. Could\
-        \ slow request response time."
+      description: If true, fetches, from the clusters service, the total numbers
+        of CPU's and sockets under an obligation, and includes in the output. Could
+        slow request response time.
       explode: true
       in: query
       name: fetchCpuAndSocket
@@ -8570,8 +8570,8 @@ components:
         type: boolean
       style: form
     fetchLabels:
-      description: "If true, includes the labels on a subscription/organization/account\
-        \ in the output. Could slow request response time."
+      description: If true, includes the labels on a subscription/organization/account
+        in the output. Could slow request response time.
       explode: true
       in: query
       name: fetchLabels
@@ -8580,8 +8580,8 @@ components:
         type: boolean
       style: form
     fetchRelatedResources:
-      description: "If true, includes the related resources in the output. Could slow\
-        \ request response time."
+      description: If true, includes the related resources in the output. Could slow
+        request response time.
       explode: true
       in: query
       name: fetchRelatedResources
@@ -8590,8 +8590,8 @@ components:
         type: boolean
       style: form
     fetchRhit:
-      description: "If true, includes the RHIT account_id in the output. Could slow\
-        \ request response time."
+      description: If true, includes the RHIT account_id in the output. Could slow
+        request response time.
       explode: true
       in: query
       name: fetchRhit
@@ -8617,7 +8617,7 @@ components:
         type: string
       style: form
     forceRecalc:
-      description: "If true, includes that ConsumedQuota should be recalculated."
+      description: If true, includes that ConsumedQuota should be recalculated.
       explode: true
       in: query
       name: forceRecalc
@@ -8740,7 +8740,7 @@ components:
         type: integer
       style: form
     product:
-      description: "The product for self_entitlement. The supported products are [rosa]."
+      description: The product for self_entitlement. The supported products are [rosa].
       explode: false
       in: path
       name: product
@@ -8758,9 +8758,9 @@ components:
         type: string
       style: simple
     reduceClusterList:
-      description: "If true, When returning a list of cluster_ids/cluster_uuids/subscription_ids,\
-        \ if those are already included in one of the organizations provided in organization_ids,\
-        \ do not include it in the list."
+      description: If true, When returning a list of cluster_ids/cluster_uuids/subscription_ids,
+        if those are already included in one of the organizations provided in organization_ids,
+        do not include it in the list.
       explode: true
       in: query
       name: reduceClusterList
@@ -8983,7 +8983,7 @@ components:
     AccessTokenCfg:
       example:
         auths:
-          key: ""
+          key: '{}'
       properties:
         auths:
           additionalProperties: true
@@ -9776,7 +9776,13 @@ components:
       - $ref: '#/components/schemas/Registry_allOf'
     RegistryAddress:
       additionalProperties:
-        $ref: '#/components/schemas/RegistryAddress_value'
+        properties:
+          auth:
+            type: string
+          email:
+            format: email
+            type: string
+        type: object
       type: object
     RegistryCreateRequest:
       allOf:
@@ -10581,8 +10587,7 @@ components:
           type: string
       type: object
     TokenAuthorizationResponse:
-      example:
-        account: null
+      example: {}
       properties:
         account:
           $ref: '#/components/schemas/Account'
@@ -10633,7 +10638,6 @@ components:
       required:
       - username
       type: object
-      example: null
     AccountGroup_allOf:
       properties:
         created_at:
@@ -10659,7 +10663,6 @@ components:
       - name
       - organization_id
       type: object
-      example: null
     AccountGroupAssignment_allOf:
       properties:
         account_group_id:
@@ -10676,7 +10679,6 @@ components:
       - account_group_id
       - account_id
       type: object
-      example: null
     AccountGroupAssignmentList_allOf:
       properties:
         items:
@@ -10685,7 +10687,6 @@ components:
             - $ref: '#/components/schemas/AccountGroupAssignment'
           type: array
       type: object
-      example: null
     AccountGroupList_allOf:
       properties:
         items:
@@ -10694,7 +10695,6 @@ components:
             - $ref: '#/components/schemas/AccountGroup'
           type: array
       type: object
-      example: null
     AccountGroupRequest_allOf:
       properties:
         description:
@@ -10705,7 +10705,6 @@ components:
       - description
       - name
       type: object
-      example: null
     AccountList_allOf:
       properties:
         items:
@@ -10714,7 +10713,6 @@ components:
             - $ref: '#/components/schemas/Account'
           type: array
       type: object
-      example: null
     AccountReference_allOf:
       properties:
         email:
@@ -10724,7 +10722,6 @@ components:
         username:
           type: string
       type: object
-      example: null
     Capability_allOf:
       properties:
         inherited:
@@ -10738,7 +10735,6 @@ components:
       - name
       - value
       type: object
-      example: null
     CloudResource_allOf:
       properties:
         active:
@@ -10779,7 +10775,6 @@ components:
           format: date-time
           type: string
       type: object
-      example: null
     CloudResourceList_allOf:
       properties:
         items:
@@ -10787,7 +10782,6 @@ components:
             $ref: '#/components/schemas/CloudResource'
           type: array
       type: object
-      example: null
     ClusterResource_total:
       properties:
         unit:
@@ -10826,7 +10820,6 @@ components:
           format: date-time
           type: string
       type: object
-      example: null
     ClusterTransferList_allOf:
       properties:
         items:
@@ -10835,7 +10828,6 @@ components:
             - $ref: '#/components/schemas/ClusterTransfer'
           type: array
       type: object
-      example: null
     ConsumedQuota_allOf:
       properties:
         availability_zone_type:
@@ -10862,7 +10854,6 @@ components:
       - byoc
       - count
       type: object
-      example: null
     ConsumedQuotaList_allOf:
       properties:
         items:
@@ -10870,7 +10861,6 @@ components:
             $ref: '#/components/schemas/ConsumedQuota'
           type: array
       type: object
-      example: null
     DeletedSubscription_allOf:
       properties:
         created_at:
@@ -10884,7 +10874,6 @@ components:
           format: date-time
           type: string
       type: object
-      example: null
     DeletedSubscriptionList_allOf:
       properties:
         items:
@@ -10892,7 +10881,6 @@ components:
             $ref: '#/components/schemas/DeletedSubscription'
           type: array
       type: object
-      example: null
     Error_allOf:
       properties:
         code:
@@ -10902,7 +10890,6 @@ components:
         reason:
           type: string
       type: object
-      example: null
     ErrorList_allOf:
       properties:
         items:
@@ -10910,7 +10897,6 @@ components:
             $ref: '#/components/schemas/Error'
           type: array
       type: object
-      example: null
     ExcessResource_allOf:
       properties:
         availability_zone_type:
@@ -10928,7 +10914,6 @@ components:
       required:
       - byoc
       type: object
-      example: null
     FeatureToggle_allOf:
       properties:
         enabled:
@@ -10937,7 +10922,6 @@ components:
       required:
       - enabled
       type: object
-      example: null
     FeatureToggleQueryRequest_allOf:
       properties:
         organization_id:
@@ -10945,7 +10929,6 @@ components:
       required:
       - organization_id
       type: object
-      example: null
     Label_allOf:
       properties:
         account_id:
@@ -10973,7 +10956,6 @@ components:
       - key
       - value
       type: object
-      example: null
     LabelList_allOf:
       properties:
         items:
@@ -10981,7 +10963,6 @@ components:
             $ref: '#/components/schemas/Label'
           type: array
       type: object
-      example: null
     LandingPageCTLItem_shape:
       example:
         link:
@@ -11011,7 +10992,6 @@ components:
           format: date-time
           type: string
       type: object
-      example: null
     MetricsList_allOf:
       properties:
         items:
@@ -11019,7 +10999,6 @@ components:
             $ref: '#/components/schemas/Metric'
           type: array
       type: object
-      example: null
     Organization_allOf:
       properties:
         capabilities:
@@ -11043,7 +11022,6 @@ components:
           format: date-time
           type: string
       type: object
-      example: null
     OrganizationList_allOf:
       properties:
         items:
@@ -11052,7 +11030,6 @@ components:
             - $ref: '#/components/schemas/Organization'
           type: array
       type: object
-      example: null
     Permission_allOf:
       properties:
         action:
@@ -11066,7 +11043,6 @@ components:
         resource:
           type: string
       type: object
-      example: null
     PermissionList_allOf:
       properties:
         items:
@@ -11074,7 +11050,6 @@ components:
             $ref: '#/components/schemas/Permission'
           type: array
       type: object
-      example: null
     Plan_allOf:
       properties:
         category:
@@ -11084,7 +11059,6 @@ components:
         type:
           type: string
       type: object
-      example: null
     PlanList_allOf:
       properties:
         items:
@@ -11092,7 +11066,6 @@ components:
             $ref: '#/components/schemas/Plan'
           type: array
       type: object
-      example: null
     Quota_allOf:
       properties:
         created_at:
@@ -11106,7 +11079,6 @@ components:
           format: date-time
           type: string
       type: object
-      example: null
     QuotaCost_allOf:
       properties:
         allowed:
@@ -11132,7 +11104,6 @@ components:
       - consumed
       - quota_id
       type: object
-      example: null
     QuotaCostList_allOf:
       properties:
         items:
@@ -11140,7 +11111,6 @@ components:
             $ref: '#/components/schemas/QuotaCost'
           type: array
       type: object
-      example: null
     QuotaList_allOf:
       properties:
         items:
@@ -11148,7 +11118,6 @@ components:
             $ref: '#/components/schemas/Quota'
           type: array
       type: object
-      example: null
     QuotaRules_allOf:
       properties:
         availability_zone:
@@ -11172,7 +11141,6 @@ components:
       required:
       - cost
       type: object
-      example: null
     QuotaRulesList_allOf:
       properties:
         items:
@@ -11180,7 +11148,6 @@ components:
             $ref: '#/components/schemas/QuotaRules'
           type: array
       type: object
-      example: null
     Registry_allOf:
       properties:
         cloudAlias:
@@ -11202,15 +11169,6 @@ components:
         url:
           type: string
       type: object
-      example: null
-    RegistryAddress_value:
-      properties:
-        auth:
-          type: string
-        email:
-          format: email
-          type: string
-      type: object
     RegistryCredential_allOf:
       properties:
         account:
@@ -11230,7 +11188,6 @@ components:
         username:
           type: string
       type: object
-      example: null
     RegistryCredentialList_allOf:
       properties:
         items:
@@ -11238,7 +11195,6 @@ components:
             $ref: '#/components/schemas/RegistryCredential'
           type: array
       type: object
-      example: null
     RegistryList_allOf:
       properties:
         items:
@@ -11246,7 +11202,6 @@ components:
             $ref: '#/components/schemas/Registry'
           type: array
       type: object
-      example: null
     RelatedResource_allOf:
       properties:
         availability_zone_type:
@@ -11277,7 +11232,6 @@ components:
       - resource_anme
       - resource_type
       type: object
-      example: null
     ReservedResource_allOf:
       properties:
         availability_zone_type:
@@ -11307,7 +11261,6 @@ components:
       required:
       - byoc
       type: object
-      example: null
     ReservedResourceList_allOf:
       properties:
         items:
@@ -11315,7 +11268,6 @@ components:
             $ref: '#/components/schemas/ReservedResource'
           type: array
       type: object
-      example: null
     ResourceQuota_allOf:
       properties:
         created_at:
@@ -11339,7 +11291,6 @@ components:
       required:
       - sku_count
       type: object
-      example: null
     ResourceQuotaList_allOf:
       properties:
         items:
@@ -11347,7 +11298,6 @@ components:
             $ref: '#/components/schemas/ResourceQuota'
           type: array
       type: object
-      example: null
     Role_allOf:
       properties:
         name:
@@ -11357,7 +11307,6 @@ components:
             $ref: '#/components/schemas/Permission'
           type: array
       type: object
-      example: null
     RoleBinding_allOf:
       properties:
         account:
@@ -11390,7 +11339,6 @@ components:
           format: date-time
           type: string
       type: object
-      example: null
     RoleBindingList_allOf:
       properties:
         items:
@@ -11398,7 +11346,6 @@ components:
             $ref: '#/components/schemas/RoleBinding'
           type: array
       type: object
-      example: null
     RoleList_allOf:
       properties:
         items:
@@ -11406,7 +11353,6 @@ components:
             $ref: '#/components/schemas/Role'
           type: array
       type: object
-      example: null
     SKU_allOf:
       properties:
         created_at:
@@ -11418,7 +11364,6 @@ components:
           format: date-time
           type: string
       type: object
-      example: null
     SelfServiceLandingPageSchema_configTryLearn:
       example:
         try:
@@ -11483,7 +11428,6 @@ components:
             $ref: '#/components/schemas/SKU'
           type: array
       type: object
-      example: null
     SkuRules_allOf:
       properties:
         allowed:
@@ -11493,7 +11437,6 @@ components:
         sku:
           type: string
       type: object
-      example: null
     SkuRulesList_allOf:
       properties:
         items:
@@ -11501,7 +11444,6 @@ components:
             $ref: '#/components/schemas/SkuRules'
           type: array
       type: object
-      example: null
     Subscription_allOf:
       properties:
         capabilities:
@@ -11536,12 +11478,11 @@ components:
           format: date-time
           type: string
       type: object
-      example: null
     SubscriptionCommonFields_allOf:
       properties:
         billing_expiration_date:
-          description: "If set, the date the subscription expires based on the billing\
-            \ model"
+          description: If set, the date the subscription expires based on the billing
+            model
           format: date-time
           type: string
         billing_marketplace_account:
@@ -11621,7 +11562,7 @@ components:
           - Sockets
           type: string
         trial_end_date:
-          description: "If the subscription is a trial, date the trial ends"
+          description: If the subscription is a trial, date the trial ends
           format: date-time
           type: string
         usage:
@@ -11634,7 +11575,6 @@ components:
       required:
       - managed
       type: object
-      example: null
     SubscriptionList_allOf:
       properties:
         items:
@@ -11642,13 +11582,11 @@ components:
             $ref: '#/components/schemas/Subscription'
           type: array
       type: object
-      example: null
     SubscriptionMetric_allOf:
       properties:
         _id:
           type: string
       type: object
-      example: null
     SubscriptionMetricList_allOf:
       properties:
         items:
@@ -11656,7 +11594,6 @@ components:
             $ref: '#/components/schemas/SubscriptionMetric'
           type: array
       type: object
-      example: null
     SubscriptionRoleBinding_allOf:
       properties:
         account:
@@ -11676,7 +11613,6 @@ components:
           format: date-time
           type: string
       type: object
-      example: null
     SubscriptionRoleBindingList_allOf:
       properties:
         items:
@@ -11684,7 +11620,6 @@ components:
             $ref: '#/components/schemas/SubscriptionRoleBinding'
           type: array
       type: object
-      example: null
     Summary_allOf:
       properties:
         metrics:
@@ -11696,7 +11631,6 @@ components:
       required:
       - metrics
       type: object
-      example: null
     SummaryMetrics_allOf:
       properties:
         name:
@@ -11706,7 +11640,6 @@ components:
             $ref: '#/components/schemas/SummaryVector'
           type: array
       type: object
-      example: null
     SummaryVector_allOf:
       properties:
         time:
@@ -11715,10 +11648,9 @@ components:
         value:
           type: double
       type: object
-      example: null
   securitySchemes:
     AccessToken:
-      description: "Authorization: AccessToken {cluster-uuid}:{access-token}"
+      description: 'Authorization: AccessToken {cluster-uuid}:{access-token}'
       in: header
       name: Authorization
       type: apiKey
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/api_app_services.go b/app-services-sdk-go/accountmgmt/apiv1/client/api_app_services.go
index 255ae2ac..b6bf636f 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/api_app_services.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/api_app_services.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -12,111 +12,123 @@ package accountmgmtclient
 
 import (
 	"bytes"
-	"context"
-	"io/ioutil"
-	"net/http"
-	"net/url"
+	_context "context"
+	_ioutil "io/ioutil"
+	_nethttp "net/http"
+	_neturl "net/url"
 	"strings"
 )
 
+// Linger please
+var (
+	_ _context.Context
+)
 
 type AppServicesApi interface {
 
 	/*
-	ApiAccountsMgmtV1AccessTokenPost Return access token generated from registries in docker format
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiApiAccountsMgmtV1AccessTokenPostRequest
-	*/
-	ApiAccountsMgmtV1AccessTokenPost(ctx context.Context) ApiApiAccountsMgmtV1AccessTokenPostRequest
-
-	// ApiAccountsMgmtV1AccessTokenPostExecute executes the request
-	//  @return AccessTokenCfg
-	ApiAccountsMgmtV1AccessTokenPostExecute(r ApiApiAccountsMgmtV1AccessTokenPostRequest) (*AccessTokenCfg, *http.Response, error)
+	 * ApiAccountsMgmtV1AccessTokenPost Return access token generated from registries in docker format
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiApiAccountsMgmtV1AccessTokenPostRequest
+	 */
+	ApiAccountsMgmtV1AccessTokenPost(ctx _context.Context) ApiApiAccountsMgmtV1AccessTokenPostRequest
 
 	/*
-	ApiAccountsMgmtV1CurrentAccountGet Get the authenticated account
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiApiAccountsMgmtV1CurrentAccountGetRequest
-	*/
-	ApiAccountsMgmtV1CurrentAccountGet(ctx context.Context) ApiApiAccountsMgmtV1CurrentAccountGetRequest
-
-	// ApiAccountsMgmtV1CurrentAccountGetExecute executes the request
-	//  @return Account
-	ApiAccountsMgmtV1CurrentAccountGetExecute(r ApiApiAccountsMgmtV1CurrentAccountGetRequest) (*Account, *http.Response, error)
+	 * ApiAccountsMgmtV1AccessTokenPostExecute executes the request
+	 * @return AccessTokenCfg
+	 */
+	ApiAccountsMgmtV1AccessTokenPostExecute(r ApiApiAccountsMgmtV1AccessTokenPostRequest) (AccessTokenCfg, *_nethttp.Response, error)
 
 	/*
-	ApiAccountsMgmtV1OrganizationsOrgIdQuotaCostGet Returns a summary of quota cost
+	 * ApiAccountsMgmtV1CurrentAccountGet Get the authenticated account
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiApiAccountsMgmtV1CurrentAccountGetRequest
+	 */
+	ApiAccountsMgmtV1CurrentAccountGet(ctx _context.Context) ApiApiAccountsMgmtV1CurrentAccountGetRequest
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param orgId The id of organization
-	@return ApiApiAccountsMgmtV1OrganizationsOrgIdQuotaCostGetRequest
-	*/
-	ApiAccountsMgmtV1OrganizationsOrgIdQuotaCostGet(ctx context.Context, orgId string) ApiApiAccountsMgmtV1OrganizationsOrgIdQuotaCostGetRequest
+	/*
+	 * ApiAccountsMgmtV1CurrentAccountGetExecute executes the request
+	 * @return Account
+	 */
+	ApiAccountsMgmtV1CurrentAccountGetExecute(r ApiApiAccountsMgmtV1CurrentAccountGetRequest) (Account, *_nethttp.Response, error)
 
-	// ApiAccountsMgmtV1OrganizationsOrgIdQuotaCostGetExecute executes the request
-	//  @return QuotaCostList
-	ApiAccountsMgmtV1OrganizationsOrgIdQuotaCostGetExecute(r ApiApiAccountsMgmtV1OrganizationsOrgIdQuotaCostGetRequest) (*QuotaCostList, *http.Response, error)
+	/*
+	 * ApiAccountsMgmtV1OrganizationsOrgIdQuotaCostGet Returns a summary of quota cost
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param orgId The id of organization
+	 * @return ApiApiAccountsMgmtV1OrganizationsOrgIdQuotaCostGetRequest
+	 */
+	ApiAccountsMgmtV1OrganizationsOrgIdQuotaCostGet(ctx _context.Context, orgId string) ApiApiAccountsMgmtV1OrganizationsOrgIdQuotaCostGetRequest
 
 	/*
-	ApiAuthorizationsV1SelfTermsReviewPost Review your status of Terms
+	 * ApiAccountsMgmtV1OrganizationsOrgIdQuotaCostGetExecute executes the request
+	 * @return QuotaCostList
+	 */
+	ApiAccountsMgmtV1OrganizationsOrgIdQuotaCostGetExecute(r ApiApiAccountsMgmtV1OrganizationsOrgIdQuotaCostGetRequest) (QuotaCostList, *_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiApiAuthorizationsV1SelfTermsReviewPostRequest
-	*/
-	ApiAuthorizationsV1SelfTermsReviewPost(ctx context.Context) ApiApiAuthorizationsV1SelfTermsReviewPostRequest
+	/*
+	 * ApiAuthorizationsV1SelfTermsReviewPost Review your status of Terms
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiApiAuthorizationsV1SelfTermsReviewPostRequest
+	 */
+	ApiAuthorizationsV1SelfTermsReviewPost(ctx _context.Context) ApiApiAuthorizationsV1SelfTermsReviewPostRequest
 
-	// ApiAuthorizationsV1SelfTermsReviewPostExecute executes the request
-	//  @return TermsReviewResponse
-	ApiAuthorizationsV1SelfTermsReviewPostExecute(r ApiApiAuthorizationsV1SelfTermsReviewPostRequest) (*TermsReviewResponse, *http.Response, error)
+	/*
+	 * ApiAuthorizationsV1SelfTermsReviewPostExecute executes the request
+	 * @return TermsReviewResponse
+	 */
+	ApiAuthorizationsV1SelfTermsReviewPostExecute(r ApiApiAuthorizationsV1SelfTermsReviewPostRequest) (TermsReviewResponse, *_nethttp.Response, error)
 }
 
 // AppServicesApiService AppServicesApi service
 type AppServicesApiService service
 
 type ApiApiAccountsMgmtV1AccessTokenPostRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService AppServicesApi
 }
 
-func (r ApiApiAccountsMgmtV1AccessTokenPostRequest) Execute() (*AccessTokenCfg, *http.Response, error) {
+
+func (r ApiApiAccountsMgmtV1AccessTokenPostRequest) Execute() (AccessTokenCfg, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1AccessTokenPostExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1AccessTokenPost Return access token generated from registries in docker format
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiApiAccountsMgmtV1AccessTokenPostRequest
-*/
-func (a *AppServicesApiService) ApiAccountsMgmtV1AccessTokenPost(ctx context.Context) ApiApiAccountsMgmtV1AccessTokenPostRequest {
+ * ApiAccountsMgmtV1AccessTokenPost Return access token generated from registries in docker format
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiApiAccountsMgmtV1AccessTokenPostRequest
+ */
+func (a *AppServicesApiService) ApiAccountsMgmtV1AccessTokenPost(ctx _context.Context) ApiApiAccountsMgmtV1AccessTokenPostRequest {
 	return ApiApiAccountsMgmtV1AccessTokenPostRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return AccessTokenCfg
-func (a *AppServicesApiService) ApiAccountsMgmtV1AccessTokenPostExecute(r ApiApiAccountsMgmtV1AccessTokenPostRequest) (*AccessTokenCfg, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return AccessTokenCfg
+ */
+func (a *AppServicesApiService) ApiAccountsMgmtV1AccessTokenPostExecute(r ApiApiAccountsMgmtV1AccessTokenPostRequest) (AccessTokenCfg, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *AccessTokenCfg
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  AccessTokenCfg
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "AppServicesApiService.ApiAccountsMgmtV1AccessTokenPost")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/access_token"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -135,7 +147,7 @@ func (a *AppServicesApiService) ApiAccountsMgmtV1AccessTokenPostExecute(r ApiApi
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -145,15 +157,15 @@ func (a *AppServicesApiService) ApiAccountsMgmtV1AccessTokenPostExecute(r ApiApi
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -164,8 +176,7 @@ func (a *AppServicesApiService) ApiAccountsMgmtV1AccessTokenPostExecute(r ApiApi
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -175,8 +186,7 @@ func (a *AppServicesApiService) ApiAccountsMgmtV1AccessTokenPostExecute(r ApiApi
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -186,8 +196,7 @@ func (a *AppServicesApiService) ApiAccountsMgmtV1AccessTokenPostExecute(r ApiApi
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -197,8 +206,7 @@ func (a *AppServicesApiService) ApiAccountsMgmtV1AccessTokenPostExecute(r ApiApi
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -208,15 +216,14 @@ func (a *AppServicesApiService) ApiAccountsMgmtV1AccessTokenPostExecute(r ApiApi
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -227,54 +234,56 @@ func (a *AppServicesApiService) ApiAccountsMgmtV1AccessTokenPostExecute(r ApiApi
 }
 
 type ApiApiAccountsMgmtV1CurrentAccountGetRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService AppServicesApi
 	fetchLabels *bool
 }
 
-// If true, includes the labels on a subscription/organization/account in the output. Could slow request response time.
 func (r ApiApiAccountsMgmtV1CurrentAccountGetRequest) FetchLabels(fetchLabels bool) ApiApiAccountsMgmtV1CurrentAccountGetRequest {
 	r.fetchLabels = &fetchLabels
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1CurrentAccountGetRequest) Execute() (*Account, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1CurrentAccountGetRequest) Execute() (Account, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1CurrentAccountGetExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1CurrentAccountGet Get the authenticated account
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiApiAccountsMgmtV1CurrentAccountGetRequest
-*/
-func (a *AppServicesApiService) ApiAccountsMgmtV1CurrentAccountGet(ctx context.Context) ApiApiAccountsMgmtV1CurrentAccountGetRequest {
+ * ApiAccountsMgmtV1CurrentAccountGet Get the authenticated account
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiApiAccountsMgmtV1CurrentAccountGetRequest
+ */
+func (a *AppServicesApiService) ApiAccountsMgmtV1CurrentAccountGet(ctx _context.Context) ApiApiAccountsMgmtV1CurrentAccountGetRequest {
 	return ApiApiAccountsMgmtV1CurrentAccountGetRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return Account
-func (a *AppServicesApiService) ApiAccountsMgmtV1CurrentAccountGetExecute(r ApiApiAccountsMgmtV1CurrentAccountGetRequest) (*Account, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return Account
+ */
+func (a *AppServicesApiService) ApiAccountsMgmtV1CurrentAccountGetExecute(r ApiApiAccountsMgmtV1CurrentAccountGetRequest) (Account, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *Account
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  Account
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "AppServicesApiService.ApiAccountsMgmtV1CurrentAccountGet")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/current_account"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.fetchLabels != nil {
 		localVarQueryParams.Add("fetchLabels", parameterToString(*r.fetchLabels, ""))
@@ -310,7 +319,7 @@ func (a *AppServicesApiService) ApiAccountsMgmtV1CurrentAccountGetExecute(r ApiA
 			}
 		}
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -320,15 +329,15 @@ func (a *AppServicesApiService) ApiAccountsMgmtV1CurrentAccountGetExecute(r ApiA
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -339,8 +348,7 @@ func (a *AppServicesApiService) ApiAccountsMgmtV1CurrentAccountGetExecute(r ApiA
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -350,8 +358,7 @@ func (a *AppServicesApiService) ApiAccountsMgmtV1CurrentAccountGetExecute(r ApiA
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -361,15 +368,14 @@ func (a *AppServicesApiService) ApiAccountsMgmtV1CurrentAccountGetExecute(r ApiA
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -380,7 +386,7 @@ func (a *AppServicesApiService) ApiAccountsMgmtV1CurrentAccountGetExecute(r ApiA
 }
 
 type ApiApiAccountsMgmtV1OrganizationsOrgIdQuotaCostGetRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService AppServicesApi
 	orgId string
 	search *string
@@ -389,42 +395,34 @@ type ApiApiAccountsMgmtV1OrganizationsOrgIdQuotaCostGetRequest struct {
 	fetchCloudAccounts *bool
 }
 
-// Specifies the search criteria. The syntax of this parameter is similar to the syntax of the _where_ clause of an SQL statement, using the names of the json attributes / column names of the account. For example, in order to retrieve all the accounts with a username starting with `my`:  ```sql username like 'my%' ```  The search criteria can also be applied on related resource. For example, in order to retrieve all the subscriptions labeled by `foo=bar`,  ```sql labels.key = 'foo' and labels.value = 'bar' ```  If the parameter isn't provided, or if the value is empty, then all the accounts that the user has permission to see will be returned.
 func (r ApiApiAccountsMgmtV1OrganizationsOrgIdQuotaCostGetRequest) Search(search string) ApiApiAccountsMgmtV1OrganizationsOrgIdQuotaCostGetRequest {
 	r.search = &search
 	return r
 }
-
-// If true, includes the related resources in the output. Could slow request response time.
 func (r ApiApiAccountsMgmtV1OrganizationsOrgIdQuotaCostGetRequest) FetchRelatedResources(fetchRelatedResources bool) ApiApiAccountsMgmtV1OrganizationsOrgIdQuotaCostGetRequest {
 	r.fetchRelatedResources = &fetchRelatedResources
 	return r
 }
-
-// If true, includes that ConsumedQuota should be recalculated.
 func (r ApiApiAccountsMgmtV1OrganizationsOrgIdQuotaCostGetRequest) ForceRecalc(forceRecalc bool) ApiApiAccountsMgmtV1OrganizationsOrgIdQuotaCostGetRequest {
 	r.forceRecalc = &forceRecalc
 	return r
 }
-
-// If true, includes the marketplace cloud accounts in the output. Could slow request response time.
 func (r ApiApiAccountsMgmtV1OrganizationsOrgIdQuotaCostGetRequest) FetchCloudAccounts(fetchCloudAccounts bool) ApiApiAccountsMgmtV1OrganizationsOrgIdQuotaCostGetRequest {
 	r.fetchCloudAccounts = &fetchCloudAccounts
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1OrganizationsOrgIdQuotaCostGetRequest) Execute() (*QuotaCostList, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1OrganizationsOrgIdQuotaCostGetRequest) Execute() (QuotaCostList, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1OrganizationsOrgIdQuotaCostGetExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1OrganizationsOrgIdQuotaCostGet Returns a summary of quota cost
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param orgId The id of organization
- @return ApiApiAccountsMgmtV1OrganizationsOrgIdQuotaCostGetRequest
-*/
-func (a *AppServicesApiService) ApiAccountsMgmtV1OrganizationsOrgIdQuotaCostGet(ctx context.Context, orgId string) ApiApiAccountsMgmtV1OrganizationsOrgIdQuotaCostGetRequest {
+ * ApiAccountsMgmtV1OrganizationsOrgIdQuotaCostGet Returns a summary of quota cost
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param orgId The id of organization
+ * @return ApiApiAccountsMgmtV1OrganizationsOrgIdQuotaCostGetRequest
+ */
+func (a *AppServicesApiService) ApiAccountsMgmtV1OrganizationsOrgIdQuotaCostGet(ctx _context.Context, orgId string) ApiApiAccountsMgmtV1OrganizationsOrgIdQuotaCostGetRequest {
 	return ApiApiAccountsMgmtV1OrganizationsOrgIdQuotaCostGetRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -432,27 +430,31 @@ func (a *AppServicesApiService) ApiAccountsMgmtV1OrganizationsOrgIdQuotaCostGet(
 	}
 }
 
-// Execute executes the request
-//  @return QuotaCostList
-func (a *AppServicesApiService) ApiAccountsMgmtV1OrganizationsOrgIdQuotaCostGetExecute(r ApiApiAccountsMgmtV1OrganizationsOrgIdQuotaCostGetRequest) (*QuotaCostList, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return QuotaCostList
+ */
+func (a *AppServicesApiService) ApiAccountsMgmtV1OrganizationsOrgIdQuotaCostGetExecute(r ApiApiAccountsMgmtV1OrganizationsOrgIdQuotaCostGetRequest) (QuotaCostList, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *QuotaCostList
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  QuotaCostList
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "AppServicesApiService.ApiAccountsMgmtV1OrganizationsOrgIdQuotaCostGet")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/organizations/{orgId}/quota_cost"
-	localVarPath = strings.Replace(localVarPath, "{"+"orgId"+"}", url.PathEscape(parameterToString(r.orgId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"orgId"+"}", _neturl.PathEscape(parameterToString(r.orgId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.search != nil {
 		localVarQueryParams.Add("search", parameterToString(*r.search, ""))
@@ -483,7 +485,7 @@ func (a *AppServicesApiService) ApiAccountsMgmtV1OrganizationsOrgIdQuotaCostGetE
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -493,15 +495,15 @@ func (a *AppServicesApiService) ApiAccountsMgmtV1OrganizationsOrgIdQuotaCostGetE
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -512,8 +514,7 @@ func (a *AppServicesApiService) ApiAccountsMgmtV1OrganizationsOrgIdQuotaCostGetE
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -523,15 +524,14 @@ func (a *AppServicesApiService) ApiAccountsMgmtV1OrganizationsOrgIdQuotaCostGetE
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -542,54 +542,56 @@ func (a *AppServicesApiService) ApiAccountsMgmtV1OrganizationsOrgIdQuotaCostGetE
 }
 
 type ApiApiAuthorizationsV1SelfTermsReviewPostRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService AppServicesApi
 	selfTermsReview *SelfTermsReview
 }
 
-// Data to check self terms for
 func (r ApiApiAuthorizationsV1SelfTermsReviewPostRequest) SelfTermsReview(selfTermsReview SelfTermsReview) ApiApiAuthorizationsV1SelfTermsReviewPostRequest {
 	r.selfTermsReview = &selfTermsReview
 	return r
 }
 
-func (r ApiApiAuthorizationsV1SelfTermsReviewPostRequest) Execute() (*TermsReviewResponse, *http.Response, error) {
+func (r ApiApiAuthorizationsV1SelfTermsReviewPostRequest) Execute() (TermsReviewResponse, *_nethttp.Response, error) {
 	return r.ApiService.ApiAuthorizationsV1SelfTermsReviewPostExecute(r)
 }
 
 /*
-ApiAuthorizationsV1SelfTermsReviewPost Review your status of Terms
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiApiAuthorizationsV1SelfTermsReviewPostRequest
-*/
-func (a *AppServicesApiService) ApiAuthorizationsV1SelfTermsReviewPost(ctx context.Context) ApiApiAuthorizationsV1SelfTermsReviewPostRequest {
+ * ApiAuthorizationsV1SelfTermsReviewPost Review your status of Terms
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiApiAuthorizationsV1SelfTermsReviewPostRequest
+ */
+func (a *AppServicesApiService) ApiAuthorizationsV1SelfTermsReviewPost(ctx _context.Context) ApiApiAuthorizationsV1SelfTermsReviewPostRequest {
 	return ApiApiAuthorizationsV1SelfTermsReviewPostRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return TermsReviewResponse
-func (a *AppServicesApiService) ApiAuthorizationsV1SelfTermsReviewPostExecute(r ApiApiAuthorizationsV1SelfTermsReviewPostRequest) (*TermsReviewResponse, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return TermsReviewResponse
+ */
+func (a *AppServicesApiService) ApiAuthorizationsV1SelfTermsReviewPostExecute(r ApiApiAuthorizationsV1SelfTermsReviewPostRequest) (TermsReviewResponse, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *TermsReviewResponse
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  TermsReviewResponse
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "AppServicesApiService.ApiAuthorizationsV1SelfTermsReviewPost")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/authorizations/v1/self_terms_review"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.selfTermsReview == nil {
 		return localVarReturnValue, nil, reportError("selfTermsReview is required and must be specified")
 	}
@@ -613,7 +615,7 @@ func (a *AppServicesApiService) ApiAuthorizationsV1SelfTermsReviewPostExecute(r
 	}
 	// body params
 	localVarPostBody = r.selfTermsReview
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -623,15 +625,15 @@ func (a *AppServicesApiService) ApiAuthorizationsV1SelfTermsReviewPostExecute(r
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -642,8 +644,7 @@ func (a *AppServicesApiService) ApiAuthorizationsV1SelfTermsReviewPostExecute(r
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -653,8 +654,7 @@ func (a *AppServicesApiService) ApiAuthorizationsV1SelfTermsReviewPostExecute(r
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -664,8 +664,7 @@ func (a *AppServicesApiService) ApiAuthorizationsV1SelfTermsReviewPostExecute(r
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 422 {
@@ -675,8 +674,7 @@ func (a *AppServicesApiService) ApiAuthorizationsV1SelfTermsReviewPostExecute(r
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -686,15 +684,14 @@ func (a *AppServicesApiService) ApiAuthorizationsV1SelfTermsReviewPostExecute(r
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/api_default.go b/app-services-sdk-go/accountmgmt/apiv1/client/api_default.go
index e3830846..dd6229ba 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/api_default.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/api_default.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -12,1667 +12,1787 @@ package accountmgmtclient
 
 import (
 	"bytes"
-	"context"
-	"io/ioutil"
-	"net/http"
-	"net/url"
+	_context "context"
+	_ioutil "io/ioutil"
+	_nethttp "net/http"
+	_neturl "net/url"
 	"strings"
 )
 
+// Linger please
+var (
+	_ _context.Context
+)
 
 type DefaultApi interface {
 
 	/*
-	ApiAccountsMgmtV1AccountsGet Returns a list of accounts
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiApiAccountsMgmtV1AccountsGetRequest
-	*/
-	ApiAccountsMgmtV1AccountsGet(ctx context.Context) ApiApiAccountsMgmtV1AccountsGetRequest
-
-	// ApiAccountsMgmtV1AccountsGetExecute executes the request
-	//  @return AccountList
-	ApiAccountsMgmtV1AccountsGetExecute(r ApiApiAccountsMgmtV1AccountsGetRequest) (*AccountList, *http.Response, error)
+	 * ApiAccountsMgmtV1AccountsGet Returns a list of accounts
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiApiAccountsMgmtV1AccountsGetRequest
+	 */
+	ApiAccountsMgmtV1AccountsGet(ctx _context.Context) ApiApiAccountsMgmtV1AccountsGetRequest
 
 	/*
-	ApiAccountsMgmtV1AccountsIdGet Get an account by id
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The id of record
-	@return ApiApiAccountsMgmtV1AccountsIdGetRequest
-	*/
-	ApiAccountsMgmtV1AccountsIdGet(ctx context.Context, id string) ApiApiAccountsMgmtV1AccountsIdGetRequest
-
-	// ApiAccountsMgmtV1AccountsIdGetExecute executes the request
-	//  @return Account
-	ApiAccountsMgmtV1AccountsIdGetExecute(r ApiApiAccountsMgmtV1AccountsIdGetRequest) (*Account, *http.Response, error)
+	 * ApiAccountsMgmtV1AccountsGetExecute executes the request
+	 * @return AccountList
+	 */
+	ApiAccountsMgmtV1AccountsGetExecute(r ApiApiAccountsMgmtV1AccountsGetRequest) (AccountList, *_nethttp.Response, error)
 
 	/*
-	ApiAccountsMgmtV1AccountsIdLabelsGet Returns a list of labels
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The id of record
-	@return ApiApiAccountsMgmtV1AccountsIdLabelsGetRequest
-	*/
-	ApiAccountsMgmtV1AccountsIdLabelsGet(ctx context.Context, id string) ApiApiAccountsMgmtV1AccountsIdLabelsGetRequest
-
-	// ApiAccountsMgmtV1AccountsIdLabelsGetExecute executes the request
-	//  @return LabelList
-	ApiAccountsMgmtV1AccountsIdLabelsGetExecute(r ApiApiAccountsMgmtV1AccountsIdLabelsGetRequest) (*LabelList, *http.Response, error)
+	 * ApiAccountsMgmtV1AccountsIdGet Get an account by id
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The id of record
+	 * @return ApiApiAccountsMgmtV1AccountsIdGetRequest
+	 */
+	ApiAccountsMgmtV1AccountsIdGet(ctx _context.Context, id string) ApiApiAccountsMgmtV1AccountsIdGetRequest
 
 	/*
-	ApiAccountsMgmtV1AccountsIdLabelsKeyDelete Delete a label
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The id of record
-	@param key The key of the label
-	@return ApiApiAccountsMgmtV1AccountsIdLabelsKeyDeleteRequest
-	*/
-	ApiAccountsMgmtV1AccountsIdLabelsKeyDelete(ctx context.Context, id string, key string) ApiApiAccountsMgmtV1AccountsIdLabelsKeyDeleteRequest
-
-	// ApiAccountsMgmtV1AccountsIdLabelsKeyDeleteExecute executes the request
-	ApiAccountsMgmtV1AccountsIdLabelsKeyDeleteExecute(r ApiApiAccountsMgmtV1AccountsIdLabelsKeyDeleteRequest) (*http.Response, error)
+	 * ApiAccountsMgmtV1AccountsIdGetExecute executes the request
+	 * @return Account
+	 */
+	ApiAccountsMgmtV1AccountsIdGetExecute(r ApiApiAccountsMgmtV1AccountsIdGetRequest) (Account, *_nethttp.Response, error)
 
 	/*
-	ApiAccountsMgmtV1AccountsIdLabelsKeyGet Get subscription labels by label key
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The id of record
-	@param key The key of the label
-	@return ApiApiAccountsMgmtV1AccountsIdLabelsKeyGetRequest
-	*/
-	ApiAccountsMgmtV1AccountsIdLabelsKeyGet(ctx context.Context, id string, key string) ApiApiAccountsMgmtV1AccountsIdLabelsKeyGetRequest
-
-	// ApiAccountsMgmtV1AccountsIdLabelsKeyGetExecute executes the request
-	//  @return Label
-	ApiAccountsMgmtV1AccountsIdLabelsKeyGetExecute(r ApiApiAccountsMgmtV1AccountsIdLabelsKeyGetRequest) (*Label, *http.Response, error)
+	 * ApiAccountsMgmtV1AccountsIdLabelsGet Returns a list of labels
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The id of record
+	 * @return ApiApiAccountsMgmtV1AccountsIdLabelsGetRequest
+	 */
+	ApiAccountsMgmtV1AccountsIdLabelsGet(ctx _context.Context, id string) ApiApiAccountsMgmtV1AccountsIdLabelsGetRequest
 
 	/*
-	ApiAccountsMgmtV1AccountsIdLabelsKeyPatch Create a new label or update an existing label
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The id of record
-	@param key The key of the label
-	@return ApiApiAccountsMgmtV1AccountsIdLabelsKeyPatchRequest
-	*/
-	ApiAccountsMgmtV1AccountsIdLabelsKeyPatch(ctx context.Context, id string, key string) ApiApiAccountsMgmtV1AccountsIdLabelsKeyPatchRequest
-
-	// ApiAccountsMgmtV1AccountsIdLabelsKeyPatchExecute executes the request
-	//  @return Label
-	ApiAccountsMgmtV1AccountsIdLabelsKeyPatchExecute(r ApiApiAccountsMgmtV1AccountsIdLabelsKeyPatchRequest) (*Label, *http.Response, error)
+	 * ApiAccountsMgmtV1AccountsIdLabelsGetExecute executes the request
+	 * @return LabelList
+	 */
+	ApiAccountsMgmtV1AccountsIdLabelsGetExecute(r ApiApiAccountsMgmtV1AccountsIdLabelsGetRequest) (LabelList, *_nethttp.Response, error)
 
 	/*
-	ApiAccountsMgmtV1AccountsIdLabelsPost Create a new label or update an existing label
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The id of record
-	@return ApiApiAccountsMgmtV1AccountsIdLabelsPostRequest
-	*/
-	ApiAccountsMgmtV1AccountsIdLabelsPost(ctx context.Context, id string) ApiApiAccountsMgmtV1AccountsIdLabelsPostRequest
-
-	// ApiAccountsMgmtV1AccountsIdLabelsPostExecute executes the request
-	//  @return Label
-	ApiAccountsMgmtV1AccountsIdLabelsPostExecute(r ApiApiAccountsMgmtV1AccountsIdLabelsPostRequest) (*Label, *http.Response, error)
+	 * ApiAccountsMgmtV1AccountsIdLabelsKeyDelete Delete a label
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The id of record
+	 * @param key The key of the label
+	 * @return ApiApiAccountsMgmtV1AccountsIdLabelsKeyDeleteRequest
+	 */
+	ApiAccountsMgmtV1AccountsIdLabelsKeyDelete(ctx _context.Context, id string, key string) ApiApiAccountsMgmtV1AccountsIdLabelsKeyDeleteRequest
 
 	/*
-	ApiAccountsMgmtV1AccountsIdPatch Update an account
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The id of record
-	@return ApiApiAccountsMgmtV1AccountsIdPatchRequest
-	*/
-	ApiAccountsMgmtV1AccountsIdPatch(ctx context.Context, id string) ApiApiAccountsMgmtV1AccountsIdPatchRequest
-
-	// ApiAccountsMgmtV1AccountsIdPatchExecute executes the request
-	//  @return Account
-	ApiAccountsMgmtV1AccountsIdPatchExecute(r ApiApiAccountsMgmtV1AccountsIdPatchRequest) (*Account, *http.Response, error)
+	 * ApiAccountsMgmtV1AccountsIdLabelsKeyDeleteExecute executes the request
+	 */
+	ApiAccountsMgmtV1AccountsIdLabelsKeyDeleteExecute(r ApiApiAccountsMgmtV1AccountsIdLabelsKeyDeleteRequest) (*_nethttp.Response, error)
 
 	/*
-	ApiAccountsMgmtV1AccountsPost Create a new account
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiApiAccountsMgmtV1AccountsPostRequest
-	*/
-	ApiAccountsMgmtV1AccountsPost(ctx context.Context) ApiApiAccountsMgmtV1AccountsPostRequest
-
-	// ApiAccountsMgmtV1AccountsPostExecute executes the request
-	//  @return Account
-	ApiAccountsMgmtV1AccountsPostExecute(r ApiApiAccountsMgmtV1AccountsPostRequest) (*Account, *http.Response, error)
+	 * ApiAccountsMgmtV1AccountsIdLabelsKeyGet Get subscription labels by label key
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The id of record
+	 * @param key The key of the label
+	 * @return ApiApiAccountsMgmtV1AccountsIdLabelsKeyGetRequest
+	 */
+	ApiAccountsMgmtV1AccountsIdLabelsKeyGet(ctx _context.Context, id string, key string) ApiApiAccountsMgmtV1AccountsIdLabelsKeyGetRequest
 
 	/*
-	ApiAccountsMgmtV1CertificatesPost Fetch certificates of a particular type
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiApiAccountsMgmtV1CertificatesPostRequest
-	*/
-	ApiAccountsMgmtV1CertificatesPost(ctx context.Context) ApiApiAccountsMgmtV1CertificatesPostRequest
-
-	// ApiAccountsMgmtV1CertificatesPostExecute executes the request
-	//  @return Certificate
-	ApiAccountsMgmtV1CertificatesPostExecute(r ApiApiAccountsMgmtV1CertificatesPostRequest) (*Certificate, *http.Response, error)
+	 * ApiAccountsMgmtV1AccountsIdLabelsKeyGetExecute executes the request
+	 * @return Label
+	 */
+	ApiAccountsMgmtV1AccountsIdLabelsKeyGetExecute(r ApiApiAccountsMgmtV1AccountsIdLabelsKeyGetRequest) (Label, *_nethttp.Response, error)
 
 	/*
-	ApiAccountsMgmtV1CloudResourcesGet Returns a list of cloud resources
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiApiAccountsMgmtV1CloudResourcesGetRequest
-	*/
-	ApiAccountsMgmtV1CloudResourcesGet(ctx context.Context) ApiApiAccountsMgmtV1CloudResourcesGetRequest
-
-	// ApiAccountsMgmtV1CloudResourcesGetExecute executes the request
-	//  @return CloudResourceList
-	ApiAccountsMgmtV1CloudResourcesGetExecute(r ApiApiAccountsMgmtV1CloudResourcesGetRequest) (*CloudResourceList, *http.Response, error)
+	 * ApiAccountsMgmtV1AccountsIdLabelsKeyPatch Create a new label or update an existing label
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The id of record
+	 * @param key The key of the label
+	 * @return ApiApiAccountsMgmtV1AccountsIdLabelsKeyPatchRequest
+	 */
+	ApiAccountsMgmtV1AccountsIdLabelsKeyPatch(ctx _context.Context, id string, key string) ApiApiAccountsMgmtV1AccountsIdLabelsKeyPatchRequest
 
 	/*
-	ApiAccountsMgmtV1CloudResourcesIdDelete Delete a cloud resource
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The id of record
-	@return ApiApiAccountsMgmtV1CloudResourcesIdDeleteRequest
-	*/
-	ApiAccountsMgmtV1CloudResourcesIdDelete(ctx context.Context, id string) ApiApiAccountsMgmtV1CloudResourcesIdDeleteRequest
-
-	// ApiAccountsMgmtV1CloudResourcesIdDeleteExecute executes the request
-	ApiAccountsMgmtV1CloudResourcesIdDeleteExecute(r ApiApiAccountsMgmtV1CloudResourcesIdDeleteRequest) (*http.Response, error)
+	 * ApiAccountsMgmtV1AccountsIdLabelsKeyPatchExecute executes the request
+	 * @return Label
+	 */
+	ApiAccountsMgmtV1AccountsIdLabelsKeyPatchExecute(r ApiApiAccountsMgmtV1AccountsIdLabelsKeyPatchRequest) (Label, *_nethttp.Response, error)
 
 	/*
-	ApiAccountsMgmtV1CloudResourcesIdGet Get a cloud resource
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The id of record
-	@return ApiApiAccountsMgmtV1CloudResourcesIdGetRequest
-	*/
-	ApiAccountsMgmtV1CloudResourcesIdGet(ctx context.Context, id string) ApiApiAccountsMgmtV1CloudResourcesIdGetRequest
-
-	// ApiAccountsMgmtV1CloudResourcesIdGetExecute executes the request
-	//  @return CloudResource
-	ApiAccountsMgmtV1CloudResourcesIdGetExecute(r ApiApiAccountsMgmtV1CloudResourcesIdGetRequest) (*CloudResource, *http.Response, error)
+	 * ApiAccountsMgmtV1AccountsIdLabelsPost Create a new label or update an existing label
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The id of record
+	 * @return ApiApiAccountsMgmtV1AccountsIdLabelsPostRequest
+	 */
+	ApiAccountsMgmtV1AccountsIdLabelsPost(ctx _context.Context, id string) ApiApiAccountsMgmtV1AccountsIdLabelsPostRequest
 
 	/*
-	ApiAccountsMgmtV1CloudResourcesIdPatch Update a cloud resource
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The id of record
-	@return ApiApiAccountsMgmtV1CloudResourcesIdPatchRequest
-	*/
-	ApiAccountsMgmtV1CloudResourcesIdPatch(ctx context.Context, id string) ApiApiAccountsMgmtV1CloudResourcesIdPatchRequest
-
-	// ApiAccountsMgmtV1CloudResourcesIdPatchExecute executes the request
-	//  @return CloudResource
-	ApiAccountsMgmtV1CloudResourcesIdPatchExecute(r ApiApiAccountsMgmtV1CloudResourcesIdPatchRequest) (*CloudResource, *http.Response, error)
+	 * ApiAccountsMgmtV1AccountsIdLabelsPostExecute executes the request
+	 * @return Label
+	 */
+	ApiAccountsMgmtV1AccountsIdLabelsPostExecute(r ApiApiAccountsMgmtV1AccountsIdLabelsPostRequest) (Label, *_nethttp.Response, error)
 
 	/*
-	ApiAccountsMgmtV1CloudResourcesPost Create a new cloud resource
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiApiAccountsMgmtV1CloudResourcesPostRequest
-	*/
-	ApiAccountsMgmtV1CloudResourcesPost(ctx context.Context) ApiApiAccountsMgmtV1CloudResourcesPostRequest
-
-	// ApiAccountsMgmtV1CloudResourcesPostExecute executes the request
-	//  @return CloudResource
-	ApiAccountsMgmtV1CloudResourcesPostExecute(r ApiApiAccountsMgmtV1CloudResourcesPostRequest) (*CloudResource, *http.Response, error)
+	 * ApiAccountsMgmtV1AccountsIdPatch Update an account
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The id of record
+	 * @return ApiApiAccountsMgmtV1AccountsIdPatchRequest
+	 */
+	ApiAccountsMgmtV1AccountsIdPatch(ctx _context.Context, id string) ApiApiAccountsMgmtV1AccountsIdPatchRequest
 
 	/*
-	ApiAccountsMgmtV1ClusterAuthorizationsPost Authorizes new cluster creation against an exsiting RH Subscription.
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiApiAccountsMgmtV1ClusterAuthorizationsPostRequest
-	*/
-	ApiAccountsMgmtV1ClusterAuthorizationsPost(ctx context.Context) ApiApiAccountsMgmtV1ClusterAuthorizationsPostRequest
-
-	// ApiAccountsMgmtV1ClusterAuthorizationsPostExecute executes the request
-	//  @return ClusterAuthorizationResponse
-	ApiAccountsMgmtV1ClusterAuthorizationsPostExecute(r ApiApiAccountsMgmtV1ClusterAuthorizationsPostRequest) (*ClusterAuthorizationResponse, *http.Response, error)
+	 * ApiAccountsMgmtV1AccountsIdPatchExecute executes the request
+	 * @return Account
+	 */
+	ApiAccountsMgmtV1AccountsIdPatchExecute(r ApiApiAccountsMgmtV1AccountsIdPatchRequest) (Account, *_nethttp.Response, error)
 
 	/*
-	ApiAccountsMgmtV1ClusterRegistrationsPost Finds or creates a cluster registration with a registy credential token and cluster ID
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiApiAccountsMgmtV1ClusterRegistrationsPostRequest
-	*/
-	ApiAccountsMgmtV1ClusterRegistrationsPost(ctx context.Context) ApiApiAccountsMgmtV1ClusterRegistrationsPostRequest
-
-	// ApiAccountsMgmtV1ClusterRegistrationsPostExecute executes the request
-	//  @return ClusterRegistrationResponse
-	ApiAccountsMgmtV1ClusterRegistrationsPostExecute(r ApiApiAccountsMgmtV1ClusterRegistrationsPostRequest) (*ClusterRegistrationResponse, *http.Response, error)
+	 * ApiAccountsMgmtV1AccountsPost Create a new account
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiApiAccountsMgmtV1AccountsPostRequest
+	 */
+	ApiAccountsMgmtV1AccountsPost(ctx _context.Context) ApiApiAccountsMgmtV1AccountsPostRequest
 
 	/*
-	ApiAccountsMgmtV1ClusterTransfersGet List cluster transfers - returns either an empty result set or a valid ClusterTransfer instance that is within a valid transfer window.
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiApiAccountsMgmtV1ClusterTransfersGetRequest
-	*/
-	ApiAccountsMgmtV1ClusterTransfersGet(ctx context.Context) ApiApiAccountsMgmtV1ClusterTransfersGetRequest
-
-	// ApiAccountsMgmtV1ClusterTransfersGetExecute executes the request
-	//  @return ClusterTransferList
-	ApiAccountsMgmtV1ClusterTransfersGetExecute(r ApiApiAccountsMgmtV1ClusterTransfersGetRequest) (*ClusterTransferList, *http.Response, error)
+	 * ApiAccountsMgmtV1AccountsPostExecute executes the request
+	 * @return Account
+	 */
+	ApiAccountsMgmtV1AccountsPostExecute(r ApiApiAccountsMgmtV1AccountsPostRequest) (Account, *_nethttp.Response, error)
 
 	/*
-	ApiAccountsMgmtV1ClusterTransfersIdPatch Update specific cluster transfer
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The id of record
-	@return ApiApiAccountsMgmtV1ClusterTransfersIdPatchRequest
-	*/
-	ApiAccountsMgmtV1ClusterTransfersIdPatch(ctx context.Context, id string) ApiApiAccountsMgmtV1ClusterTransfersIdPatchRequest
-
-	// ApiAccountsMgmtV1ClusterTransfersIdPatchExecute executes the request
-	//  @return ClusterTransfer
-	ApiAccountsMgmtV1ClusterTransfersIdPatchExecute(r ApiApiAccountsMgmtV1ClusterTransfersIdPatchRequest) (*ClusterTransfer, *http.Response, error)
+	 * ApiAccountsMgmtV1CertificatesPost Fetch certificates of a particular type
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiApiAccountsMgmtV1CertificatesPostRequest
+	 */
+	ApiAccountsMgmtV1CertificatesPost(ctx _context.Context) ApiApiAccountsMgmtV1CertificatesPostRequest
 
 	/*
-	ApiAccountsMgmtV1ClusterTransfersPost Initiate cluster transfer.
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiApiAccountsMgmtV1ClusterTransfersPostRequest
-	*/
-	ApiAccountsMgmtV1ClusterTransfersPost(ctx context.Context) ApiApiAccountsMgmtV1ClusterTransfersPostRequest
-
-	// ApiAccountsMgmtV1ClusterTransfersPostExecute executes the request
-	//  @return ClusterTransfer
-	ApiAccountsMgmtV1ClusterTransfersPostExecute(r ApiApiAccountsMgmtV1ClusterTransfersPostRequest) (*ClusterTransfer, *http.Response, error)
+	 * ApiAccountsMgmtV1CertificatesPostExecute executes the request
+	 * @return Certificate
+	 */
+	ApiAccountsMgmtV1CertificatesPostExecute(r ApiApiAccountsMgmtV1CertificatesPostRequest) (Certificate, *_nethttp.Response, error)
 
 	/*
-	ApiAccountsMgmtV1ConfigSkusGet Returns a list of skus
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiApiAccountsMgmtV1ConfigSkusGetRequest
-	*/
-	ApiAccountsMgmtV1ConfigSkusGet(ctx context.Context) ApiApiAccountsMgmtV1ConfigSkusGetRequest
-
-	// ApiAccountsMgmtV1ConfigSkusGetExecute executes the request
-	//  @return SkuList
-	ApiAccountsMgmtV1ConfigSkusGetExecute(r ApiApiAccountsMgmtV1ConfigSkusGetRequest) (*SkuList, *http.Response, error)
+	 * ApiAccountsMgmtV1CloudResourcesGet Returns a list of cloud resources
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiApiAccountsMgmtV1CloudResourcesGetRequest
+	 */
+	ApiAccountsMgmtV1CloudResourcesGet(ctx _context.Context) ApiApiAccountsMgmtV1CloudResourcesGetRequest
 
 	/*
-	ApiAccountsMgmtV1ConfigSkusIdDelete Delete a sku
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The id of record
-	@return ApiApiAccountsMgmtV1ConfigSkusIdDeleteRequest
-	*/
-	ApiAccountsMgmtV1ConfigSkusIdDelete(ctx context.Context, id string) ApiApiAccountsMgmtV1ConfigSkusIdDeleteRequest
-
-	// ApiAccountsMgmtV1ConfigSkusIdDeleteExecute executes the request
-	ApiAccountsMgmtV1ConfigSkusIdDeleteExecute(r ApiApiAccountsMgmtV1ConfigSkusIdDeleteRequest) (*http.Response, error)
+	 * ApiAccountsMgmtV1CloudResourcesGetExecute executes the request
+	 * @return CloudResourceList
+	 */
+	ApiAccountsMgmtV1CloudResourcesGetExecute(r ApiApiAccountsMgmtV1CloudResourcesGetRequest) (CloudResourceList, *_nethttp.Response, error)
 
 	/*
-	ApiAccountsMgmtV1ConfigSkusIdGet Get a sku
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The id of record
-	@return ApiApiAccountsMgmtV1ConfigSkusIdGetRequest
-	*/
-	ApiAccountsMgmtV1ConfigSkusIdGet(ctx context.Context, id string) ApiApiAccountsMgmtV1ConfigSkusIdGetRequest
-
-	// ApiAccountsMgmtV1ConfigSkusIdGetExecute executes the request
-	//  @return SKU
-	ApiAccountsMgmtV1ConfigSkusIdGetExecute(r ApiApiAccountsMgmtV1ConfigSkusIdGetRequest) (*SKU, *http.Response, error)
+	 * ApiAccountsMgmtV1CloudResourcesIdDelete Delete a cloud resource
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The id of record
+	 * @return ApiApiAccountsMgmtV1CloudResourcesIdDeleteRequest
+	 */
+	ApiAccountsMgmtV1CloudResourcesIdDelete(ctx _context.Context, id string) ApiApiAccountsMgmtV1CloudResourcesIdDeleteRequest
 
 	/*
-	ApiAccountsMgmtV1ConfigSkusIdPatch Update a Sku
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The id of record
-	@return ApiApiAccountsMgmtV1ConfigSkusIdPatchRequest
-	*/
-	ApiAccountsMgmtV1ConfigSkusIdPatch(ctx context.Context, id string) ApiApiAccountsMgmtV1ConfigSkusIdPatchRequest
-
-	// ApiAccountsMgmtV1ConfigSkusIdPatchExecute executes the request
-	//  @return SKU
-	ApiAccountsMgmtV1ConfigSkusIdPatchExecute(r ApiApiAccountsMgmtV1ConfigSkusIdPatchRequest) (*SKU, *http.Response, error)
+	 * ApiAccountsMgmtV1CloudResourcesIdDeleteExecute executes the request
+	 */
+	ApiAccountsMgmtV1CloudResourcesIdDeleteExecute(r ApiApiAccountsMgmtV1CloudResourcesIdDeleteRequest) (*_nethttp.Response, error)
 
 	/*
-	ApiAccountsMgmtV1ConfigSkusPost Create a new sku
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiApiAccountsMgmtV1ConfigSkusPostRequest
-	*/
-	ApiAccountsMgmtV1ConfigSkusPost(ctx context.Context) ApiApiAccountsMgmtV1ConfigSkusPostRequest
-
-	// ApiAccountsMgmtV1ConfigSkusPostExecute executes the request
-	//  @return SKU
-	ApiAccountsMgmtV1ConfigSkusPostExecute(r ApiApiAccountsMgmtV1ConfigSkusPostRequest) (*SKU, *http.Response, error)
+	 * ApiAccountsMgmtV1CloudResourcesIdGet Get a cloud resource
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The id of record
+	 * @return ApiApiAccountsMgmtV1CloudResourcesIdGetRequest
+	 */
+	ApiAccountsMgmtV1CloudResourcesIdGet(ctx _context.Context, id string) ApiApiAccountsMgmtV1CloudResourcesIdGetRequest
 
 	/*
-	ApiAccountsMgmtV1DeletedSubscriptionsGet Returns a list of deleted subscriptions
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiApiAccountsMgmtV1DeletedSubscriptionsGetRequest
-	*/
-	ApiAccountsMgmtV1DeletedSubscriptionsGet(ctx context.Context) ApiApiAccountsMgmtV1DeletedSubscriptionsGetRequest
-
-	// ApiAccountsMgmtV1DeletedSubscriptionsGetExecute executes the request
-	//  @return DeletedSubscriptionList
-	ApiAccountsMgmtV1DeletedSubscriptionsGetExecute(r ApiApiAccountsMgmtV1DeletedSubscriptionsGetRequest) (*DeletedSubscriptionList, *http.Response, error)
+	 * ApiAccountsMgmtV1CloudResourcesIdGetExecute executes the request
+	 * @return CloudResource
+	 */
+	ApiAccountsMgmtV1CloudResourcesIdGetExecute(r ApiApiAccountsMgmtV1CloudResourcesIdGetRequest) (CloudResource, *_nethttp.Response, error)
 
 	/*
-	ApiAccountsMgmtV1ErrorsGet Returns a list of errors
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiApiAccountsMgmtV1ErrorsGetRequest
-	*/
-	ApiAccountsMgmtV1ErrorsGet(ctx context.Context) ApiApiAccountsMgmtV1ErrorsGetRequest
-
-	// ApiAccountsMgmtV1ErrorsGetExecute executes the request
-	//  @return ErrorList
-	ApiAccountsMgmtV1ErrorsGetExecute(r ApiApiAccountsMgmtV1ErrorsGetRequest) (*ErrorList, *http.Response, error)
+	 * ApiAccountsMgmtV1CloudResourcesIdPatch Update a cloud resource
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The id of record
+	 * @return ApiApiAccountsMgmtV1CloudResourcesIdPatchRequest
+	 */
+	ApiAccountsMgmtV1CloudResourcesIdPatch(ctx _context.Context, id string) ApiApiAccountsMgmtV1CloudResourcesIdPatchRequest
 
 	/*
-	ApiAccountsMgmtV1ErrorsIdGet Get an error by id
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The id of record
-	@return ApiApiAccountsMgmtV1ErrorsIdGetRequest
-	*/
-	ApiAccountsMgmtV1ErrorsIdGet(ctx context.Context, id string) ApiApiAccountsMgmtV1ErrorsIdGetRequest
-
-	// ApiAccountsMgmtV1ErrorsIdGetExecute executes the request
-	//  @return Error
-	ApiAccountsMgmtV1ErrorsIdGetExecute(r ApiApiAccountsMgmtV1ErrorsIdGetRequest) (*Error, *http.Response, error)
+	 * ApiAccountsMgmtV1CloudResourcesIdPatchExecute executes the request
+	 * @return CloudResource
+	 */
+	ApiAccountsMgmtV1CloudResourcesIdPatchExecute(r ApiApiAccountsMgmtV1CloudResourcesIdPatchRequest) (CloudResource, *_nethttp.Response, error)
 
 	/*
-	ApiAccountsMgmtV1FeatureTogglesIdQueryPost Query a feature toggle by id
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The id of record
-	@return ApiApiAccountsMgmtV1FeatureTogglesIdQueryPostRequest
-
-	Deprecated
-	*/
-	ApiAccountsMgmtV1FeatureTogglesIdQueryPost(ctx context.Context, id string) ApiApiAccountsMgmtV1FeatureTogglesIdQueryPostRequest
-
-	// ApiAccountsMgmtV1FeatureTogglesIdQueryPostExecute executes the request
-	//  @return FeatureToggle
-	// Deprecated
-	ApiAccountsMgmtV1FeatureTogglesIdQueryPostExecute(r ApiApiAccountsMgmtV1FeatureTogglesIdQueryPostRequest) (*FeatureToggle, *http.Response, error)
+	 * ApiAccountsMgmtV1CloudResourcesPost Create a new cloud resource
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiApiAccountsMgmtV1CloudResourcesPostRequest
+	 */
+	ApiAccountsMgmtV1CloudResourcesPost(ctx _context.Context) ApiApiAccountsMgmtV1CloudResourcesPostRequest
 
 	/*
-	ApiAccountsMgmtV1LabelsGet Returns a list of labels
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiApiAccountsMgmtV1LabelsGetRequest
-	*/
-	ApiAccountsMgmtV1LabelsGet(ctx context.Context) ApiApiAccountsMgmtV1LabelsGetRequest
-
-	// ApiAccountsMgmtV1LabelsGetExecute executes the request
-	//  @return LabelList
-	ApiAccountsMgmtV1LabelsGetExecute(r ApiApiAccountsMgmtV1LabelsGetRequest) (*LabelList, *http.Response, error)
+	 * ApiAccountsMgmtV1CloudResourcesPostExecute executes the request
+	 * @return CloudResource
+	 */
+	ApiAccountsMgmtV1CloudResourcesPostExecute(r ApiApiAccountsMgmtV1CloudResourcesPostRequest) (CloudResource, *_nethttp.Response, error)
 
 	/*
-	ApiAccountsMgmtV1LandingPageSelfServiceGet Get a console.redhat.com landing page content JSON schema
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiApiAccountsMgmtV1LandingPageSelfServiceGetRequest
-	*/
-	ApiAccountsMgmtV1LandingPageSelfServiceGet(ctx context.Context) ApiApiAccountsMgmtV1LandingPageSelfServiceGetRequest
-
-	// ApiAccountsMgmtV1LandingPageSelfServiceGetExecute executes the request
-	//  @return SelfServiceLandingPageSchema
-	ApiAccountsMgmtV1LandingPageSelfServiceGetExecute(r ApiApiAccountsMgmtV1LandingPageSelfServiceGetRequest) (*SelfServiceLandingPageSchema, *http.Response, error)
+	 * ApiAccountsMgmtV1ClusterAuthorizationsPost Authorizes new cluster creation against an exsiting RH Subscription.
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiApiAccountsMgmtV1ClusterAuthorizationsPostRequest
+	 */
+	ApiAccountsMgmtV1ClusterAuthorizationsPost(ctx _context.Context) ApiApiAccountsMgmtV1ClusterAuthorizationsPostRequest
 
 	/*
-	ApiAccountsMgmtV1MetricsGet Returns a list of metrics
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiApiAccountsMgmtV1MetricsGetRequest
-	*/
-	ApiAccountsMgmtV1MetricsGet(ctx context.Context) ApiApiAccountsMgmtV1MetricsGetRequest
-
-	// ApiAccountsMgmtV1MetricsGetExecute executes the request
-	//  @return MetricsList
-	ApiAccountsMgmtV1MetricsGetExecute(r ApiApiAccountsMgmtV1MetricsGetRequest) (*MetricsList, *http.Response, error)
+	 * ApiAccountsMgmtV1ClusterAuthorizationsPostExecute executes the request
+	 * @return ClusterAuthorizationResponse
+	 */
+	ApiAccountsMgmtV1ClusterAuthorizationsPostExecute(r ApiApiAccountsMgmtV1ClusterAuthorizationsPostRequest) (ClusterAuthorizationResponse, *_nethttp.Response, error)
 
 	/*
-	ApiAccountsMgmtV1NotifyPost Notify the owner of cluster/subscription
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiApiAccountsMgmtV1NotifyPostRequest
-	*/
-	ApiAccountsMgmtV1NotifyPost(ctx context.Context) ApiApiAccountsMgmtV1NotifyPostRequest
-
-	// ApiAccountsMgmtV1NotifyPostExecute executes the request
-	ApiAccountsMgmtV1NotifyPostExecute(r ApiApiAccountsMgmtV1NotifyPostRequest) (*http.Response, error)
+	 * ApiAccountsMgmtV1ClusterRegistrationsPost Finds or creates a cluster registration with a registy credential token and cluster ID
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiApiAccountsMgmtV1ClusterRegistrationsPostRequest
+	 */
+	ApiAccountsMgmtV1ClusterRegistrationsPost(ctx _context.Context) ApiApiAccountsMgmtV1ClusterRegistrationsPostRequest
 
 	/*
-	ApiAccountsMgmtV1OrganizationsGet Returns a list of organizations
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiApiAccountsMgmtV1OrganizationsGetRequest
-	*/
-	ApiAccountsMgmtV1OrganizationsGet(ctx context.Context) ApiApiAccountsMgmtV1OrganizationsGetRequest
-
-	// ApiAccountsMgmtV1OrganizationsGetExecute executes the request
-	//  @return OrganizationList
-	ApiAccountsMgmtV1OrganizationsGetExecute(r ApiApiAccountsMgmtV1OrganizationsGetRequest) (*OrganizationList, *http.Response, error)
+	 * ApiAccountsMgmtV1ClusterRegistrationsPostExecute executes the request
+	 * @return ClusterRegistrationResponse
+	 */
+	ApiAccountsMgmtV1ClusterRegistrationsPostExecute(r ApiApiAccountsMgmtV1ClusterRegistrationsPostRequest) (ClusterRegistrationResponse, *_nethttp.Response, error)
 
 	/*
-	ApiAccountsMgmtV1OrganizationsIdGet Get an organization by id
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The id of record
-	@return ApiApiAccountsMgmtV1OrganizationsIdGetRequest
-	*/
-	ApiAccountsMgmtV1OrganizationsIdGet(ctx context.Context, id string) ApiApiAccountsMgmtV1OrganizationsIdGetRequest
-
-	// ApiAccountsMgmtV1OrganizationsIdGetExecute executes the request
-	//  @return Organization
-	ApiAccountsMgmtV1OrganizationsIdGetExecute(r ApiApiAccountsMgmtV1OrganizationsIdGetRequest) (*Organization, *http.Response, error)
+	 * ApiAccountsMgmtV1ClusterTransfersGet List cluster transfers - returns either an empty result set or a valid ClusterTransfer instance that is within a valid transfer window.
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiApiAccountsMgmtV1ClusterTransfersGetRequest
+	 */
+	ApiAccountsMgmtV1ClusterTransfersGet(ctx _context.Context) ApiApiAccountsMgmtV1ClusterTransfersGetRequest
 
 	/*
-	ApiAccountsMgmtV1OrganizationsIdLabelsGet Returns a list of labels
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The id of record
-	@return ApiApiAccountsMgmtV1OrganizationsIdLabelsGetRequest
-	*/
-	ApiAccountsMgmtV1OrganizationsIdLabelsGet(ctx context.Context, id string) ApiApiAccountsMgmtV1OrganizationsIdLabelsGetRequest
-
-	// ApiAccountsMgmtV1OrganizationsIdLabelsGetExecute executes the request
-	//  @return LabelList
-	ApiAccountsMgmtV1OrganizationsIdLabelsGetExecute(r ApiApiAccountsMgmtV1OrganizationsIdLabelsGetRequest) (*LabelList, *http.Response, error)
+	 * ApiAccountsMgmtV1ClusterTransfersGetExecute executes the request
+	 * @return ClusterTransferList
+	 */
+	ApiAccountsMgmtV1ClusterTransfersGetExecute(r ApiApiAccountsMgmtV1ClusterTransfersGetRequest) (ClusterTransferList, *_nethttp.Response, error)
 
 	/*
-	ApiAccountsMgmtV1OrganizationsIdLabelsKeyDelete Delete a label
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The id of record
-	@param key The key of the label
-	@return ApiApiAccountsMgmtV1OrganizationsIdLabelsKeyDeleteRequest
-	*/
-	ApiAccountsMgmtV1OrganizationsIdLabelsKeyDelete(ctx context.Context, id string, key string) ApiApiAccountsMgmtV1OrganizationsIdLabelsKeyDeleteRequest
-
-	// ApiAccountsMgmtV1OrganizationsIdLabelsKeyDeleteExecute executes the request
-	ApiAccountsMgmtV1OrganizationsIdLabelsKeyDeleteExecute(r ApiApiAccountsMgmtV1OrganizationsIdLabelsKeyDeleteRequest) (*http.Response, error)
+	 * ApiAccountsMgmtV1ClusterTransfersIdPatch Update specific cluster transfer
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The id of record
+	 * @return ApiApiAccountsMgmtV1ClusterTransfersIdPatchRequest
+	 */
+	ApiAccountsMgmtV1ClusterTransfersIdPatch(ctx _context.Context, id string) ApiApiAccountsMgmtV1ClusterTransfersIdPatchRequest
 
 	/*
-	ApiAccountsMgmtV1OrganizationsIdLabelsKeyGet Get subscription labels by label key
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The id of record
-	@param key The key of the label
-	@return ApiApiAccountsMgmtV1OrganizationsIdLabelsKeyGetRequest
-	*/
-	ApiAccountsMgmtV1OrganizationsIdLabelsKeyGet(ctx context.Context, id string, key string) ApiApiAccountsMgmtV1OrganizationsIdLabelsKeyGetRequest
-
-	// ApiAccountsMgmtV1OrganizationsIdLabelsKeyGetExecute executes the request
-	//  @return Label
-	ApiAccountsMgmtV1OrganizationsIdLabelsKeyGetExecute(r ApiApiAccountsMgmtV1OrganizationsIdLabelsKeyGetRequest) (*Label, *http.Response, error)
+	 * ApiAccountsMgmtV1ClusterTransfersIdPatchExecute executes the request
+	 * @return ClusterTransfer
+	 */
+	ApiAccountsMgmtV1ClusterTransfersIdPatchExecute(r ApiApiAccountsMgmtV1ClusterTransfersIdPatchRequest) (ClusterTransfer, *_nethttp.Response, error)
 
 	/*
-	ApiAccountsMgmtV1OrganizationsIdLabelsKeyPatch Create a new label or update an existing label
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The id of record
-	@param key The key of the label
-	@return ApiApiAccountsMgmtV1OrganizationsIdLabelsKeyPatchRequest
-	*/
-	ApiAccountsMgmtV1OrganizationsIdLabelsKeyPatch(ctx context.Context, id string, key string) ApiApiAccountsMgmtV1OrganizationsIdLabelsKeyPatchRequest
-
-	// ApiAccountsMgmtV1OrganizationsIdLabelsKeyPatchExecute executes the request
-	//  @return Label
-	ApiAccountsMgmtV1OrganizationsIdLabelsKeyPatchExecute(r ApiApiAccountsMgmtV1OrganizationsIdLabelsKeyPatchRequest) (*Label, *http.Response, error)
+	 * ApiAccountsMgmtV1ClusterTransfersPost Initiate cluster transfer.
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiApiAccountsMgmtV1ClusterTransfersPostRequest
+	 */
+	ApiAccountsMgmtV1ClusterTransfersPost(ctx _context.Context) ApiApiAccountsMgmtV1ClusterTransfersPostRequest
 
 	/*
-	ApiAccountsMgmtV1OrganizationsIdLabelsPost Create a new label or update an existing label
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The id of record
-	@return ApiApiAccountsMgmtV1OrganizationsIdLabelsPostRequest
-	*/
-	ApiAccountsMgmtV1OrganizationsIdLabelsPost(ctx context.Context, id string) ApiApiAccountsMgmtV1OrganizationsIdLabelsPostRequest
-
-	// ApiAccountsMgmtV1OrganizationsIdLabelsPostExecute executes the request
-	//  @return Label
-	ApiAccountsMgmtV1OrganizationsIdLabelsPostExecute(r ApiApiAccountsMgmtV1OrganizationsIdLabelsPostRequest) (*Label, *http.Response, error)
+	 * ApiAccountsMgmtV1ClusterTransfersPostExecute executes the request
+	 * @return ClusterTransfer
+	 */
+	ApiAccountsMgmtV1ClusterTransfersPostExecute(r ApiApiAccountsMgmtV1ClusterTransfersPostRequest) (ClusterTransfer, *_nethttp.Response, error)
 
 	/*
-	ApiAccountsMgmtV1OrganizationsIdPatch Update an organization
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The id of record
-	@return ApiApiAccountsMgmtV1OrganizationsIdPatchRequest
-	*/
-	ApiAccountsMgmtV1OrganizationsIdPatch(ctx context.Context, id string) ApiApiAccountsMgmtV1OrganizationsIdPatchRequest
-
-	// ApiAccountsMgmtV1OrganizationsIdPatchExecute executes the request
-	//  @return Organization
-	ApiAccountsMgmtV1OrganizationsIdPatchExecute(r ApiApiAccountsMgmtV1OrganizationsIdPatchRequest) (*Organization, *http.Response, error)
+	 * ApiAccountsMgmtV1ConfigSkusGet Returns a list of skus
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiApiAccountsMgmtV1ConfigSkusGetRequest
+	 */
+	ApiAccountsMgmtV1ConfigSkusGet(ctx _context.Context) ApiApiAccountsMgmtV1ConfigSkusGetRequest
 
 	/*
-	ApiAccountsMgmtV1OrganizationsIdSummaryDashboardGet Returns a summary of organizations clusters based on metrics
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The id of record
-	@return ApiApiAccountsMgmtV1OrganizationsIdSummaryDashboardGetRequest
-	*/
-	ApiAccountsMgmtV1OrganizationsIdSummaryDashboardGet(ctx context.Context, id string) ApiApiAccountsMgmtV1OrganizationsIdSummaryDashboardGetRequest
-
-	// ApiAccountsMgmtV1OrganizationsIdSummaryDashboardGetExecute executes the request
-	//  @return Summary
-	ApiAccountsMgmtV1OrganizationsIdSummaryDashboardGetExecute(r ApiApiAccountsMgmtV1OrganizationsIdSummaryDashboardGetRequest) (*Summary, *http.Response, error)
+	 * ApiAccountsMgmtV1ConfigSkusGetExecute executes the request
+	 * @return SkuList
+	 */
+	ApiAccountsMgmtV1ConfigSkusGetExecute(r ApiApiAccountsMgmtV1ConfigSkusGetRequest) (SkuList, *_nethttp.Response, error)
 
 	/*
-	ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdDelete Delete an account group assignment
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param orgId The id of organization
-	@param acctGrpAsgnId The id of account group assignment
-	@return ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdDeleteRequest
-	*/
-	ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdDelete(ctx context.Context, orgId string, acctGrpAsgnId string) ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdDeleteRequest
-
-	// ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdDeleteExecute executes the request
-	ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdDeleteExecute(r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdDeleteRequest) (*http.Response, error)
+	 * ApiAccountsMgmtV1ConfigSkusIdDelete Delete a sku
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The id of record
+	 * @return ApiApiAccountsMgmtV1ConfigSkusIdDeleteRequest
+	 */
+	ApiAccountsMgmtV1ConfigSkusIdDelete(ctx _context.Context, id string) ApiApiAccountsMgmtV1ConfigSkusIdDeleteRequest
 
 	/*
-	ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdGet Get account group assignment by id
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param orgId The id of organization
-	@param acctGrpAsgnId The id of account group assignment
-	@return ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdGetRequest
-	*/
-	ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdGet(ctx context.Context, orgId string, acctGrpAsgnId string) ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdGetRequest
-
-	// ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdGetExecute executes the request
-	//  @return AccountGroupAssignment
-	ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdGetExecute(r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdGetRequest) (*AccountGroupAssignment, *http.Response, error)
+	 * ApiAccountsMgmtV1ConfigSkusIdDeleteExecute executes the request
+	 */
+	ApiAccountsMgmtV1ConfigSkusIdDeleteExecute(r ApiApiAccountsMgmtV1ConfigSkusIdDeleteRequest) (*_nethttp.Response, error)
 
 	/*
-	ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsGet Returns a list of account group assignments for the given org
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param orgId The id of organization
-	@return ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsGetRequest
-	*/
-	ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsGet(ctx context.Context, orgId string) ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsGetRequest
-
-	// ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsGetExecute executes the request
-	//  @return AccountGroupAssignmentList
-	ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsGetExecute(r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsGetRequest) (*AccountGroupAssignmentList, *http.Response, error)
+	 * ApiAccountsMgmtV1ConfigSkusIdGet Get a sku
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The id of record
+	 * @return ApiApiAccountsMgmtV1ConfigSkusIdGetRequest
+	 */
+	ApiAccountsMgmtV1ConfigSkusIdGet(ctx _context.Context, id string) ApiApiAccountsMgmtV1ConfigSkusIdGetRequest
 
 	/*
-	ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsPost Create a new AccountGroupAssignment
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param orgId The id of organization
-	@return ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsPostRequest
-	*/
-	ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsPost(ctx context.Context, orgId string) ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsPostRequest
-
-	// ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsPostExecute executes the request
-	//  @return AccountGroupAssignment
-	ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsPostExecute(r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsPostRequest) (*AccountGroupAssignment, *http.Response, error)
+	 * ApiAccountsMgmtV1ConfigSkusIdGetExecute executes the request
+	 * @return SKU
+	 */
+	ApiAccountsMgmtV1ConfigSkusIdGetExecute(r ApiApiAccountsMgmtV1ConfigSkusIdGetRequest) (SKU, *_nethttp.Response, error)
 
 	/*
-	ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdDelete Delete an account group
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param orgId The id of organization
-	@param acctGrpId The id of account group
-	@return ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdDeleteRequest
-	*/
-	ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdDelete(ctx context.Context, orgId string, acctGrpId string) ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdDeleteRequest
-
-	// ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdDeleteExecute executes the request
-	ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdDeleteExecute(r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdDeleteRequest) (*http.Response, error)
+	 * ApiAccountsMgmtV1ConfigSkusIdPatch Update a Sku
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The id of record
+	 * @return ApiApiAccountsMgmtV1ConfigSkusIdPatchRequest
+	 */
+	ApiAccountsMgmtV1ConfigSkusIdPatch(ctx _context.Context, id string) ApiApiAccountsMgmtV1ConfigSkusIdPatchRequest
 
 	/*
-	ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdGet Get account group by id
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param orgId The id of organization
-	@param acctGrpId The id of account group
-	@return ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdGetRequest
-	*/
-	ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdGet(ctx context.Context, orgId string, acctGrpId string) ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdGetRequest
-
-	// ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdGetExecute executes the request
-	//  @return AccountGroup
-	ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdGetExecute(r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdGetRequest) (*AccountGroup, *http.Response, error)
+	 * ApiAccountsMgmtV1ConfigSkusIdPatchExecute executes the request
+	 * @return SKU
+	 */
+	ApiAccountsMgmtV1ConfigSkusIdPatchExecute(r ApiApiAccountsMgmtV1ConfigSkusIdPatchRequest) (SKU, *_nethttp.Response, error)
 
 	/*
-	ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdPatch Update an account group
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param orgId The id of organization
-	@param acctGrpId The id of account group
-	@return ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdPatchRequest
-	*/
-	ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdPatch(ctx context.Context, orgId string, acctGrpId string) ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdPatchRequest
-
-	// ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdPatchExecute executes the request
-	//  @return AccountGroup
-	ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdPatchExecute(r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdPatchRequest) (*AccountGroup, *http.Response, error)
+	 * ApiAccountsMgmtV1ConfigSkusPost Create a new sku
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiApiAccountsMgmtV1ConfigSkusPostRequest
+	 */
+	ApiAccountsMgmtV1ConfigSkusPost(ctx _context.Context) ApiApiAccountsMgmtV1ConfigSkusPostRequest
 
 	/*
-	ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsGet Returns a list of account groups for the given org
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param orgId The id of organization
-	@return ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsGetRequest
-	*/
-	ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsGet(ctx context.Context, orgId string) ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsGetRequest
-
-	// ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsGetExecute executes the request
-	//  @return AccountGroupList
-	ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsGetExecute(r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsGetRequest) (*AccountGroupList, *http.Response, error)
+	 * ApiAccountsMgmtV1ConfigSkusPostExecute executes the request
+	 * @return SKU
+	 */
+	ApiAccountsMgmtV1ConfigSkusPostExecute(r ApiApiAccountsMgmtV1ConfigSkusPostRequest) (SKU, *_nethttp.Response, error)
 
 	/*
-	ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsPost Create a new AccountGroup
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param orgId The id of organization
-	@return ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsPostRequest
-	*/
-	ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsPost(ctx context.Context, orgId string) ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsPostRequest
-
-	// ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsPostExecute executes the request
-	//  @return AccountGroup
-	ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsPostExecute(r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsPostRequest) (*AccountGroup, *http.Response, error)
+	 * ApiAccountsMgmtV1DeletedSubscriptionsGet Returns a list of deleted subscriptions
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiApiAccountsMgmtV1DeletedSubscriptionsGetRequest
+	 */
+	ApiAccountsMgmtV1DeletedSubscriptionsGet(ctx _context.Context) ApiApiAccountsMgmtV1DeletedSubscriptionsGetRequest
 
 	/*
-	ApiAccountsMgmtV1OrganizationsOrgIdConsumedQuotaGet Returns a list of consumed quota for an organization
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param orgId The id of organization
-	@return ApiApiAccountsMgmtV1OrganizationsOrgIdConsumedQuotaGetRequest
-	*/
-	ApiAccountsMgmtV1OrganizationsOrgIdConsumedQuotaGet(ctx context.Context, orgId string) ApiApiAccountsMgmtV1OrganizationsOrgIdConsumedQuotaGetRequest
-
-	// ApiAccountsMgmtV1OrganizationsOrgIdConsumedQuotaGetExecute executes the request
-	//  @return ConsumedQuotaList
-	ApiAccountsMgmtV1OrganizationsOrgIdConsumedQuotaGetExecute(r ApiApiAccountsMgmtV1OrganizationsOrgIdConsumedQuotaGetRequest) (*ConsumedQuotaList, *http.Response, error)
+	 * ApiAccountsMgmtV1DeletedSubscriptionsGetExecute executes the request
+	 * @return DeletedSubscriptionList
+	 */
+	ApiAccountsMgmtV1DeletedSubscriptionsGetExecute(r ApiApiAccountsMgmtV1DeletedSubscriptionsGetRequest) (DeletedSubscriptionList, *_nethttp.Response, error)
 
 	/*
-	ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaGet Returns a list of resource quota objects
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param orgId The id of organization
-	@return ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaGetRequest
-	*/
-	ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaGet(ctx context.Context, orgId string) ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaGetRequest
-
-	// ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaGetExecute executes the request
-	//  @return ResourceQuotaList
-	ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaGetExecute(r ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaGetRequest) (*ResourceQuotaList, *http.Response, error)
+	 * ApiAccountsMgmtV1ErrorsGet Returns a list of errors
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiApiAccountsMgmtV1ErrorsGetRequest
+	 */
+	ApiAccountsMgmtV1ErrorsGet(ctx _context.Context) ApiApiAccountsMgmtV1ErrorsGetRequest
 
 	/*
-	ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaPost Create a new resource quota
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param orgId The id of organization
-	@return ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaPostRequest
-	*/
-	ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaPost(ctx context.Context, orgId string) ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaPostRequest
-
-	// ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaPostExecute executes the request
-	//  @return ResourceQuota
-	ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaPostExecute(r ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaPostRequest) (*ResourceQuota, *http.Response, error)
+	 * ApiAccountsMgmtV1ErrorsGetExecute executes the request
+	 * @return ErrorList
+	 */
+	ApiAccountsMgmtV1ErrorsGetExecute(r ApiApiAccountsMgmtV1ErrorsGetRequest) (ErrorList, *_nethttp.Response, error)
 
 	/*
-	ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdDelete Delete a resource quota
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param orgId The id of organization
-	@param quotaId The id of quota
-	@return ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdDeleteRequest
-	*/
-	ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdDelete(ctx context.Context, orgId string, quotaId string) ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdDeleteRequest
-
-	// ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdDeleteExecute executes the request
-	ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdDeleteExecute(r ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdDeleteRequest) (*http.Response, error)
+	 * ApiAccountsMgmtV1ErrorsIdGet Get an error by id
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The id of record
+	 * @return ApiApiAccountsMgmtV1ErrorsIdGetRequest
+	 */
+	ApiAccountsMgmtV1ErrorsIdGet(ctx _context.Context, id string) ApiApiAccountsMgmtV1ErrorsIdGetRequest
 
 	/*
-	ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdGet Get a resource quota by id
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param orgId The id of organization
-	@param quotaId The id of quota
-	@return ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdGetRequest
-	*/
-	ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdGet(ctx context.Context, orgId string, quotaId string) ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdGetRequest
-
-	// ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdGetExecute executes the request
-	//  @return ResourceQuota
-	ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdGetExecute(r ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdGetRequest) (*ResourceQuota, *http.Response, error)
+	 * ApiAccountsMgmtV1ErrorsIdGetExecute executes the request
+	 * @return Error
+	 */
+	ApiAccountsMgmtV1ErrorsIdGetExecute(r ApiApiAccountsMgmtV1ErrorsIdGetRequest) (Error, *_nethttp.Response, error)
 
 	/*
-	ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdPatch Update a resource quota
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param orgId The id of organization
-	@param quotaId The id of quota
-	@return ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdPatchRequest
-	*/
-	ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdPatch(ctx context.Context, orgId string, quotaId string) ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdPatchRequest
-
-	// ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdPatchExecute executes the request
-	//  @return ResourceQuota
-	ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdPatchExecute(r ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdPatchRequest) (*ResourceQuota, *http.Response, error)
+	 * ApiAccountsMgmtV1FeatureTogglesIdQueryPost Query a feature toggle by id
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The id of record
+	 * @return ApiApiAccountsMgmtV1FeatureTogglesIdQueryPostRequest
+	 */
+	ApiAccountsMgmtV1FeatureTogglesIdQueryPost(ctx _context.Context, id string) ApiApiAccountsMgmtV1FeatureTogglesIdQueryPostRequest
 
 	/*
-	ApiAccountsMgmtV1OrganizationsPost Create a new organization
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiApiAccountsMgmtV1OrganizationsPostRequest
-	*/
-	ApiAccountsMgmtV1OrganizationsPost(ctx context.Context) ApiApiAccountsMgmtV1OrganizationsPostRequest
-
-	// ApiAccountsMgmtV1OrganizationsPostExecute executes the request
-	//  @return Organization
-	ApiAccountsMgmtV1OrganizationsPostExecute(r ApiApiAccountsMgmtV1OrganizationsPostRequest) (*Organization, *http.Response, error)
+	 * ApiAccountsMgmtV1FeatureTogglesIdQueryPostExecute executes the request
+	 * @return FeatureToggle
+	 */
+	ApiAccountsMgmtV1FeatureTogglesIdQueryPostExecute(r ApiApiAccountsMgmtV1FeatureTogglesIdQueryPostRequest) (FeatureToggle, *_nethttp.Response, error)
 
 	/*
-	ApiAccountsMgmtV1PlansGet Get all plans
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiApiAccountsMgmtV1PlansGetRequest
-	*/
-	ApiAccountsMgmtV1PlansGet(ctx context.Context) ApiApiAccountsMgmtV1PlansGetRequest
-
-	// ApiAccountsMgmtV1PlansGetExecute executes the request
-	//  @return PlanList
-	ApiAccountsMgmtV1PlansGetExecute(r ApiApiAccountsMgmtV1PlansGetRequest) (*PlanList, *http.Response, error)
+	 * ApiAccountsMgmtV1LabelsGet Returns a list of labels
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiApiAccountsMgmtV1LabelsGetRequest
+	 */
+	ApiAccountsMgmtV1LabelsGet(ctx _context.Context) ApiApiAccountsMgmtV1LabelsGetRequest
 
 	/*
-	ApiAccountsMgmtV1PlansIdGet Get a plan by id
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The id of record
-	@return ApiApiAccountsMgmtV1PlansIdGetRequest
-	*/
-	ApiAccountsMgmtV1PlansIdGet(ctx context.Context, id string) ApiApiAccountsMgmtV1PlansIdGetRequest
-
-	// ApiAccountsMgmtV1PlansIdGetExecute executes the request
-	//  @return Plan
-	ApiAccountsMgmtV1PlansIdGetExecute(r ApiApiAccountsMgmtV1PlansIdGetRequest) (*Plan, *http.Response, error)
+	 * ApiAccountsMgmtV1LabelsGetExecute executes the request
+	 * @return LabelList
+	 */
+	ApiAccountsMgmtV1LabelsGetExecute(r ApiApiAccountsMgmtV1LabelsGetRequest) (LabelList, *_nethttp.Response, error)
 
 	/*
-	ApiAccountsMgmtV1PullSecretsExternalResourceIdDelete Delete a pull secret
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param externalResourceId The external resource id of record
-	@return ApiApiAccountsMgmtV1PullSecretsExternalResourceIdDeleteRequest
-	*/
-	ApiAccountsMgmtV1PullSecretsExternalResourceIdDelete(ctx context.Context, externalResourceId string) ApiApiAccountsMgmtV1PullSecretsExternalResourceIdDeleteRequest
-
-	// ApiAccountsMgmtV1PullSecretsExternalResourceIdDeleteExecute executes the request
-	ApiAccountsMgmtV1PullSecretsExternalResourceIdDeleteExecute(r ApiApiAccountsMgmtV1PullSecretsExternalResourceIdDeleteRequest) (*http.Response, error)
+	 * ApiAccountsMgmtV1LandingPageSelfServiceGet Get a console.redhat.com landing page content JSON schema
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiApiAccountsMgmtV1LandingPageSelfServiceGetRequest
+	 */
+	ApiAccountsMgmtV1LandingPageSelfServiceGet(ctx _context.Context) ApiApiAccountsMgmtV1LandingPageSelfServiceGetRequest
 
 	/*
-	ApiAccountsMgmtV1PullSecretsPost Return access token generated from registries in docker format
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiApiAccountsMgmtV1PullSecretsPostRequest
-	*/
-	ApiAccountsMgmtV1PullSecretsPost(ctx context.Context) ApiApiAccountsMgmtV1PullSecretsPostRequest
-
-	// ApiAccountsMgmtV1PullSecretsPostExecute executes the request
-	//  @return AccessTokenCfg
-	ApiAccountsMgmtV1PullSecretsPostExecute(r ApiApiAccountsMgmtV1PullSecretsPostRequest) (*AccessTokenCfg, *http.Response, error)
+	 * ApiAccountsMgmtV1LandingPageSelfServiceGetExecute executes the request
+	 * @return SelfServiceLandingPageSchema
+	 */
+	ApiAccountsMgmtV1LandingPageSelfServiceGetExecute(r ApiApiAccountsMgmtV1LandingPageSelfServiceGetRequest) (SelfServiceLandingPageSchema, *_nethttp.Response, error)
 
 	/*
-	ApiAccountsMgmtV1QuotaCostGet Returns a summary of quota cost for the authenticated user
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiApiAccountsMgmtV1QuotaCostGetRequest
-	*/
-	ApiAccountsMgmtV1QuotaCostGet(ctx context.Context) ApiApiAccountsMgmtV1QuotaCostGetRequest
-
-	// ApiAccountsMgmtV1QuotaCostGetExecute executes the request
-	//  @return QuotaCostList
-	ApiAccountsMgmtV1QuotaCostGetExecute(r ApiApiAccountsMgmtV1QuotaCostGetRequest) (*QuotaCostList, *http.Response, error)
+	 * ApiAccountsMgmtV1MetricsGet Returns a list of metrics
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiApiAccountsMgmtV1MetricsGetRequest
+	 */
+	ApiAccountsMgmtV1MetricsGet(ctx _context.Context) ApiApiAccountsMgmtV1MetricsGetRequest
 
 	/*
-	ApiAccountsMgmtV1QuotaRulesGet Returns a list of UHC product Quota Rules
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiApiAccountsMgmtV1QuotaRulesGetRequest
-	*/
-	ApiAccountsMgmtV1QuotaRulesGet(ctx context.Context) ApiApiAccountsMgmtV1QuotaRulesGetRequest
-
-	// ApiAccountsMgmtV1QuotaRulesGetExecute executes the request
-	//  @return QuotaRulesList
-	ApiAccountsMgmtV1QuotaRulesGetExecute(r ApiApiAccountsMgmtV1QuotaRulesGetRequest) (*QuotaRulesList, *http.Response, error)
+	 * ApiAccountsMgmtV1MetricsGetExecute executes the request
+	 * @return MetricsList
+	 */
+	ApiAccountsMgmtV1MetricsGetExecute(r ApiApiAccountsMgmtV1MetricsGetRequest) (MetricsList, *_nethttp.Response, error)
 
 	/*
-	ApiAccountsMgmtV1QuotasGet Returns a list of quotas
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiApiAccountsMgmtV1QuotasGetRequest
-	*/
-	ApiAccountsMgmtV1QuotasGet(ctx context.Context) ApiApiAccountsMgmtV1QuotasGetRequest
-
-	// ApiAccountsMgmtV1QuotasGetExecute executes the request
-	//  @return QuotaList
-	ApiAccountsMgmtV1QuotasGetExecute(r ApiApiAccountsMgmtV1QuotasGetRequest) (*QuotaList, *http.Response, error)
+	 * ApiAccountsMgmtV1NotifyPost Notify the owner of cluster/subscription
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiApiAccountsMgmtV1NotifyPostRequest
+	 */
+	ApiAccountsMgmtV1NotifyPost(ctx _context.Context) ApiApiAccountsMgmtV1NotifyPostRequest
 
 	/*
-	ApiAccountsMgmtV1QuotasIdDelete Delete a quota
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The id of record
-	@return ApiApiAccountsMgmtV1QuotasIdDeleteRequest
-	*/
-	ApiAccountsMgmtV1QuotasIdDelete(ctx context.Context, id string) ApiApiAccountsMgmtV1QuotasIdDeleteRequest
-
-	// ApiAccountsMgmtV1QuotasIdDeleteExecute executes the request
-	ApiAccountsMgmtV1QuotasIdDeleteExecute(r ApiApiAccountsMgmtV1QuotasIdDeleteRequest) (*http.Response, error)
+	 * ApiAccountsMgmtV1NotifyPostExecute executes the request
+	 */
+	ApiAccountsMgmtV1NotifyPostExecute(r ApiApiAccountsMgmtV1NotifyPostRequest) (*_nethttp.Response, error)
 
 	/*
-	ApiAccountsMgmtV1QuotasIdGet Get a quota
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The id of record
-	@return ApiApiAccountsMgmtV1QuotasIdGetRequest
-	*/
-	ApiAccountsMgmtV1QuotasIdGet(ctx context.Context, id string) ApiApiAccountsMgmtV1QuotasIdGetRequest
+	 * ApiAccountsMgmtV1OrganizationsGet Returns a list of organizations
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiApiAccountsMgmtV1OrganizationsGetRequest
+	 */
+	ApiAccountsMgmtV1OrganizationsGet(ctx _context.Context) ApiApiAccountsMgmtV1OrganizationsGetRequest
 
-	// ApiAccountsMgmtV1QuotasIdGetExecute executes the request
-	//  @return Quota
-	ApiAccountsMgmtV1QuotasIdGetExecute(r ApiApiAccountsMgmtV1QuotasIdGetRequest) (*Quota, *http.Response, error)
+	/*
+	 * ApiAccountsMgmtV1OrganizationsGetExecute executes the request
+	 * @return OrganizationList
+	 */
+	ApiAccountsMgmtV1OrganizationsGetExecute(r ApiApiAccountsMgmtV1OrganizationsGetRequest) (OrganizationList, *_nethttp.Response, error)
 
 	/*
-	ApiAccountsMgmtV1QuotasIdPatch Update a quota
+	 * ApiAccountsMgmtV1OrganizationsIdGet Get an organization by id
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The id of record
+	 * @return ApiApiAccountsMgmtV1OrganizationsIdGetRequest
+	 */
+	ApiAccountsMgmtV1OrganizationsIdGet(ctx _context.Context, id string) ApiApiAccountsMgmtV1OrganizationsIdGetRequest
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The id of record
-	@return ApiApiAccountsMgmtV1QuotasIdPatchRequest
-	*/
-	ApiAccountsMgmtV1QuotasIdPatch(ctx context.Context, id string) ApiApiAccountsMgmtV1QuotasIdPatchRequest
+	/*
+	 * ApiAccountsMgmtV1OrganizationsIdGetExecute executes the request
+	 * @return Organization
+	 */
+	ApiAccountsMgmtV1OrganizationsIdGetExecute(r ApiApiAccountsMgmtV1OrganizationsIdGetRequest) (Organization, *_nethttp.Response, error)
 
-	// ApiAccountsMgmtV1QuotasIdPatchExecute executes the request
-	//  @return Quota
-	ApiAccountsMgmtV1QuotasIdPatchExecute(r ApiApiAccountsMgmtV1QuotasIdPatchRequest) (*Quota, *http.Response, error)
+	/*
+	 * ApiAccountsMgmtV1OrganizationsIdLabelsGet Returns a list of labels
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The id of record
+	 * @return ApiApiAccountsMgmtV1OrganizationsIdLabelsGetRequest
+	 */
+	ApiAccountsMgmtV1OrganizationsIdLabelsGet(ctx _context.Context, id string) ApiApiAccountsMgmtV1OrganizationsIdLabelsGetRequest
 
 	/*
-	ApiAccountsMgmtV1QuotasPost Create a new quota
+	 * ApiAccountsMgmtV1OrganizationsIdLabelsGetExecute executes the request
+	 * @return LabelList
+	 */
+	ApiAccountsMgmtV1OrganizationsIdLabelsGetExecute(r ApiApiAccountsMgmtV1OrganizationsIdLabelsGetRequest) (LabelList, *_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiApiAccountsMgmtV1QuotasPostRequest
-	*/
-	ApiAccountsMgmtV1QuotasPost(ctx context.Context) ApiApiAccountsMgmtV1QuotasPostRequest
+	/*
+	 * ApiAccountsMgmtV1OrganizationsIdLabelsKeyDelete Delete a label
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The id of record
+	 * @param key The key of the label
+	 * @return ApiApiAccountsMgmtV1OrganizationsIdLabelsKeyDeleteRequest
+	 */
+	ApiAccountsMgmtV1OrganizationsIdLabelsKeyDelete(ctx _context.Context, id string, key string) ApiApiAccountsMgmtV1OrganizationsIdLabelsKeyDeleteRequest
 
-	// ApiAccountsMgmtV1QuotasPostExecute executes the request
-	//  @return Quota
-	ApiAccountsMgmtV1QuotasPostExecute(r ApiApiAccountsMgmtV1QuotasPostRequest) (*Quota, *http.Response, error)
+	/*
+	 * ApiAccountsMgmtV1OrganizationsIdLabelsKeyDeleteExecute executes the request
+	 */
+	ApiAccountsMgmtV1OrganizationsIdLabelsKeyDeleteExecute(r ApiApiAccountsMgmtV1OrganizationsIdLabelsKeyDeleteRequest) (*_nethttp.Response, error)
 
 	/*
-	ApiAccountsMgmtV1RegistriesGet Returns a list of registries
+	 * ApiAccountsMgmtV1OrganizationsIdLabelsKeyGet Get subscription labels by label key
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The id of record
+	 * @param key The key of the label
+	 * @return ApiApiAccountsMgmtV1OrganizationsIdLabelsKeyGetRequest
+	 */
+	ApiAccountsMgmtV1OrganizationsIdLabelsKeyGet(ctx _context.Context, id string, key string) ApiApiAccountsMgmtV1OrganizationsIdLabelsKeyGetRequest
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiApiAccountsMgmtV1RegistriesGetRequest
-	*/
-	ApiAccountsMgmtV1RegistriesGet(ctx context.Context) ApiApiAccountsMgmtV1RegistriesGetRequest
+	/*
+	 * ApiAccountsMgmtV1OrganizationsIdLabelsKeyGetExecute executes the request
+	 * @return Label
+	 */
+	ApiAccountsMgmtV1OrganizationsIdLabelsKeyGetExecute(r ApiApiAccountsMgmtV1OrganizationsIdLabelsKeyGetRequest) (Label, *_nethttp.Response, error)
 
-	// ApiAccountsMgmtV1RegistriesGetExecute executes the request
-	//  @return RegistryList
-	ApiAccountsMgmtV1RegistriesGetExecute(r ApiApiAccountsMgmtV1RegistriesGetRequest) (*RegistryList, *http.Response, error)
+	/*
+	 * ApiAccountsMgmtV1OrganizationsIdLabelsKeyPatch Create a new label or update an existing label
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The id of record
+	 * @param key The key of the label
+	 * @return ApiApiAccountsMgmtV1OrganizationsIdLabelsKeyPatchRequest
+	 */
+	ApiAccountsMgmtV1OrganizationsIdLabelsKeyPatch(ctx _context.Context, id string, key string) ApiApiAccountsMgmtV1OrganizationsIdLabelsKeyPatchRequest
 
 	/*
-	ApiAccountsMgmtV1RegistriesIdGet Get an registry by id
+	 * ApiAccountsMgmtV1OrganizationsIdLabelsKeyPatchExecute executes the request
+	 * @return Label
+	 */
+	ApiAccountsMgmtV1OrganizationsIdLabelsKeyPatchExecute(r ApiApiAccountsMgmtV1OrganizationsIdLabelsKeyPatchRequest) (Label, *_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The id of record
-	@return ApiApiAccountsMgmtV1RegistriesIdGetRequest
-	*/
-	ApiAccountsMgmtV1RegistriesIdGet(ctx context.Context, id string) ApiApiAccountsMgmtV1RegistriesIdGetRequest
+	/*
+	 * ApiAccountsMgmtV1OrganizationsIdLabelsPost Create a new label or update an existing label
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The id of record
+	 * @return ApiApiAccountsMgmtV1OrganizationsIdLabelsPostRequest
+	 */
+	ApiAccountsMgmtV1OrganizationsIdLabelsPost(ctx _context.Context, id string) ApiApiAccountsMgmtV1OrganizationsIdLabelsPostRequest
 
-	// ApiAccountsMgmtV1RegistriesIdGetExecute executes the request
-	//  @return Registry
-	ApiAccountsMgmtV1RegistriesIdGetExecute(r ApiApiAccountsMgmtV1RegistriesIdGetRequest) (*Registry, *http.Response, error)
+	/*
+	 * ApiAccountsMgmtV1OrganizationsIdLabelsPostExecute executes the request
+	 * @return Label
+	 */
+	ApiAccountsMgmtV1OrganizationsIdLabelsPostExecute(r ApiApiAccountsMgmtV1OrganizationsIdLabelsPostRequest) (Label, *_nethttp.Response, error)
 
 	/*
-	ApiAccountsMgmtV1RegistryCredentialsGet Method for ApiAccountsMgmtV1RegistryCredentialsGet
+	 * ApiAccountsMgmtV1OrganizationsIdPatch Update an organization
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The id of record
+	 * @return ApiApiAccountsMgmtV1OrganizationsIdPatchRequest
+	 */
+	ApiAccountsMgmtV1OrganizationsIdPatch(ctx _context.Context, id string) ApiApiAccountsMgmtV1OrganizationsIdPatchRequest
 
-	List Registry Credentials
+	/*
+	 * ApiAccountsMgmtV1OrganizationsIdPatchExecute executes the request
+	 * @return Organization
+	 */
+	ApiAccountsMgmtV1OrganizationsIdPatchExecute(r ApiApiAccountsMgmtV1OrganizationsIdPatchRequest) (Organization, *_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiApiAccountsMgmtV1RegistryCredentialsGetRequest
-	*/
-	ApiAccountsMgmtV1RegistryCredentialsGet(ctx context.Context) ApiApiAccountsMgmtV1RegistryCredentialsGetRequest
+	/*
+	 * ApiAccountsMgmtV1OrganizationsIdSummaryDashboardGet Returns a summary of organizations clusters based on metrics
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The id of record
+	 * @return ApiApiAccountsMgmtV1OrganizationsIdSummaryDashboardGetRequest
+	 */
+	ApiAccountsMgmtV1OrganizationsIdSummaryDashboardGet(ctx _context.Context, id string) ApiApiAccountsMgmtV1OrganizationsIdSummaryDashboardGetRequest
 
-	// ApiAccountsMgmtV1RegistryCredentialsGetExecute executes the request
-	//  @return RegistryCredentialList
-	ApiAccountsMgmtV1RegistryCredentialsGetExecute(r ApiApiAccountsMgmtV1RegistryCredentialsGetRequest) (*RegistryCredentialList, *http.Response, error)
+	/*
+	 * ApiAccountsMgmtV1OrganizationsIdSummaryDashboardGetExecute executes the request
+	 * @return Summary
+	 */
+	ApiAccountsMgmtV1OrganizationsIdSummaryDashboardGetExecute(r ApiApiAccountsMgmtV1OrganizationsIdSummaryDashboardGetRequest) (Summary, *_nethttp.Response, error)
 
 	/*
-	ApiAccountsMgmtV1RegistryCredentialsIdDelete Delete a registry credential by id
+	 * ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdDelete Delete an account group assignment
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param orgId The id of organization
+	 * @param acctGrpAsgnId The id of account group assignment
+	 * @return ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdDeleteRequest
+	 */
+	ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdDelete(ctx _context.Context, orgId string, acctGrpAsgnId string) ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdDeleteRequest
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The id of record
-	@return ApiApiAccountsMgmtV1RegistryCredentialsIdDeleteRequest
-	*/
-	ApiAccountsMgmtV1RegistryCredentialsIdDelete(ctx context.Context, id string) ApiApiAccountsMgmtV1RegistryCredentialsIdDeleteRequest
+	/*
+	 * ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdDeleteExecute executes the request
+	 */
+	ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdDeleteExecute(r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdDeleteRequest) (*_nethttp.Response, error)
 
-	// ApiAccountsMgmtV1RegistryCredentialsIdDeleteExecute executes the request
-	ApiAccountsMgmtV1RegistryCredentialsIdDeleteExecute(r ApiApiAccountsMgmtV1RegistryCredentialsIdDeleteRequest) (*http.Response, error)
+	/*
+	 * ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdGet Get account group assignment by id
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param orgId The id of organization
+	 * @param acctGrpAsgnId The id of account group assignment
+	 * @return ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdGetRequest
+	 */
+	ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdGet(ctx _context.Context, orgId string, acctGrpAsgnId string) ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdGetRequest
 
 	/*
-	ApiAccountsMgmtV1RegistryCredentialsIdGet Get a registry credentials by id
+	 * ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdGetExecute executes the request
+	 * @return AccountGroupAssignment
+	 */
+	ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdGetExecute(r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdGetRequest) (AccountGroupAssignment, *_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The id of record
-	@return ApiApiAccountsMgmtV1RegistryCredentialsIdGetRequest
-	*/
-	ApiAccountsMgmtV1RegistryCredentialsIdGet(ctx context.Context, id string) ApiApiAccountsMgmtV1RegistryCredentialsIdGetRequest
+	/*
+	 * ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsGet Returns a list of account group assignments for the given org
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param orgId The id of organization
+	 * @return ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsGetRequest
+	 */
+	ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsGet(ctx _context.Context, orgId string) ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsGetRequest
 
-	// ApiAccountsMgmtV1RegistryCredentialsIdGetExecute executes the request
-	//  @return RegistryCredential
-	ApiAccountsMgmtV1RegistryCredentialsIdGetExecute(r ApiApiAccountsMgmtV1RegistryCredentialsIdGetRequest) (*RegistryCredential, *http.Response, error)
+	/*
+	 * ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsGetExecute executes the request
+	 * @return AccountGroupAssignmentList
+	 */
+	ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsGetExecute(r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsGetRequest) (AccountGroupAssignmentList, *_nethttp.Response, error)
 
 	/*
-	ApiAccountsMgmtV1RegistryCredentialsIdPatch Update a registry credential
+	 * ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsPost Create a new AccountGroupAssignment
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param orgId The id of organization
+	 * @return ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsPostRequest
+	 */
+	ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsPost(ctx _context.Context, orgId string) ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsPostRequest
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The id of record
-	@return ApiApiAccountsMgmtV1RegistryCredentialsIdPatchRequest
-	*/
-	ApiAccountsMgmtV1RegistryCredentialsIdPatch(ctx context.Context, id string) ApiApiAccountsMgmtV1RegistryCredentialsIdPatchRequest
+	/*
+	 * ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsPostExecute executes the request
+	 * @return AccountGroupAssignment
+	 */
+	ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsPostExecute(r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsPostRequest) (AccountGroupAssignment, *_nethttp.Response, error)
 
-	// ApiAccountsMgmtV1RegistryCredentialsIdPatchExecute executes the request
-	//  @return RegistryCredential
-	ApiAccountsMgmtV1RegistryCredentialsIdPatchExecute(r ApiApiAccountsMgmtV1RegistryCredentialsIdPatchRequest) (*RegistryCredential, *http.Response, error)
+	/*
+	 * ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdDelete Delete an account group
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param orgId The id of organization
+	 * @param acctGrpId The id of account group
+	 * @return ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdDeleteRequest
+	 */
+	ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdDelete(ctx _context.Context, orgId string, acctGrpId string) ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdDeleteRequest
 
 	/*
-	ApiAccountsMgmtV1RegistryCredentialsPost Request the creation of a registry credential
+	 * ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdDeleteExecute executes the request
+	 */
+	ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdDeleteExecute(r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdDeleteRequest) (*_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiApiAccountsMgmtV1RegistryCredentialsPostRequest
-	*/
-	ApiAccountsMgmtV1RegistryCredentialsPost(ctx context.Context) ApiApiAccountsMgmtV1RegistryCredentialsPostRequest
+	/*
+	 * ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdGet Get account group by id
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param orgId The id of organization
+	 * @param acctGrpId The id of account group
+	 * @return ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdGetRequest
+	 */
+	ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdGet(ctx _context.Context, orgId string, acctGrpId string) ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdGetRequest
 
-	// ApiAccountsMgmtV1RegistryCredentialsPostExecute executes the request
-	//  @return RegistryCredential
-	ApiAccountsMgmtV1RegistryCredentialsPostExecute(r ApiApiAccountsMgmtV1RegistryCredentialsPostRequest) (*RegistryCredential, *http.Response, error)
+	/*
+	 * ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdGetExecute executes the request
+	 * @return AccountGroup
+	 */
+	ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdGetExecute(r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdGetRequest) (AccountGroup, *_nethttp.Response, error)
 
 	/*
-	ApiAccountsMgmtV1ReservedResourcesGet Returns a list of reserved resources
+	 * ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdPatch Update an account group
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param orgId The id of organization
+	 * @param acctGrpId The id of account group
+	 * @return ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdPatchRequest
+	 */
+	ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdPatch(ctx _context.Context, orgId string, acctGrpId string) ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdPatchRequest
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiApiAccountsMgmtV1ReservedResourcesGetRequest
-	*/
-	ApiAccountsMgmtV1ReservedResourcesGet(ctx context.Context) ApiApiAccountsMgmtV1ReservedResourcesGetRequest
+	/*
+	 * ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdPatchExecute executes the request
+	 * @return AccountGroup
+	 */
+	ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdPatchExecute(r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdPatchRequest) (AccountGroup, *_nethttp.Response, error)
 
-	// ApiAccountsMgmtV1ReservedResourcesGetExecute executes the request
-	//  @return ReservedResourceList
-	ApiAccountsMgmtV1ReservedResourcesGetExecute(r ApiApiAccountsMgmtV1ReservedResourcesGetRequest) (*ReservedResourceList, *http.Response, error)
+	/*
+	 * ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsGet Returns a list of account groups for the given org
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param orgId The id of organization
+	 * @return ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsGetRequest
+	 */
+	ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsGet(ctx _context.Context, orgId string) ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsGetRequest
 
 	/*
-	ApiAccountsMgmtV1ResourceQuotaGet Returns a list of resource quota objects
+	 * ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsGetExecute executes the request
+	 * @return AccountGroupList
+	 */
+	ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsGetExecute(r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsGetRequest) (AccountGroupList, *_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiApiAccountsMgmtV1ResourceQuotaGetRequest
-	*/
-	ApiAccountsMgmtV1ResourceQuotaGet(ctx context.Context) ApiApiAccountsMgmtV1ResourceQuotaGetRequest
+	/*
+	 * ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsPost Create a new AccountGroup
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param orgId The id of organization
+	 * @return ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsPostRequest
+	 */
+	ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsPost(ctx _context.Context, orgId string) ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsPostRequest
 
-	// ApiAccountsMgmtV1ResourceQuotaGetExecute executes the request
-	//  @return ResourceQuotaList
-	ApiAccountsMgmtV1ResourceQuotaGetExecute(r ApiApiAccountsMgmtV1ResourceQuotaGetRequest) (*ResourceQuotaList, *http.Response, error)
+	/*
+	 * ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsPostExecute executes the request
+	 * @return AccountGroup
+	 */
+	ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsPostExecute(r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsPostRequest) (AccountGroup, *_nethttp.Response, error)
 
 	/*
-	ApiAccountsMgmtV1RoleBindingsGet Returns a list of role bindings
+	 * ApiAccountsMgmtV1OrganizationsOrgIdConsumedQuotaGet Returns a list of consumed quota for an organization
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param orgId The id of organization
+	 * @return ApiApiAccountsMgmtV1OrganizationsOrgIdConsumedQuotaGetRequest
+	 */
+	ApiAccountsMgmtV1OrganizationsOrgIdConsumedQuotaGet(ctx _context.Context, orgId string) ApiApiAccountsMgmtV1OrganizationsOrgIdConsumedQuotaGetRequest
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiApiAccountsMgmtV1RoleBindingsGetRequest
-	*/
-	ApiAccountsMgmtV1RoleBindingsGet(ctx context.Context) ApiApiAccountsMgmtV1RoleBindingsGetRequest
+	/*
+	 * ApiAccountsMgmtV1OrganizationsOrgIdConsumedQuotaGetExecute executes the request
+	 * @return ConsumedQuotaList
+	 */
+	ApiAccountsMgmtV1OrganizationsOrgIdConsumedQuotaGetExecute(r ApiApiAccountsMgmtV1OrganizationsOrgIdConsumedQuotaGetRequest) (ConsumedQuotaList, *_nethttp.Response, error)
 
-	// ApiAccountsMgmtV1RoleBindingsGetExecute executes the request
-	//  @return RoleBindingList
-	ApiAccountsMgmtV1RoleBindingsGetExecute(r ApiApiAccountsMgmtV1RoleBindingsGetRequest) (*RoleBindingList, *http.Response, error)
+	/*
+	 * ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaGet Returns a list of resource quota objects
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param orgId The id of organization
+	 * @return ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaGetRequest
+	 */
+	ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaGet(ctx _context.Context, orgId string) ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaGetRequest
 
 	/*
-	ApiAccountsMgmtV1RoleBindingsIdDelete Delete a role binding
+	 * ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaGetExecute executes the request
+	 * @return ResourceQuotaList
+	 */
+	ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaGetExecute(r ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaGetRequest) (ResourceQuotaList, *_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The id of record
-	@return ApiApiAccountsMgmtV1RoleBindingsIdDeleteRequest
-	*/
-	ApiAccountsMgmtV1RoleBindingsIdDelete(ctx context.Context, id string) ApiApiAccountsMgmtV1RoleBindingsIdDeleteRequest
+	/*
+	 * ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaPost Create a new resource quota
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param orgId The id of organization
+	 * @return ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaPostRequest
+	 */
+	ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaPost(ctx _context.Context, orgId string) ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaPostRequest
 
-	// ApiAccountsMgmtV1RoleBindingsIdDeleteExecute executes the request
-	ApiAccountsMgmtV1RoleBindingsIdDeleteExecute(r ApiApiAccountsMgmtV1RoleBindingsIdDeleteRequest) (*http.Response, error)
+	/*
+	 * ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaPostExecute executes the request
+	 * @return ResourceQuota
+	 */
+	ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaPostExecute(r ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaPostRequest) (ResourceQuota, *_nethttp.Response, error)
 
 	/*
-	ApiAccountsMgmtV1RoleBindingsIdGet Get a role binding
+	 * ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdDelete Delete a resource quota
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param orgId The id of organization
+	 * @param quotaId The id of quota
+	 * @return ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdDeleteRequest
+	 */
+	ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdDelete(ctx _context.Context, orgId string, quotaId string) ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdDeleteRequest
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The id of record
-	@return ApiApiAccountsMgmtV1RoleBindingsIdGetRequest
-	*/
-	ApiAccountsMgmtV1RoleBindingsIdGet(ctx context.Context, id string) ApiApiAccountsMgmtV1RoleBindingsIdGetRequest
+	/*
+	 * ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdDeleteExecute executes the request
+	 */
+	ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdDeleteExecute(r ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdDeleteRequest) (*_nethttp.Response, error)
 
-	// ApiAccountsMgmtV1RoleBindingsIdGetExecute executes the request
-	//  @return RoleBinding
-	ApiAccountsMgmtV1RoleBindingsIdGetExecute(r ApiApiAccountsMgmtV1RoleBindingsIdGetRequest) (*RoleBinding, *http.Response, error)
+	/*
+	 * ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdGet Get a resource quota by id
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param orgId The id of organization
+	 * @param quotaId The id of quota
+	 * @return ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdGetRequest
+	 */
+	ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdGet(ctx _context.Context, orgId string, quotaId string) ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdGetRequest
 
 	/*
-	ApiAccountsMgmtV1RoleBindingsIdPatch Update a role binding
+	 * ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdGetExecute executes the request
+	 * @return ResourceQuota
+	 */
+	ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdGetExecute(r ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdGetRequest) (ResourceQuota, *_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The id of record
-	@return ApiApiAccountsMgmtV1RoleBindingsIdPatchRequest
-	*/
-	ApiAccountsMgmtV1RoleBindingsIdPatch(ctx context.Context, id string) ApiApiAccountsMgmtV1RoleBindingsIdPatchRequest
+	/*
+	 * ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdPatch Update a resource quota
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param orgId The id of organization
+	 * @param quotaId The id of quota
+	 * @return ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdPatchRequest
+	 */
+	ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdPatch(ctx _context.Context, orgId string, quotaId string) ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdPatchRequest
 
-	// ApiAccountsMgmtV1RoleBindingsIdPatchExecute executes the request
-	//  @return RoleBinding
-	ApiAccountsMgmtV1RoleBindingsIdPatchExecute(r ApiApiAccountsMgmtV1RoleBindingsIdPatchRequest) (*RoleBinding, *http.Response, error)
+	/*
+	 * ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdPatchExecute executes the request
+	 * @return ResourceQuota
+	 */
+	ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdPatchExecute(r ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdPatchRequest) (ResourceQuota, *_nethttp.Response, error)
 
 	/*
-	ApiAccountsMgmtV1RoleBindingsPost Create a new role binding
+	 * ApiAccountsMgmtV1OrganizationsPost Create a new organization
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiApiAccountsMgmtV1OrganizationsPostRequest
+	 */
+	ApiAccountsMgmtV1OrganizationsPost(ctx _context.Context) ApiApiAccountsMgmtV1OrganizationsPostRequest
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiApiAccountsMgmtV1RoleBindingsPostRequest
-	*/
-	ApiAccountsMgmtV1RoleBindingsPost(ctx context.Context) ApiApiAccountsMgmtV1RoleBindingsPostRequest
+	/*
+	 * ApiAccountsMgmtV1OrganizationsPostExecute executes the request
+	 * @return Organization
+	 */
+	ApiAccountsMgmtV1OrganizationsPostExecute(r ApiApiAccountsMgmtV1OrganizationsPostRequest) (Organization, *_nethttp.Response, error)
 
-	// ApiAccountsMgmtV1RoleBindingsPostExecute executes the request
-	//  @return RoleBinding
-	ApiAccountsMgmtV1RoleBindingsPostExecute(r ApiApiAccountsMgmtV1RoleBindingsPostRequest) (*RoleBinding, *http.Response, error)
+	/*
+	 * ApiAccountsMgmtV1PlansGet Get all plans
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiApiAccountsMgmtV1PlansGetRequest
+	 */
+	ApiAccountsMgmtV1PlansGet(ctx _context.Context) ApiApiAccountsMgmtV1PlansGetRequest
 
 	/*
-	ApiAccountsMgmtV1RolesGet Returns a list of roles
+	 * ApiAccountsMgmtV1PlansGetExecute executes the request
+	 * @return PlanList
+	 */
+	ApiAccountsMgmtV1PlansGetExecute(r ApiApiAccountsMgmtV1PlansGetRequest) (PlanList, *_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiApiAccountsMgmtV1RolesGetRequest
-	*/
-	ApiAccountsMgmtV1RolesGet(ctx context.Context) ApiApiAccountsMgmtV1RolesGetRequest
+	/*
+	 * ApiAccountsMgmtV1PlansIdGet Get a plan by id
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The id of record
+	 * @return ApiApiAccountsMgmtV1PlansIdGetRequest
+	 */
+	ApiAccountsMgmtV1PlansIdGet(ctx _context.Context, id string) ApiApiAccountsMgmtV1PlansIdGetRequest
 
-	// ApiAccountsMgmtV1RolesGetExecute executes the request
-	//  @return RoleList
-	ApiAccountsMgmtV1RolesGetExecute(r ApiApiAccountsMgmtV1RolesGetRequest) (*RoleList, *http.Response, error)
+	/*
+	 * ApiAccountsMgmtV1PlansIdGetExecute executes the request
+	 * @return Plan
+	 */
+	ApiAccountsMgmtV1PlansIdGetExecute(r ApiApiAccountsMgmtV1PlansIdGetRequest) (Plan, *_nethttp.Response, error)
 
 	/*
-	ApiAccountsMgmtV1RolesIdGet Get a role by id
+	 * ApiAccountsMgmtV1PullSecretsExternalResourceIdDelete Delete a pull secret
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param externalResourceId The external resource id of record
+	 * @return ApiApiAccountsMgmtV1PullSecretsExternalResourceIdDeleteRequest
+	 */
+	ApiAccountsMgmtV1PullSecretsExternalResourceIdDelete(ctx _context.Context, externalResourceId string) ApiApiAccountsMgmtV1PullSecretsExternalResourceIdDeleteRequest
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The id of record
-	@return ApiApiAccountsMgmtV1RolesIdGetRequest
-	*/
-	ApiAccountsMgmtV1RolesIdGet(ctx context.Context, id string) ApiApiAccountsMgmtV1RolesIdGetRequest
+	/*
+	 * ApiAccountsMgmtV1PullSecretsExternalResourceIdDeleteExecute executes the request
+	 */
+	ApiAccountsMgmtV1PullSecretsExternalResourceIdDeleteExecute(r ApiApiAccountsMgmtV1PullSecretsExternalResourceIdDeleteRequest) (*_nethttp.Response, error)
 
-	// ApiAccountsMgmtV1RolesIdGetExecute executes the request
-	//  @return Role
-	ApiAccountsMgmtV1RolesIdGetExecute(r ApiApiAccountsMgmtV1RolesIdGetRequest) (*Role, *http.Response, error)
+	/*
+	 * ApiAccountsMgmtV1PullSecretsPost Return access token generated from registries in docker format
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiApiAccountsMgmtV1PullSecretsPostRequest
+	 */
+	ApiAccountsMgmtV1PullSecretsPost(ctx _context.Context) ApiApiAccountsMgmtV1PullSecretsPostRequest
 
 	/*
-	ApiAccountsMgmtV1SelfEntitlementProductPost Create or renew the entitlement to support a product for the user's organization.
+	 * ApiAccountsMgmtV1PullSecretsPostExecute executes the request
+	 * @return AccessTokenCfg
+	 */
+	ApiAccountsMgmtV1PullSecretsPostExecute(r ApiApiAccountsMgmtV1PullSecretsPostRequest) (AccessTokenCfg, *_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param product The product for self_entitlement. The supported products are [rosa].
-	@return ApiApiAccountsMgmtV1SelfEntitlementProductPostRequest
-	*/
-	ApiAccountsMgmtV1SelfEntitlementProductPost(ctx context.Context, product string) ApiApiAccountsMgmtV1SelfEntitlementProductPostRequest
+	/*
+	 * ApiAccountsMgmtV1QuotaCostGet Returns a summary of quota cost for the authenticated user
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiApiAccountsMgmtV1QuotaCostGetRequest
+	 */
+	ApiAccountsMgmtV1QuotaCostGet(ctx _context.Context) ApiApiAccountsMgmtV1QuotaCostGetRequest
 
-	// ApiAccountsMgmtV1SelfEntitlementProductPostExecute executes the request
-	//  @return SelfEntitlementStatus
-	ApiAccountsMgmtV1SelfEntitlementProductPostExecute(r ApiApiAccountsMgmtV1SelfEntitlementProductPostRequest) (*SelfEntitlementStatus, *http.Response, error)
+	/*
+	 * ApiAccountsMgmtV1QuotaCostGetExecute executes the request
+	 * @return QuotaCostList
+	 */
+	ApiAccountsMgmtV1QuotaCostGetExecute(r ApiApiAccountsMgmtV1QuotaCostGetRequest) (QuotaCostList, *_nethttp.Response, error)
 
 	/*
-	ApiAccountsMgmtV1SkuRulesGet Returns a list of UHC product SKU Rules
+	 * ApiAccountsMgmtV1QuotaRulesGet Returns a list of UHC product Quota Rules
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiApiAccountsMgmtV1QuotaRulesGetRequest
+	 */
+	ApiAccountsMgmtV1QuotaRulesGet(ctx _context.Context) ApiApiAccountsMgmtV1QuotaRulesGetRequest
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiApiAccountsMgmtV1SkuRulesGetRequest
-	*/
-	ApiAccountsMgmtV1SkuRulesGet(ctx context.Context) ApiApiAccountsMgmtV1SkuRulesGetRequest
+	/*
+	 * ApiAccountsMgmtV1QuotaRulesGetExecute executes the request
+	 * @return QuotaRulesList
+	 */
+	ApiAccountsMgmtV1QuotaRulesGetExecute(r ApiApiAccountsMgmtV1QuotaRulesGetRequest) (QuotaRulesList, *_nethttp.Response, error)
 
-	// ApiAccountsMgmtV1SkuRulesGetExecute executes the request
-	//  @return SkuRulesList
-	ApiAccountsMgmtV1SkuRulesGetExecute(r ApiApiAccountsMgmtV1SkuRulesGetRequest) (*SkuRulesList, *http.Response, error)
+	/*
+	 * ApiAccountsMgmtV1QuotasGet Returns a list of quotas
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiApiAccountsMgmtV1QuotasGetRequest
+	 */
+	ApiAccountsMgmtV1QuotasGet(ctx _context.Context) ApiApiAccountsMgmtV1QuotasGetRequest
 
 	/*
-	ApiAccountsMgmtV1SkuRulesIdDelete Delete a sku rule
+	 * ApiAccountsMgmtV1QuotasGetExecute executes the request
+	 * @return QuotaList
+	 */
+	ApiAccountsMgmtV1QuotasGetExecute(r ApiApiAccountsMgmtV1QuotasGetRequest) (QuotaList, *_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The id of record
-	@return ApiApiAccountsMgmtV1SkuRulesIdDeleteRequest
-	*/
-	ApiAccountsMgmtV1SkuRulesIdDelete(ctx context.Context, id string) ApiApiAccountsMgmtV1SkuRulesIdDeleteRequest
+	/*
+	 * ApiAccountsMgmtV1QuotasIdDelete Delete a quota
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The id of record
+	 * @return ApiApiAccountsMgmtV1QuotasIdDeleteRequest
+	 */
+	ApiAccountsMgmtV1QuotasIdDelete(ctx _context.Context, id string) ApiApiAccountsMgmtV1QuotasIdDeleteRequest
 
-	// ApiAccountsMgmtV1SkuRulesIdDeleteExecute executes the request
-	ApiAccountsMgmtV1SkuRulesIdDeleteExecute(r ApiApiAccountsMgmtV1SkuRulesIdDeleteRequest) (*http.Response, error)
+	/*
+	 * ApiAccountsMgmtV1QuotasIdDeleteExecute executes the request
+	 */
+	ApiAccountsMgmtV1QuotasIdDeleteExecute(r ApiApiAccountsMgmtV1QuotasIdDeleteRequest) (*_nethttp.Response, error)
 
 	/*
-	ApiAccountsMgmtV1SkuRulesIdGet Get a sku rules by id
+	 * ApiAccountsMgmtV1QuotasIdGet Get a quota
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The id of record
+	 * @return ApiApiAccountsMgmtV1QuotasIdGetRequest
+	 */
+	ApiAccountsMgmtV1QuotasIdGet(ctx _context.Context, id string) ApiApiAccountsMgmtV1QuotasIdGetRequest
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The id of record
-	@return ApiApiAccountsMgmtV1SkuRulesIdGetRequest
-	*/
-	ApiAccountsMgmtV1SkuRulesIdGet(ctx context.Context, id string) ApiApiAccountsMgmtV1SkuRulesIdGetRequest
+	/*
+	 * ApiAccountsMgmtV1QuotasIdGetExecute executes the request
+	 * @return Quota
+	 */
+	ApiAccountsMgmtV1QuotasIdGetExecute(r ApiApiAccountsMgmtV1QuotasIdGetRequest) (Quota, *_nethttp.Response, error)
 
-	// ApiAccountsMgmtV1SkuRulesIdGetExecute executes the request
-	//  @return SkuRules
-	ApiAccountsMgmtV1SkuRulesIdGetExecute(r ApiApiAccountsMgmtV1SkuRulesIdGetRequest) (*SkuRules, *http.Response, error)
+	/*
+	 * ApiAccountsMgmtV1QuotasIdPatch Update a quota
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The id of record
+	 * @return ApiApiAccountsMgmtV1QuotasIdPatchRequest
+	 */
+	ApiAccountsMgmtV1QuotasIdPatch(ctx _context.Context, id string) ApiApiAccountsMgmtV1QuotasIdPatchRequest
 
 	/*
-	ApiAccountsMgmtV1SkuRulesIdPatch Update a sku rule
+	 * ApiAccountsMgmtV1QuotasIdPatchExecute executes the request
+	 * @return Quota
+	 */
+	ApiAccountsMgmtV1QuotasIdPatchExecute(r ApiApiAccountsMgmtV1QuotasIdPatchRequest) (Quota, *_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The id of record
-	@return ApiApiAccountsMgmtV1SkuRulesIdPatchRequest
-	*/
-	ApiAccountsMgmtV1SkuRulesIdPatch(ctx context.Context, id string) ApiApiAccountsMgmtV1SkuRulesIdPatchRequest
+	/*
+	 * ApiAccountsMgmtV1QuotasPost Create a new quota
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiApiAccountsMgmtV1QuotasPostRequest
+	 */
+	ApiAccountsMgmtV1QuotasPost(ctx _context.Context) ApiApiAccountsMgmtV1QuotasPostRequest
 
-	// ApiAccountsMgmtV1SkuRulesIdPatchExecute executes the request
-	//  @return SkuRules
-	ApiAccountsMgmtV1SkuRulesIdPatchExecute(r ApiApiAccountsMgmtV1SkuRulesIdPatchRequest) (*SkuRules, *http.Response, error)
+	/*
+	 * ApiAccountsMgmtV1QuotasPostExecute executes the request
+	 * @return Quota
+	 */
+	ApiAccountsMgmtV1QuotasPostExecute(r ApiApiAccountsMgmtV1QuotasPostRequest) (Quota, *_nethttp.Response, error)
 
 	/*
-	ApiAccountsMgmtV1SkuRulesPost Create a new sku rule
+	 * ApiAccountsMgmtV1RegistriesGet Returns a list of registries
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiApiAccountsMgmtV1RegistriesGetRequest
+	 */
+	ApiAccountsMgmtV1RegistriesGet(ctx _context.Context) ApiApiAccountsMgmtV1RegistriesGetRequest
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiApiAccountsMgmtV1SkuRulesPostRequest
-	*/
-	ApiAccountsMgmtV1SkuRulesPost(ctx context.Context) ApiApiAccountsMgmtV1SkuRulesPostRequest
+	/*
+	 * ApiAccountsMgmtV1RegistriesGetExecute executes the request
+	 * @return RegistryList
+	 */
+	ApiAccountsMgmtV1RegistriesGetExecute(r ApiApiAccountsMgmtV1RegistriesGetRequest) (RegistryList, *_nethttp.Response, error)
 
-	// ApiAccountsMgmtV1SkuRulesPostExecute executes the request
-	//  @return SkuRules
-	ApiAccountsMgmtV1SkuRulesPostExecute(r ApiApiAccountsMgmtV1SkuRulesPostRequest) (*SkuRules, *http.Response, error)
+	/*
+	 * ApiAccountsMgmtV1RegistriesIdGet Get an registry by id
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The id of record
+	 * @return ApiApiAccountsMgmtV1RegistriesIdGetRequest
+	 */
+	ApiAccountsMgmtV1RegistriesIdGet(ctx _context.Context, id string) ApiApiAccountsMgmtV1RegistriesIdGetRequest
 
 	/*
-	ApiAccountsMgmtV1SkusGet Returns a list of UHC product SKUs
+	 * ApiAccountsMgmtV1RegistriesIdGetExecute executes the request
+	 * @return Registry
+	 */
+	ApiAccountsMgmtV1RegistriesIdGetExecute(r ApiApiAccountsMgmtV1RegistriesIdGetRequest) (Registry, *_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiApiAccountsMgmtV1SkusGetRequest
+	/*
+	 * ApiAccountsMgmtV1RegistryCredentialsGet Method for ApiAccountsMgmtV1RegistryCredentialsGet
+	 * List Registry Credentials
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiApiAccountsMgmtV1RegistryCredentialsGetRequest
+	 */
+	ApiAccountsMgmtV1RegistryCredentialsGet(ctx _context.Context) ApiApiAccountsMgmtV1RegistryCredentialsGetRequest
 
-	Deprecated
-	*/
-	ApiAccountsMgmtV1SkusGet(ctx context.Context) ApiApiAccountsMgmtV1SkusGetRequest
+	/*
+	 * ApiAccountsMgmtV1RegistryCredentialsGetExecute executes the request
+	 * @return RegistryCredentialList
+	 */
+	ApiAccountsMgmtV1RegistryCredentialsGetExecute(r ApiApiAccountsMgmtV1RegistryCredentialsGetRequest) (RegistryCredentialList, *_nethttp.Response, error)
 
-	// ApiAccountsMgmtV1SkusGetExecute executes the request
-	//  @return SkuList
-	// Deprecated
-	ApiAccountsMgmtV1SkusGetExecute(r ApiApiAccountsMgmtV1SkusGetRequest) (*SkuList, *http.Response, error)
+	/*
+	 * ApiAccountsMgmtV1RegistryCredentialsIdDelete Delete a registry credential by id
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The id of record
+	 * @return ApiApiAccountsMgmtV1RegistryCredentialsIdDeleteRequest
+	 */
+	ApiAccountsMgmtV1RegistryCredentialsIdDelete(ctx _context.Context, id string) ApiApiAccountsMgmtV1RegistryCredentialsIdDeleteRequest
 
 	/*
-	ApiAccountsMgmtV1SkusIdGet Get a sku by id
+	 * ApiAccountsMgmtV1RegistryCredentialsIdDeleteExecute executes the request
+	 */
+	ApiAccountsMgmtV1RegistryCredentialsIdDeleteExecute(r ApiApiAccountsMgmtV1RegistryCredentialsIdDeleteRequest) (*_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The id of record
-	@return ApiApiAccountsMgmtV1SkusIdGetRequest
+	/*
+	 * ApiAccountsMgmtV1RegistryCredentialsIdGet Get a registry credentials by id
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The id of record
+	 * @return ApiApiAccountsMgmtV1RegistryCredentialsIdGetRequest
+	 */
+	ApiAccountsMgmtV1RegistryCredentialsIdGet(ctx _context.Context, id string) ApiApiAccountsMgmtV1RegistryCredentialsIdGetRequest
 
-	Deprecated
-	*/
-	ApiAccountsMgmtV1SkusIdGet(ctx context.Context, id string) ApiApiAccountsMgmtV1SkusIdGetRequest
+	/*
+	 * ApiAccountsMgmtV1RegistryCredentialsIdGetExecute executes the request
+	 * @return RegistryCredential
+	 */
+	ApiAccountsMgmtV1RegistryCredentialsIdGetExecute(r ApiApiAccountsMgmtV1RegistryCredentialsIdGetRequest) (RegistryCredential, *_nethttp.Response, error)
 
-	// ApiAccountsMgmtV1SkusIdGetExecute executes the request
-	//  @return SKU
-	// Deprecated
-	ApiAccountsMgmtV1SkusIdGetExecute(r ApiApiAccountsMgmtV1SkusIdGetRequest) (*SKU, *http.Response, error)
+	/*
+	 * ApiAccountsMgmtV1RegistryCredentialsIdPatch Update a registry credential
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The id of record
+	 * @return ApiApiAccountsMgmtV1RegistryCredentialsIdPatchRequest
+	 */
+	ApiAccountsMgmtV1RegistryCredentialsIdPatch(ctx _context.Context, id string) ApiApiAccountsMgmtV1RegistryCredentialsIdPatchRequest
 
 	/*
-	ApiAccountsMgmtV1SubscriptionsGet Returns a list of subscriptions
+	 * ApiAccountsMgmtV1RegistryCredentialsIdPatchExecute executes the request
+	 * @return RegistryCredential
+	 */
+	ApiAccountsMgmtV1RegistryCredentialsIdPatchExecute(r ApiApiAccountsMgmtV1RegistryCredentialsIdPatchRequest) (RegistryCredential, *_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiApiAccountsMgmtV1SubscriptionsGetRequest
-	*/
-	ApiAccountsMgmtV1SubscriptionsGet(ctx context.Context) ApiApiAccountsMgmtV1SubscriptionsGetRequest
+	/*
+	 * ApiAccountsMgmtV1RegistryCredentialsPost Request the creation of a registry credential
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiApiAccountsMgmtV1RegistryCredentialsPostRequest
+	 */
+	ApiAccountsMgmtV1RegistryCredentialsPost(ctx _context.Context) ApiApiAccountsMgmtV1RegistryCredentialsPostRequest
 
-	// ApiAccountsMgmtV1SubscriptionsGetExecute executes the request
-	//  @return SubscriptionList
-	ApiAccountsMgmtV1SubscriptionsGetExecute(r ApiApiAccountsMgmtV1SubscriptionsGetRequest) (*SubscriptionList, *http.Response, error)
+	/*
+	 * ApiAccountsMgmtV1RegistryCredentialsPostExecute executes the request
+	 * @return RegistryCredential
+	 */
+	ApiAccountsMgmtV1RegistryCredentialsPostExecute(r ApiApiAccountsMgmtV1RegistryCredentialsPostRequest) (RegistryCredential, *_nethttp.Response, error)
 
 	/*
-	ApiAccountsMgmtV1SubscriptionsIdDelete Deletes a subscription by id
+	 * ApiAccountsMgmtV1ReservedResourcesGet Returns a list of reserved resources
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiApiAccountsMgmtV1ReservedResourcesGetRequest
+	 */
+	ApiAccountsMgmtV1ReservedResourcesGet(ctx _context.Context) ApiApiAccountsMgmtV1ReservedResourcesGetRequest
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The id of record
-	@return ApiApiAccountsMgmtV1SubscriptionsIdDeleteRequest
-	*/
-	ApiAccountsMgmtV1SubscriptionsIdDelete(ctx context.Context, id string) ApiApiAccountsMgmtV1SubscriptionsIdDeleteRequest
+	/*
+	 * ApiAccountsMgmtV1ReservedResourcesGetExecute executes the request
+	 * @return ReservedResourceList
+	 */
+	ApiAccountsMgmtV1ReservedResourcesGetExecute(r ApiApiAccountsMgmtV1ReservedResourcesGetRequest) (ReservedResourceList, *_nethttp.Response, error)
 
-	// ApiAccountsMgmtV1SubscriptionsIdDeleteExecute executes the request
-	ApiAccountsMgmtV1SubscriptionsIdDeleteExecute(r ApiApiAccountsMgmtV1SubscriptionsIdDeleteRequest) (*http.Response, error)
+	/*
+	 * ApiAccountsMgmtV1ResourceQuotaGet Returns a list of resource quota objects
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiApiAccountsMgmtV1ResourceQuotaGetRequest
+	 */
+	ApiAccountsMgmtV1ResourceQuotaGet(ctx _context.Context) ApiApiAccountsMgmtV1ResourceQuotaGetRequest
 
 	/*
-	ApiAccountsMgmtV1SubscriptionsIdGet Get a subscription by id
+	 * ApiAccountsMgmtV1ResourceQuotaGetExecute executes the request
+	 * @return ResourceQuotaList
+	 */
+	ApiAccountsMgmtV1ResourceQuotaGetExecute(r ApiApiAccountsMgmtV1ResourceQuotaGetRequest) (ResourceQuotaList, *_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The id of record
-	@return ApiApiAccountsMgmtV1SubscriptionsIdGetRequest
-	*/
-	ApiAccountsMgmtV1SubscriptionsIdGet(ctx context.Context, id string) ApiApiAccountsMgmtV1SubscriptionsIdGetRequest
+	/*
+	 * ApiAccountsMgmtV1RoleBindingsGet Returns a list of role bindings
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiApiAccountsMgmtV1RoleBindingsGetRequest
+	 */
+	ApiAccountsMgmtV1RoleBindingsGet(ctx _context.Context) ApiApiAccountsMgmtV1RoleBindingsGetRequest
 
-	// ApiAccountsMgmtV1SubscriptionsIdGetExecute executes the request
-	//  @return Subscription
-	ApiAccountsMgmtV1SubscriptionsIdGetExecute(r ApiApiAccountsMgmtV1SubscriptionsIdGetRequest) (*Subscription, *http.Response, error)
+	/*
+	 * ApiAccountsMgmtV1RoleBindingsGetExecute executes the request
+	 * @return RoleBindingList
+	 */
+	ApiAccountsMgmtV1RoleBindingsGetExecute(r ApiApiAccountsMgmtV1RoleBindingsGetRequest) (RoleBindingList, *_nethttp.Response, error)
 
 	/*
-	ApiAccountsMgmtV1SubscriptionsIdLabelsGet Returns a list of labels
+	 * ApiAccountsMgmtV1RoleBindingsIdDelete Delete a role binding
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The id of record
+	 * @return ApiApiAccountsMgmtV1RoleBindingsIdDeleteRequest
+	 */
+	ApiAccountsMgmtV1RoleBindingsIdDelete(ctx _context.Context, id string) ApiApiAccountsMgmtV1RoleBindingsIdDeleteRequest
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The id of record
-	@return ApiApiAccountsMgmtV1SubscriptionsIdLabelsGetRequest
-	*/
-	ApiAccountsMgmtV1SubscriptionsIdLabelsGet(ctx context.Context, id string) ApiApiAccountsMgmtV1SubscriptionsIdLabelsGetRequest
+	/*
+	 * ApiAccountsMgmtV1RoleBindingsIdDeleteExecute executes the request
+	 */
+	ApiAccountsMgmtV1RoleBindingsIdDeleteExecute(r ApiApiAccountsMgmtV1RoleBindingsIdDeleteRequest) (*_nethttp.Response, error)
 
-	// ApiAccountsMgmtV1SubscriptionsIdLabelsGetExecute executes the request
-	//  @return LabelList
-	ApiAccountsMgmtV1SubscriptionsIdLabelsGetExecute(r ApiApiAccountsMgmtV1SubscriptionsIdLabelsGetRequest) (*LabelList, *http.Response, error)
+	/*
+	 * ApiAccountsMgmtV1RoleBindingsIdGet Get a role binding
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The id of record
+	 * @return ApiApiAccountsMgmtV1RoleBindingsIdGetRequest
+	 */
+	ApiAccountsMgmtV1RoleBindingsIdGet(ctx _context.Context, id string) ApiApiAccountsMgmtV1RoleBindingsIdGetRequest
 
 	/*
-	ApiAccountsMgmtV1SubscriptionsIdLabelsKeyDelete Delete a label
+	 * ApiAccountsMgmtV1RoleBindingsIdGetExecute executes the request
+	 * @return RoleBinding
+	 */
+	ApiAccountsMgmtV1RoleBindingsIdGetExecute(r ApiApiAccountsMgmtV1RoleBindingsIdGetRequest) (RoleBinding, *_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The id of record
-	@param key The key of the label
-	@return ApiApiAccountsMgmtV1SubscriptionsIdLabelsKeyDeleteRequest
-	*/
-	ApiAccountsMgmtV1SubscriptionsIdLabelsKeyDelete(ctx context.Context, id string, key string) ApiApiAccountsMgmtV1SubscriptionsIdLabelsKeyDeleteRequest
+	/*
+	 * ApiAccountsMgmtV1RoleBindingsIdPatch Update a role binding
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The id of record
+	 * @return ApiApiAccountsMgmtV1RoleBindingsIdPatchRequest
+	 */
+	ApiAccountsMgmtV1RoleBindingsIdPatch(ctx _context.Context, id string) ApiApiAccountsMgmtV1RoleBindingsIdPatchRequest
 
-	// ApiAccountsMgmtV1SubscriptionsIdLabelsKeyDeleteExecute executes the request
-	ApiAccountsMgmtV1SubscriptionsIdLabelsKeyDeleteExecute(r ApiApiAccountsMgmtV1SubscriptionsIdLabelsKeyDeleteRequest) (*http.Response, error)
+	/*
+	 * ApiAccountsMgmtV1RoleBindingsIdPatchExecute executes the request
+	 * @return RoleBinding
+	 */
+	ApiAccountsMgmtV1RoleBindingsIdPatchExecute(r ApiApiAccountsMgmtV1RoleBindingsIdPatchRequest) (RoleBinding, *_nethttp.Response, error)
 
 	/*
-	ApiAccountsMgmtV1SubscriptionsIdLabelsKeyGet Get subscription labels by label key
+	 * ApiAccountsMgmtV1RoleBindingsPost Create a new role binding
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiApiAccountsMgmtV1RoleBindingsPostRequest
+	 */
+	ApiAccountsMgmtV1RoleBindingsPost(ctx _context.Context) ApiApiAccountsMgmtV1RoleBindingsPostRequest
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The id of record
-	@param key The key of the label
-	@return ApiApiAccountsMgmtV1SubscriptionsIdLabelsKeyGetRequest
-	*/
-	ApiAccountsMgmtV1SubscriptionsIdLabelsKeyGet(ctx context.Context, id string, key string) ApiApiAccountsMgmtV1SubscriptionsIdLabelsKeyGetRequest
+	/*
+	 * ApiAccountsMgmtV1RoleBindingsPostExecute executes the request
+	 * @return RoleBinding
+	 */
+	ApiAccountsMgmtV1RoleBindingsPostExecute(r ApiApiAccountsMgmtV1RoleBindingsPostRequest) (RoleBinding, *_nethttp.Response, error)
 
-	// ApiAccountsMgmtV1SubscriptionsIdLabelsKeyGetExecute executes the request
-	//  @return Label
-	ApiAccountsMgmtV1SubscriptionsIdLabelsKeyGetExecute(r ApiApiAccountsMgmtV1SubscriptionsIdLabelsKeyGetRequest) (*Label, *http.Response, error)
+	/*
+	 * ApiAccountsMgmtV1RolesGet Returns a list of roles
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiApiAccountsMgmtV1RolesGetRequest
+	 */
+	ApiAccountsMgmtV1RolesGet(ctx _context.Context) ApiApiAccountsMgmtV1RolesGetRequest
 
 	/*
-	ApiAccountsMgmtV1SubscriptionsIdLabelsKeyPatch Create a new label or update an existing label
+	 * ApiAccountsMgmtV1RolesGetExecute executes the request
+	 * @return RoleList
+	 */
+	ApiAccountsMgmtV1RolesGetExecute(r ApiApiAccountsMgmtV1RolesGetRequest) (RoleList, *_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The id of record
-	@param key The key of the label
-	@return ApiApiAccountsMgmtV1SubscriptionsIdLabelsKeyPatchRequest
-	*/
-	ApiAccountsMgmtV1SubscriptionsIdLabelsKeyPatch(ctx context.Context, id string, key string) ApiApiAccountsMgmtV1SubscriptionsIdLabelsKeyPatchRequest
+	/*
+	 * ApiAccountsMgmtV1RolesIdGet Get a role by id
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The id of record
+	 * @return ApiApiAccountsMgmtV1RolesIdGetRequest
+	 */
+	ApiAccountsMgmtV1RolesIdGet(ctx _context.Context, id string) ApiApiAccountsMgmtV1RolesIdGetRequest
 
-	// ApiAccountsMgmtV1SubscriptionsIdLabelsKeyPatchExecute executes the request
-	//  @return Label
-	ApiAccountsMgmtV1SubscriptionsIdLabelsKeyPatchExecute(r ApiApiAccountsMgmtV1SubscriptionsIdLabelsKeyPatchRequest) (*Label, *http.Response, error)
+	/*
+	 * ApiAccountsMgmtV1RolesIdGetExecute executes the request
+	 * @return Role
+	 */
+	ApiAccountsMgmtV1RolesIdGetExecute(r ApiApiAccountsMgmtV1RolesIdGetRequest) (Role, *_nethttp.Response, error)
 
 	/*
-	ApiAccountsMgmtV1SubscriptionsIdLabelsPost Create a new label or update an existing label
+	 * ApiAccountsMgmtV1SelfEntitlementProductPost Create or renew the entitlement to support a product for the user's organization.
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param product The product for self_entitlement. The supported products are [rosa].
+	 * @return ApiApiAccountsMgmtV1SelfEntitlementProductPostRequest
+	 */
+	ApiAccountsMgmtV1SelfEntitlementProductPost(ctx _context.Context, product string) ApiApiAccountsMgmtV1SelfEntitlementProductPostRequest
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The id of record
-	@return ApiApiAccountsMgmtV1SubscriptionsIdLabelsPostRequest
-	*/
-	ApiAccountsMgmtV1SubscriptionsIdLabelsPost(ctx context.Context, id string) ApiApiAccountsMgmtV1SubscriptionsIdLabelsPostRequest
+	/*
+	 * ApiAccountsMgmtV1SelfEntitlementProductPostExecute executes the request
+	 * @return SelfEntitlementStatus
+	 */
+	ApiAccountsMgmtV1SelfEntitlementProductPostExecute(r ApiApiAccountsMgmtV1SelfEntitlementProductPostRequest) (SelfEntitlementStatus, *_nethttp.Response, error)
 
-	// ApiAccountsMgmtV1SubscriptionsIdLabelsPostExecute executes the request
-	//  @return Label
-	ApiAccountsMgmtV1SubscriptionsIdLabelsPostExecute(r ApiApiAccountsMgmtV1SubscriptionsIdLabelsPostRequest) (*Label, *http.Response, error)
+	/*
+	 * ApiAccountsMgmtV1SkuRulesGet Returns a list of UHC product SKU Rules
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiApiAccountsMgmtV1SkuRulesGetRequest
+	 */
+	ApiAccountsMgmtV1SkuRulesGet(ctx _context.Context) ApiApiAccountsMgmtV1SkuRulesGetRequest
 
 	/*
-	ApiAccountsMgmtV1SubscriptionsIdMetricsMetricNameGet Get subscription's metrics by metric name
+	 * ApiAccountsMgmtV1SkuRulesGetExecute executes the request
+	 * @return SkuRulesList
+	 */
+	ApiAccountsMgmtV1SkuRulesGetExecute(r ApiApiAccountsMgmtV1SkuRulesGetRequest) (SkuRulesList, *_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The id of record
-	@param metricName The name of the metric
-	@return ApiApiAccountsMgmtV1SubscriptionsIdMetricsMetricNameGetRequest
-	*/
-	ApiAccountsMgmtV1SubscriptionsIdMetricsMetricNameGet(ctx context.Context, id string, metricName string) ApiApiAccountsMgmtV1SubscriptionsIdMetricsMetricNameGetRequest
+	/*
+	 * ApiAccountsMgmtV1SkuRulesIdDelete Delete a sku rule
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The id of record
+	 * @return ApiApiAccountsMgmtV1SkuRulesIdDeleteRequest
+	 */
+	ApiAccountsMgmtV1SkuRulesIdDelete(ctx _context.Context, id string) ApiApiAccountsMgmtV1SkuRulesIdDeleteRequest
 
-	// ApiAccountsMgmtV1SubscriptionsIdMetricsMetricNameGetExecute executes the request
-	//  @return SubscriptionMetricList
-	ApiAccountsMgmtV1SubscriptionsIdMetricsMetricNameGetExecute(r ApiApiAccountsMgmtV1SubscriptionsIdMetricsMetricNameGetRequest) (*SubscriptionMetricList, *http.Response, error)
+	/*
+	 * ApiAccountsMgmtV1SkuRulesIdDeleteExecute executes the request
+	 */
+	ApiAccountsMgmtV1SkuRulesIdDeleteExecute(r ApiApiAccountsMgmtV1SkuRulesIdDeleteRequest) (*_nethttp.Response, error)
 
 	/*
-	ApiAccountsMgmtV1SubscriptionsIdNotifyPost Notify the owner of a subscription
+	 * ApiAccountsMgmtV1SkuRulesIdGet Get a sku rules by id
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The id of record
+	 * @return ApiApiAccountsMgmtV1SkuRulesIdGetRequest
+	 */
+	ApiAccountsMgmtV1SkuRulesIdGet(ctx _context.Context, id string) ApiApiAccountsMgmtV1SkuRulesIdGetRequest
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The id of record
-	@return ApiApiAccountsMgmtV1SubscriptionsIdNotifyPostRequest
-	*/
-	ApiAccountsMgmtV1SubscriptionsIdNotifyPost(ctx context.Context, id string) ApiApiAccountsMgmtV1SubscriptionsIdNotifyPostRequest
+	/*
+	 * ApiAccountsMgmtV1SkuRulesIdGetExecute executes the request
+	 * @return SkuRules
+	 */
+	ApiAccountsMgmtV1SkuRulesIdGetExecute(r ApiApiAccountsMgmtV1SkuRulesIdGetRequest) (SkuRules, *_nethttp.Response, error)
 
-	// ApiAccountsMgmtV1SubscriptionsIdNotifyPostExecute executes the request
-	ApiAccountsMgmtV1SubscriptionsIdNotifyPostExecute(r ApiApiAccountsMgmtV1SubscriptionsIdNotifyPostRequest) (*http.Response, error)
+	/*
+	 * ApiAccountsMgmtV1SkuRulesIdPatch Update a sku rule
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The id of record
+	 * @return ApiApiAccountsMgmtV1SkuRulesIdPatchRequest
+	 */
+	ApiAccountsMgmtV1SkuRulesIdPatch(ctx _context.Context, id string) ApiApiAccountsMgmtV1SkuRulesIdPatchRequest
 
 	/*
-	ApiAccountsMgmtV1SubscriptionsIdPatch Update a subscription
+	 * ApiAccountsMgmtV1SkuRulesIdPatchExecute executes the request
+	 * @return SkuRules
+	 */
+	ApiAccountsMgmtV1SkuRulesIdPatchExecute(r ApiApiAccountsMgmtV1SkuRulesIdPatchRequest) (SkuRules, *_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The id of record
-	@return ApiApiAccountsMgmtV1SubscriptionsIdPatchRequest
-	*/
-	ApiAccountsMgmtV1SubscriptionsIdPatch(ctx context.Context, id string) ApiApiAccountsMgmtV1SubscriptionsIdPatchRequest
+	/*
+	 * ApiAccountsMgmtV1SkuRulesPost Create a new sku rule
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiApiAccountsMgmtV1SkuRulesPostRequest
+	 */
+	ApiAccountsMgmtV1SkuRulesPost(ctx _context.Context) ApiApiAccountsMgmtV1SkuRulesPostRequest
 
-	// ApiAccountsMgmtV1SubscriptionsIdPatchExecute executes the request
-	//  @return Subscription
-	ApiAccountsMgmtV1SubscriptionsIdPatchExecute(r ApiApiAccountsMgmtV1SubscriptionsIdPatchRequest) (*Subscription, *http.Response, error)
+	/*
+	 * ApiAccountsMgmtV1SkuRulesPostExecute executes the request
+	 * @return SkuRules
+	 */
+	ApiAccountsMgmtV1SkuRulesPostExecute(r ApiApiAccountsMgmtV1SkuRulesPostRequest) (SkuRules, *_nethttp.Response, error)
 
 	/*
-	ApiAccountsMgmtV1SubscriptionsIdReservedResourcesGet Returns a list of reserved resources
+	 * ApiAccountsMgmtV1SkusGet Returns a list of UHC product SKUs
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiApiAccountsMgmtV1SkusGetRequest
+	 */
+	ApiAccountsMgmtV1SkusGet(ctx _context.Context) ApiApiAccountsMgmtV1SkusGetRequest
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The id of record
-	@return ApiApiAccountsMgmtV1SubscriptionsIdReservedResourcesGetRequest
-	*/
-	ApiAccountsMgmtV1SubscriptionsIdReservedResourcesGet(ctx context.Context, id string) ApiApiAccountsMgmtV1SubscriptionsIdReservedResourcesGetRequest
+	/*
+	 * ApiAccountsMgmtV1SkusGetExecute executes the request
+	 * @return SkuList
+	 */
+	ApiAccountsMgmtV1SkusGetExecute(r ApiApiAccountsMgmtV1SkusGetRequest) (SkuList, *_nethttp.Response, error)
 
-	// ApiAccountsMgmtV1SubscriptionsIdReservedResourcesGetExecute executes the request
-	//  @return ReservedResourceList
-	ApiAccountsMgmtV1SubscriptionsIdReservedResourcesGetExecute(r ApiApiAccountsMgmtV1SubscriptionsIdReservedResourcesGetRequest) (*ReservedResourceList, *http.Response, error)
+	/*
+	 * ApiAccountsMgmtV1SkusIdGet Get a sku by id
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The id of record
+	 * @return ApiApiAccountsMgmtV1SkusIdGetRequest
+	 */
+	ApiAccountsMgmtV1SkusIdGet(ctx _context.Context, id string) ApiApiAccountsMgmtV1SkusIdGetRequest
 
 	/*
-	ApiAccountsMgmtV1SubscriptionsIdSupportCasesGet Returns a list of open support creates opened against the external cluster id of this subscrption
+	 * ApiAccountsMgmtV1SkusIdGetExecute executes the request
+	 * @return SKU
+	 */
+	ApiAccountsMgmtV1SkusIdGetExecute(r ApiApiAccountsMgmtV1SkusIdGetRequest) (SKU, *_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The id of record
-	@return ApiApiAccountsMgmtV1SubscriptionsIdSupportCasesGetRequest
-	*/
-	ApiAccountsMgmtV1SubscriptionsIdSupportCasesGet(ctx context.Context, id string) ApiApiAccountsMgmtV1SubscriptionsIdSupportCasesGetRequest
+	/*
+	 * ApiAccountsMgmtV1SubscriptionsGet Returns a list of subscriptions
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiApiAccountsMgmtV1SubscriptionsGetRequest
+	 */
+	ApiAccountsMgmtV1SubscriptionsGet(ctx _context.Context) ApiApiAccountsMgmtV1SubscriptionsGetRequest
 
-	// ApiAccountsMgmtV1SubscriptionsIdSupportCasesGetExecute executes the request
-	ApiAccountsMgmtV1SubscriptionsIdSupportCasesGetExecute(r ApiApiAccountsMgmtV1SubscriptionsIdSupportCasesGetRequest) (*http.Response, error)
+	/*
+	 * ApiAccountsMgmtV1SubscriptionsGetExecute executes the request
+	 * @return SubscriptionList
+	 */
+	ApiAccountsMgmtV1SubscriptionsGetExecute(r ApiApiAccountsMgmtV1SubscriptionsGetRequest) (SubscriptionList, *_nethttp.Response, error)
 
 	/*
-	ApiAccountsMgmtV1SubscriptionsPost Create a new subscription
+	 * ApiAccountsMgmtV1SubscriptionsIdDelete Deletes a subscription by id
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The id of record
+	 * @return ApiApiAccountsMgmtV1SubscriptionsIdDeleteRequest
+	 */
+	ApiAccountsMgmtV1SubscriptionsIdDelete(ctx _context.Context, id string) ApiApiAccountsMgmtV1SubscriptionsIdDeleteRequest
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiApiAccountsMgmtV1SubscriptionsPostRequest
-	*/
-	ApiAccountsMgmtV1SubscriptionsPost(ctx context.Context) ApiApiAccountsMgmtV1SubscriptionsPostRequest
+	/*
+	 * ApiAccountsMgmtV1SubscriptionsIdDeleteExecute executes the request
+	 */
+	ApiAccountsMgmtV1SubscriptionsIdDeleteExecute(r ApiApiAccountsMgmtV1SubscriptionsIdDeleteRequest) (*_nethttp.Response, error)
 
-	// ApiAccountsMgmtV1SubscriptionsPostExecute executes the request
-	//  @return Subscription
-	ApiAccountsMgmtV1SubscriptionsPostExecute(r ApiApiAccountsMgmtV1SubscriptionsPostRequest) (*Subscription, *http.Response, error)
+	/*
+	 * ApiAccountsMgmtV1SubscriptionsIdGet Get a subscription by id
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The id of record
+	 * @return ApiApiAccountsMgmtV1SubscriptionsIdGetRequest
+	 */
+	ApiAccountsMgmtV1SubscriptionsIdGet(ctx _context.Context, id string) ApiApiAccountsMgmtV1SubscriptionsIdGetRequest
 
 	/*
-	ApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsAccountIdDelete Deletes a notification contact by subscription and account id
+	 * ApiAccountsMgmtV1SubscriptionsIdGetExecute executes the request
+	 * @return Subscription
+	 */
+	ApiAccountsMgmtV1SubscriptionsIdGetExecute(r ApiApiAccountsMgmtV1SubscriptionsIdGetRequest) (Subscription, *_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param subId The id of subscription
-	@param accountId The id of account
-	@return ApiApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsAccountIdDeleteRequest
-	*/
-	ApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsAccountIdDelete(ctx context.Context, subId string, accountId string) ApiApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsAccountIdDeleteRequest
+	/*
+	 * ApiAccountsMgmtV1SubscriptionsIdLabelsGet Returns a list of labels
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The id of record
+	 * @return ApiApiAccountsMgmtV1SubscriptionsIdLabelsGetRequest
+	 */
+	ApiAccountsMgmtV1SubscriptionsIdLabelsGet(ctx _context.Context, id string) ApiApiAccountsMgmtV1SubscriptionsIdLabelsGetRequest
 
-	// ApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsAccountIdDeleteExecute executes the request
-	ApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsAccountIdDeleteExecute(r ApiApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsAccountIdDeleteRequest) (*http.Response, error)
+	/*
+	 * ApiAccountsMgmtV1SubscriptionsIdLabelsGetExecute executes the request
+	 * @return LabelList
+	 */
+	ApiAccountsMgmtV1SubscriptionsIdLabelsGetExecute(r ApiApiAccountsMgmtV1SubscriptionsIdLabelsGetRequest) (LabelList, *_nethttp.Response, error)
 
 	/*
-	ApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsGet Returns a list of notification contacts for the given subscription
+	 * ApiAccountsMgmtV1SubscriptionsIdLabelsKeyDelete Delete a label
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The id of record
+	 * @param key The key of the label
+	 * @return ApiApiAccountsMgmtV1SubscriptionsIdLabelsKeyDeleteRequest
+	 */
+	ApiAccountsMgmtV1SubscriptionsIdLabelsKeyDelete(ctx _context.Context, id string, key string) ApiApiAccountsMgmtV1SubscriptionsIdLabelsKeyDeleteRequest
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param subId The id of subscription
-	@return ApiApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsGetRequest
-	*/
-	ApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsGet(ctx context.Context, subId string) ApiApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsGetRequest
+	/*
+	 * ApiAccountsMgmtV1SubscriptionsIdLabelsKeyDeleteExecute executes the request
+	 */
+	ApiAccountsMgmtV1SubscriptionsIdLabelsKeyDeleteExecute(r ApiApiAccountsMgmtV1SubscriptionsIdLabelsKeyDeleteRequest) (*_nethttp.Response, error)
 
-	// ApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsGetExecute executes the request
-	//  @return AccountList
-	ApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsGetExecute(r ApiApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsGetRequest) (*AccountList, *http.Response, error)
+	/*
+	 * ApiAccountsMgmtV1SubscriptionsIdLabelsKeyGet Get subscription labels by label key
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The id of record
+	 * @param key The key of the label
+	 * @return ApiApiAccountsMgmtV1SubscriptionsIdLabelsKeyGetRequest
+	 */
+	ApiAccountsMgmtV1SubscriptionsIdLabelsKeyGet(ctx _context.Context, id string, key string) ApiApiAccountsMgmtV1SubscriptionsIdLabelsKeyGetRequest
 
 	/*
-	ApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsPost Add an account as a notification contact to this subscription
+	 * ApiAccountsMgmtV1SubscriptionsIdLabelsKeyGetExecute executes the request
+	 * @return Label
+	 */
+	ApiAccountsMgmtV1SubscriptionsIdLabelsKeyGetExecute(r ApiApiAccountsMgmtV1SubscriptionsIdLabelsKeyGetRequest) (Label, *_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param subId The id of subscription
-	@return ApiApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsPostRequest
-	*/
-	ApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsPost(ctx context.Context, subId string) ApiApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsPostRequest
+	/*
+	 * ApiAccountsMgmtV1SubscriptionsIdLabelsKeyPatch Create a new label or update an existing label
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The id of record
+	 * @param key The key of the label
+	 * @return ApiApiAccountsMgmtV1SubscriptionsIdLabelsKeyPatchRequest
+	 */
+	ApiAccountsMgmtV1SubscriptionsIdLabelsKeyPatch(ctx _context.Context, id string, key string) ApiApiAccountsMgmtV1SubscriptionsIdLabelsKeyPatchRequest
 
-	// ApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsPostExecute executes the request
-	//  @return Account
-	ApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsPostExecute(r ApiApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsPostRequest) (*Account, *http.Response, error)
+	/*
+	 * ApiAccountsMgmtV1SubscriptionsIdLabelsKeyPatchExecute executes the request
+	 * @return Label
+	 */
+	ApiAccountsMgmtV1SubscriptionsIdLabelsKeyPatchExecute(r ApiApiAccountsMgmtV1SubscriptionsIdLabelsKeyPatchRequest) (Label, *_nethttp.Response, error)
 
 	/*
-	ApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdDelete Delete reserved resources by id
+	 * ApiAccountsMgmtV1SubscriptionsIdLabelsPost Create a new label or update an existing label
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The id of record
+	 * @return ApiApiAccountsMgmtV1SubscriptionsIdLabelsPostRequest
+	 */
+	ApiAccountsMgmtV1SubscriptionsIdLabelsPost(ctx _context.Context, id string) ApiApiAccountsMgmtV1SubscriptionsIdLabelsPostRequest
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param subId The id of subscription
-	@param reservedResourceId The id of reserved resource
-	@return ApiApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdDeleteRequest
-	*/
-	ApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdDelete(ctx context.Context, subId string, reservedResourceId string) ApiApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdDeleteRequest
+	/*
+	 * ApiAccountsMgmtV1SubscriptionsIdLabelsPostExecute executes the request
+	 * @return Label
+	 */
+	ApiAccountsMgmtV1SubscriptionsIdLabelsPostExecute(r ApiApiAccountsMgmtV1SubscriptionsIdLabelsPostRequest) (Label, *_nethttp.Response, error)
 
-	// ApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdDeleteExecute executes the request
-	ApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdDeleteExecute(r ApiApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdDeleteRequest) (*http.Response, error)
+	/*
+	 * ApiAccountsMgmtV1SubscriptionsIdMetricsMetricNameGet Get subscription's metrics by metric name
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The id of record
+	 * @param metricName The name of the metric
+	 * @return ApiApiAccountsMgmtV1SubscriptionsIdMetricsMetricNameGetRequest
+	 */
+	ApiAccountsMgmtV1SubscriptionsIdMetricsMetricNameGet(ctx _context.Context, id string, metricName string) ApiApiAccountsMgmtV1SubscriptionsIdMetricsMetricNameGetRequest
 
 	/*
-	ApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdGet Get reserved resources by id
+	 * ApiAccountsMgmtV1SubscriptionsIdMetricsMetricNameGetExecute executes the request
+	 * @return SubscriptionMetricList
+	 */
+	ApiAccountsMgmtV1SubscriptionsIdMetricsMetricNameGetExecute(r ApiApiAccountsMgmtV1SubscriptionsIdMetricsMetricNameGetRequest) (SubscriptionMetricList, *_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param subId The id of subscription
-	@param reservedResourceId The id of reserved resource
-	@return ApiApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdGetRequest
-	*/
-	ApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdGet(ctx context.Context, subId string, reservedResourceId string) ApiApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdGetRequest
+	/*
+	 * ApiAccountsMgmtV1SubscriptionsIdNotifyPost Notify the owner of a subscription
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The id of record
+	 * @return ApiApiAccountsMgmtV1SubscriptionsIdNotifyPostRequest
+	 */
+	ApiAccountsMgmtV1SubscriptionsIdNotifyPost(ctx _context.Context, id string) ApiApiAccountsMgmtV1SubscriptionsIdNotifyPostRequest
 
-	// ApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdGetExecute executes the request
-	//  @return ReservedResource
-	ApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdGetExecute(r ApiApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdGetRequest) (*ReservedResource, *http.Response, error)
+	/*
+	 * ApiAccountsMgmtV1SubscriptionsIdNotifyPostExecute executes the request
+	 */
+	ApiAccountsMgmtV1SubscriptionsIdNotifyPostExecute(r ApiApiAccountsMgmtV1SubscriptionsIdNotifyPostRequest) (*_nethttp.Response, error)
 
 	/*
-	ApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdPatch Update a reserved resource
+	 * ApiAccountsMgmtV1SubscriptionsIdPatch Update a subscription
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The id of record
+	 * @return ApiApiAccountsMgmtV1SubscriptionsIdPatchRequest
+	 */
+	ApiAccountsMgmtV1SubscriptionsIdPatch(ctx _context.Context, id string) ApiApiAccountsMgmtV1SubscriptionsIdPatchRequest
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param subId The id of subscription
-	@param reservedResourceId The id of reserved resource
-	@return ApiApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdPatchRequest
-	*/
-	ApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdPatch(ctx context.Context, subId string, reservedResourceId string) ApiApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdPatchRequest
+	/*
+	 * ApiAccountsMgmtV1SubscriptionsIdPatchExecute executes the request
+	 * @return Subscription
+	 */
+	ApiAccountsMgmtV1SubscriptionsIdPatchExecute(r ApiApiAccountsMgmtV1SubscriptionsIdPatchRequest) (Subscription, *_nethttp.Response, error)
 
-	// ApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdPatchExecute executes the request
-	//  @return ReservedResource
-	ApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdPatchExecute(r ApiApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdPatchRequest) (*ReservedResource, *http.Response, error)
+	/*
+	 * ApiAccountsMgmtV1SubscriptionsIdReservedResourcesGet Returns a list of reserved resources
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The id of record
+	 * @return ApiApiAccountsMgmtV1SubscriptionsIdReservedResourcesGetRequest
+	 */
+	ApiAccountsMgmtV1SubscriptionsIdReservedResourcesGet(ctx _context.Context, id string) ApiApiAccountsMgmtV1SubscriptionsIdReservedResourcesGetRequest
 
 	/*
-	ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsGet Get subscription role bindings
+	 * ApiAccountsMgmtV1SubscriptionsIdReservedResourcesGetExecute executes the request
+	 * @return ReservedResourceList
+	 */
+	ApiAccountsMgmtV1SubscriptionsIdReservedResourcesGetExecute(r ApiApiAccountsMgmtV1SubscriptionsIdReservedResourcesGetRequest) (ReservedResourceList, *_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param subId The id of subscription
-	@return ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsGetRequest
-	*/
-	ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsGet(ctx context.Context, subId string) ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsGetRequest
+	/*
+	 * ApiAccountsMgmtV1SubscriptionsIdSupportCasesGet Returns a list of open support creates opened against the external cluster id of this subscrption
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The id of record
+	 * @return ApiApiAccountsMgmtV1SubscriptionsIdSupportCasesGetRequest
+	 */
+	ApiAccountsMgmtV1SubscriptionsIdSupportCasesGet(ctx _context.Context, id string) ApiApiAccountsMgmtV1SubscriptionsIdSupportCasesGetRequest
 
-	// ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsGetExecute executes the request
-	//  @return SubscriptionRoleBindingList
-	ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsGetExecute(r ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsGetRequest) (*SubscriptionRoleBindingList, *http.Response, error)
+	/*
+	 * ApiAccountsMgmtV1SubscriptionsIdSupportCasesGetExecute executes the request
+	 */
+	ApiAccountsMgmtV1SubscriptionsIdSupportCasesGetExecute(r ApiApiAccountsMgmtV1SubscriptionsIdSupportCasesGetRequest) (*_nethttp.Response, error)
 
 	/*
-	ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdDelete Delete a subscription role binding
+	 * ApiAccountsMgmtV1SubscriptionsPost Create a new subscription
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiApiAccountsMgmtV1SubscriptionsPostRequest
+	 */
+	ApiAccountsMgmtV1SubscriptionsPost(ctx _context.Context) ApiApiAccountsMgmtV1SubscriptionsPostRequest
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The id of record
-	@param subId The id of subscription
-	@return ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdDeleteRequest
-	*/
-	ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdDelete(ctx context.Context, id string, subId string) ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdDeleteRequest
+	/*
+	 * ApiAccountsMgmtV1SubscriptionsPostExecute executes the request
+	 * @return Subscription
+	 */
+	ApiAccountsMgmtV1SubscriptionsPostExecute(r ApiApiAccountsMgmtV1SubscriptionsPostRequest) (Subscription, *_nethttp.Response, error)
 
-	// ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdDeleteExecute executes the request
-	ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdDeleteExecute(r ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdDeleteRequest) (*http.Response, error)
+	/*
+	 * ApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsAccountIdDelete Deletes a notification contact by subscription and account id
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param subId The id of subscription
+	 * @param accountId The id of account
+	 * @return ApiApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsAccountIdDeleteRequest
+	 */
+	ApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsAccountIdDelete(ctx _context.Context, subId string, accountId string) ApiApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsAccountIdDeleteRequest
 
 	/*
-	ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdGet Get a Subscription Role Binding by id
+	 * ApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsAccountIdDeleteExecute executes the request
+	 */
+	ApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsAccountIdDeleteExecute(r ApiApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsAccountIdDeleteRequest) (*_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The id of record
-	@param subId The id of subscription
-	@return ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdGetRequest
-	*/
-	ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdGet(ctx context.Context, id string, subId string) ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdGetRequest
+	/*
+	 * ApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsGet Returns a list of notification contacts for the given subscription
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param subId The id of subscription
+	 * @return ApiApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsGetRequest
+	 */
+	ApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsGet(ctx _context.Context, subId string) ApiApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsGetRequest
 
-	// ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdGetExecute executes the request
-	//  @return SubscriptionRoleBinding
-	ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdGetExecute(r ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdGetRequest) (*SubscriptionRoleBinding, *http.Response, error)
+	/*
+	 * ApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsGetExecute executes the request
+	 * @return AccountList
+	 */
+	ApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsGetExecute(r ApiApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsGetRequest) (AccountList, *_nethttp.Response, error)
 
 	/*
-	ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsPost Create a new subscription role binding
+	 * ApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsPost Add an account as a notification contact to this subscription
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param subId The id of subscription
+	 * @return ApiApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsPostRequest
+	 */
+	ApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsPost(ctx _context.Context, subId string) ApiApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsPostRequest
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param subId The id of subscription
-	@return ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsPostRequest
-	*/
-	ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsPost(ctx context.Context, subId string) ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsPostRequest
+	/*
+	 * ApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsPostExecute executes the request
+	 * @return Account
+	 */
+	ApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsPostExecute(r ApiApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsPostRequest) (Account, *_nethttp.Response, error)
 
-	// ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsPostExecute executes the request
-	//  @return SubscriptionRoleBinding
-	ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsPostExecute(r ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsPostRequest) (*SubscriptionRoleBinding, *http.Response, error)
+	/*
+	 * ApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdDelete Delete reserved resources by id
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param subId The id of subscription
+	 * @param reservedResourceId The id of reserved resource
+	 * @return ApiApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdDeleteRequest
+	 */
+	ApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdDelete(ctx _context.Context, subId string, reservedResourceId string) ApiApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdDeleteRequest
 
 	/*
-	ApiAccountsMgmtV1SupportCasesCaseIdDelete Delete a support case
+	 * ApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdDeleteExecute executes the request
+	 */
+	ApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdDeleteExecute(r ApiApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdDeleteRequest) (*_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param caseId The id of a support case
-	@return ApiApiAccountsMgmtV1SupportCasesCaseIdDeleteRequest
-	*/
-	ApiAccountsMgmtV1SupportCasesCaseIdDelete(ctx context.Context, caseId string) ApiApiAccountsMgmtV1SupportCasesCaseIdDeleteRequest
+	/*
+	 * ApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdGet Get reserved resources by id
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param subId The id of subscription
+	 * @param reservedResourceId The id of reserved resource
+	 * @return ApiApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdGetRequest
+	 */
+	ApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdGet(ctx _context.Context, subId string, reservedResourceId string) ApiApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdGetRequest
 
-	// ApiAccountsMgmtV1SupportCasesCaseIdDeleteExecute executes the request
-	ApiAccountsMgmtV1SupportCasesCaseIdDeleteExecute(r ApiApiAccountsMgmtV1SupportCasesCaseIdDeleteRequest) (*http.Response, error)
+	/*
+	 * ApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdGetExecute executes the request
+	 * @return ReservedResource
+	 */
+	ApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdGetExecute(r ApiApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdGetRequest) (ReservedResource, *_nethttp.Response, error)
 
 	/*
-	ApiAccountsMgmtV1SupportCasesPost create a support case for the subscription
+	 * ApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdPatch Update a reserved resource
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param subId The id of subscription
+	 * @param reservedResourceId The id of reserved resource
+	 * @return ApiApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdPatchRequest
+	 */
+	ApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdPatch(ctx _context.Context, subId string, reservedResourceId string) ApiApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdPatchRequest
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiApiAccountsMgmtV1SupportCasesPostRequest
-	*/
-	ApiAccountsMgmtV1SupportCasesPost(ctx context.Context) ApiApiAccountsMgmtV1SupportCasesPostRequest
+	/*
+	 * ApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdPatchExecute executes the request
+	 * @return ReservedResource
+	 */
+	ApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdPatchExecute(r ApiApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdPatchRequest) (ReservedResource, *_nethttp.Response, error)
 
-	// ApiAccountsMgmtV1SupportCasesPostExecute executes the request
-	//  @return SupportCasesCreatedResponse
-	ApiAccountsMgmtV1SupportCasesPostExecute(r ApiApiAccountsMgmtV1SupportCasesPostRequest) (*SupportCasesCreatedResponse, *http.Response, error)
+	/*
+	 * ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsGet Get subscription role bindings
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param subId The id of subscription
+	 * @return ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsGetRequest
+	 */
+	ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsGet(ctx _context.Context, subId string) ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsGetRequest
 
 	/*
-	ApiAccountsMgmtV1TokenAuthorizationPost Finds the account owner of the provided token
+	 * ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsGetExecute executes the request
+	 * @return SubscriptionRoleBindingList
+	 */
+	ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsGetExecute(r ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsGetRequest) (SubscriptionRoleBindingList, *_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiApiAccountsMgmtV1TokenAuthorizationPostRequest
-	*/
-	ApiAccountsMgmtV1TokenAuthorizationPost(ctx context.Context) ApiApiAccountsMgmtV1TokenAuthorizationPostRequest
+	/*
+	 * ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdDelete Delete a subscription role binding
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The id of record
+	 * @param subId The id of subscription
+	 * @return ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdDeleteRequest
+	 */
+	ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdDelete(ctx _context.Context, id string, subId string) ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdDeleteRequest
 
-	// ApiAccountsMgmtV1TokenAuthorizationPostExecute executes the request
-	//  @return TokenAuthorizationResponse
-	ApiAccountsMgmtV1TokenAuthorizationPostExecute(r ApiApiAccountsMgmtV1TokenAuthorizationPostRequest) (*TokenAuthorizationResponse, *http.Response, error)
+	/*
+	 * ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdDeleteExecute executes the request
+	 */
+	ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdDeleteExecute(r ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdDeleteRequest) (*_nethttp.Response, error)
 
 	/*
-	ApiAuthorizationsV1AccessReviewPost Review an account's access to perform an action on a particular resource or resource type
+	 * ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdGet Get a Subscription Role Binding by id
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The id of record
+	 * @param subId The id of subscription
+	 * @return ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdGetRequest
+	 */
+	ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdGet(ctx _context.Context, id string, subId string) ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdGetRequest
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiApiAuthorizationsV1AccessReviewPostRequest
-	*/
-	ApiAuthorizationsV1AccessReviewPost(ctx context.Context) ApiApiAuthorizationsV1AccessReviewPostRequest
+	/*
+	 * ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdGetExecute executes the request
+	 * @return SubscriptionRoleBinding
+	 */
+	ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdGetExecute(r ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdGetRequest) (SubscriptionRoleBinding, *_nethttp.Response, error)
 
-	// ApiAuthorizationsV1AccessReviewPostExecute executes the request
-	//  @return AccessReviewResponse
-	ApiAuthorizationsV1AccessReviewPostExecute(r ApiApiAuthorizationsV1AccessReviewPostRequest) (*AccessReviewResponse, *http.Response, error)
+	/*
+	 * ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsPost Create a new subscription role binding
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param subId The id of subscription
+	 * @return ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsPostRequest
+	 */
+	ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsPost(ctx _context.Context, subId string) ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsPostRequest
 
 	/*
-	ApiAuthorizationsV1CapabilityReviewPost Review an account's capabilities
+	 * ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsPostExecute executes the request
+	 * @return SubscriptionRoleBinding
+	 */
+	ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsPostExecute(r ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsPostRequest) (SubscriptionRoleBinding, *_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiApiAuthorizationsV1CapabilityReviewPostRequest
-	*/
-	ApiAuthorizationsV1CapabilityReviewPost(ctx context.Context) ApiApiAuthorizationsV1CapabilityReviewPostRequest
+	/*
+	 * ApiAccountsMgmtV1SupportCasesCaseIdDelete Delete a support case
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param caseId The id of a support case
+	 * @return ApiApiAccountsMgmtV1SupportCasesCaseIdDeleteRequest
+	 */
+	ApiAccountsMgmtV1SupportCasesCaseIdDelete(ctx _context.Context, caseId string) ApiApiAccountsMgmtV1SupportCasesCaseIdDeleteRequest
 
-	// ApiAuthorizationsV1CapabilityReviewPostExecute executes the request
-	//  @return CapabilityReview
-	ApiAuthorizationsV1CapabilityReviewPostExecute(r ApiApiAuthorizationsV1CapabilityReviewPostRequest) (*CapabilityReview, *http.Response, error)
+	/*
+	 * ApiAccountsMgmtV1SupportCasesCaseIdDeleteExecute executes the request
+	 */
+	ApiAccountsMgmtV1SupportCasesCaseIdDeleteExecute(r ApiApiAccountsMgmtV1SupportCasesCaseIdDeleteRequest) (*_nethttp.Response, error)
 
 	/*
-	ApiAuthorizationsV1ExportControlReviewPost Determine whether a user is restricted from downloading Red Hat software based on export control compliance. 
+	 * ApiAccountsMgmtV1SupportCasesPost create a support case for the subscription
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiApiAccountsMgmtV1SupportCasesPostRequest
+	 */
+	ApiAccountsMgmtV1SupportCasesPost(ctx _context.Context) ApiApiAccountsMgmtV1SupportCasesPostRequest
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiApiAuthorizationsV1ExportControlReviewPostRequest
-	*/
-	ApiAuthorizationsV1ExportControlReviewPost(ctx context.Context) ApiApiAuthorizationsV1ExportControlReviewPostRequest
+	/*
+	 * ApiAccountsMgmtV1SupportCasesPostExecute executes the request
+	 * @return SupportCasesCreatedResponse
+	 */
+	ApiAccountsMgmtV1SupportCasesPostExecute(r ApiApiAccountsMgmtV1SupportCasesPostRequest) (SupportCasesCreatedResponse, *_nethttp.Response, error)
 
-	// ApiAuthorizationsV1ExportControlReviewPostExecute executes the request
-	//  @return ExportControlReview
-	ApiAuthorizationsV1ExportControlReviewPostExecute(r ApiApiAuthorizationsV1ExportControlReviewPostRequest) (*ExportControlReview, *http.Response, error)
+	/*
+	 * ApiAccountsMgmtV1TokenAuthorizationPost Finds the account owner of the provided token
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiApiAccountsMgmtV1TokenAuthorizationPostRequest
+	 */
+	ApiAccountsMgmtV1TokenAuthorizationPost(ctx _context.Context) ApiApiAccountsMgmtV1TokenAuthorizationPostRequest
 
 	/*
-	ApiAuthorizationsV1FeatureReviewPost Review feature to perform an action on it such as toggle a feature on/off
+	 * ApiAccountsMgmtV1TokenAuthorizationPostExecute executes the request
+	 * @return TokenAuthorizationResponse
+	 */
+	ApiAccountsMgmtV1TokenAuthorizationPostExecute(r ApiApiAccountsMgmtV1TokenAuthorizationPostRequest) (TokenAuthorizationResponse, *_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiApiAuthorizationsV1FeatureReviewPostRequest
-	*/
-	ApiAuthorizationsV1FeatureReviewPost(ctx context.Context) ApiApiAuthorizationsV1FeatureReviewPostRequest
+	/*
+	 * ApiAuthorizationsV1AccessReviewPost Review an account's access to perform an action on a particular resource or resource type
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiApiAuthorizationsV1AccessReviewPostRequest
+	 */
+	ApiAuthorizationsV1AccessReviewPost(ctx _context.Context) ApiApiAuthorizationsV1AccessReviewPostRequest
 
-	// ApiAuthorizationsV1FeatureReviewPostExecute executes the request
-	//  @return FeatureReviewResponse
-	ApiAuthorizationsV1FeatureReviewPostExecute(r ApiApiAuthorizationsV1FeatureReviewPostRequest) (*FeatureReviewResponse, *http.Response, error)
+	/*
+	 * ApiAuthorizationsV1AccessReviewPostExecute executes the request
+	 * @return AccessReviewResponse
+	 */
+	ApiAuthorizationsV1AccessReviewPostExecute(r ApiApiAuthorizationsV1AccessReviewPostRequest) (AccessReviewResponse, *_nethttp.Response, error)
 
 	/*
-	ApiAuthorizationsV1ResourceReviewPost Obtain resource ids for resources an account may perform the specified action upon. Resource ids returned as [\"*\"] is shorthand for all ids.
+	 * ApiAuthorizationsV1CapabilityReviewPost Review an account's capabilities
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiApiAuthorizationsV1CapabilityReviewPostRequest
+	 */
+	ApiAuthorizationsV1CapabilityReviewPost(ctx _context.Context) ApiApiAuthorizationsV1CapabilityReviewPostRequest
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiApiAuthorizationsV1ResourceReviewPostRequest
+	/*
+	 * ApiAuthorizationsV1CapabilityReviewPostExecute executes the request
+	 * @return CapabilityReview
+	 */
+	ApiAuthorizationsV1CapabilityReviewPostExecute(r ApiApiAuthorizationsV1CapabilityReviewPostRequest) (CapabilityReview, *_nethttp.Response, error)
 
-	Deprecated
-	*/
-	ApiAuthorizationsV1ResourceReviewPost(ctx context.Context) ApiApiAuthorizationsV1ResourceReviewPostRequest
+	/*
+	 * ApiAuthorizationsV1ExportControlReviewPost Determine whether a user is restricted from downloading Red Hat software based on export control compliance. 
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiApiAuthorizationsV1ExportControlReviewPostRequest
+	 */
+	ApiAuthorizationsV1ExportControlReviewPost(ctx _context.Context) ApiApiAuthorizationsV1ExportControlReviewPostRequest
 
-	// ApiAuthorizationsV1ResourceReviewPostExecute executes the request
-	//  @return ResourceReview
-	// Deprecated
-	ApiAuthorizationsV1ResourceReviewPostExecute(r ApiApiAuthorizationsV1ResourceReviewPostRequest) (*ResourceReview, *http.Response, error)
+	/*
+	 * ApiAuthorizationsV1ExportControlReviewPostExecute executes the request
+	 * @return ExportControlReview
+	 */
+	ApiAuthorizationsV1ExportControlReviewPostExecute(r ApiApiAuthorizationsV1ExportControlReviewPostRequest) (ExportControlReview, *_nethttp.Response, error)
 
 	/*
-	ApiAuthorizationsV1SelfAccessReviewPost Review your ability to perform an action on a particular resource or resource type
+	 * ApiAuthorizationsV1FeatureReviewPost Review feature to perform an action on it such as toggle a feature on/off
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiApiAuthorizationsV1FeatureReviewPostRequest
+	 */
+	ApiAuthorizationsV1FeatureReviewPost(ctx _context.Context) ApiApiAuthorizationsV1FeatureReviewPostRequest
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiApiAuthorizationsV1SelfAccessReviewPostRequest
-	*/
-	ApiAuthorizationsV1SelfAccessReviewPost(ctx context.Context) ApiApiAuthorizationsV1SelfAccessReviewPostRequest
+	/*
+	 * ApiAuthorizationsV1FeatureReviewPostExecute executes the request
+	 * @return FeatureReviewResponse
+	 */
+	ApiAuthorizationsV1FeatureReviewPostExecute(r ApiApiAuthorizationsV1FeatureReviewPostRequest) (FeatureReviewResponse, *_nethttp.Response, error)
 
-	// ApiAuthorizationsV1SelfAccessReviewPostExecute executes the request
-	//  @return AccessReviewResponse
-	ApiAuthorizationsV1SelfAccessReviewPostExecute(r ApiApiAuthorizationsV1SelfAccessReviewPostRequest) (*AccessReviewResponse, *http.Response, error)
+	/*
+	 * ApiAuthorizationsV1ResourceReviewPost Obtain resource ids for resources an account may perform the specified action upon. Resource ids returned as [\"*\"] is shorthand for all ids.
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiApiAuthorizationsV1ResourceReviewPostRequest
+	 */
+	ApiAuthorizationsV1ResourceReviewPost(ctx _context.Context) ApiApiAuthorizationsV1ResourceReviewPostRequest
 
 	/*
-	ApiAuthorizationsV1SelfFeatureReviewPost Review your ability to toggle a feature
+	 * ApiAuthorizationsV1ResourceReviewPostExecute executes the request
+	 * @return ResourceReview
+	 */
+	ApiAuthorizationsV1ResourceReviewPostExecute(r ApiApiAuthorizationsV1ResourceReviewPostRequest) (ResourceReview, *_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiApiAuthorizationsV1SelfFeatureReviewPostRequest
-	*/
-	ApiAuthorizationsV1SelfFeatureReviewPost(ctx context.Context) ApiApiAuthorizationsV1SelfFeatureReviewPostRequest
+	/*
+	 * ApiAuthorizationsV1SelfAccessReviewPost Review your ability to perform an action on a particular resource or resource type
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiApiAuthorizationsV1SelfAccessReviewPostRequest
+	 */
+	ApiAuthorizationsV1SelfAccessReviewPost(ctx _context.Context) ApiApiAuthorizationsV1SelfAccessReviewPostRequest
 
-	// ApiAuthorizationsV1SelfFeatureReviewPostExecute executes the request
-	//  @return FeatureReviewResponse
-	ApiAuthorizationsV1SelfFeatureReviewPostExecute(r ApiApiAuthorizationsV1SelfFeatureReviewPostRequest) (*FeatureReviewResponse, *http.Response, error)
+	/*
+	 * ApiAuthorizationsV1SelfAccessReviewPostExecute executes the request
+	 * @return AccessReviewResponse
+	 */
+	ApiAuthorizationsV1SelfAccessReviewPostExecute(r ApiApiAuthorizationsV1SelfAccessReviewPostRequest) (AccessReviewResponse, *_nethttp.Response, error)
 
 	/*
-	ApiAuthorizationsV1SelfResourceReviewPost Obtain resource ids for resources you may perform the specified action upon. Resource ids returned as [\"*\"] is shorthand for all ids.
+	 * ApiAuthorizationsV1SelfFeatureReviewPost Review your ability to toggle a feature
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiApiAuthorizationsV1SelfFeatureReviewPostRequest
+	 */
+	ApiAuthorizationsV1SelfFeatureReviewPost(ctx _context.Context) ApiApiAuthorizationsV1SelfFeatureReviewPostRequest
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiApiAuthorizationsV1SelfResourceReviewPostRequest
-	*/
-	ApiAuthorizationsV1SelfResourceReviewPost(ctx context.Context) ApiApiAuthorizationsV1SelfResourceReviewPostRequest
+	/*
+	 * ApiAuthorizationsV1SelfFeatureReviewPostExecute executes the request
+	 * @return FeatureReviewResponse
+	 */
+	ApiAuthorizationsV1SelfFeatureReviewPostExecute(r ApiApiAuthorizationsV1SelfFeatureReviewPostRequest) (FeatureReviewResponse, *_nethttp.Response, error)
 
-	// ApiAuthorizationsV1SelfResourceReviewPostExecute executes the request
-	//  @return SelfResourceReview
-	ApiAuthorizationsV1SelfResourceReviewPostExecute(r ApiApiAuthorizationsV1SelfResourceReviewPostRequest) (*SelfResourceReview, *http.Response, error)
+	/*
+	 * ApiAuthorizationsV1SelfResourceReviewPost Obtain resource ids for resources you may perform the specified action upon. Resource ids returned as [\"*\"] is shorthand for all ids.
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiApiAuthorizationsV1SelfResourceReviewPostRequest
+	 */
+	ApiAuthorizationsV1SelfResourceReviewPost(ctx _context.Context) ApiApiAuthorizationsV1SelfResourceReviewPostRequest
 
 	/*
-	ApiAuthorizationsV1TermsReviewPost Review an account's status of Terms
+	 * ApiAuthorizationsV1SelfResourceReviewPostExecute executes the request
+	 * @return SelfResourceReview
+	 */
+	ApiAuthorizationsV1SelfResourceReviewPostExecute(r ApiApiAuthorizationsV1SelfResourceReviewPostRequest) (SelfResourceReview, *_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiApiAuthorizationsV1TermsReviewPostRequest
-	*/
-	ApiAuthorizationsV1TermsReviewPost(ctx context.Context) ApiApiAuthorizationsV1TermsReviewPostRequest
+	/*
+	 * ApiAuthorizationsV1TermsReviewPost Review an account's status of Terms
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiApiAuthorizationsV1TermsReviewPostRequest
+	 */
+	ApiAuthorizationsV1TermsReviewPost(ctx _context.Context) ApiApiAuthorizationsV1TermsReviewPostRequest
 
-	// ApiAuthorizationsV1TermsReviewPostExecute executes the request
-	//  @return TermsReviewResponse
-	ApiAuthorizationsV1TermsReviewPostExecute(r ApiApiAuthorizationsV1TermsReviewPostRequest) (*TermsReviewResponse, *http.Response, error)
+	/*
+	 * ApiAuthorizationsV1TermsReviewPostExecute executes the request
+	 * @return TermsReviewResponse
+	 */
+	ApiAuthorizationsV1TermsReviewPostExecute(r ApiApiAuthorizationsV1TermsReviewPostRequest) (TermsReviewResponse, *_nethttp.Response, error)
 }
 
 // DefaultApiService DefaultApi service
 type DefaultApiService service
 
 type ApiApiAccountsMgmtV1AccountsGetRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	page *int32
 	size *int32
@@ -1683,85 +1803,75 @@ type ApiApiAccountsMgmtV1AccountsGetRequest struct {
 	fetchCapabilities *bool
 }
 
-// Page number of record list when record list exceeds specified page size
 func (r ApiApiAccountsMgmtV1AccountsGetRequest) Page(page int32) ApiApiAccountsMgmtV1AccountsGetRequest {
 	r.page = &page
 	return r
 }
-
-// Maximum number of records to return
 func (r ApiApiAccountsMgmtV1AccountsGetRequest) Size(size int32) ApiApiAccountsMgmtV1AccountsGetRequest {
 	r.size = &size
 	return r
 }
-
-// Specifies the search criteria. The syntax of this parameter is similar to the syntax of the _where_ clause of an SQL statement, using the names of the json attributes / column names of the account. For example, in order to retrieve all the accounts with a username starting with `my`:  ```sql username like 'my%' ```  The search criteria can also be applied on related resource. For example, in order to retrieve all the subscriptions labeled by `foo=bar`,  ```sql labels.key = 'foo' and labels.value = 'bar' ```  If the parameter isn't provided, or if the value is empty, then all the accounts that the user has permission to see will be returned.
 func (r ApiApiAccountsMgmtV1AccountsGetRequest) Search(search string) ApiApiAccountsMgmtV1AccountsGetRequest {
 	r.search = &search
 	return r
 }
-
-// Specifies the order by criteria. The syntax of this parameter is similar to the syntax of the _order by_ clause of an SQL statement, but using the names of the json attributes / column of the account. For example, in order to retrieve all accounts ordered by username:  ```sql username asc ```  Or in order to retrieve all accounts ordered by username _and_ first name:  ```sql username asc, firstName asc ```  If the parameter isn't provided, or if the value is empty, then no explicit ordering will be applied.
 func (r ApiApiAccountsMgmtV1AccountsGetRequest) OrderBy(orderBy string) ApiApiAccountsMgmtV1AccountsGetRequest {
 	r.orderBy = &orderBy
 	return r
 }
-
-// Supplies a comma-separated list of fields to be returned. Fields of sub-structures and of arrays use <structure>.<field> notation. <stucture>.* means all field of a structure Example: For each Subscription to get id, href, plan(id and kind) and labels (all fields)  ``` ocm get subscriptions --parameter fields=id,href,plan.id,plan.kind,labels.* --parameter fetchLabels=true ```
 func (r ApiApiAccountsMgmtV1AccountsGetRequest) Fields(fields string) ApiApiAccountsMgmtV1AccountsGetRequest {
 	r.fields = &fields
 	return r
 }
-
-// If true, includes the labels on a subscription/organization/account in the output. Could slow request response time.
 func (r ApiApiAccountsMgmtV1AccountsGetRequest) FetchLabels(fetchLabels bool) ApiApiAccountsMgmtV1AccountsGetRequest {
 	r.fetchLabels = &fetchLabels
 	return r
 }
-
-// If true, includes the capabilities on a subscription in the output. Could slow request response time.
 func (r ApiApiAccountsMgmtV1AccountsGetRequest) FetchCapabilities(fetchCapabilities bool) ApiApiAccountsMgmtV1AccountsGetRequest {
 	r.fetchCapabilities = &fetchCapabilities
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1AccountsGetRequest) Execute() (*AccountList, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1AccountsGetRequest) Execute() (AccountList, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1AccountsGetExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1AccountsGet Returns a list of accounts
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiApiAccountsMgmtV1AccountsGetRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1AccountsGet(ctx context.Context) ApiApiAccountsMgmtV1AccountsGetRequest {
+ * ApiAccountsMgmtV1AccountsGet Returns a list of accounts
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiApiAccountsMgmtV1AccountsGetRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1AccountsGet(ctx _context.Context) ApiApiAccountsMgmtV1AccountsGetRequest {
 	return ApiApiAccountsMgmtV1AccountsGetRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return AccountList
-func (a *DefaultApiService) ApiAccountsMgmtV1AccountsGetExecute(r ApiApiAccountsMgmtV1AccountsGetRequest) (*AccountList, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return AccountList
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1AccountsGetExecute(r ApiApiAccountsMgmtV1AccountsGetRequest) (AccountList, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *AccountList
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  AccountList
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1AccountsGet")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/accounts"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.page != nil {
 		localVarQueryParams.Add("page", parameterToString(*r.page, ""))
@@ -1801,7 +1911,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsGetExecute(r ApiApiAccounts
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -1811,15 +1921,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsGetExecute(r ApiApiAccounts
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -1830,8 +1940,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsGetExecute(r ApiApiAccounts
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -1841,8 +1950,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsGetExecute(r ApiApiAccounts
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -1852,15 +1960,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsGetExecute(r ApiApiAccounts
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -1871,7 +1978,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsGetExecute(r ApiApiAccounts
 }
 
 type ApiApiAccountsMgmtV1AccountsIdGetRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	id string
 	fetchLabels *bool
@@ -1879,36 +1986,30 @@ type ApiApiAccountsMgmtV1AccountsIdGetRequest struct {
 	fetchRhit *bool
 }
 
-// If true, includes the labels on a subscription/organization/account in the output. Could slow request response time.
 func (r ApiApiAccountsMgmtV1AccountsIdGetRequest) FetchLabels(fetchLabels bool) ApiApiAccountsMgmtV1AccountsIdGetRequest {
 	r.fetchLabels = &fetchLabels
 	return r
 }
-
-// If true, includes the capabilities on a subscription in the output. Could slow request response time.
 func (r ApiApiAccountsMgmtV1AccountsIdGetRequest) FetchCapabilities(fetchCapabilities bool) ApiApiAccountsMgmtV1AccountsIdGetRequest {
 	r.fetchCapabilities = &fetchCapabilities
 	return r
 }
-
-// If true, includes the RHIT account_id in the output. Could slow request response time.
 func (r ApiApiAccountsMgmtV1AccountsIdGetRequest) FetchRhit(fetchRhit bool) ApiApiAccountsMgmtV1AccountsIdGetRequest {
 	r.fetchRhit = &fetchRhit
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1AccountsIdGetRequest) Execute() (*Account, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1AccountsIdGetRequest) Execute() (Account, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1AccountsIdGetExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1AccountsIdGet Get an account by id
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The id of record
- @return ApiApiAccountsMgmtV1AccountsIdGetRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdGet(ctx context.Context, id string) ApiApiAccountsMgmtV1AccountsIdGetRequest {
+ * ApiAccountsMgmtV1AccountsIdGet Get an account by id
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The id of record
+ * @return ApiApiAccountsMgmtV1AccountsIdGetRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdGet(ctx _context.Context, id string) ApiApiAccountsMgmtV1AccountsIdGetRequest {
 	return ApiApiAccountsMgmtV1AccountsIdGetRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -1916,27 +2017,31 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdGet(ctx context.Context,
 	}
 }
 
-// Execute executes the request
-//  @return Account
-func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdGetExecute(r ApiApiAccountsMgmtV1AccountsIdGetRequest) (*Account, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return Account
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdGetExecute(r ApiApiAccountsMgmtV1AccountsIdGetRequest) (Account, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *Account
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  Account
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1AccountsIdGet")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/accounts/{id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.fetchLabels != nil {
 		localVarQueryParams.Add("fetchLabels", parameterToString(*r.fetchLabels, ""))
@@ -1964,7 +2069,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdGetExecute(r ApiApiAccoun
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -1974,15 +2079,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdGetExecute(r ApiApiAccoun
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -1993,8 +2098,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdGetExecute(r ApiApiAccoun
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -2004,8 +2108,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdGetExecute(r ApiApiAccoun
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -2015,8 +2118,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdGetExecute(r ApiApiAccoun
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -2026,15 +2128,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdGetExecute(r ApiApiAccoun
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -2045,7 +2146,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdGetExecute(r ApiApiAccoun
 }
 
 type ApiApiAccountsMgmtV1AccountsIdLabelsGetRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	id string
 	page *int32
@@ -2054,42 +2155,34 @@ type ApiApiAccountsMgmtV1AccountsIdLabelsGetRequest struct {
 	orderBy *string
 }
 
-// Page number of record list when record list exceeds specified page size
 func (r ApiApiAccountsMgmtV1AccountsIdLabelsGetRequest) Page(page int32) ApiApiAccountsMgmtV1AccountsIdLabelsGetRequest {
 	r.page = &page
 	return r
 }
-
-// Maximum number of records to return
 func (r ApiApiAccountsMgmtV1AccountsIdLabelsGetRequest) Size(size int32) ApiApiAccountsMgmtV1AccountsIdLabelsGetRequest {
 	r.size = &size
 	return r
 }
-
-// Specifies the search criteria. The syntax of this parameter is similar to the syntax of the _where_ clause of an SQL statement, using the names of the json attributes / column names of the account. For example, in order to retrieve all the accounts with a username starting with `my`:  ```sql username like 'my%' ```  The search criteria can also be applied on related resource. For example, in order to retrieve all the subscriptions labeled by `foo=bar`,  ```sql labels.key = 'foo' and labels.value = 'bar' ```  If the parameter isn't provided, or if the value is empty, then all the accounts that the user has permission to see will be returned.
 func (r ApiApiAccountsMgmtV1AccountsIdLabelsGetRequest) Search(search string) ApiApiAccountsMgmtV1AccountsIdLabelsGetRequest {
 	r.search = &search
 	return r
 }
-
-// Specifies the order by criteria. The syntax of this parameter is similar to the syntax of the _order by_ clause of an SQL statement, but using the names of the json attributes / column of the account. For example, in order to retrieve all accounts ordered by username:  ```sql username asc ```  Or in order to retrieve all accounts ordered by username _and_ first name:  ```sql username asc, firstName asc ```  If the parameter isn't provided, or if the value is empty, then no explicit ordering will be applied.
 func (r ApiApiAccountsMgmtV1AccountsIdLabelsGetRequest) OrderBy(orderBy string) ApiApiAccountsMgmtV1AccountsIdLabelsGetRequest {
 	r.orderBy = &orderBy
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1AccountsIdLabelsGetRequest) Execute() (*LabelList, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1AccountsIdLabelsGetRequest) Execute() (LabelList, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1AccountsIdLabelsGetExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1AccountsIdLabelsGet Returns a list of labels
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The id of record
- @return ApiApiAccountsMgmtV1AccountsIdLabelsGetRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdLabelsGet(ctx context.Context, id string) ApiApiAccountsMgmtV1AccountsIdLabelsGetRequest {
+ * ApiAccountsMgmtV1AccountsIdLabelsGet Returns a list of labels
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The id of record
+ * @return ApiApiAccountsMgmtV1AccountsIdLabelsGetRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdLabelsGet(ctx _context.Context, id string) ApiApiAccountsMgmtV1AccountsIdLabelsGetRequest {
 	return ApiApiAccountsMgmtV1AccountsIdLabelsGetRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -2097,27 +2190,31 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdLabelsGet(ctx context.Con
 	}
 }
 
-// Execute executes the request
-//  @return LabelList
-func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdLabelsGetExecute(r ApiApiAccountsMgmtV1AccountsIdLabelsGetRequest) (*LabelList, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return LabelList
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdLabelsGetExecute(r ApiApiAccountsMgmtV1AccountsIdLabelsGetRequest) (LabelList, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *LabelList
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  LabelList
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1AccountsIdLabelsGet")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/accounts/{id}/labels"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.page != nil {
 		localVarQueryParams.Add("page", parameterToString(*r.page, ""))
@@ -2148,7 +2245,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdLabelsGetExecute(r ApiApi
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -2158,15 +2255,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdLabelsGetExecute(r ApiApi
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -2177,8 +2274,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdLabelsGetExecute(r ApiApi
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -2188,8 +2284,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdLabelsGetExecute(r ApiApi
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -2199,15 +2294,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdLabelsGetExecute(r ApiApi
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -2218,25 +2312,25 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdLabelsGetExecute(r ApiApi
 }
 
 type ApiApiAccountsMgmtV1AccountsIdLabelsKeyDeleteRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	id string
 	key string
 }
 
-func (r ApiApiAccountsMgmtV1AccountsIdLabelsKeyDeleteRequest) Execute() (*http.Response, error) {
+
+func (r ApiApiAccountsMgmtV1AccountsIdLabelsKeyDeleteRequest) Execute() (*_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1AccountsIdLabelsKeyDeleteExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1AccountsIdLabelsKeyDelete Delete a label
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The id of record
- @param key The key of the label
- @return ApiApiAccountsMgmtV1AccountsIdLabelsKeyDeleteRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdLabelsKeyDelete(ctx context.Context, id string, key string) ApiApiAccountsMgmtV1AccountsIdLabelsKeyDeleteRequest {
+ * ApiAccountsMgmtV1AccountsIdLabelsKeyDelete Delete a label
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The id of record
+ * @param key The key of the label
+ * @return ApiApiAccountsMgmtV1AccountsIdLabelsKeyDeleteRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdLabelsKeyDelete(ctx _context.Context, id string, key string) ApiApiAccountsMgmtV1AccountsIdLabelsKeyDeleteRequest {
 	return ApiApiAccountsMgmtV1AccountsIdLabelsKeyDeleteRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -2245,26 +2339,30 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdLabelsKeyDelete(ctx conte
 	}
 }
 
-// Execute executes the request
-func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdLabelsKeyDeleteExecute(r ApiApiAccountsMgmtV1AccountsIdLabelsKeyDeleteRequest) (*http.Response, error) {
+/*
+ * Execute executes the request
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdLabelsKeyDeleteExecute(r ApiApiAccountsMgmtV1AccountsIdLabelsKeyDeleteRequest) (*_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodDelete
+		localVarHTTPMethod   = _nethttp.MethodDelete
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1AccountsIdLabelsKeyDelete")
 	if err != nil {
-		return nil, &GenericOpenAPIError{error: err.Error()}
+		return nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/accounts/{id}/labels/{key}"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"key"+"}", url.PathEscape(parameterToString(r.key, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"key"+"}", _neturl.PathEscape(parameterToString(r.key, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -2283,7 +2381,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdLabelsKeyDeleteExecute(r
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return nil, err
 	}
@@ -2293,15 +2391,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdLabelsKeyDeleteExecute(r
 		return localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -2312,8 +2410,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdLabelsKeyDeleteExecute(r
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -2323,8 +2420,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdLabelsKeyDeleteExecute(r
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -2334,8 +2430,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdLabelsKeyDeleteExecute(r
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -2345,8 +2440,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdLabelsKeyDeleteExecute(r
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarHTTPResponse, newErr
 	}
@@ -2355,25 +2449,25 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdLabelsKeyDeleteExecute(r
 }
 
 type ApiApiAccountsMgmtV1AccountsIdLabelsKeyGetRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	id string
 	key string
 }
 
-func (r ApiApiAccountsMgmtV1AccountsIdLabelsKeyGetRequest) Execute() (*Label, *http.Response, error) {
+
+func (r ApiApiAccountsMgmtV1AccountsIdLabelsKeyGetRequest) Execute() (Label, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1AccountsIdLabelsKeyGetExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1AccountsIdLabelsKeyGet Get subscription labels by label key
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The id of record
- @param key The key of the label
- @return ApiApiAccountsMgmtV1AccountsIdLabelsKeyGetRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdLabelsKeyGet(ctx context.Context, id string, key string) ApiApiAccountsMgmtV1AccountsIdLabelsKeyGetRequest {
+ * ApiAccountsMgmtV1AccountsIdLabelsKeyGet Get subscription labels by label key
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The id of record
+ * @param key The key of the label
+ * @return ApiApiAccountsMgmtV1AccountsIdLabelsKeyGetRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdLabelsKeyGet(ctx _context.Context, id string, key string) ApiApiAccountsMgmtV1AccountsIdLabelsKeyGetRequest {
 	return ApiApiAccountsMgmtV1AccountsIdLabelsKeyGetRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -2382,28 +2476,32 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdLabelsKeyGet(ctx context.
 	}
 }
 
-// Execute executes the request
-//  @return Label
-func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdLabelsKeyGetExecute(r ApiApiAccountsMgmtV1AccountsIdLabelsKeyGetRequest) (*Label, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return Label
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdLabelsKeyGetExecute(r ApiApiAccountsMgmtV1AccountsIdLabelsKeyGetRequest) (Label, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *Label
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  Label
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1AccountsIdLabelsKeyGet")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/accounts/{id}/labels/{key}"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"key"+"}", url.PathEscape(parameterToString(r.key, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"key"+"}", _neturl.PathEscape(parameterToString(r.key, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -2422,7 +2520,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdLabelsKeyGetExecute(r Api
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -2432,15 +2530,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdLabelsKeyGetExecute(r Api
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -2451,8 +2549,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdLabelsKeyGetExecute(r Api
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -2462,8 +2559,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdLabelsKeyGetExecute(r Api
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -2473,8 +2569,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdLabelsKeyGetExecute(r Api
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -2484,15 +2579,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdLabelsKeyGetExecute(r Api
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -2503,32 +2597,30 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdLabelsKeyGetExecute(r Api
 }
 
 type ApiApiAccountsMgmtV1AccountsIdLabelsKeyPatchRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	id string
 	key string
 	label *Label
 }
 
-// Label data
 func (r ApiApiAccountsMgmtV1AccountsIdLabelsKeyPatchRequest) Label(label Label) ApiApiAccountsMgmtV1AccountsIdLabelsKeyPatchRequest {
 	r.label = &label
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1AccountsIdLabelsKeyPatchRequest) Execute() (*Label, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1AccountsIdLabelsKeyPatchRequest) Execute() (Label, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1AccountsIdLabelsKeyPatchExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1AccountsIdLabelsKeyPatch Create a new label or update an existing label
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The id of record
- @param key The key of the label
- @return ApiApiAccountsMgmtV1AccountsIdLabelsKeyPatchRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdLabelsKeyPatch(ctx context.Context, id string, key string) ApiApiAccountsMgmtV1AccountsIdLabelsKeyPatchRequest {
+ * ApiAccountsMgmtV1AccountsIdLabelsKeyPatch Create a new label or update an existing label
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The id of record
+ * @param key The key of the label
+ * @return ApiApiAccountsMgmtV1AccountsIdLabelsKeyPatchRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdLabelsKeyPatch(ctx _context.Context, id string, key string) ApiApiAccountsMgmtV1AccountsIdLabelsKeyPatchRequest {
 	return ApiApiAccountsMgmtV1AccountsIdLabelsKeyPatchRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -2537,28 +2629,32 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdLabelsKeyPatch(ctx contex
 	}
 }
 
-// Execute executes the request
-//  @return Label
-func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdLabelsKeyPatchExecute(r ApiApiAccountsMgmtV1AccountsIdLabelsKeyPatchRequest) (*Label, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return Label
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdLabelsKeyPatchExecute(r ApiApiAccountsMgmtV1AccountsIdLabelsKeyPatchRequest) (Label, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPatch
+		localVarHTTPMethod   = _nethttp.MethodPatch
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *Label
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  Label
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1AccountsIdLabelsKeyPatch")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/accounts/{id}/labels/{key}"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"key"+"}", url.PathEscape(parameterToString(r.key, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"key"+"}", _neturl.PathEscape(parameterToString(r.key, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.label == nil {
 		return localVarReturnValue, nil, reportError("label is required and must be specified")
 	}
@@ -2582,7 +2678,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdLabelsKeyPatchExecute(r A
 	}
 	// body params
 	localVarPostBody = r.label
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -2592,15 +2688,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdLabelsKeyPatchExecute(r A
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -2611,8 +2707,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdLabelsKeyPatchExecute(r A
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -2622,8 +2717,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdLabelsKeyPatchExecute(r A
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -2633,8 +2727,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdLabelsKeyPatchExecute(r A
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 409 {
@@ -2644,8 +2737,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdLabelsKeyPatchExecute(r A
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -2655,15 +2747,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdLabelsKeyPatchExecute(r A
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -2674,30 +2765,28 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdLabelsKeyPatchExecute(r A
 }
 
 type ApiApiAccountsMgmtV1AccountsIdLabelsPostRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	id string
 	label *Label
 }
 
-// Label data
 func (r ApiApiAccountsMgmtV1AccountsIdLabelsPostRequest) Label(label Label) ApiApiAccountsMgmtV1AccountsIdLabelsPostRequest {
 	r.label = &label
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1AccountsIdLabelsPostRequest) Execute() (*Label, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1AccountsIdLabelsPostRequest) Execute() (Label, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1AccountsIdLabelsPostExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1AccountsIdLabelsPost Create a new label or update an existing label
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The id of record
- @return ApiApiAccountsMgmtV1AccountsIdLabelsPostRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdLabelsPost(ctx context.Context, id string) ApiApiAccountsMgmtV1AccountsIdLabelsPostRequest {
+ * ApiAccountsMgmtV1AccountsIdLabelsPost Create a new label or update an existing label
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The id of record
+ * @return ApiApiAccountsMgmtV1AccountsIdLabelsPostRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdLabelsPost(ctx _context.Context, id string) ApiApiAccountsMgmtV1AccountsIdLabelsPostRequest {
 	return ApiApiAccountsMgmtV1AccountsIdLabelsPostRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -2705,27 +2794,31 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdLabelsPost(ctx context.Co
 	}
 }
 
-// Execute executes the request
-//  @return Label
-func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdLabelsPostExecute(r ApiApiAccountsMgmtV1AccountsIdLabelsPostRequest) (*Label, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return Label
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdLabelsPostExecute(r ApiApiAccountsMgmtV1AccountsIdLabelsPostRequest) (Label, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *Label
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  Label
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1AccountsIdLabelsPost")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/accounts/{id}/labels"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.label == nil {
 		return localVarReturnValue, nil, reportError("label is required and must be specified")
 	}
@@ -2749,7 +2842,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdLabelsPostExecute(r ApiAp
 	}
 	// body params
 	localVarPostBody = r.label
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -2759,15 +2852,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdLabelsPostExecute(r ApiAp
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -2778,8 +2871,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdLabelsPostExecute(r ApiAp
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -2789,8 +2881,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdLabelsPostExecute(r ApiAp
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -2800,8 +2891,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdLabelsPostExecute(r ApiAp
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -2811,15 +2901,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdLabelsPostExecute(r ApiAp
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -2830,30 +2919,28 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdLabelsPostExecute(r ApiAp
 }
 
 type ApiApiAccountsMgmtV1AccountsIdPatchRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	id string
 	accountPatchRequest *AccountPatchRequest
 }
 
-// Updated account data
 func (r ApiApiAccountsMgmtV1AccountsIdPatchRequest) AccountPatchRequest(accountPatchRequest AccountPatchRequest) ApiApiAccountsMgmtV1AccountsIdPatchRequest {
 	r.accountPatchRequest = &accountPatchRequest
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1AccountsIdPatchRequest) Execute() (*Account, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1AccountsIdPatchRequest) Execute() (Account, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1AccountsIdPatchExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1AccountsIdPatch Update an account
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The id of record
- @return ApiApiAccountsMgmtV1AccountsIdPatchRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdPatch(ctx context.Context, id string) ApiApiAccountsMgmtV1AccountsIdPatchRequest {
+ * ApiAccountsMgmtV1AccountsIdPatch Update an account
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The id of record
+ * @return ApiApiAccountsMgmtV1AccountsIdPatchRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdPatch(ctx _context.Context, id string) ApiApiAccountsMgmtV1AccountsIdPatchRequest {
 	return ApiApiAccountsMgmtV1AccountsIdPatchRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -2861,27 +2948,31 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdPatch(ctx context.Context
 	}
 }
 
-// Execute executes the request
-//  @return Account
-func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdPatchExecute(r ApiApiAccountsMgmtV1AccountsIdPatchRequest) (*Account, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return Account
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdPatchExecute(r ApiApiAccountsMgmtV1AccountsIdPatchRequest) (Account, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPatch
+		localVarHTTPMethod   = _nethttp.MethodPatch
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *Account
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  Account
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1AccountsIdPatch")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/accounts/{id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.accountPatchRequest == nil {
 		return localVarReturnValue, nil, reportError("accountPatchRequest is required and must be specified")
 	}
@@ -2905,7 +2996,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdPatchExecute(r ApiApiAcco
 	}
 	// body params
 	localVarPostBody = r.accountPatchRequest
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -2915,15 +3006,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdPatchExecute(r ApiApiAcco
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -2934,8 +3025,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdPatchExecute(r ApiApiAcco
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -2945,8 +3035,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdPatchExecute(r ApiApiAcco
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -2956,8 +3045,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdPatchExecute(r ApiApiAcco
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -2967,8 +3055,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdPatchExecute(r ApiApiAcco
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 409 {
@@ -2978,8 +3065,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdPatchExecute(r ApiApiAcco
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -2989,15 +3075,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdPatchExecute(r ApiApiAcco
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -3008,61 +3093,61 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsIdPatchExecute(r ApiApiAcco
 }
 
 type ApiApiAccountsMgmtV1AccountsPostRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	account *Account
 	dryRun *bool
 }
 
-// Account data
 func (r ApiApiAccountsMgmtV1AccountsPostRequest) Account(account Account) ApiApiAccountsMgmtV1AccountsPostRequest {
 	r.account = &account
 	return r
 }
-
-// If true, instructs API to avoid making any changes, but rather run through validations only.
 func (r ApiApiAccountsMgmtV1AccountsPostRequest) DryRun(dryRun bool) ApiApiAccountsMgmtV1AccountsPostRequest {
 	r.dryRun = &dryRun
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1AccountsPostRequest) Execute() (*Account, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1AccountsPostRequest) Execute() (Account, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1AccountsPostExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1AccountsPost Create a new account
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiApiAccountsMgmtV1AccountsPostRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1AccountsPost(ctx context.Context) ApiApiAccountsMgmtV1AccountsPostRequest {
+ * ApiAccountsMgmtV1AccountsPost Create a new account
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiApiAccountsMgmtV1AccountsPostRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1AccountsPost(ctx _context.Context) ApiApiAccountsMgmtV1AccountsPostRequest {
 	return ApiApiAccountsMgmtV1AccountsPostRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return Account
-func (a *DefaultApiService) ApiAccountsMgmtV1AccountsPostExecute(r ApiApiAccountsMgmtV1AccountsPostRequest) (*Account, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return Account
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1AccountsPostExecute(r ApiApiAccountsMgmtV1AccountsPostRequest) (Account, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *Account
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  Account
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1AccountsPost")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/accounts"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.account == nil {
 		return localVarReturnValue, nil, reportError("account is required and must be specified")
 	}
@@ -3089,7 +3174,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsPostExecute(r ApiApiAccount
 	}
 	// body params
 	localVarPostBody = r.account
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -3099,15 +3184,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsPostExecute(r ApiApiAccount
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -3118,8 +3203,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsPostExecute(r ApiApiAccount
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -3129,8 +3213,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsPostExecute(r ApiApiAccount
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -3140,8 +3223,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsPostExecute(r ApiApiAccount
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 409 {
@@ -3151,8 +3233,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsPostExecute(r ApiApiAccount
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -3162,15 +3243,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsPostExecute(r ApiApiAccount
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -3181,54 +3261,56 @@ func (a *DefaultApiService) ApiAccountsMgmtV1AccountsPostExecute(r ApiApiAccount
 }
 
 type ApiApiAccountsMgmtV1CertificatesPostRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	certificatesRequest *CertificatesRequest
 }
 
-// # The payload depends on the type of the requested certificate The examples for supported types: * {\"type\": \"sca\", \"arch\": \"x86_64\"} 
 func (r ApiApiAccountsMgmtV1CertificatesPostRequest) CertificatesRequest(certificatesRequest CertificatesRequest) ApiApiAccountsMgmtV1CertificatesPostRequest {
 	r.certificatesRequest = &certificatesRequest
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1CertificatesPostRequest) Execute() (*Certificate, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1CertificatesPostRequest) Execute() (Certificate, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1CertificatesPostExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1CertificatesPost Fetch certificates of a particular type
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiApiAccountsMgmtV1CertificatesPostRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1CertificatesPost(ctx context.Context) ApiApiAccountsMgmtV1CertificatesPostRequest {
+ * ApiAccountsMgmtV1CertificatesPost Fetch certificates of a particular type
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiApiAccountsMgmtV1CertificatesPostRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1CertificatesPost(ctx _context.Context) ApiApiAccountsMgmtV1CertificatesPostRequest {
 	return ApiApiAccountsMgmtV1CertificatesPostRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return Certificate
-func (a *DefaultApiService) ApiAccountsMgmtV1CertificatesPostExecute(r ApiApiAccountsMgmtV1CertificatesPostRequest) (*Certificate, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return Certificate
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1CertificatesPostExecute(r ApiApiAccountsMgmtV1CertificatesPostRequest) (Certificate, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *Certificate
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  Certificate
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1CertificatesPost")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/certificates"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.certificatesRequest == nil {
 		return localVarReturnValue, nil, reportError("certificatesRequest is required and must be specified")
 	}
@@ -3266,7 +3348,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1CertificatesPostExecute(r ApiApiAcc
 			}
 		}
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -3276,15 +3358,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1CertificatesPostExecute(r ApiApiAcc
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -3295,8 +3377,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1CertificatesPostExecute(r ApiApiAcc
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -3306,8 +3387,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1CertificatesPostExecute(r ApiApiAcc
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -3317,8 +3397,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1CertificatesPostExecute(r ApiApiAcc
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -3328,8 +3407,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1CertificatesPostExecute(r ApiApiAcc
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -3339,15 +3417,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1CertificatesPostExecute(r ApiApiAcc
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -3358,68 +3435,66 @@ func (a *DefaultApiService) ApiAccountsMgmtV1CertificatesPostExecute(r ApiApiAcc
 }
 
 type ApiApiAccountsMgmtV1CloudResourcesGetRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	page *int32
 	size *int32
 	search *string
 }
 
-// Page number of record list when record list exceeds specified page size
 func (r ApiApiAccountsMgmtV1CloudResourcesGetRequest) Page(page int32) ApiApiAccountsMgmtV1CloudResourcesGetRequest {
 	r.page = &page
 	return r
 }
-
-// Maximum number of records to return
 func (r ApiApiAccountsMgmtV1CloudResourcesGetRequest) Size(size int32) ApiApiAccountsMgmtV1CloudResourcesGetRequest {
 	r.size = &size
 	return r
 }
-
-// Specifies the search criteria. The syntax of this parameter is similar to the syntax of the _where_ clause of an SQL statement, using the names of the json attributes / column names of the account. For example, in order to retrieve all the accounts with a username starting with `my`:  ```sql username like 'my%' ```  The search criteria can also be applied on related resource. For example, in order to retrieve all the subscriptions labeled by `foo=bar`,  ```sql labels.key = 'foo' and labels.value = 'bar' ```  If the parameter isn't provided, or if the value is empty, then all the accounts that the user has permission to see will be returned.
 func (r ApiApiAccountsMgmtV1CloudResourcesGetRequest) Search(search string) ApiApiAccountsMgmtV1CloudResourcesGetRequest {
 	r.search = &search
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1CloudResourcesGetRequest) Execute() (*CloudResourceList, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1CloudResourcesGetRequest) Execute() (CloudResourceList, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1CloudResourcesGetExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1CloudResourcesGet Returns a list of cloud resources
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiApiAccountsMgmtV1CloudResourcesGetRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1CloudResourcesGet(ctx context.Context) ApiApiAccountsMgmtV1CloudResourcesGetRequest {
+ * ApiAccountsMgmtV1CloudResourcesGet Returns a list of cloud resources
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiApiAccountsMgmtV1CloudResourcesGetRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1CloudResourcesGet(ctx _context.Context) ApiApiAccountsMgmtV1CloudResourcesGetRequest {
 	return ApiApiAccountsMgmtV1CloudResourcesGetRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return CloudResourceList
-func (a *DefaultApiService) ApiAccountsMgmtV1CloudResourcesGetExecute(r ApiApiAccountsMgmtV1CloudResourcesGetRequest) (*CloudResourceList, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return CloudResourceList
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1CloudResourcesGetExecute(r ApiApiAccountsMgmtV1CloudResourcesGetRequest) (CloudResourceList, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *CloudResourceList
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  CloudResourceList
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1CloudResourcesGet")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/cloud_resources"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.page != nil {
 		localVarQueryParams.Add("page", parameterToString(*r.page, ""))
@@ -3447,7 +3522,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1CloudResourcesGetExecute(r ApiApiAc
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -3457,15 +3532,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1CloudResourcesGetExecute(r ApiApiAc
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -3476,8 +3551,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1CloudResourcesGetExecute(r ApiApiAc
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -3487,8 +3561,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1CloudResourcesGetExecute(r ApiApiAc
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -3498,15 +3571,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1CloudResourcesGetExecute(r ApiApiAc
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -3517,23 +3589,23 @@ func (a *DefaultApiService) ApiAccountsMgmtV1CloudResourcesGetExecute(r ApiApiAc
 }
 
 type ApiApiAccountsMgmtV1CloudResourcesIdDeleteRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	id string
 }
 
-func (r ApiApiAccountsMgmtV1CloudResourcesIdDeleteRequest) Execute() (*http.Response, error) {
+
+func (r ApiApiAccountsMgmtV1CloudResourcesIdDeleteRequest) Execute() (*_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1CloudResourcesIdDeleteExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1CloudResourcesIdDelete Delete a cloud resource
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The id of record
- @return ApiApiAccountsMgmtV1CloudResourcesIdDeleteRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1CloudResourcesIdDelete(ctx context.Context, id string) ApiApiAccountsMgmtV1CloudResourcesIdDeleteRequest {
+ * ApiAccountsMgmtV1CloudResourcesIdDelete Delete a cloud resource
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The id of record
+ * @return ApiApiAccountsMgmtV1CloudResourcesIdDeleteRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1CloudResourcesIdDelete(ctx _context.Context, id string) ApiApiAccountsMgmtV1CloudResourcesIdDeleteRequest {
 	return ApiApiAccountsMgmtV1CloudResourcesIdDeleteRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -3541,25 +3613,29 @@ func (a *DefaultApiService) ApiAccountsMgmtV1CloudResourcesIdDelete(ctx context.
 	}
 }
 
-// Execute executes the request
-func (a *DefaultApiService) ApiAccountsMgmtV1CloudResourcesIdDeleteExecute(r ApiApiAccountsMgmtV1CloudResourcesIdDeleteRequest) (*http.Response, error) {
+/*
+ * Execute executes the request
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1CloudResourcesIdDeleteExecute(r ApiApiAccountsMgmtV1CloudResourcesIdDeleteRequest) (*_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodDelete
+		localVarHTTPMethod   = _nethttp.MethodDelete
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1CloudResourcesIdDelete")
 	if err != nil {
-		return nil, &GenericOpenAPIError{error: err.Error()}
+		return nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/cloud_resources/{id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -3578,7 +3654,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1CloudResourcesIdDeleteExecute(r Api
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return nil, err
 	}
@@ -3588,15 +3664,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1CloudResourcesIdDeleteExecute(r Api
 		return localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -3607,8 +3683,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1CloudResourcesIdDeleteExecute(r Api
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -3618,8 +3693,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1CloudResourcesIdDeleteExecute(r Api
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -3629,8 +3703,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1CloudResourcesIdDeleteExecute(r Api
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -3640,8 +3713,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1CloudResourcesIdDeleteExecute(r Api
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarHTTPResponse, newErr
 	}
@@ -3650,23 +3722,23 @@ func (a *DefaultApiService) ApiAccountsMgmtV1CloudResourcesIdDeleteExecute(r Api
 }
 
 type ApiApiAccountsMgmtV1CloudResourcesIdGetRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	id string
 }
 
-func (r ApiApiAccountsMgmtV1CloudResourcesIdGetRequest) Execute() (*CloudResource, *http.Response, error) {
+
+func (r ApiApiAccountsMgmtV1CloudResourcesIdGetRequest) Execute() (CloudResource, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1CloudResourcesIdGetExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1CloudResourcesIdGet Get a cloud resource
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The id of record
- @return ApiApiAccountsMgmtV1CloudResourcesIdGetRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1CloudResourcesIdGet(ctx context.Context, id string) ApiApiAccountsMgmtV1CloudResourcesIdGetRequest {
+ * ApiAccountsMgmtV1CloudResourcesIdGet Get a cloud resource
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The id of record
+ * @return ApiApiAccountsMgmtV1CloudResourcesIdGetRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1CloudResourcesIdGet(ctx _context.Context, id string) ApiApiAccountsMgmtV1CloudResourcesIdGetRequest {
 	return ApiApiAccountsMgmtV1CloudResourcesIdGetRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -3674,27 +3746,31 @@ func (a *DefaultApiService) ApiAccountsMgmtV1CloudResourcesIdGet(ctx context.Con
 	}
 }
 
-// Execute executes the request
-//  @return CloudResource
-func (a *DefaultApiService) ApiAccountsMgmtV1CloudResourcesIdGetExecute(r ApiApiAccountsMgmtV1CloudResourcesIdGetRequest) (*CloudResource, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return CloudResource
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1CloudResourcesIdGetExecute(r ApiApiAccountsMgmtV1CloudResourcesIdGetRequest) (CloudResource, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *CloudResource
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  CloudResource
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1CloudResourcesIdGet")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/cloud_resources/{id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -3713,7 +3789,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1CloudResourcesIdGetExecute(r ApiApi
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -3723,15 +3799,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1CloudResourcesIdGetExecute(r ApiApi
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -3742,8 +3818,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1CloudResourcesIdGetExecute(r ApiApi
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -3753,8 +3828,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1CloudResourcesIdGetExecute(r ApiApi
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -3764,8 +3838,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1CloudResourcesIdGetExecute(r ApiApi
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -3775,15 +3848,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1CloudResourcesIdGetExecute(r ApiApi
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -3794,30 +3866,28 @@ func (a *DefaultApiService) ApiAccountsMgmtV1CloudResourcesIdGetExecute(r ApiApi
 }
 
 type ApiApiAccountsMgmtV1CloudResourcesIdPatchRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	id string
 	cloudResource *CloudResource
 }
 
-// Updated cloud resource data
 func (r ApiApiAccountsMgmtV1CloudResourcesIdPatchRequest) CloudResource(cloudResource CloudResource) ApiApiAccountsMgmtV1CloudResourcesIdPatchRequest {
 	r.cloudResource = &cloudResource
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1CloudResourcesIdPatchRequest) Execute() (*CloudResource, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1CloudResourcesIdPatchRequest) Execute() (CloudResource, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1CloudResourcesIdPatchExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1CloudResourcesIdPatch Update a cloud resource
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The id of record
- @return ApiApiAccountsMgmtV1CloudResourcesIdPatchRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1CloudResourcesIdPatch(ctx context.Context, id string) ApiApiAccountsMgmtV1CloudResourcesIdPatchRequest {
+ * ApiAccountsMgmtV1CloudResourcesIdPatch Update a cloud resource
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The id of record
+ * @return ApiApiAccountsMgmtV1CloudResourcesIdPatchRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1CloudResourcesIdPatch(ctx _context.Context, id string) ApiApiAccountsMgmtV1CloudResourcesIdPatchRequest {
 	return ApiApiAccountsMgmtV1CloudResourcesIdPatchRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -3825,27 +3895,31 @@ func (a *DefaultApiService) ApiAccountsMgmtV1CloudResourcesIdPatch(ctx context.C
 	}
 }
 
-// Execute executes the request
-//  @return CloudResource
-func (a *DefaultApiService) ApiAccountsMgmtV1CloudResourcesIdPatchExecute(r ApiApiAccountsMgmtV1CloudResourcesIdPatchRequest) (*CloudResource, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return CloudResource
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1CloudResourcesIdPatchExecute(r ApiApiAccountsMgmtV1CloudResourcesIdPatchRequest) (CloudResource, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPatch
+		localVarHTTPMethod   = _nethttp.MethodPatch
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *CloudResource
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  CloudResource
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1CloudResourcesIdPatch")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/cloud_resources/{id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.cloudResource == nil {
 		return localVarReturnValue, nil, reportError("cloudResource is required and must be specified")
 	}
@@ -3869,7 +3943,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1CloudResourcesIdPatchExecute(r ApiA
 	}
 	// body params
 	localVarPostBody = r.cloudResource
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -3879,15 +3953,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1CloudResourcesIdPatchExecute(r ApiA
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -3898,8 +3972,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1CloudResourcesIdPatchExecute(r ApiA
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -3909,8 +3982,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1CloudResourcesIdPatchExecute(r ApiA
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -3920,8 +3992,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1CloudResourcesIdPatchExecute(r ApiA
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -3931,8 +4002,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1CloudResourcesIdPatchExecute(r ApiA
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -3942,15 +4012,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1CloudResourcesIdPatchExecute(r ApiA
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -3961,54 +4030,56 @@ func (a *DefaultApiService) ApiAccountsMgmtV1CloudResourcesIdPatchExecute(r ApiA
 }
 
 type ApiApiAccountsMgmtV1CloudResourcesPostRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	cloudResource *CloudResource
 }
 
-// Cloud resource data
 func (r ApiApiAccountsMgmtV1CloudResourcesPostRequest) CloudResource(cloudResource CloudResource) ApiApiAccountsMgmtV1CloudResourcesPostRequest {
 	r.cloudResource = &cloudResource
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1CloudResourcesPostRequest) Execute() (*CloudResource, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1CloudResourcesPostRequest) Execute() (CloudResource, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1CloudResourcesPostExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1CloudResourcesPost Create a new cloud resource
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiApiAccountsMgmtV1CloudResourcesPostRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1CloudResourcesPost(ctx context.Context) ApiApiAccountsMgmtV1CloudResourcesPostRequest {
+ * ApiAccountsMgmtV1CloudResourcesPost Create a new cloud resource
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiApiAccountsMgmtV1CloudResourcesPostRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1CloudResourcesPost(ctx _context.Context) ApiApiAccountsMgmtV1CloudResourcesPostRequest {
 	return ApiApiAccountsMgmtV1CloudResourcesPostRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return CloudResource
-func (a *DefaultApiService) ApiAccountsMgmtV1CloudResourcesPostExecute(r ApiApiAccountsMgmtV1CloudResourcesPostRequest) (*CloudResource, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return CloudResource
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1CloudResourcesPostExecute(r ApiApiAccountsMgmtV1CloudResourcesPostRequest) (CloudResource, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *CloudResource
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  CloudResource
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1CloudResourcesPost")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/cloud_resources"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.cloudResource == nil {
 		return localVarReturnValue, nil, reportError("cloudResource is required and must be specified")
 	}
@@ -4032,7 +4103,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1CloudResourcesPostExecute(r ApiApiA
 	}
 	// body params
 	localVarPostBody = r.cloudResource
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -4042,15 +4113,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1CloudResourcesPostExecute(r ApiApiA
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -4061,8 +4132,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1CloudResourcesPostExecute(r ApiApiA
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -4072,8 +4142,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1CloudResourcesPostExecute(r ApiApiA
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -4083,8 +4152,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1CloudResourcesPostExecute(r ApiApiA
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 409 {
@@ -4094,8 +4162,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1CloudResourcesPostExecute(r ApiApiA
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -4105,15 +4172,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1CloudResourcesPostExecute(r ApiApiA
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -4124,54 +4190,56 @@ func (a *DefaultApiService) ApiAccountsMgmtV1CloudResourcesPostExecute(r ApiApiA
 }
 
 type ApiApiAccountsMgmtV1ClusterAuthorizationsPostRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	clusterAuthorizationRequest *ClusterAuthorizationRequest
 }
 
-// Cluster and authorization data
 func (r ApiApiAccountsMgmtV1ClusterAuthorizationsPostRequest) ClusterAuthorizationRequest(clusterAuthorizationRequest ClusterAuthorizationRequest) ApiApiAccountsMgmtV1ClusterAuthorizationsPostRequest {
 	r.clusterAuthorizationRequest = &clusterAuthorizationRequest
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1ClusterAuthorizationsPostRequest) Execute() (*ClusterAuthorizationResponse, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1ClusterAuthorizationsPostRequest) Execute() (ClusterAuthorizationResponse, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1ClusterAuthorizationsPostExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1ClusterAuthorizationsPost Authorizes new cluster creation against an exsiting RH Subscription.
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiApiAccountsMgmtV1ClusterAuthorizationsPostRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1ClusterAuthorizationsPost(ctx context.Context) ApiApiAccountsMgmtV1ClusterAuthorizationsPostRequest {
+ * ApiAccountsMgmtV1ClusterAuthorizationsPost Authorizes new cluster creation against an exsiting RH Subscription.
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiApiAccountsMgmtV1ClusterAuthorizationsPostRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1ClusterAuthorizationsPost(ctx _context.Context) ApiApiAccountsMgmtV1ClusterAuthorizationsPostRequest {
 	return ApiApiAccountsMgmtV1ClusterAuthorizationsPostRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return ClusterAuthorizationResponse
-func (a *DefaultApiService) ApiAccountsMgmtV1ClusterAuthorizationsPostExecute(r ApiApiAccountsMgmtV1ClusterAuthorizationsPostRequest) (*ClusterAuthorizationResponse, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return ClusterAuthorizationResponse
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1ClusterAuthorizationsPostExecute(r ApiApiAccountsMgmtV1ClusterAuthorizationsPostRequest) (ClusterAuthorizationResponse, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *ClusterAuthorizationResponse
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  ClusterAuthorizationResponse
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1ClusterAuthorizationsPost")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/cluster_authorizations"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.clusterAuthorizationRequest == nil {
 		return localVarReturnValue, nil, reportError("clusterAuthorizationRequest is required and must be specified")
 	}
@@ -4195,7 +4263,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ClusterAuthorizationsPostExecute(r
 	}
 	// body params
 	localVarPostBody = r.clusterAuthorizationRequest
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -4205,15 +4273,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ClusterAuthorizationsPostExecute(r
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -4224,8 +4292,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ClusterAuthorizationsPostExecute(r
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -4235,8 +4302,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ClusterAuthorizationsPostExecute(r
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -4246,8 +4312,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ClusterAuthorizationsPostExecute(r
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 409 {
@@ -4257,8 +4322,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ClusterAuthorizationsPostExecute(r
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 429 {
@@ -4268,8 +4332,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ClusterAuthorizationsPostExecute(r
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -4279,15 +4342,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ClusterAuthorizationsPostExecute(r
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -4298,54 +4360,56 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ClusterAuthorizationsPostExecute(r
 }
 
 type ApiApiAccountsMgmtV1ClusterRegistrationsPostRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	clusterRegistrationRequest *ClusterRegistrationRequest
 }
 
-// Cluster and authorization data
 func (r ApiApiAccountsMgmtV1ClusterRegistrationsPostRequest) ClusterRegistrationRequest(clusterRegistrationRequest ClusterRegistrationRequest) ApiApiAccountsMgmtV1ClusterRegistrationsPostRequest {
 	r.clusterRegistrationRequest = &clusterRegistrationRequest
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1ClusterRegistrationsPostRequest) Execute() (*ClusterRegistrationResponse, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1ClusterRegistrationsPostRequest) Execute() (ClusterRegistrationResponse, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1ClusterRegistrationsPostExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1ClusterRegistrationsPost Finds or creates a cluster registration with a registy credential token and cluster ID
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiApiAccountsMgmtV1ClusterRegistrationsPostRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1ClusterRegistrationsPost(ctx context.Context) ApiApiAccountsMgmtV1ClusterRegistrationsPostRequest {
+ * ApiAccountsMgmtV1ClusterRegistrationsPost Finds or creates a cluster registration with a registy credential token and cluster ID
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiApiAccountsMgmtV1ClusterRegistrationsPostRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1ClusterRegistrationsPost(ctx _context.Context) ApiApiAccountsMgmtV1ClusterRegistrationsPostRequest {
 	return ApiApiAccountsMgmtV1ClusterRegistrationsPostRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return ClusterRegistrationResponse
-func (a *DefaultApiService) ApiAccountsMgmtV1ClusterRegistrationsPostExecute(r ApiApiAccountsMgmtV1ClusterRegistrationsPostRequest) (*ClusterRegistrationResponse, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return ClusterRegistrationResponse
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1ClusterRegistrationsPostExecute(r ApiApiAccountsMgmtV1ClusterRegistrationsPostRequest) (ClusterRegistrationResponse, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *ClusterRegistrationResponse
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  ClusterRegistrationResponse
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1ClusterRegistrationsPost")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/cluster_registrations"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.clusterRegistrationRequest == nil {
 		return localVarReturnValue, nil, reportError("clusterRegistrationRequest is required and must be specified")
 	}
@@ -4369,7 +4433,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ClusterRegistrationsPostExecute(r A
 	}
 	// body params
 	localVarPostBody = r.clusterRegistrationRequest
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -4379,15 +4443,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ClusterRegistrationsPostExecute(r A
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -4398,8 +4462,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ClusterRegistrationsPostExecute(r A
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -4409,8 +4472,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ClusterRegistrationsPostExecute(r A
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -4420,8 +4482,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ClusterRegistrationsPostExecute(r A
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 409 {
@@ -4431,8 +4492,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ClusterRegistrationsPostExecute(r A
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 422 {
@@ -4442,8 +4502,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ClusterRegistrationsPostExecute(r A
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 429 {
@@ -4453,8 +4512,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ClusterRegistrationsPostExecute(r A
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -4464,15 +4522,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ClusterRegistrationsPostExecute(r A
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -4483,7 +4540,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ClusterRegistrationsPostExecute(r A
 }
 
 type ApiApiAccountsMgmtV1ClusterTransfersGetRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	page *int32
 	size *int32
@@ -4491,67 +4548,63 @@ type ApiApiAccountsMgmtV1ClusterTransfersGetRequest struct {
 	orderBy *string
 }
 
-// Page number of record list when record list exceeds specified page size
 func (r ApiApiAccountsMgmtV1ClusterTransfersGetRequest) Page(page int32) ApiApiAccountsMgmtV1ClusterTransfersGetRequest {
 	r.page = &page
 	return r
 }
-
-// Maximum number of records to return
 func (r ApiApiAccountsMgmtV1ClusterTransfersGetRequest) Size(size int32) ApiApiAccountsMgmtV1ClusterTransfersGetRequest {
 	r.size = &size
 	return r
 }
-
-// Specifies the search criteria. The syntax of this parameter is similar to the syntax of the _where_ clause of an SQL statement, using the names of the json attributes / column names of the account. For example, in order to retrieve all the accounts with a username starting with `my`:  ```sql username like 'my%' ```  The search criteria can also be applied on related resource. For example, in order to retrieve all the subscriptions labeled by `foo=bar`,  ```sql labels.key = 'foo' and labels.value = 'bar' ```  If the parameter isn't provided, or if the value is empty, then all the accounts that the user has permission to see will be returned.
 func (r ApiApiAccountsMgmtV1ClusterTransfersGetRequest) Search(search string) ApiApiAccountsMgmtV1ClusterTransfersGetRequest {
 	r.search = &search
 	return r
 }
-
-// Specifies the order by criteria. The syntax of this parameter is similar to the syntax of the _order by_ clause of an SQL statement, but using the names of the json attributes / column of the account. For example, in order to retrieve all accounts ordered by username:  ```sql username asc ```  Or in order to retrieve all accounts ordered by username _and_ first name:  ```sql username asc, firstName asc ```  If the parameter isn't provided, or if the value is empty, then no explicit ordering will be applied.
 func (r ApiApiAccountsMgmtV1ClusterTransfersGetRequest) OrderBy(orderBy string) ApiApiAccountsMgmtV1ClusterTransfersGetRequest {
 	r.orderBy = &orderBy
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1ClusterTransfersGetRequest) Execute() (*ClusterTransferList, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1ClusterTransfersGetRequest) Execute() (ClusterTransferList, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1ClusterTransfersGetExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1ClusterTransfersGet List cluster transfers - returns either an empty result set or a valid ClusterTransfer instance that is within a valid transfer window.
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiApiAccountsMgmtV1ClusterTransfersGetRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1ClusterTransfersGet(ctx context.Context) ApiApiAccountsMgmtV1ClusterTransfersGetRequest {
+ * ApiAccountsMgmtV1ClusterTransfersGet List cluster transfers - returns either an empty result set or a valid ClusterTransfer instance that is within a valid transfer window.
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiApiAccountsMgmtV1ClusterTransfersGetRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1ClusterTransfersGet(ctx _context.Context) ApiApiAccountsMgmtV1ClusterTransfersGetRequest {
 	return ApiApiAccountsMgmtV1ClusterTransfersGetRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return ClusterTransferList
-func (a *DefaultApiService) ApiAccountsMgmtV1ClusterTransfersGetExecute(r ApiApiAccountsMgmtV1ClusterTransfersGetRequest) (*ClusterTransferList, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return ClusterTransferList
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1ClusterTransfersGetExecute(r ApiApiAccountsMgmtV1ClusterTransfersGetRequest) (ClusterTransferList, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *ClusterTransferList
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  ClusterTransferList
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1ClusterTransfersGet")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/cluster_transfers"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.page != nil {
 		localVarQueryParams.Add("page", parameterToString(*r.page, ""))
@@ -4596,7 +4649,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ClusterTransfersGetExecute(r ApiApi
 			}
 		}
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -4606,15 +4659,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ClusterTransfersGetExecute(r ApiApi
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -4625,8 +4678,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ClusterTransfersGetExecute(r ApiApi
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -4636,8 +4688,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ClusterTransfersGetExecute(r ApiApi
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -4647,15 +4698,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ClusterTransfersGetExecute(r ApiApi
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -4666,30 +4716,28 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ClusterTransfersGetExecute(r ApiApi
 }
 
 type ApiApiAccountsMgmtV1ClusterTransfersIdPatchRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	id string
 	clusterTransferPatchRequest *ClusterTransferPatchRequest
 }
 
-// Updated cluster transfer
 func (r ApiApiAccountsMgmtV1ClusterTransfersIdPatchRequest) ClusterTransferPatchRequest(clusterTransferPatchRequest ClusterTransferPatchRequest) ApiApiAccountsMgmtV1ClusterTransfersIdPatchRequest {
 	r.clusterTransferPatchRequest = &clusterTransferPatchRequest
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1ClusterTransfersIdPatchRequest) Execute() (*ClusterTransfer, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1ClusterTransfersIdPatchRequest) Execute() (ClusterTransfer, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1ClusterTransfersIdPatchExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1ClusterTransfersIdPatch Update specific cluster transfer
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The id of record
- @return ApiApiAccountsMgmtV1ClusterTransfersIdPatchRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1ClusterTransfersIdPatch(ctx context.Context, id string) ApiApiAccountsMgmtV1ClusterTransfersIdPatchRequest {
+ * ApiAccountsMgmtV1ClusterTransfersIdPatch Update specific cluster transfer
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The id of record
+ * @return ApiApiAccountsMgmtV1ClusterTransfersIdPatchRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1ClusterTransfersIdPatch(ctx _context.Context, id string) ApiApiAccountsMgmtV1ClusterTransfersIdPatchRequest {
 	return ApiApiAccountsMgmtV1ClusterTransfersIdPatchRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -4697,27 +4745,31 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ClusterTransfersIdPatch(ctx context
 	}
 }
 
-// Execute executes the request
-//  @return ClusterTransfer
-func (a *DefaultApiService) ApiAccountsMgmtV1ClusterTransfersIdPatchExecute(r ApiApiAccountsMgmtV1ClusterTransfersIdPatchRequest) (*ClusterTransfer, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return ClusterTransfer
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1ClusterTransfersIdPatchExecute(r ApiApiAccountsMgmtV1ClusterTransfersIdPatchRequest) (ClusterTransfer, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPatch
+		localVarHTTPMethod   = _nethttp.MethodPatch
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *ClusterTransfer
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  ClusterTransfer
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1ClusterTransfersIdPatch")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/cluster_transfers/{id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.clusterTransferPatchRequest == nil {
 		return localVarReturnValue, nil, reportError("clusterTransferPatchRequest is required and must be specified")
 	}
@@ -4741,7 +4793,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ClusterTransfersIdPatchExecute(r Ap
 	}
 	// body params
 	localVarPostBody = r.clusterTransferPatchRequest
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -4751,15 +4803,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ClusterTransfersIdPatchExecute(r Ap
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -4770,8 +4822,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ClusterTransfersIdPatchExecute(r Ap
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -4781,8 +4832,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ClusterTransfersIdPatchExecute(r Ap
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 409 {
@@ -4792,8 +4842,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ClusterTransfersIdPatchExecute(r Ap
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -4803,15 +4852,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ClusterTransfersIdPatchExecute(r Ap
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -4822,54 +4870,56 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ClusterTransfersIdPatchExecute(r Ap
 }
 
 type ApiApiAccountsMgmtV1ClusterTransfersPostRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	clusterTransferRequest *ClusterTransferRequest
 }
 
-// The contents of the cluster transfer creation request
 func (r ApiApiAccountsMgmtV1ClusterTransfersPostRequest) ClusterTransferRequest(clusterTransferRequest ClusterTransferRequest) ApiApiAccountsMgmtV1ClusterTransfersPostRequest {
 	r.clusterTransferRequest = &clusterTransferRequest
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1ClusterTransfersPostRequest) Execute() (*ClusterTransfer, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1ClusterTransfersPostRequest) Execute() (ClusterTransfer, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1ClusterTransfersPostExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1ClusterTransfersPost Initiate cluster transfer.
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiApiAccountsMgmtV1ClusterTransfersPostRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1ClusterTransfersPost(ctx context.Context) ApiApiAccountsMgmtV1ClusterTransfersPostRequest {
+ * ApiAccountsMgmtV1ClusterTransfersPost Initiate cluster transfer.
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiApiAccountsMgmtV1ClusterTransfersPostRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1ClusterTransfersPost(ctx _context.Context) ApiApiAccountsMgmtV1ClusterTransfersPostRequest {
 	return ApiApiAccountsMgmtV1ClusterTransfersPostRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return ClusterTransfer
-func (a *DefaultApiService) ApiAccountsMgmtV1ClusterTransfersPostExecute(r ApiApiAccountsMgmtV1ClusterTransfersPostRequest) (*ClusterTransfer, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return ClusterTransfer
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1ClusterTransfersPostExecute(r ApiApiAccountsMgmtV1ClusterTransfersPostRequest) (ClusterTransfer, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *ClusterTransfer
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  ClusterTransfer
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1ClusterTransfersPost")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/cluster_transfers"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.clusterTransferRequest == nil {
 		return localVarReturnValue, nil, reportError("clusterTransferRequest is required and must be specified")
 	}
@@ -4893,7 +4943,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ClusterTransfersPostExecute(r ApiAp
 	}
 	// body params
 	localVarPostBody = r.clusterTransferRequest
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -4903,15 +4953,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ClusterTransfersPostExecute(r ApiAp
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -4922,8 +4972,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ClusterTransfersPostExecute(r ApiAp
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -4933,8 +4982,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ClusterTransfersPostExecute(r ApiAp
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -4944,15 +4992,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ClusterTransfersPostExecute(r ApiAp
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -4963,68 +5010,66 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ClusterTransfersPostExecute(r ApiAp
 }
 
 type ApiApiAccountsMgmtV1ConfigSkusGetRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	page *int32
 	size *int32
 	search *string
 }
 
-// Page number of record list when record list exceeds specified page size
 func (r ApiApiAccountsMgmtV1ConfigSkusGetRequest) Page(page int32) ApiApiAccountsMgmtV1ConfigSkusGetRequest {
 	r.page = &page
 	return r
 }
-
-// Maximum number of records to return
 func (r ApiApiAccountsMgmtV1ConfigSkusGetRequest) Size(size int32) ApiApiAccountsMgmtV1ConfigSkusGetRequest {
 	r.size = &size
 	return r
 }
-
-// Specifies the search criteria. The syntax of this parameter is similar to the syntax of the _where_ clause of an SQL statement, using the names of the json attributes / column names of the account. For example, in order to retrieve all the accounts with a username starting with `my`:  ```sql username like 'my%' ```  The search criteria can also be applied on related resource. For example, in order to retrieve all the subscriptions labeled by `foo=bar`,  ```sql labels.key = 'foo' and labels.value = 'bar' ```  If the parameter isn't provided, or if the value is empty, then all the accounts that the user has permission to see will be returned.
 func (r ApiApiAccountsMgmtV1ConfigSkusGetRequest) Search(search string) ApiApiAccountsMgmtV1ConfigSkusGetRequest {
 	r.search = &search
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1ConfigSkusGetRequest) Execute() (*SkuList, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1ConfigSkusGetRequest) Execute() (SkuList, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1ConfigSkusGetExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1ConfigSkusGet Returns a list of skus
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiApiAccountsMgmtV1ConfigSkusGetRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1ConfigSkusGet(ctx context.Context) ApiApiAccountsMgmtV1ConfigSkusGetRequest {
+ * ApiAccountsMgmtV1ConfigSkusGet Returns a list of skus
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiApiAccountsMgmtV1ConfigSkusGetRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1ConfigSkusGet(ctx _context.Context) ApiApiAccountsMgmtV1ConfigSkusGetRequest {
 	return ApiApiAccountsMgmtV1ConfigSkusGetRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return SkuList
-func (a *DefaultApiService) ApiAccountsMgmtV1ConfigSkusGetExecute(r ApiApiAccountsMgmtV1ConfigSkusGetRequest) (*SkuList, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return SkuList
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1ConfigSkusGetExecute(r ApiApiAccountsMgmtV1ConfigSkusGetRequest) (SkuList, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *SkuList
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  SkuList
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1ConfigSkusGet")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/config/skus"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.page != nil {
 		localVarQueryParams.Add("page", parameterToString(*r.page, ""))
@@ -5052,7 +5097,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ConfigSkusGetExecute(r ApiApiAccoun
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -5062,15 +5107,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ConfigSkusGetExecute(r ApiApiAccoun
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -5081,8 +5126,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ConfigSkusGetExecute(r ApiApiAccoun
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -5092,8 +5136,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ConfigSkusGetExecute(r ApiApiAccoun
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -5103,15 +5146,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ConfigSkusGetExecute(r ApiApiAccoun
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -5122,23 +5164,23 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ConfigSkusGetExecute(r ApiApiAccoun
 }
 
 type ApiApiAccountsMgmtV1ConfigSkusIdDeleteRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	id string
 }
 
-func (r ApiApiAccountsMgmtV1ConfigSkusIdDeleteRequest) Execute() (*http.Response, error) {
+
+func (r ApiApiAccountsMgmtV1ConfigSkusIdDeleteRequest) Execute() (*_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1ConfigSkusIdDeleteExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1ConfigSkusIdDelete Delete a sku
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The id of record
- @return ApiApiAccountsMgmtV1ConfigSkusIdDeleteRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1ConfigSkusIdDelete(ctx context.Context, id string) ApiApiAccountsMgmtV1ConfigSkusIdDeleteRequest {
+ * ApiAccountsMgmtV1ConfigSkusIdDelete Delete a sku
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The id of record
+ * @return ApiApiAccountsMgmtV1ConfigSkusIdDeleteRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1ConfigSkusIdDelete(ctx _context.Context, id string) ApiApiAccountsMgmtV1ConfigSkusIdDeleteRequest {
 	return ApiApiAccountsMgmtV1ConfigSkusIdDeleteRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -5146,25 +5188,29 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ConfigSkusIdDelete(ctx context.Cont
 	}
 }
 
-// Execute executes the request
-func (a *DefaultApiService) ApiAccountsMgmtV1ConfigSkusIdDeleteExecute(r ApiApiAccountsMgmtV1ConfigSkusIdDeleteRequest) (*http.Response, error) {
+/*
+ * Execute executes the request
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1ConfigSkusIdDeleteExecute(r ApiApiAccountsMgmtV1ConfigSkusIdDeleteRequest) (*_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodDelete
+		localVarHTTPMethod   = _nethttp.MethodDelete
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1ConfigSkusIdDelete")
 	if err != nil {
-		return nil, &GenericOpenAPIError{error: err.Error()}
+		return nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/config/skus/{id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -5183,7 +5229,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ConfigSkusIdDeleteExecute(r ApiApiA
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return nil, err
 	}
@@ -5193,15 +5239,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ConfigSkusIdDeleteExecute(r ApiApiA
 		return localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -5212,8 +5258,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ConfigSkusIdDeleteExecute(r ApiApiA
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -5223,8 +5268,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ConfigSkusIdDeleteExecute(r ApiApiA
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -5234,8 +5278,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ConfigSkusIdDeleteExecute(r ApiApiA
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -5245,8 +5288,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ConfigSkusIdDeleteExecute(r ApiApiA
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarHTTPResponse, newErr
 	}
@@ -5255,23 +5297,23 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ConfigSkusIdDeleteExecute(r ApiApiA
 }
 
 type ApiApiAccountsMgmtV1ConfigSkusIdGetRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	id string
 }
 
-func (r ApiApiAccountsMgmtV1ConfigSkusIdGetRequest) Execute() (*SKU, *http.Response, error) {
+
+func (r ApiApiAccountsMgmtV1ConfigSkusIdGetRequest) Execute() (SKU, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1ConfigSkusIdGetExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1ConfigSkusIdGet Get a sku
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The id of record
- @return ApiApiAccountsMgmtV1ConfigSkusIdGetRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1ConfigSkusIdGet(ctx context.Context, id string) ApiApiAccountsMgmtV1ConfigSkusIdGetRequest {
+ * ApiAccountsMgmtV1ConfigSkusIdGet Get a sku
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The id of record
+ * @return ApiApiAccountsMgmtV1ConfigSkusIdGetRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1ConfigSkusIdGet(ctx _context.Context, id string) ApiApiAccountsMgmtV1ConfigSkusIdGetRequest {
 	return ApiApiAccountsMgmtV1ConfigSkusIdGetRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -5279,27 +5321,31 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ConfigSkusIdGet(ctx context.Context
 	}
 }
 
-// Execute executes the request
-//  @return SKU
-func (a *DefaultApiService) ApiAccountsMgmtV1ConfigSkusIdGetExecute(r ApiApiAccountsMgmtV1ConfigSkusIdGetRequest) (*SKU, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return SKU
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1ConfigSkusIdGetExecute(r ApiApiAccountsMgmtV1ConfigSkusIdGetRequest) (SKU, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *SKU
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  SKU
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1ConfigSkusIdGet")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/config/skus/{id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -5318,7 +5364,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ConfigSkusIdGetExecute(r ApiApiAcco
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -5328,15 +5374,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ConfigSkusIdGetExecute(r ApiApiAcco
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -5347,8 +5393,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ConfigSkusIdGetExecute(r ApiApiAcco
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -5358,8 +5403,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ConfigSkusIdGetExecute(r ApiApiAcco
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -5369,8 +5413,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ConfigSkusIdGetExecute(r ApiApiAcco
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -5380,15 +5423,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ConfigSkusIdGetExecute(r ApiApiAcco
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -5399,30 +5441,28 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ConfigSkusIdGetExecute(r ApiApiAcco
 }
 
 type ApiApiAccountsMgmtV1ConfigSkusIdPatchRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	id string
 	sKU *SKU
 }
 
-// Updated sku data
 func (r ApiApiAccountsMgmtV1ConfigSkusIdPatchRequest) SKU(sKU SKU) ApiApiAccountsMgmtV1ConfigSkusIdPatchRequest {
 	r.sKU = &sKU
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1ConfigSkusIdPatchRequest) Execute() (*SKU, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1ConfigSkusIdPatchRequest) Execute() (SKU, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1ConfigSkusIdPatchExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1ConfigSkusIdPatch Update a Sku
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The id of record
- @return ApiApiAccountsMgmtV1ConfigSkusIdPatchRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1ConfigSkusIdPatch(ctx context.Context, id string) ApiApiAccountsMgmtV1ConfigSkusIdPatchRequest {
+ * ApiAccountsMgmtV1ConfigSkusIdPatch Update a Sku
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The id of record
+ * @return ApiApiAccountsMgmtV1ConfigSkusIdPatchRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1ConfigSkusIdPatch(ctx _context.Context, id string) ApiApiAccountsMgmtV1ConfigSkusIdPatchRequest {
 	return ApiApiAccountsMgmtV1ConfigSkusIdPatchRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -5430,27 +5470,31 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ConfigSkusIdPatch(ctx context.Conte
 	}
 }
 
-// Execute executes the request
-//  @return SKU
-func (a *DefaultApiService) ApiAccountsMgmtV1ConfigSkusIdPatchExecute(r ApiApiAccountsMgmtV1ConfigSkusIdPatchRequest) (*SKU, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return SKU
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1ConfigSkusIdPatchExecute(r ApiApiAccountsMgmtV1ConfigSkusIdPatchRequest) (SKU, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPatch
+		localVarHTTPMethod   = _nethttp.MethodPatch
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *SKU
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  SKU
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1ConfigSkusIdPatch")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/config/skus/{id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.sKU == nil {
 		return localVarReturnValue, nil, reportError("sKU is required and must be specified")
 	}
@@ -5474,7 +5518,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ConfigSkusIdPatchExecute(r ApiApiAc
 	}
 	// body params
 	localVarPostBody = r.sKU
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -5484,15 +5528,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ConfigSkusIdPatchExecute(r ApiApiAc
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -5503,8 +5547,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ConfigSkusIdPatchExecute(r ApiApiAc
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -5514,8 +5557,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ConfigSkusIdPatchExecute(r ApiApiAc
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -5525,8 +5567,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ConfigSkusIdPatchExecute(r ApiApiAc
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -5536,8 +5577,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ConfigSkusIdPatchExecute(r ApiApiAc
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -5547,15 +5587,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ConfigSkusIdPatchExecute(r ApiApiAc
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -5566,54 +5605,56 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ConfigSkusIdPatchExecute(r ApiApiAc
 }
 
 type ApiApiAccountsMgmtV1ConfigSkusPostRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	sKU *SKU
 }
 
-// Sku data
 func (r ApiApiAccountsMgmtV1ConfigSkusPostRequest) SKU(sKU SKU) ApiApiAccountsMgmtV1ConfigSkusPostRequest {
 	r.sKU = &sKU
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1ConfigSkusPostRequest) Execute() (*SKU, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1ConfigSkusPostRequest) Execute() (SKU, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1ConfigSkusPostExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1ConfigSkusPost Create a new sku
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiApiAccountsMgmtV1ConfigSkusPostRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1ConfigSkusPost(ctx context.Context) ApiApiAccountsMgmtV1ConfigSkusPostRequest {
+ * ApiAccountsMgmtV1ConfigSkusPost Create a new sku
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiApiAccountsMgmtV1ConfigSkusPostRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1ConfigSkusPost(ctx _context.Context) ApiApiAccountsMgmtV1ConfigSkusPostRequest {
 	return ApiApiAccountsMgmtV1ConfigSkusPostRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return SKU
-func (a *DefaultApiService) ApiAccountsMgmtV1ConfigSkusPostExecute(r ApiApiAccountsMgmtV1ConfigSkusPostRequest) (*SKU, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return SKU
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1ConfigSkusPostExecute(r ApiApiAccountsMgmtV1ConfigSkusPostRequest) (SKU, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *SKU
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  SKU
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1ConfigSkusPost")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/config/skus"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.sKU == nil {
 		return localVarReturnValue, nil, reportError("sKU is required and must be specified")
 	}
@@ -5637,7 +5678,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ConfigSkusPostExecute(r ApiApiAccou
 	}
 	// body params
 	localVarPostBody = r.sKU
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -5647,15 +5688,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ConfigSkusPostExecute(r ApiApiAccou
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -5666,8 +5707,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ConfigSkusPostExecute(r ApiApiAccou
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -5677,8 +5717,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ConfigSkusPostExecute(r ApiApiAccou
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -5688,8 +5727,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ConfigSkusPostExecute(r ApiApiAccou
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 409 {
@@ -5699,8 +5737,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ConfigSkusPostExecute(r ApiApiAccou
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -5710,15 +5747,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ConfigSkusPostExecute(r ApiApiAccou
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -5729,7 +5765,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ConfigSkusPostExecute(r ApiApiAccou
 }
 
 type ApiApiAccountsMgmtV1DeletedSubscriptionsGetRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	page *int32
 	size *int32
@@ -5737,67 +5773,63 @@ type ApiApiAccountsMgmtV1DeletedSubscriptionsGetRequest struct {
 	orderBy *string
 }
 
-// Page number of record list when record list exceeds specified page size
 func (r ApiApiAccountsMgmtV1DeletedSubscriptionsGetRequest) Page(page int32) ApiApiAccountsMgmtV1DeletedSubscriptionsGetRequest {
 	r.page = &page
 	return r
 }
-
-// Maximum number of records to return
 func (r ApiApiAccountsMgmtV1DeletedSubscriptionsGetRequest) Size(size int32) ApiApiAccountsMgmtV1DeletedSubscriptionsGetRequest {
 	r.size = &size
 	return r
 }
-
-// Specifies the search criteria. The syntax of this parameter is similar to the syntax of the _where_ clause of an SQL statement, using the names of the json attributes / column names of the account. For example, in order to retrieve all the accounts with a username starting with `my`:  ```sql username like 'my%' ```  The search criteria can also be applied on related resource. For example, in order to retrieve all the subscriptions labeled by `foo=bar`,  ```sql labels.key = 'foo' and labels.value = 'bar' ```  If the parameter isn't provided, or if the value is empty, then all the accounts that the user has permission to see will be returned.
 func (r ApiApiAccountsMgmtV1DeletedSubscriptionsGetRequest) Search(search string) ApiApiAccountsMgmtV1DeletedSubscriptionsGetRequest {
 	r.search = &search
 	return r
 }
-
-// Specifies the order by criteria. The syntax of this parameter is similar to the syntax of the _order by_ clause of an SQL statement, but using the names of the json attributes / column of the account. For example, in order to retrieve all accounts ordered by username:  ```sql username asc ```  Or in order to retrieve all accounts ordered by username _and_ first name:  ```sql username asc, firstName asc ```  If the parameter isn't provided, or if the value is empty, then no explicit ordering will be applied.
 func (r ApiApiAccountsMgmtV1DeletedSubscriptionsGetRequest) OrderBy(orderBy string) ApiApiAccountsMgmtV1DeletedSubscriptionsGetRequest {
 	r.orderBy = &orderBy
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1DeletedSubscriptionsGetRequest) Execute() (*DeletedSubscriptionList, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1DeletedSubscriptionsGetRequest) Execute() (DeletedSubscriptionList, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1DeletedSubscriptionsGetExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1DeletedSubscriptionsGet Returns a list of deleted subscriptions
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiApiAccountsMgmtV1DeletedSubscriptionsGetRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1DeletedSubscriptionsGet(ctx context.Context) ApiApiAccountsMgmtV1DeletedSubscriptionsGetRequest {
+ * ApiAccountsMgmtV1DeletedSubscriptionsGet Returns a list of deleted subscriptions
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiApiAccountsMgmtV1DeletedSubscriptionsGetRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1DeletedSubscriptionsGet(ctx _context.Context) ApiApiAccountsMgmtV1DeletedSubscriptionsGetRequest {
 	return ApiApiAccountsMgmtV1DeletedSubscriptionsGetRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return DeletedSubscriptionList
-func (a *DefaultApiService) ApiAccountsMgmtV1DeletedSubscriptionsGetExecute(r ApiApiAccountsMgmtV1DeletedSubscriptionsGetRequest) (*DeletedSubscriptionList, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return DeletedSubscriptionList
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1DeletedSubscriptionsGetExecute(r ApiApiAccountsMgmtV1DeletedSubscriptionsGetRequest) (DeletedSubscriptionList, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *DeletedSubscriptionList
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  DeletedSubscriptionList
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1DeletedSubscriptionsGet")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/deleted_subscriptions"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.page != nil {
 		localVarQueryParams.Add("page", parameterToString(*r.page, ""))
@@ -5842,7 +5874,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1DeletedSubscriptionsGetExecute(r Ap
 			}
 		}
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -5852,15 +5884,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1DeletedSubscriptionsGetExecute(r Ap
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -5871,8 +5903,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1DeletedSubscriptionsGetExecute(r Ap
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -5882,8 +5913,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1DeletedSubscriptionsGetExecute(r Ap
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -5893,15 +5923,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1DeletedSubscriptionsGetExecute(r Ap
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -5912,68 +5941,66 @@ func (a *DefaultApiService) ApiAccountsMgmtV1DeletedSubscriptionsGetExecute(r Ap
 }
 
 type ApiApiAccountsMgmtV1ErrorsGetRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	page *int32
 	size *int32
 	search *string
 }
 
-// Page number of record list when record list exceeds specified page size
 func (r ApiApiAccountsMgmtV1ErrorsGetRequest) Page(page int32) ApiApiAccountsMgmtV1ErrorsGetRequest {
 	r.page = &page
 	return r
 }
-
-// Maximum number of records to return
 func (r ApiApiAccountsMgmtV1ErrorsGetRequest) Size(size int32) ApiApiAccountsMgmtV1ErrorsGetRequest {
 	r.size = &size
 	return r
 }
-
-// Specifies the search criteria. The syntax of this parameter is similar to the syntax of the _where_ clause of an SQL statement, using the names of the json attributes / column names of the account. For example, in order to retrieve all the accounts with a username starting with `my`:  ```sql username like 'my%' ```  The search criteria can also be applied on related resource. For example, in order to retrieve all the subscriptions labeled by `foo=bar`,  ```sql labels.key = 'foo' and labels.value = 'bar' ```  If the parameter isn't provided, or if the value is empty, then all the accounts that the user has permission to see will be returned.
 func (r ApiApiAccountsMgmtV1ErrorsGetRequest) Search(search string) ApiApiAccountsMgmtV1ErrorsGetRequest {
 	r.search = &search
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1ErrorsGetRequest) Execute() (*ErrorList, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1ErrorsGetRequest) Execute() (ErrorList, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1ErrorsGetExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1ErrorsGet Returns a list of errors
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiApiAccountsMgmtV1ErrorsGetRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1ErrorsGet(ctx context.Context) ApiApiAccountsMgmtV1ErrorsGetRequest {
+ * ApiAccountsMgmtV1ErrorsGet Returns a list of errors
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiApiAccountsMgmtV1ErrorsGetRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1ErrorsGet(ctx _context.Context) ApiApiAccountsMgmtV1ErrorsGetRequest {
 	return ApiApiAccountsMgmtV1ErrorsGetRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return ErrorList
-func (a *DefaultApiService) ApiAccountsMgmtV1ErrorsGetExecute(r ApiApiAccountsMgmtV1ErrorsGetRequest) (*ErrorList, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return ErrorList
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1ErrorsGetExecute(r ApiApiAccountsMgmtV1ErrorsGetRequest) (ErrorList, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *ErrorList
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  ErrorList
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1ErrorsGet")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/errors"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.page != nil {
 		localVarQueryParams.Add("page", parameterToString(*r.page, ""))
@@ -6001,7 +6028,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ErrorsGetExecute(r ApiApiAccountsMg
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -6011,15 +6038,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ErrorsGetExecute(r ApiApiAccountsMg
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -6030,8 +6057,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ErrorsGetExecute(r ApiApiAccountsMg
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -6041,8 +6067,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ErrorsGetExecute(r ApiApiAccountsMg
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -6052,15 +6077,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ErrorsGetExecute(r ApiApiAccountsMg
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -6071,23 +6095,23 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ErrorsGetExecute(r ApiApiAccountsMg
 }
 
 type ApiApiAccountsMgmtV1ErrorsIdGetRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	id string
 }
 
-func (r ApiApiAccountsMgmtV1ErrorsIdGetRequest) Execute() (*Error, *http.Response, error) {
+
+func (r ApiApiAccountsMgmtV1ErrorsIdGetRequest) Execute() (Error, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1ErrorsIdGetExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1ErrorsIdGet Get an error by id
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The id of record
- @return ApiApiAccountsMgmtV1ErrorsIdGetRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1ErrorsIdGet(ctx context.Context, id string) ApiApiAccountsMgmtV1ErrorsIdGetRequest {
+ * ApiAccountsMgmtV1ErrorsIdGet Get an error by id
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The id of record
+ * @return ApiApiAccountsMgmtV1ErrorsIdGetRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1ErrorsIdGet(ctx _context.Context, id string) ApiApiAccountsMgmtV1ErrorsIdGetRequest {
 	return ApiApiAccountsMgmtV1ErrorsIdGetRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -6095,27 +6119,31 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ErrorsIdGet(ctx context.Context, id
 	}
 }
 
-// Execute executes the request
-//  @return Error
-func (a *DefaultApiService) ApiAccountsMgmtV1ErrorsIdGetExecute(r ApiApiAccountsMgmtV1ErrorsIdGetRequest) (*Error, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return Error
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1ErrorsIdGetExecute(r ApiApiAccountsMgmtV1ErrorsIdGetRequest) (Error, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *Error
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  Error
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1ErrorsIdGet")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/errors/{id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -6134,7 +6162,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ErrorsIdGetExecute(r ApiApiAccounts
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -6144,15 +6172,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ErrorsIdGetExecute(r ApiApiAccounts
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -6163,8 +6191,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ErrorsIdGetExecute(r ApiApiAccounts
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -6174,8 +6201,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ErrorsIdGetExecute(r ApiApiAccounts
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -6185,8 +6211,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ErrorsIdGetExecute(r ApiApiAccounts
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -6196,15 +6221,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ErrorsIdGetExecute(r ApiApiAccounts
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -6215,32 +6239,28 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ErrorsIdGetExecute(r ApiApiAccounts
 }
 
 type ApiApiAccountsMgmtV1FeatureTogglesIdQueryPostRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	id string
 	featureToggleQueryRequest *FeatureToggleQueryRequest
 }
 
-// The context of the query
 func (r ApiApiAccountsMgmtV1FeatureTogglesIdQueryPostRequest) FeatureToggleQueryRequest(featureToggleQueryRequest FeatureToggleQueryRequest) ApiApiAccountsMgmtV1FeatureTogglesIdQueryPostRequest {
 	r.featureToggleQueryRequest = &featureToggleQueryRequest
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1FeatureTogglesIdQueryPostRequest) Execute() (*FeatureToggle, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1FeatureTogglesIdQueryPostRequest) Execute() (FeatureToggle, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1FeatureTogglesIdQueryPostExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1FeatureTogglesIdQueryPost Query a feature toggle by id
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The id of record
- @return ApiApiAccountsMgmtV1FeatureTogglesIdQueryPostRequest
-
-Deprecated
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1FeatureTogglesIdQueryPost(ctx context.Context, id string) ApiApiAccountsMgmtV1FeatureTogglesIdQueryPostRequest {
+ * ApiAccountsMgmtV1FeatureTogglesIdQueryPost Query a feature toggle by id
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The id of record
+ * @return ApiApiAccountsMgmtV1FeatureTogglesIdQueryPostRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1FeatureTogglesIdQueryPost(ctx _context.Context, id string) ApiApiAccountsMgmtV1FeatureTogglesIdQueryPostRequest {
 	return ApiApiAccountsMgmtV1FeatureTogglesIdQueryPostRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -6248,28 +6268,31 @@ func (a *DefaultApiService) ApiAccountsMgmtV1FeatureTogglesIdQueryPost(ctx conte
 	}
 }
 
-// Execute executes the request
-//  @return FeatureToggle
-// Deprecated
-func (a *DefaultApiService) ApiAccountsMgmtV1FeatureTogglesIdQueryPostExecute(r ApiApiAccountsMgmtV1FeatureTogglesIdQueryPostRequest) (*FeatureToggle, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return FeatureToggle
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1FeatureTogglesIdQueryPostExecute(r ApiApiAccountsMgmtV1FeatureTogglesIdQueryPostRequest) (FeatureToggle, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *FeatureToggle
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  FeatureToggle
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1FeatureTogglesIdQueryPost")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/feature_toggles/{id}/query"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.featureToggleQueryRequest == nil {
 		return localVarReturnValue, nil, reportError("featureToggleQueryRequest is required and must be specified")
 	}
@@ -6293,7 +6316,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1FeatureTogglesIdQueryPostExecute(r
 	}
 	// body params
 	localVarPostBody = r.featureToggleQueryRequest
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -6303,15 +6326,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1FeatureTogglesIdQueryPostExecute(r
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -6322,8 +6345,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1FeatureTogglesIdQueryPostExecute(r
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -6333,8 +6355,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1FeatureTogglesIdQueryPostExecute(r
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -6344,8 +6365,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1FeatureTogglesIdQueryPostExecute(r
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -6355,15 +6375,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1FeatureTogglesIdQueryPostExecute(r
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -6374,7 +6393,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1FeatureTogglesIdQueryPostExecute(r
 }
 
 type ApiApiAccountsMgmtV1LabelsGetRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	page *int32
 	size *int32
@@ -6382,67 +6401,63 @@ type ApiApiAccountsMgmtV1LabelsGetRequest struct {
 	orderBy *string
 }
 
-// Page number of record list when record list exceeds specified page size
 func (r ApiApiAccountsMgmtV1LabelsGetRequest) Page(page int32) ApiApiAccountsMgmtV1LabelsGetRequest {
 	r.page = &page
 	return r
 }
-
-// Maximum number of records to return
 func (r ApiApiAccountsMgmtV1LabelsGetRequest) Size(size int32) ApiApiAccountsMgmtV1LabelsGetRequest {
 	r.size = &size
 	return r
 }
-
-// Specifies the search criteria. The syntax of this parameter is similar to the syntax of the _where_ clause of an SQL statement, using the names of the json attributes / column names of the account. For example, in order to retrieve all the accounts with a username starting with `my`:  ```sql username like 'my%' ```  The search criteria can also be applied on related resource. For example, in order to retrieve all the subscriptions labeled by `foo=bar`,  ```sql labels.key = 'foo' and labels.value = 'bar' ```  If the parameter isn't provided, or if the value is empty, then all the accounts that the user has permission to see will be returned.
 func (r ApiApiAccountsMgmtV1LabelsGetRequest) Search(search string) ApiApiAccountsMgmtV1LabelsGetRequest {
 	r.search = &search
 	return r
 }
-
-// Specifies the order by criteria. The syntax of this parameter is similar to the syntax of the _order by_ clause of an SQL statement, but using the names of the json attributes / column of the account. For example, in order to retrieve all accounts ordered by username:  ```sql username asc ```  Or in order to retrieve all accounts ordered by username _and_ first name:  ```sql username asc, firstName asc ```  If the parameter isn't provided, or if the value is empty, then no explicit ordering will be applied.
 func (r ApiApiAccountsMgmtV1LabelsGetRequest) OrderBy(orderBy string) ApiApiAccountsMgmtV1LabelsGetRequest {
 	r.orderBy = &orderBy
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1LabelsGetRequest) Execute() (*LabelList, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1LabelsGetRequest) Execute() (LabelList, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1LabelsGetExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1LabelsGet Returns a list of labels
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiApiAccountsMgmtV1LabelsGetRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1LabelsGet(ctx context.Context) ApiApiAccountsMgmtV1LabelsGetRequest {
+ * ApiAccountsMgmtV1LabelsGet Returns a list of labels
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiApiAccountsMgmtV1LabelsGetRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1LabelsGet(ctx _context.Context) ApiApiAccountsMgmtV1LabelsGetRequest {
 	return ApiApiAccountsMgmtV1LabelsGetRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return LabelList
-func (a *DefaultApiService) ApiAccountsMgmtV1LabelsGetExecute(r ApiApiAccountsMgmtV1LabelsGetRequest) (*LabelList, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return LabelList
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1LabelsGetExecute(r ApiApiAccountsMgmtV1LabelsGetRequest) (LabelList, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *LabelList
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  LabelList
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1LabelsGet")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/labels"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.page != nil {
 		localVarQueryParams.Add("page", parameterToString(*r.page, ""))
@@ -6473,7 +6488,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1LabelsGetExecute(r ApiApiAccountsMg
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -6483,15 +6498,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1LabelsGetExecute(r ApiApiAccountsMg
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -6502,8 +6517,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1LabelsGetExecute(r ApiApiAccountsMg
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -6513,8 +6527,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1LabelsGetExecute(r ApiApiAccountsMg
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -6524,15 +6537,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1LabelsGetExecute(r ApiApiAccountsMg
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -6543,47 +6555,51 @@ func (a *DefaultApiService) ApiAccountsMgmtV1LabelsGetExecute(r ApiApiAccountsMg
 }
 
 type ApiApiAccountsMgmtV1LandingPageSelfServiceGetRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 }
 
-func (r ApiApiAccountsMgmtV1LandingPageSelfServiceGetRequest) Execute() (*SelfServiceLandingPageSchema, *http.Response, error) {
+
+func (r ApiApiAccountsMgmtV1LandingPageSelfServiceGetRequest) Execute() (SelfServiceLandingPageSchema, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1LandingPageSelfServiceGetExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1LandingPageSelfServiceGet Get a console.redhat.com landing page content JSON schema
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiApiAccountsMgmtV1LandingPageSelfServiceGetRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1LandingPageSelfServiceGet(ctx context.Context) ApiApiAccountsMgmtV1LandingPageSelfServiceGetRequest {
+ * ApiAccountsMgmtV1LandingPageSelfServiceGet Get a console.redhat.com landing page content JSON schema
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiApiAccountsMgmtV1LandingPageSelfServiceGetRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1LandingPageSelfServiceGet(ctx _context.Context) ApiApiAccountsMgmtV1LandingPageSelfServiceGetRequest {
 	return ApiApiAccountsMgmtV1LandingPageSelfServiceGetRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return SelfServiceLandingPageSchema
-func (a *DefaultApiService) ApiAccountsMgmtV1LandingPageSelfServiceGetExecute(r ApiApiAccountsMgmtV1LandingPageSelfServiceGetRequest) (*SelfServiceLandingPageSchema, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return SelfServiceLandingPageSchema
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1LandingPageSelfServiceGetExecute(r ApiApiAccountsMgmtV1LandingPageSelfServiceGetRequest) (SelfServiceLandingPageSchema, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *SelfServiceLandingPageSchema
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  SelfServiceLandingPageSchema
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1LandingPageSelfServiceGet")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/landing_page/self_service"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -6602,7 +6618,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1LandingPageSelfServiceGetExecute(r
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -6612,15 +6628,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1LandingPageSelfServiceGetExecute(r
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -6631,8 +6647,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1LandingPageSelfServiceGetExecute(r
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -6642,15 +6657,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1LandingPageSelfServiceGetExecute(r
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -6661,54 +6675,56 @@ func (a *DefaultApiService) ApiAccountsMgmtV1LandingPageSelfServiceGetExecute(r
 }
 
 type ApiApiAccountsMgmtV1MetricsGetRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	search *string
 }
 
-// Specifies the search criteria. The syntax of this parameter is similar to the syntax of the _where_ clause of an SQL statement, using the names of the json attributes / column names of the account. For example, in order to retrieve all the accounts with a username starting with `my`:  ```sql username like 'my%' ```  The search criteria can also be applied on related resource. For example, in order to retrieve all the subscriptions labeled by `foo=bar`,  ```sql labels.key = 'foo' and labels.value = 'bar' ```  If the parameter isn't provided, or if the value is empty, then all the accounts that the user has permission to see will be returned.
 func (r ApiApiAccountsMgmtV1MetricsGetRequest) Search(search string) ApiApiAccountsMgmtV1MetricsGetRequest {
 	r.search = &search
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1MetricsGetRequest) Execute() (*MetricsList, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1MetricsGetRequest) Execute() (MetricsList, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1MetricsGetExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1MetricsGet Returns a list of metrics
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiApiAccountsMgmtV1MetricsGetRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1MetricsGet(ctx context.Context) ApiApiAccountsMgmtV1MetricsGetRequest {
+ * ApiAccountsMgmtV1MetricsGet Returns a list of metrics
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiApiAccountsMgmtV1MetricsGetRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1MetricsGet(ctx _context.Context) ApiApiAccountsMgmtV1MetricsGetRequest {
 	return ApiApiAccountsMgmtV1MetricsGetRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return MetricsList
-func (a *DefaultApiService) ApiAccountsMgmtV1MetricsGetExecute(r ApiApiAccountsMgmtV1MetricsGetRequest) (*MetricsList, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return MetricsList
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1MetricsGetExecute(r ApiApiAccountsMgmtV1MetricsGetRequest) (MetricsList, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *MetricsList
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  MetricsList
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1MetricsGet")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/metrics"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.search != nil {
 		localVarQueryParams.Add("search", parameterToString(*r.search, ""))
@@ -6730,7 +6746,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1MetricsGetExecute(r ApiApiAccountsM
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -6740,15 +6756,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1MetricsGetExecute(r ApiApiAccountsM
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -6759,8 +6775,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1MetricsGetExecute(r ApiApiAccountsM
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -6770,8 +6785,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1MetricsGetExecute(r ApiApiAccountsM
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -6781,15 +6795,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1MetricsGetExecute(r ApiApiAccountsM
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -6800,52 +6813,54 @@ func (a *DefaultApiService) ApiAccountsMgmtV1MetricsGetExecute(r ApiApiAccountsM
 }
 
 type ApiApiAccountsMgmtV1NotifyPostRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	notificationRequest *NotificationRequest
 }
 
-// The contents of the notification to send to the owner of a cluster/subscription in addition to the set of template parameters which are sent automatically ACCOUNT_USERNAME, FIRST_NAME, LAST_NAME, ORGANIZATION_NAME, ORGANIZATION_EXTERNAL_ID
 func (r ApiApiAccountsMgmtV1NotifyPostRequest) NotificationRequest(notificationRequest NotificationRequest) ApiApiAccountsMgmtV1NotifyPostRequest {
 	r.notificationRequest = &notificationRequest
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1NotifyPostRequest) Execute() (*http.Response, error) {
+func (r ApiApiAccountsMgmtV1NotifyPostRequest) Execute() (*_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1NotifyPostExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1NotifyPost Notify the owner of cluster/subscription
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiApiAccountsMgmtV1NotifyPostRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1NotifyPost(ctx context.Context) ApiApiAccountsMgmtV1NotifyPostRequest {
+ * ApiAccountsMgmtV1NotifyPost Notify the owner of cluster/subscription
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiApiAccountsMgmtV1NotifyPostRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1NotifyPost(ctx _context.Context) ApiApiAccountsMgmtV1NotifyPostRequest {
 	return ApiApiAccountsMgmtV1NotifyPostRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-func (a *DefaultApiService) ApiAccountsMgmtV1NotifyPostExecute(r ApiApiAccountsMgmtV1NotifyPostRequest) (*http.Response, error) {
+/*
+ * Execute executes the request
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1NotifyPostExecute(r ApiApiAccountsMgmtV1NotifyPostRequest) (*_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1NotifyPost")
 	if err != nil {
-		return nil, &GenericOpenAPIError{error: err.Error()}
+		return nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/notify"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.notificationRequest == nil {
 		return nil, reportError("notificationRequest is required and must be specified")
 	}
@@ -6869,7 +6884,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1NotifyPostExecute(r ApiApiAccountsM
 	}
 	// body params
 	localVarPostBody = r.notificationRequest
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return nil, err
 	}
@@ -6879,15 +6894,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1NotifyPostExecute(r ApiApiAccountsM
 		return localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -6898,8 +6913,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1NotifyPostExecute(r ApiApiAccountsM
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -6909,8 +6923,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1NotifyPostExecute(r ApiApiAccountsM
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -6920,8 +6933,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1NotifyPostExecute(r ApiApiAccountsM
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -6931,8 +6943,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1NotifyPostExecute(r ApiApiAccountsM
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarHTTPResponse, newErr
 	}
@@ -6941,7 +6952,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1NotifyPostExecute(r ApiApiAccountsM
 }
 
 type ApiApiAccountsMgmtV1OrganizationsGetRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	page *int32
 	size *int32
@@ -6952,85 +6963,75 @@ type ApiApiAccountsMgmtV1OrganizationsGetRequest struct {
 	fields *string
 }
 
-// Page number of record list when record list exceeds specified page size
 func (r ApiApiAccountsMgmtV1OrganizationsGetRequest) Page(page int32) ApiApiAccountsMgmtV1OrganizationsGetRequest {
 	r.page = &page
 	return r
 }
-
-// Maximum number of records to return
 func (r ApiApiAccountsMgmtV1OrganizationsGetRequest) Size(size int32) ApiApiAccountsMgmtV1OrganizationsGetRequest {
 	r.size = &size
 	return r
 }
-
-// Specifies the search criteria. The syntax of this parameter is similar to the syntax of the _where_ clause of an SQL statement, using the names of the json attributes / column names of the account. For example, in order to retrieve all the accounts with a username starting with `my`:  ```sql username like 'my%' ```  The search criteria can also be applied on related resource. For example, in order to retrieve all the subscriptions labeled by `foo=bar`,  ```sql labels.key = 'foo' and labels.value = 'bar' ```  If the parameter isn't provided, or if the value is empty, then all the accounts that the user has permission to see will be returned.
 func (r ApiApiAccountsMgmtV1OrganizationsGetRequest) Search(search string) ApiApiAccountsMgmtV1OrganizationsGetRequest {
 	r.search = &search
 	return r
 }
-
-// Specifies the order by criteria. The syntax of this parameter is similar to the syntax of the _order by_ clause of an SQL statement, but using the names of the json attributes / column of the account. For example, in order to retrieve all accounts ordered by username:  ```sql username asc ```  Or in order to retrieve all accounts ordered by username _and_ first name:  ```sql username asc, firstName asc ```  If the parameter isn't provided, or if the value is empty, then no explicit ordering will be applied.
 func (r ApiApiAccountsMgmtV1OrganizationsGetRequest) OrderBy(orderBy string) ApiApiAccountsMgmtV1OrganizationsGetRequest {
 	r.orderBy = &orderBy
 	return r
 }
-
-// If true, includes the labels on a subscription/organization/account in the output. Could slow request response time.
 func (r ApiApiAccountsMgmtV1OrganizationsGetRequest) FetchLabels(fetchLabels bool) ApiApiAccountsMgmtV1OrganizationsGetRequest {
 	r.fetchLabels = &fetchLabels
 	return r
 }
-
-// If true, includes the capabilities on a subscription in the output. Could slow request response time.
 func (r ApiApiAccountsMgmtV1OrganizationsGetRequest) FetchCapabilities(fetchCapabilities bool) ApiApiAccountsMgmtV1OrganizationsGetRequest {
 	r.fetchCapabilities = &fetchCapabilities
 	return r
 }
-
-// Supplies a comma-separated list of fields to be returned. Fields of sub-structures and of arrays use <structure>.<field> notation. <stucture>.* means all field of a structure Example: For each Subscription to get id, href, plan(id and kind) and labels (all fields)  ``` ocm get subscriptions --parameter fields=id,href,plan.id,plan.kind,labels.* --parameter fetchLabels=true ```
 func (r ApiApiAccountsMgmtV1OrganizationsGetRequest) Fields(fields string) ApiApiAccountsMgmtV1OrganizationsGetRequest {
 	r.fields = &fields
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1OrganizationsGetRequest) Execute() (*OrganizationList, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1OrganizationsGetRequest) Execute() (OrganizationList, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1OrganizationsGetExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1OrganizationsGet Returns a list of organizations
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiApiAccountsMgmtV1OrganizationsGetRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsGet(ctx context.Context) ApiApiAccountsMgmtV1OrganizationsGetRequest {
+ * ApiAccountsMgmtV1OrganizationsGet Returns a list of organizations
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiApiAccountsMgmtV1OrganizationsGetRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsGet(ctx _context.Context) ApiApiAccountsMgmtV1OrganizationsGetRequest {
 	return ApiApiAccountsMgmtV1OrganizationsGetRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return OrganizationList
-func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsGetExecute(r ApiApiAccountsMgmtV1OrganizationsGetRequest) (*OrganizationList, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return OrganizationList
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsGetExecute(r ApiApiAccountsMgmtV1OrganizationsGetRequest) (OrganizationList, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *OrganizationList
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  OrganizationList
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1OrganizationsGet")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/organizations"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.page != nil {
 		localVarQueryParams.Add("page", parameterToString(*r.page, ""))
@@ -7070,7 +7071,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsGetExecute(r ApiApiAcc
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -7080,15 +7081,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsGetExecute(r ApiApiAcc
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -7099,8 +7100,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsGetExecute(r ApiApiAcc
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -7110,8 +7110,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsGetExecute(r ApiApiAcc
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -7121,15 +7120,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsGetExecute(r ApiApiAcc
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -7140,37 +7138,33 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsGetExecute(r ApiApiAcc
 }
 
 type ApiApiAccountsMgmtV1OrganizationsIdGetRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	id string
 	fetchLabels *bool
 	fetchCapabilities *bool
 }
 
-// If true, includes the labels on a subscription/organization/account in the output. Could slow request response time.
 func (r ApiApiAccountsMgmtV1OrganizationsIdGetRequest) FetchLabels(fetchLabels bool) ApiApiAccountsMgmtV1OrganizationsIdGetRequest {
 	r.fetchLabels = &fetchLabels
 	return r
 }
-
-// If true, includes the capabilities on a subscription in the output. Could slow request response time.
 func (r ApiApiAccountsMgmtV1OrganizationsIdGetRequest) FetchCapabilities(fetchCapabilities bool) ApiApiAccountsMgmtV1OrganizationsIdGetRequest {
 	r.fetchCapabilities = &fetchCapabilities
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1OrganizationsIdGetRequest) Execute() (*Organization, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1OrganizationsIdGetRequest) Execute() (Organization, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1OrganizationsIdGetExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1OrganizationsIdGet Get an organization by id
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The id of record
- @return ApiApiAccountsMgmtV1OrganizationsIdGetRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdGet(ctx context.Context, id string) ApiApiAccountsMgmtV1OrganizationsIdGetRequest {
+ * ApiAccountsMgmtV1OrganizationsIdGet Get an organization by id
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The id of record
+ * @return ApiApiAccountsMgmtV1OrganizationsIdGetRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdGet(ctx _context.Context, id string) ApiApiAccountsMgmtV1OrganizationsIdGetRequest {
 	return ApiApiAccountsMgmtV1OrganizationsIdGetRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -7178,27 +7172,31 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdGet(ctx context.Cont
 	}
 }
 
-// Execute executes the request
-//  @return Organization
-func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdGetExecute(r ApiApiAccountsMgmtV1OrganizationsIdGetRequest) (*Organization, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return Organization
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdGetExecute(r ApiApiAccountsMgmtV1OrganizationsIdGetRequest) (Organization, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *Organization
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  Organization
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1OrganizationsIdGet")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/organizations/{id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.fetchLabels != nil {
 		localVarQueryParams.Add("fetchLabels", parameterToString(*r.fetchLabels, ""))
@@ -7223,7 +7221,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdGetExecute(r ApiApiA
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -7233,15 +7231,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdGetExecute(r ApiApiA
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -7252,8 +7250,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdGetExecute(r ApiApiA
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -7263,8 +7260,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdGetExecute(r ApiApiA
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -7274,8 +7270,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdGetExecute(r ApiApiA
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -7285,15 +7280,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdGetExecute(r ApiApiA
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -7304,7 +7298,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdGetExecute(r ApiApiA
 }
 
 type ApiApiAccountsMgmtV1OrganizationsIdLabelsGetRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	id string
 	page *int32
@@ -7313,42 +7307,34 @@ type ApiApiAccountsMgmtV1OrganizationsIdLabelsGetRequest struct {
 	orderBy *string
 }
 
-// Page number of record list when record list exceeds specified page size
 func (r ApiApiAccountsMgmtV1OrganizationsIdLabelsGetRequest) Page(page int32) ApiApiAccountsMgmtV1OrganizationsIdLabelsGetRequest {
 	r.page = &page
 	return r
 }
-
-// Maximum number of records to return
 func (r ApiApiAccountsMgmtV1OrganizationsIdLabelsGetRequest) Size(size int32) ApiApiAccountsMgmtV1OrganizationsIdLabelsGetRequest {
 	r.size = &size
 	return r
 }
-
-// Specifies the search criteria. The syntax of this parameter is similar to the syntax of the _where_ clause of an SQL statement, using the names of the json attributes / column names of the account. For example, in order to retrieve all the accounts with a username starting with `my`:  ```sql username like 'my%' ```  The search criteria can also be applied on related resource. For example, in order to retrieve all the subscriptions labeled by `foo=bar`,  ```sql labels.key = 'foo' and labels.value = 'bar' ```  If the parameter isn't provided, or if the value is empty, then all the accounts that the user has permission to see will be returned.
 func (r ApiApiAccountsMgmtV1OrganizationsIdLabelsGetRequest) Search(search string) ApiApiAccountsMgmtV1OrganizationsIdLabelsGetRequest {
 	r.search = &search
 	return r
 }
-
-// Specifies the order by criteria. The syntax of this parameter is similar to the syntax of the _order by_ clause of an SQL statement, but using the names of the json attributes / column of the account. For example, in order to retrieve all accounts ordered by username:  ```sql username asc ```  Or in order to retrieve all accounts ordered by username _and_ first name:  ```sql username asc, firstName asc ```  If the parameter isn't provided, or if the value is empty, then no explicit ordering will be applied.
 func (r ApiApiAccountsMgmtV1OrganizationsIdLabelsGetRequest) OrderBy(orderBy string) ApiApiAccountsMgmtV1OrganizationsIdLabelsGetRequest {
 	r.orderBy = &orderBy
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1OrganizationsIdLabelsGetRequest) Execute() (*LabelList, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1OrganizationsIdLabelsGetRequest) Execute() (LabelList, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1OrganizationsIdLabelsGetExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1OrganizationsIdLabelsGet Returns a list of labels
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The id of record
- @return ApiApiAccountsMgmtV1OrganizationsIdLabelsGetRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdLabelsGet(ctx context.Context, id string) ApiApiAccountsMgmtV1OrganizationsIdLabelsGetRequest {
+ * ApiAccountsMgmtV1OrganizationsIdLabelsGet Returns a list of labels
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The id of record
+ * @return ApiApiAccountsMgmtV1OrganizationsIdLabelsGetRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdLabelsGet(ctx _context.Context, id string) ApiApiAccountsMgmtV1OrganizationsIdLabelsGetRequest {
 	return ApiApiAccountsMgmtV1OrganizationsIdLabelsGetRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -7356,27 +7342,31 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdLabelsGet(ctx contex
 	}
 }
 
-// Execute executes the request
-//  @return LabelList
-func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdLabelsGetExecute(r ApiApiAccountsMgmtV1OrganizationsIdLabelsGetRequest) (*LabelList, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return LabelList
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdLabelsGetExecute(r ApiApiAccountsMgmtV1OrganizationsIdLabelsGetRequest) (LabelList, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *LabelList
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  LabelList
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1OrganizationsIdLabelsGet")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/organizations/{id}/labels"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.page != nil {
 		localVarQueryParams.Add("page", parameterToString(*r.page, ""))
@@ -7407,7 +7397,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdLabelsGetExecute(r A
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -7417,15 +7407,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdLabelsGetExecute(r A
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -7436,8 +7426,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdLabelsGetExecute(r A
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -7447,8 +7436,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdLabelsGetExecute(r A
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -7458,15 +7446,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdLabelsGetExecute(r A
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -7477,25 +7464,25 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdLabelsGetExecute(r A
 }
 
 type ApiApiAccountsMgmtV1OrganizationsIdLabelsKeyDeleteRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	id string
 	key string
 }
 
-func (r ApiApiAccountsMgmtV1OrganizationsIdLabelsKeyDeleteRequest) Execute() (*http.Response, error) {
+
+func (r ApiApiAccountsMgmtV1OrganizationsIdLabelsKeyDeleteRequest) Execute() (*_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1OrganizationsIdLabelsKeyDeleteExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1OrganizationsIdLabelsKeyDelete Delete a label
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The id of record
- @param key The key of the label
- @return ApiApiAccountsMgmtV1OrganizationsIdLabelsKeyDeleteRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdLabelsKeyDelete(ctx context.Context, id string, key string) ApiApiAccountsMgmtV1OrganizationsIdLabelsKeyDeleteRequest {
+ * ApiAccountsMgmtV1OrganizationsIdLabelsKeyDelete Delete a label
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The id of record
+ * @param key The key of the label
+ * @return ApiApiAccountsMgmtV1OrganizationsIdLabelsKeyDeleteRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdLabelsKeyDelete(ctx _context.Context, id string, key string) ApiApiAccountsMgmtV1OrganizationsIdLabelsKeyDeleteRequest {
 	return ApiApiAccountsMgmtV1OrganizationsIdLabelsKeyDeleteRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -7504,26 +7491,30 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdLabelsKeyDelete(ctx
 	}
 }
 
-// Execute executes the request
-func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdLabelsKeyDeleteExecute(r ApiApiAccountsMgmtV1OrganizationsIdLabelsKeyDeleteRequest) (*http.Response, error) {
+/*
+ * Execute executes the request
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdLabelsKeyDeleteExecute(r ApiApiAccountsMgmtV1OrganizationsIdLabelsKeyDeleteRequest) (*_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodDelete
+		localVarHTTPMethod   = _nethttp.MethodDelete
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1OrganizationsIdLabelsKeyDelete")
 	if err != nil {
-		return nil, &GenericOpenAPIError{error: err.Error()}
+		return nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/organizations/{id}/labels/{key}"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"key"+"}", url.PathEscape(parameterToString(r.key, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"key"+"}", _neturl.PathEscape(parameterToString(r.key, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -7542,7 +7533,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdLabelsKeyDeleteExecu
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return nil, err
 	}
@@ -7552,15 +7543,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdLabelsKeyDeleteExecu
 		return localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -7571,8 +7562,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdLabelsKeyDeleteExecu
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -7582,8 +7572,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdLabelsKeyDeleteExecu
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -7593,8 +7582,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdLabelsKeyDeleteExecu
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -7604,8 +7592,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdLabelsKeyDeleteExecu
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarHTTPResponse, newErr
 	}
@@ -7614,25 +7601,25 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdLabelsKeyDeleteExecu
 }
 
 type ApiApiAccountsMgmtV1OrganizationsIdLabelsKeyGetRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	id string
 	key string
 }
 
-func (r ApiApiAccountsMgmtV1OrganizationsIdLabelsKeyGetRequest) Execute() (*Label, *http.Response, error) {
+
+func (r ApiApiAccountsMgmtV1OrganizationsIdLabelsKeyGetRequest) Execute() (Label, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1OrganizationsIdLabelsKeyGetExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1OrganizationsIdLabelsKeyGet Get subscription labels by label key
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The id of record
- @param key The key of the label
- @return ApiApiAccountsMgmtV1OrganizationsIdLabelsKeyGetRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdLabelsKeyGet(ctx context.Context, id string, key string) ApiApiAccountsMgmtV1OrganizationsIdLabelsKeyGetRequest {
+ * ApiAccountsMgmtV1OrganizationsIdLabelsKeyGet Get subscription labels by label key
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The id of record
+ * @param key The key of the label
+ * @return ApiApiAccountsMgmtV1OrganizationsIdLabelsKeyGetRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdLabelsKeyGet(ctx _context.Context, id string, key string) ApiApiAccountsMgmtV1OrganizationsIdLabelsKeyGetRequest {
 	return ApiApiAccountsMgmtV1OrganizationsIdLabelsKeyGetRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -7641,28 +7628,32 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdLabelsKeyGet(ctx con
 	}
 }
 
-// Execute executes the request
-//  @return Label
-func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdLabelsKeyGetExecute(r ApiApiAccountsMgmtV1OrganizationsIdLabelsKeyGetRequest) (*Label, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return Label
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdLabelsKeyGetExecute(r ApiApiAccountsMgmtV1OrganizationsIdLabelsKeyGetRequest) (Label, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *Label
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  Label
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1OrganizationsIdLabelsKeyGet")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/organizations/{id}/labels/{key}"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"key"+"}", url.PathEscape(parameterToString(r.key, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"key"+"}", _neturl.PathEscape(parameterToString(r.key, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -7681,7 +7672,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdLabelsKeyGetExecute(
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -7691,15 +7682,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdLabelsKeyGetExecute(
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -7710,8 +7701,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdLabelsKeyGetExecute(
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -7721,8 +7711,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdLabelsKeyGetExecute(
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -7732,8 +7721,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdLabelsKeyGetExecute(
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -7743,15 +7731,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdLabelsKeyGetExecute(
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -7762,32 +7749,30 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdLabelsKeyGetExecute(
 }
 
 type ApiApiAccountsMgmtV1OrganizationsIdLabelsKeyPatchRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	id string
 	key string
 	label *Label
 }
 
-// Label data
 func (r ApiApiAccountsMgmtV1OrganizationsIdLabelsKeyPatchRequest) Label(label Label) ApiApiAccountsMgmtV1OrganizationsIdLabelsKeyPatchRequest {
 	r.label = &label
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1OrganizationsIdLabelsKeyPatchRequest) Execute() (*Label, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1OrganizationsIdLabelsKeyPatchRequest) Execute() (Label, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1OrganizationsIdLabelsKeyPatchExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1OrganizationsIdLabelsKeyPatch Create a new label or update an existing label
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The id of record
- @param key The key of the label
- @return ApiApiAccountsMgmtV1OrganizationsIdLabelsKeyPatchRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdLabelsKeyPatch(ctx context.Context, id string, key string) ApiApiAccountsMgmtV1OrganizationsIdLabelsKeyPatchRequest {
+ * ApiAccountsMgmtV1OrganizationsIdLabelsKeyPatch Create a new label or update an existing label
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The id of record
+ * @param key The key of the label
+ * @return ApiApiAccountsMgmtV1OrganizationsIdLabelsKeyPatchRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdLabelsKeyPatch(ctx _context.Context, id string, key string) ApiApiAccountsMgmtV1OrganizationsIdLabelsKeyPatchRequest {
 	return ApiApiAccountsMgmtV1OrganizationsIdLabelsKeyPatchRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -7796,28 +7781,32 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdLabelsKeyPatch(ctx c
 	}
 }
 
-// Execute executes the request
-//  @return Label
-func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdLabelsKeyPatchExecute(r ApiApiAccountsMgmtV1OrganizationsIdLabelsKeyPatchRequest) (*Label, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return Label
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdLabelsKeyPatchExecute(r ApiApiAccountsMgmtV1OrganizationsIdLabelsKeyPatchRequest) (Label, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPatch
+		localVarHTTPMethod   = _nethttp.MethodPatch
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *Label
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  Label
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1OrganizationsIdLabelsKeyPatch")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/organizations/{id}/labels/{key}"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"key"+"}", url.PathEscape(parameterToString(r.key, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"key"+"}", _neturl.PathEscape(parameterToString(r.key, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.label == nil {
 		return localVarReturnValue, nil, reportError("label is required and must be specified")
 	}
@@ -7841,7 +7830,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdLabelsKeyPatchExecut
 	}
 	// body params
 	localVarPostBody = r.label
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -7851,15 +7840,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdLabelsKeyPatchExecut
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -7870,8 +7859,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdLabelsKeyPatchExecut
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -7881,8 +7869,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdLabelsKeyPatchExecut
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -7892,8 +7879,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdLabelsKeyPatchExecut
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 409 {
@@ -7903,8 +7889,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdLabelsKeyPatchExecut
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -7914,15 +7899,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdLabelsKeyPatchExecut
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -7933,30 +7917,28 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdLabelsKeyPatchExecut
 }
 
 type ApiApiAccountsMgmtV1OrganizationsIdLabelsPostRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	id string
 	label *Label
 }
 
-// Label data
 func (r ApiApiAccountsMgmtV1OrganizationsIdLabelsPostRequest) Label(label Label) ApiApiAccountsMgmtV1OrganizationsIdLabelsPostRequest {
 	r.label = &label
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1OrganizationsIdLabelsPostRequest) Execute() (*Label, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1OrganizationsIdLabelsPostRequest) Execute() (Label, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1OrganizationsIdLabelsPostExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1OrganizationsIdLabelsPost Create a new label or update an existing label
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The id of record
- @return ApiApiAccountsMgmtV1OrganizationsIdLabelsPostRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdLabelsPost(ctx context.Context, id string) ApiApiAccountsMgmtV1OrganizationsIdLabelsPostRequest {
+ * ApiAccountsMgmtV1OrganizationsIdLabelsPost Create a new label or update an existing label
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The id of record
+ * @return ApiApiAccountsMgmtV1OrganizationsIdLabelsPostRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdLabelsPost(ctx _context.Context, id string) ApiApiAccountsMgmtV1OrganizationsIdLabelsPostRequest {
 	return ApiApiAccountsMgmtV1OrganizationsIdLabelsPostRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -7964,27 +7946,31 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdLabelsPost(ctx conte
 	}
 }
 
-// Execute executes the request
-//  @return Label
-func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdLabelsPostExecute(r ApiApiAccountsMgmtV1OrganizationsIdLabelsPostRequest) (*Label, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return Label
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdLabelsPostExecute(r ApiApiAccountsMgmtV1OrganizationsIdLabelsPostRequest) (Label, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *Label
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  Label
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1OrganizationsIdLabelsPost")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/organizations/{id}/labels"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.label == nil {
 		return localVarReturnValue, nil, reportError("label is required and must be specified")
 	}
@@ -8008,7 +7994,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdLabelsPostExecute(r
 	}
 	// body params
 	localVarPostBody = r.label
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -8018,15 +8004,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdLabelsPostExecute(r
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -8037,8 +8023,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdLabelsPostExecute(r
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -8048,8 +8033,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdLabelsPostExecute(r
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -8059,8 +8043,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdLabelsPostExecute(r
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -8070,15 +8053,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdLabelsPostExecute(r
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -8089,30 +8071,28 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdLabelsPostExecute(r
 }
 
 type ApiApiAccountsMgmtV1OrganizationsIdPatchRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	id string
 	organizationPatchRequest *OrganizationPatchRequest
 }
 
-// Updated organization data
 func (r ApiApiAccountsMgmtV1OrganizationsIdPatchRequest) OrganizationPatchRequest(organizationPatchRequest OrganizationPatchRequest) ApiApiAccountsMgmtV1OrganizationsIdPatchRequest {
 	r.organizationPatchRequest = &organizationPatchRequest
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1OrganizationsIdPatchRequest) Execute() (*Organization, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1OrganizationsIdPatchRequest) Execute() (Organization, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1OrganizationsIdPatchExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1OrganizationsIdPatch Update an organization
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The id of record
- @return ApiApiAccountsMgmtV1OrganizationsIdPatchRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdPatch(ctx context.Context, id string) ApiApiAccountsMgmtV1OrganizationsIdPatchRequest {
+ * ApiAccountsMgmtV1OrganizationsIdPatch Update an organization
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The id of record
+ * @return ApiApiAccountsMgmtV1OrganizationsIdPatchRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdPatch(ctx _context.Context, id string) ApiApiAccountsMgmtV1OrganizationsIdPatchRequest {
 	return ApiApiAccountsMgmtV1OrganizationsIdPatchRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -8120,27 +8100,31 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdPatch(ctx context.Co
 	}
 }
 
-// Execute executes the request
-//  @return Organization
-func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdPatchExecute(r ApiApiAccountsMgmtV1OrganizationsIdPatchRequest) (*Organization, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return Organization
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdPatchExecute(r ApiApiAccountsMgmtV1OrganizationsIdPatchRequest) (Organization, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPatch
+		localVarHTTPMethod   = _nethttp.MethodPatch
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *Organization
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  Organization
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1OrganizationsIdPatch")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/organizations/{id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.organizationPatchRequest == nil {
 		return localVarReturnValue, nil, reportError("organizationPatchRequest is required and must be specified")
 	}
@@ -8164,7 +8148,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdPatchExecute(r ApiAp
 	}
 	// body params
 	localVarPostBody = r.organizationPatchRequest
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -8174,15 +8158,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdPatchExecute(r ApiAp
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -8193,8 +8177,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdPatchExecute(r ApiAp
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -8204,8 +8187,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdPatchExecute(r ApiAp
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -8215,8 +8197,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdPatchExecute(r ApiAp
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -8226,8 +8207,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdPatchExecute(r ApiAp
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -8237,15 +8217,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdPatchExecute(r ApiAp
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -8256,23 +8235,23 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdPatchExecute(r ApiAp
 }
 
 type ApiApiAccountsMgmtV1OrganizationsIdSummaryDashboardGetRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	id string
 }
 
-func (r ApiApiAccountsMgmtV1OrganizationsIdSummaryDashboardGetRequest) Execute() (*Summary, *http.Response, error) {
+
+func (r ApiApiAccountsMgmtV1OrganizationsIdSummaryDashboardGetRequest) Execute() (Summary, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1OrganizationsIdSummaryDashboardGetExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1OrganizationsIdSummaryDashboardGet Returns a summary of organizations clusters based on metrics
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The id of record
- @return ApiApiAccountsMgmtV1OrganizationsIdSummaryDashboardGetRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdSummaryDashboardGet(ctx context.Context, id string) ApiApiAccountsMgmtV1OrganizationsIdSummaryDashboardGetRequest {
+ * ApiAccountsMgmtV1OrganizationsIdSummaryDashboardGet Returns a summary of organizations clusters based on metrics
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The id of record
+ * @return ApiApiAccountsMgmtV1OrganizationsIdSummaryDashboardGetRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdSummaryDashboardGet(ctx _context.Context, id string) ApiApiAccountsMgmtV1OrganizationsIdSummaryDashboardGetRequest {
 	return ApiApiAccountsMgmtV1OrganizationsIdSummaryDashboardGetRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -8280,27 +8259,31 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdSummaryDashboardGet(
 	}
 }
 
-// Execute executes the request
-//  @return Summary
-func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdSummaryDashboardGetExecute(r ApiApiAccountsMgmtV1OrganizationsIdSummaryDashboardGetRequest) (*Summary, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return Summary
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdSummaryDashboardGetExecute(r ApiApiAccountsMgmtV1OrganizationsIdSummaryDashboardGetRequest) (Summary, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *Summary
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  Summary
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1OrganizationsIdSummaryDashboardGet")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/organizations/{id}/summary_dashboard"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -8319,7 +8302,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdSummaryDashboardGetE
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -8329,15 +8312,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdSummaryDashboardGetE
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -8348,8 +8331,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdSummaryDashboardGetE
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -8359,8 +8341,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdSummaryDashboardGetE
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -8370,15 +8351,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdSummaryDashboardGetE
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -8389,25 +8369,25 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsIdSummaryDashboardGetE
 }
 
 type ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdDeleteRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	orgId string
 	acctGrpAsgnId string
 }
 
-func (r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdDeleteRequest) Execute() (*http.Response, error) {
+
+func (r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdDeleteRequest) Execute() (*_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdDeleteExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdDelete Delete an account group assignment
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param orgId The id of organization
- @param acctGrpAsgnId The id of account group assignment
- @return ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdDeleteRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdDelete(ctx context.Context, orgId string, acctGrpAsgnId string) ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdDeleteRequest {
+ * ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdDelete Delete an account group assignment
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param orgId The id of organization
+ * @param acctGrpAsgnId The id of account group assignment
+ * @return ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdDeleteRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdDelete(ctx _context.Context, orgId string, acctGrpAsgnId string) ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdDeleteRequest {
 	return ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdDeleteRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -8416,26 +8396,30 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssig
 	}
 }
 
-// Execute executes the request
-func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdDeleteExecute(r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdDeleteRequest) (*http.Response, error) {
+/*
+ * Execute executes the request
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdDeleteExecute(r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdDeleteRequest) (*_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodDelete
+		localVarHTTPMethod   = _nethttp.MethodDelete
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdDelete")
 	if err != nil {
-		return nil, &GenericOpenAPIError{error: err.Error()}
+		return nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/organizations/{orgId}/account_group_assignments/{acctGrpAsgnId}"
-	localVarPath = strings.Replace(localVarPath, "{"+"orgId"+"}", url.PathEscape(parameterToString(r.orgId, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"acctGrpAsgnId"+"}", url.PathEscape(parameterToString(r.acctGrpAsgnId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"orgId"+"}", _neturl.PathEscape(parameterToString(r.orgId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"acctGrpAsgnId"+"}", _neturl.PathEscape(parameterToString(r.acctGrpAsgnId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -8454,7 +8438,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssig
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return nil, err
 	}
@@ -8464,15 +8448,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssig
 		return localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -8483,8 +8467,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssig
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -8494,8 +8477,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssig
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -8505,8 +8487,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssig
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -8516,8 +8497,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssig
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -8527,8 +8507,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssig
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarHTTPResponse, newErr
 	}
@@ -8537,25 +8516,25 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssig
 }
 
 type ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdGetRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	orgId string
 	acctGrpAsgnId string
 }
 
-func (r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdGetRequest) Execute() (*AccountGroupAssignment, *http.Response, error) {
+
+func (r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdGetRequest) Execute() (AccountGroupAssignment, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdGetExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdGet Get account group assignment by id
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param orgId The id of organization
- @param acctGrpAsgnId The id of account group assignment
- @return ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdGetRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdGet(ctx context.Context, orgId string, acctGrpAsgnId string) ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdGetRequest {
+ * ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdGet Get account group assignment by id
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param orgId The id of organization
+ * @param acctGrpAsgnId The id of account group assignment
+ * @return ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdGetRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdGet(ctx _context.Context, orgId string, acctGrpAsgnId string) ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdGetRequest {
 	return ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdGetRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -8564,28 +8543,32 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssig
 	}
 }
 
-// Execute executes the request
-//  @return AccountGroupAssignment
-func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdGetExecute(r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdGetRequest) (*AccountGroupAssignment, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return AccountGroupAssignment
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdGetExecute(r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdGetRequest) (AccountGroupAssignment, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *AccountGroupAssignment
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  AccountGroupAssignment
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdGet")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/organizations/{orgId}/account_group_assignments/{acctGrpAsgnId}"
-	localVarPath = strings.Replace(localVarPath, "{"+"orgId"+"}", url.PathEscape(parameterToString(r.orgId, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"acctGrpAsgnId"+"}", url.PathEscape(parameterToString(r.acctGrpAsgnId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"orgId"+"}", _neturl.PathEscape(parameterToString(r.orgId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"acctGrpAsgnId"+"}", _neturl.PathEscape(parameterToString(r.acctGrpAsgnId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -8604,7 +8587,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssig
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -8614,15 +8597,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssig
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -8633,8 +8616,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssig
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -8644,8 +8626,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssig
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -8655,8 +8636,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssig
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -8666,8 +8646,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssig
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -8677,15 +8656,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssig
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -8696,7 +8674,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssig
 }
 
 type ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsGetRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	orgId string
 	page *int32
@@ -8705,42 +8683,34 @@ type ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsGetRequest str
 	orderBy *string
 }
 
-// Page number of record list when record list exceeds specified page size
 func (r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsGetRequest) Page(page int32) ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsGetRequest {
 	r.page = &page
 	return r
 }
-
-// Maximum number of records to return
 func (r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsGetRequest) Size(size int32) ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsGetRequest {
 	r.size = &size
 	return r
 }
-
-// Specifies the search criteria. The syntax of this parameter is similar to the syntax of the _where_ clause of an SQL statement, using the names of the json attributes / column names of the account. For example, in order to retrieve all the accounts with a username starting with `my`:  ```sql username like 'my%' ```  The search criteria can also be applied on related resource. For example, in order to retrieve all the subscriptions labeled by `foo=bar`,  ```sql labels.key = 'foo' and labels.value = 'bar' ```  If the parameter isn't provided, or if the value is empty, then all the accounts that the user has permission to see will be returned.
 func (r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsGetRequest) Search(search string) ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsGetRequest {
 	r.search = &search
 	return r
 }
-
-// Specifies the order by criteria. The syntax of this parameter is similar to the syntax of the _order by_ clause of an SQL statement, but using the names of the json attributes / column of the account. For example, in order to retrieve all accounts ordered by username:  ```sql username asc ```  Or in order to retrieve all accounts ordered by username _and_ first name:  ```sql username asc, firstName asc ```  If the parameter isn't provided, or if the value is empty, then no explicit ordering will be applied.
 func (r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsGetRequest) OrderBy(orderBy string) ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsGetRequest {
 	r.orderBy = &orderBy
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsGetRequest) Execute() (*AccountGroupAssignmentList, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsGetRequest) Execute() (AccountGroupAssignmentList, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsGetExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsGet Returns a list of account group assignments for the given org
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param orgId The id of organization
- @return ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsGetRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsGet(ctx context.Context, orgId string) ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsGetRequest {
+ * ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsGet Returns a list of account group assignments for the given org
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param orgId The id of organization
+ * @return ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsGetRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsGet(ctx _context.Context, orgId string) ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsGetRequest {
 	return ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsGetRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -8748,27 +8718,31 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssig
 	}
 }
 
-// Execute executes the request
-//  @return AccountGroupAssignmentList
-func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsGetExecute(r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsGetRequest) (*AccountGroupAssignmentList, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return AccountGroupAssignmentList
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsGetExecute(r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsGetRequest) (AccountGroupAssignmentList, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *AccountGroupAssignmentList
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  AccountGroupAssignmentList
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsGet")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/organizations/{orgId}/account_group_assignments"
-	localVarPath = strings.Replace(localVarPath, "{"+"orgId"+"}", url.PathEscape(parameterToString(r.orgId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"orgId"+"}", _neturl.PathEscape(parameterToString(r.orgId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.page != nil {
 		localVarQueryParams.Add("page", parameterToString(*r.page, ""))
@@ -8799,7 +8773,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssig
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -8809,15 +8783,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssig
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -8828,8 +8802,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssig
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -8839,8 +8812,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssig
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -8850,8 +8822,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssig
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -8861,15 +8832,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssig
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -8880,30 +8850,28 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssig
 }
 
 type ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsPostRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	orgId string
 	accountGroupAssignment *AccountGroupAssignment
 }
 
-// New AccountGroup data
 func (r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsPostRequest) AccountGroupAssignment(accountGroupAssignment AccountGroupAssignment) ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsPostRequest {
 	r.accountGroupAssignment = &accountGroupAssignment
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsPostRequest) Execute() (*AccountGroupAssignment, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsPostRequest) Execute() (AccountGroupAssignment, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsPostExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsPost Create a new AccountGroupAssignment
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param orgId The id of organization
- @return ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsPostRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsPost(ctx context.Context, orgId string) ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsPostRequest {
+ * ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsPost Create a new AccountGroupAssignment
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param orgId The id of organization
+ * @return ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsPostRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsPost(ctx _context.Context, orgId string) ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsPostRequest {
 	return ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsPostRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -8911,27 +8879,31 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssig
 	}
 }
 
-// Execute executes the request
-//  @return AccountGroupAssignment
-func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsPostExecute(r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsPostRequest) (*AccountGroupAssignment, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return AccountGroupAssignment
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsPostExecute(r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsPostRequest) (AccountGroupAssignment, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *AccountGroupAssignment
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  AccountGroupAssignment
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsPost")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/organizations/{orgId}/account_group_assignments"
-	localVarPath = strings.Replace(localVarPath, "{"+"orgId"+"}", url.PathEscape(parameterToString(r.orgId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"orgId"+"}", _neturl.PathEscape(parameterToString(r.orgId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.accountGroupAssignment == nil {
 		return localVarReturnValue, nil, reportError("accountGroupAssignment is required and must be specified")
 	}
@@ -8955,7 +8927,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssig
 	}
 	// body params
 	localVarPostBody = r.accountGroupAssignment
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -8965,15 +8937,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssig
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -8984,8 +8956,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssig
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -8995,8 +8966,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssig
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -9006,8 +8976,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssig
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -9017,8 +8986,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssig
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -9028,15 +8996,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssig
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -9047,25 +9014,25 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssig
 }
 
 type ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdDeleteRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	orgId string
 	acctGrpId string
 }
 
-func (r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdDeleteRequest) Execute() (*http.Response, error) {
+
+func (r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdDeleteRequest) Execute() (*_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdDeleteExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdDelete Delete an account group
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param orgId The id of organization
- @param acctGrpId The id of account group
- @return ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdDeleteRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdDelete(ctx context.Context, orgId string, acctGrpId string) ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdDeleteRequest {
+ * ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdDelete Delete an account group
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param orgId The id of organization
+ * @param acctGrpId The id of account group
+ * @return ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdDeleteRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdDelete(ctx _context.Context, orgId string, acctGrpId string) ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdDeleteRequest {
 	return ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdDeleteRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -9074,26 +9041,30 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcct
 	}
 }
 
-// Execute executes the request
-func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdDeleteExecute(r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdDeleteRequest) (*http.Response, error) {
+/*
+ * Execute executes the request
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdDeleteExecute(r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdDeleteRequest) (*_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodDelete
+		localVarHTTPMethod   = _nethttp.MethodDelete
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdDelete")
 	if err != nil {
-		return nil, &GenericOpenAPIError{error: err.Error()}
+		return nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/organizations/{orgId}/account_groups/{acctGrpId}"
-	localVarPath = strings.Replace(localVarPath, "{"+"orgId"+"}", url.PathEscape(parameterToString(r.orgId, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"acctGrpId"+"}", url.PathEscape(parameterToString(r.acctGrpId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"orgId"+"}", _neturl.PathEscape(parameterToString(r.orgId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"acctGrpId"+"}", _neturl.PathEscape(parameterToString(r.acctGrpId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -9112,7 +9083,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcct
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return nil, err
 	}
@@ -9122,15 +9093,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcct
 		return localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -9141,8 +9112,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcct
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -9152,8 +9122,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcct
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -9163,8 +9132,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcct
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -9174,8 +9142,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcct
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarHTTPResponse, newErr
 	}
@@ -9184,25 +9151,25 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcct
 }
 
 type ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdGetRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	orgId string
 	acctGrpId string
 }
 
-func (r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdGetRequest) Execute() (*AccountGroup, *http.Response, error) {
+
+func (r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdGetRequest) Execute() (AccountGroup, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdGetExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdGet Get account group by id
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param orgId The id of organization
- @param acctGrpId The id of account group
- @return ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdGetRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdGet(ctx context.Context, orgId string, acctGrpId string) ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdGetRequest {
+ * ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdGet Get account group by id
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param orgId The id of organization
+ * @param acctGrpId The id of account group
+ * @return ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdGetRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdGet(ctx _context.Context, orgId string, acctGrpId string) ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdGetRequest {
 	return ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdGetRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -9211,28 +9178,32 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcct
 	}
 }
 
-// Execute executes the request
-//  @return AccountGroup
-func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdGetExecute(r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdGetRequest) (*AccountGroup, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return AccountGroup
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdGetExecute(r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdGetRequest) (AccountGroup, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *AccountGroup
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  AccountGroup
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdGet")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/organizations/{orgId}/account_groups/{acctGrpId}"
-	localVarPath = strings.Replace(localVarPath, "{"+"orgId"+"}", url.PathEscape(parameterToString(r.orgId, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"acctGrpId"+"}", url.PathEscape(parameterToString(r.acctGrpId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"orgId"+"}", _neturl.PathEscape(parameterToString(r.orgId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"acctGrpId"+"}", _neturl.PathEscape(parameterToString(r.acctGrpId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -9251,7 +9222,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcct
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -9261,15 +9232,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcct
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -9280,8 +9251,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcct
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -9291,8 +9261,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcct
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -9302,8 +9271,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcct
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -9313,8 +9281,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcct
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -9324,15 +9291,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcct
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -9343,32 +9309,30 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcct
 }
 
 type ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdPatchRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	orgId string
 	acctGrpId string
 	accountGroupRequest *AccountGroupRequest
 }
 
-// Updated account group data
 func (r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdPatchRequest) AccountGroupRequest(accountGroupRequest AccountGroupRequest) ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdPatchRequest {
 	r.accountGroupRequest = &accountGroupRequest
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdPatchRequest) Execute() (*AccountGroup, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdPatchRequest) Execute() (AccountGroup, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdPatchExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdPatch Update an account group
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param orgId The id of organization
- @param acctGrpId The id of account group
- @return ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdPatchRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdPatch(ctx context.Context, orgId string, acctGrpId string) ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdPatchRequest {
+ * ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdPatch Update an account group
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param orgId The id of organization
+ * @param acctGrpId The id of account group
+ * @return ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdPatchRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdPatch(ctx _context.Context, orgId string, acctGrpId string) ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdPatchRequest {
 	return ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdPatchRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -9377,28 +9341,32 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcct
 	}
 }
 
-// Execute executes the request
-//  @return AccountGroup
-func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdPatchExecute(r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdPatchRequest) (*AccountGroup, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return AccountGroup
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdPatchExecute(r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdPatchRequest) (AccountGroup, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPatch
+		localVarHTTPMethod   = _nethttp.MethodPatch
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *AccountGroup
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  AccountGroup
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdPatch")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/organizations/{orgId}/account_groups/{acctGrpId}"
-	localVarPath = strings.Replace(localVarPath, "{"+"orgId"+"}", url.PathEscape(parameterToString(r.orgId, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"acctGrpId"+"}", url.PathEscape(parameterToString(r.acctGrpId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"orgId"+"}", _neturl.PathEscape(parameterToString(r.orgId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"acctGrpId"+"}", _neturl.PathEscape(parameterToString(r.acctGrpId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.accountGroupRequest == nil {
 		return localVarReturnValue, nil, reportError("accountGroupRequest is required and must be specified")
 	}
@@ -9422,7 +9390,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcct
 	}
 	// body params
 	localVarPostBody = r.accountGroupRequest
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -9432,15 +9400,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcct
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -9451,8 +9419,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcct
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -9462,8 +9429,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcct
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -9473,8 +9439,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcct
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -9484,8 +9449,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcct
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -9495,15 +9459,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcct
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -9514,7 +9477,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcct
 }
 
 type ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsGetRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	orgId string
 	page *int32
@@ -9523,42 +9486,34 @@ type ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsGetRequest struct {
 	orderBy *string
 }
 
-// Page number of record list when record list exceeds specified page size
 func (r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsGetRequest) Page(page int32) ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsGetRequest {
 	r.page = &page
 	return r
 }
-
-// Maximum number of records to return
 func (r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsGetRequest) Size(size int32) ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsGetRequest {
 	r.size = &size
 	return r
 }
-
-// Specifies the search criteria. The syntax of this parameter is similar to the syntax of the _where_ clause of an SQL statement, using the names of the json attributes / column names of the account. For example, in order to retrieve all the accounts with a username starting with `my`:  ```sql username like 'my%' ```  The search criteria can also be applied on related resource. For example, in order to retrieve all the subscriptions labeled by `foo=bar`,  ```sql labels.key = 'foo' and labels.value = 'bar' ```  If the parameter isn't provided, or if the value is empty, then all the accounts that the user has permission to see will be returned.
 func (r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsGetRequest) Search(search string) ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsGetRequest {
 	r.search = &search
 	return r
 }
-
-// Specifies the order by criteria. The syntax of this parameter is similar to the syntax of the _order by_ clause of an SQL statement, but using the names of the json attributes / column of the account. For example, in order to retrieve all accounts ordered by username:  ```sql username asc ```  Or in order to retrieve all accounts ordered by username _and_ first name:  ```sql username asc, firstName asc ```  If the parameter isn't provided, or if the value is empty, then no explicit ordering will be applied.
 func (r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsGetRequest) OrderBy(orderBy string) ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsGetRequest {
 	r.orderBy = &orderBy
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsGetRequest) Execute() (*AccountGroupList, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsGetRequest) Execute() (AccountGroupList, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsGetExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsGet Returns a list of account groups for the given org
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param orgId The id of organization
- @return ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsGetRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsGet(ctx context.Context, orgId string) ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsGetRequest {
+ * ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsGet Returns a list of account groups for the given org
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param orgId The id of organization
+ * @return ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsGetRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsGet(ctx _context.Context, orgId string) ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsGetRequest {
 	return ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsGetRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -9566,27 +9521,31 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsGet(
 	}
 }
 
-// Execute executes the request
-//  @return AccountGroupList
-func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsGetExecute(r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsGetRequest) (*AccountGroupList, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return AccountGroupList
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsGetExecute(r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsGetRequest) (AccountGroupList, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *AccountGroupList
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  AccountGroupList
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsGet")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/organizations/{orgId}/account_groups"
-	localVarPath = strings.Replace(localVarPath, "{"+"orgId"+"}", url.PathEscape(parameterToString(r.orgId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"orgId"+"}", _neturl.PathEscape(parameterToString(r.orgId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.page != nil {
 		localVarQueryParams.Add("page", parameterToString(*r.page, ""))
@@ -9617,7 +9576,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsGetE
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -9627,15 +9586,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsGetE
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -9646,8 +9605,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsGetE
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -9657,8 +9615,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsGetE
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -9668,8 +9625,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsGetE
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -9679,15 +9635,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsGetE
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -9698,30 +9653,28 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsGetE
 }
 
 type ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsPostRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	orgId string
 	accountGroupRequest *AccountGroupRequest
 }
 
-// New AccountGroup data
 func (r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsPostRequest) AccountGroupRequest(accountGroupRequest AccountGroupRequest) ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsPostRequest {
 	r.accountGroupRequest = &accountGroupRequest
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsPostRequest) Execute() (*AccountGroup, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsPostRequest) Execute() (AccountGroup, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsPostExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsPost Create a new AccountGroup
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param orgId The id of organization
- @return ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsPostRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsPost(ctx context.Context, orgId string) ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsPostRequest {
+ * ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsPost Create a new AccountGroup
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param orgId The id of organization
+ * @return ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsPostRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsPost(ctx _context.Context, orgId string) ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsPostRequest {
 	return ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsPostRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -9729,27 +9682,31 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsPost
 	}
 }
 
-// Execute executes the request
-//  @return AccountGroup
-func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsPostExecute(r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsPostRequest) (*AccountGroup, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return AccountGroup
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsPostExecute(r ApiApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsPostRequest) (AccountGroup, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *AccountGroup
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  AccountGroup
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsPost")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/organizations/{orgId}/account_groups"
-	localVarPath = strings.Replace(localVarPath, "{"+"orgId"+"}", url.PathEscape(parameterToString(r.orgId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"orgId"+"}", _neturl.PathEscape(parameterToString(r.orgId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.accountGroupRequest == nil {
 		return localVarReturnValue, nil, reportError("accountGroupRequest is required and must be specified")
 	}
@@ -9773,7 +9730,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsPost
 	}
 	// body params
 	localVarPostBody = r.accountGroupRequest
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -9783,15 +9740,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsPost
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -9802,8 +9759,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsPost
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -9813,8 +9769,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsPost
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -9824,8 +9779,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsPost
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -9835,8 +9789,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsPost
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -9846,15 +9799,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsPost
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -9865,30 +9817,28 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsPost
 }
 
 type ApiApiAccountsMgmtV1OrganizationsOrgIdConsumedQuotaGetRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	orgId string
 	forceRecalc *bool
 }
 
-// If true, includes that ConsumedQuota should be recalculated.
 func (r ApiApiAccountsMgmtV1OrganizationsOrgIdConsumedQuotaGetRequest) ForceRecalc(forceRecalc bool) ApiApiAccountsMgmtV1OrganizationsOrgIdConsumedQuotaGetRequest {
 	r.forceRecalc = &forceRecalc
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1OrganizationsOrgIdConsumedQuotaGetRequest) Execute() (*ConsumedQuotaList, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1OrganizationsOrgIdConsumedQuotaGetRequest) Execute() (ConsumedQuotaList, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1OrganizationsOrgIdConsumedQuotaGetExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1OrganizationsOrgIdConsumedQuotaGet Returns a list of consumed quota for an organization
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param orgId The id of organization
- @return ApiApiAccountsMgmtV1OrganizationsOrgIdConsumedQuotaGetRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdConsumedQuotaGet(ctx context.Context, orgId string) ApiApiAccountsMgmtV1OrganizationsOrgIdConsumedQuotaGetRequest {
+ * ApiAccountsMgmtV1OrganizationsOrgIdConsumedQuotaGet Returns a list of consumed quota for an organization
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param orgId The id of organization
+ * @return ApiApiAccountsMgmtV1OrganizationsOrgIdConsumedQuotaGetRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdConsumedQuotaGet(ctx _context.Context, orgId string) ApiApiAccountsMgmtV1OrganizationsOrgIdConsumedQuotaGetRequest {
 	return ApiApiAccountsMgmtV1OrganizationsOrgIdConsumedQuotaGetRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -9896,27 +9846,31 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdConsumedQuotaGet(
 	}
 }
 
-// Execute executes the request
-//  @return ConsumedQuotaList
-func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdConsumedQuotaGetExecute(r ApiApiAccountsMgmtV1OrganizationsOrgIdConsumedQuotaGetRequest) (*ConsumedQuotaList, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return ConsumedQuotaList
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdConsumedQuotaGetExecute(r ApiApiAccountsMgmtV1OrganizationsOrgIdConsumedQuotaGetRequest) (ConsumedQuotaList, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *ConsumedQuotaList
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  ConsumedQuotaList
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1OrganizationsOrgIdConsumedQuotaGet")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/organizations/{orgId}/consumed_quota"
-	localVarPath = strings.Replace(localVarPath, "{"+"orgId"+"}", url.PathEscape(parameterToString(r.orgId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"orgId"+"}", _neturl.PathEscape(parameterToString(r.orgId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.forceRecalc != nil {
 		localVarQueryParams.Add("forceRecalc", parameterToString(*r.forceRecalc, ""))
@@ -9938,7 +9892,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdConsumedQuotaGetE
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -9948,15 +9902,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdConsumedQuotaGetE
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -9967,8 +9921,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdConsumedQuotaGetE
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -9978,8 +9931,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdConsumedQuotaGetE
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -9989,8 +9941,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdConsumedQuotaGetE
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -10000,15 +9951,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdConsumedQuotaGetE
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -10019,7 +9969,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdConsumedQuotaGetE
 }
 
 type ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaGetRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	orgId string
 	page *int32
@@ -10028,42 +9978,34 @@ type ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaGetRequest struct {
 	orderBy *string
 }
 
-// Page number of record list when record list exceeds specified page size
 func (r ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaGetRequest) Page(page int32) ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaGetRequest {
 	r.page = &page
 	return r
 }
-
-// Maximum number of records to return
 func (r ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaGetRequest) Size(size int32) ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaGetRequest {
 	r.size = &size
 	return r
 }
-
-// Specifies the search criteria. The syntax of this parameter is similar to the syntax of the _where_ clause of an SQL statement, using the names of the json attributes / column names of the account. For example, in order to retrieve all the accounts with a username starting with `my`:  ```sql username like 'my%' ```  The search criteria can also be applied on related resource. For example, in order to retrieve all the subscriptions labeled by `foo=bar`,  ```sql labels.key = 'foo' and labels.value = 'bar' ```  If the parameter isn't provided, or if the value is empty, then all the accounts that the user has permission to see will be returned.
 func (r ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaGetRequest) Search(search string) ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaGetRequest {
 	r.search = &search
 	return r
 }
-
-// Specifies the order by criteria. The syntax of this parameter is similar to the syntax of the _order by_ clause of an SQL statement, but using the names of the json attributes / column of the account. For example, in order to retrieve all accounts ordered by username:  ```sql username asc ```  Or in order to retrieve all accounts ordered by username _and_ first name:  ```sql username asc, firstName asc ```  If the parameter isn't provided, or if the value is empty, then no explicit ordering will be applied.
 func (r ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaGetRequest) OrderBy(orderBy string) ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaGetRequest {
 	r.orderBy = &orderBy
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaGetRequest) Execute() (*ResourceQuotaList, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaGetRequest) Execute() (ResourceQuotaList, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaGetExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaGet Returns a list of resource quota objects
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param orgId The id of organization
- @return ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaGetRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaGet(ctx context.Context, orgId string) ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaGetRequest {
+ * ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaGet Returns a list of resource quota objects
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param orgId The id of organization
+ * @return ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaGetRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaGet(ctx _context.Context, orgId string) ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaGetRequest {
 	return ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaGetRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -10071,27 +10013,31 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaGet(
 	}
 }
 
-// Execute executes the request
-//  @return ResourceQuotaList
-func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaGetExecute(r ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaGetRequest) (*ResourceQuotaList, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return ResourceQuotaList
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaGetExecute(r ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaGetRequest) (ResourceQuotaList, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *ResourceQuotaList
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  ResourceQuotaList
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaGet")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/organizations/{orgId}/resource_quota"
-	localVarPath = strings.Replace(localVarPath, "{"+"orgId"+"}", url.PathEscape(parameterToString(r.orgId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"orgId"+"}", _neturl.PathEscape(parameterToString(r.orgId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.page != nil {
 		localVarQueryParams.Add("page", parameterToString(*r.page, ""))
@@ -10122,7 +10068,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaGetE
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -10132,15 +10078,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaGetE
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -10151,8 +10097,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaGetE
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -10162,8 +10107,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaGetE
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -10173,8 +10117,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaGetE
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -10184,15 +10127,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaGetE
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -10203,30 +10145,28 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaGetE
 }
 
 type ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaPostRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	orgId string
 	resourceQuotaRequest *ResourceQuotaRequest
 }
 
-// Resource quota data
 func (r ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaPostRequest) ResourceQuotaRequest(resourceQuotaRequest ResourceQuotaRequest) ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaPostRequest {
 	r.resourceQuotaRequest = &resourceQuotaRequest
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaPostRequest) Execute() (*ResourceQuota, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaPostRequest) Execute() (ResourceQuota, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaPostExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaPost Create a new resource quota
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param orgId The id of organization
- @return ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaPostRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaPost(ctx context.Context, orgId string) ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaPostRequest {
+ * ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaPost Create a new resource quota
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param orgId The id of organization
+ * @return ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaPostRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaPost(ctx _context.Context, orgId string) ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaPostRequest {
 	return ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaPostRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -10234,27 +10174,31 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaPost
 	}
 }
 
-// Execute executes the request
-//  @return ResourceQuota
-func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaPostExecute(r ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaPostRequest) (*ResourceQuota, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return ResourceQuota
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaPostExecute(r ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaPostRequest) (ResourceQuota, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *ResourceQuota
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  ResourceQuota
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaPost")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/organizations/{orgId}/resource_quota"
-	localVarPath = strings.Replace(localVarPath, "{"+"orgId"+"}", url.PathEscape(parameterToString(r.orgId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"orgId"+"}", _neturl.PathEscape(parameterToString(r.orgId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.resourceQuotaRequest == nil {
 		return localVarReturnValue, nil, reportError("resourceQuotaRequest is required and must be specified")
 	}
@@ -10278,7 +10222,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaPost
 	}
 	// body params
 	localVarPostBody = r.resourceQuotaRequest
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -10288,15 +10232,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaPost
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -10307,8 +10251,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaPost
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -10318,8 +10261,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaPost
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -10329,8 +10271,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaPost
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 409 {
@@ -10340,8 +10281,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaPost
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -10351,15 +10291,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaPost
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -10370,25 +10309,25 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaPost
 }
 
 type ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdDeleteRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	orgId string
 	quotaId string
 }
 
-func (r ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdDeleteRequest) Execute() (*http.Response, error) {
+
+func (r ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdDeleteRequest) Execute() (*_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdDeleteExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdDelete Delete a resource quota
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param orgId The id of organization
- @param quotaId The id of quota
- @return ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdDeleteRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdDelete(ctx context.Context, orgId string, quotaId string) ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdDeleteRequest {
+ * ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdDelete Delete a resource quota
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param orgId The id of organization
+ * @param quotaId The id of quota
+ * @return ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdDeleteRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdDelete(ctx _context.Context, orgId string, quotaId string) ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdDeleteRequest {
 	return ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdDeleteRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -10397,26 +10336,30 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuot
 	}
 }
 
-// Execute executes the request
-func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdDeleteExecute(r ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdDeleteRequest) (*http.Response, error) {
+/*
+ * Execute executes the request
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdDeleteExecute(r ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdDeleteRequest) (*_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodDelete
+		localVarHTTPMethod   = _nethttp.MethodDelete
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdDelete")
 	if err != nil {
-		return nil, &GenericOpenAPIError{error: err.Error()}
+		return nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/organizations/{orgId}/resource_quota/{quotaId}"
-	localVarPath = strings.Replace(localVarPath, "{"+"orgId"+"}", url.PathEscape(parameterToString(r.orgId, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"quotaId"+"}", url.PathEscape(parameterToString(r.quotaId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"orgId"+"}", _neturl.PathEscape(parameterToString(r.orgId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"quotaId"+"}", _neturl.PathEscape(parameterToString(r.quotaId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -10435,7 +10378,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuot
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return nil, err
 	}
@@ -10445,15 +10388,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuot
 		return localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -10464,8 +10407,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuot
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -10475,8 +10417,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuot
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -10486,8 +10427,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuot
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -10497,8 +10437,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuot
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarHTTPResponse, newErr
 	}
@@ -10507,25 +10446,25 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuot
 }
 
 type ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdGetRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	orgId string
 	quotaId string
 }
 
-func (r ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdGetRequest) Execute() (*ResourceQuota, *http.Response, error) {
+
+func (r ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdGetRequest) Execute() (ResourceQuota, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdGetExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdGet Get a resource quota by id
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param orgId The id of organization
- @param quotaId The id of quota
- @return ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdGetRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdGet(ctx context.Context, orgId string, quotaId string) ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdGetRequest {
+ * ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdGet Get a resource quota by id
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param orgId The id of organization
+ * @param quotaId The id of quota
+ * @return ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdGetRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdGet(ctx _context.Context, orgId string, quotaId string) ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdGetRequest {
 	return ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdGetRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -10534,28 +10473,32 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuot
 	}
 }
 
-// Execute executes the request
-//  @return ResourceQuota
-func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdGetExecute(r ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdGetRequest) (*ResourceQuota, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return ResourceQuota
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdGetExecute(r ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdGetRequest) (ResourceQuota, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *ResourceQuota
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  ResourceQuota
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdGet")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/organizations/{orgId}/resource_quota/{quotaId}"
-	localVarPath = strings.Replace(localVarPath, "{"+"orgId"+"}", url.PathEscape(parameterToString(r.orgId, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"quotaId"+"}", url.PathEscape(parameterToString(r.quotaId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"orgId"+"}", _neturl.PathEscape(parameterToString(r.orgId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"quotaId"+"}", _neturl.PathEscape(parameterToString(r.quotaId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -10574,7 +10517,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuot
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -10584,15 +10527,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuot
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -10603,8 +10546,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuot
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -10614,8 +10556,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuot
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -10625,8 +10566,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuot
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -10636,15 +10576,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuot
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -10655,32 +10594,30 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuot
 }
 
 type ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdPatchRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	orgId string
 	quotaId string
 	resourceQuotaRequest *ResourceQuotaRequest
 }
 
-// Updated resource quota data
 func (r ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdPatchRequest) ResourceQuotaRequest(resourceQuotaRequest ResourceQuotaRequest) ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdPatchRequest {
 	r.resourceQuotaRequest = &resourceQuotaRequest
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdPatchRequest) Execute() (*ResourceQuota, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdPatchRequest) Execute() (ResourceQuota, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdPatchExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdPatch Update a resource quota
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param orgId The id of organization
- @param quotaId The id of quota
- @return ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdPatchRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdPatch(ctx context.Context, orgId string, quotaId string) ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdPatchRequest {
+ * ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdPatch Update a resource quota
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param orgId The id of organization
+ * @param quotaId The id of quota
+ * @return ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdPatchRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdPatch(ctx _context.Context, orgId string, quotaId string) ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdPatchRequest {
 	return ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdPatchRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -10689,28 +10626,32 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuot
 	}
 }
 
-// Execute executes the request
-//  @return ResourceQuota
-func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdPatchExecute(r ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdPatchRequest) (*ResourceQuota, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return ResourceQuota
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdPatchExecute(r ApiApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdPatchRequest) (ResourceQuota, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPatch
+		localVarHTTPMethod   = _nethttp.MethodPatch
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *ResourceQuota
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  ResourceQuota
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdPatch")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/organizations/{orgId}/resource_quota/{quotaId}"
-	localVarPath = strings.Replace(localVarPath, "{"+"orgId"+"}", url.PathEscape(parameterToString(r.orgId, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"quotaId"+"}", url.PathEscape(parameterToString(r.quotaId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"orgId"+"}", _neturl.PathEscape(parameterToString(r.orgId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"quotaId"+"}", _neturl.PathEscape(parameterToString(r.quotaId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.resourceQuotaRequest == nil {
 		return localVarReturnValue, nil, reportError("resourceQuotaRequest is required and must be specified")
 	}
@@ -10734,7 +10675,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuot
 	}
 	// body params
 	localVarPostBody = r.resourceQuotaRequest
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -10744,15 +10685,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuot
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -10763,8 +10704,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuot
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -10774,8 +10714,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuot
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -10785,8 +10724,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuot
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -10796,8 +10734,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuot
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -10807,15 +10744,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuot
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -10826,54 +10762,56 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuot
 }
 
 type ApiApiAccountsMgmtV1OrganizationsPostRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	organization *Organization
 }
 
-// Organization data
 func (r ApiApiAccountsMgmtV1OrganizationsPostRequest) Organization(organization Organization) ApiApiAccountsMgmtV1OrganizationsPostRequest {
 	r.organization = &organization
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1OrganizationsPostRequest) Execute() (*Organization, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1OrganizationsPostRequest) Execute() (Organization, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1OrganizationsPostExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1OrganizationsPost Create a new organization
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiApiAccountsMgmtV1OrganizationsPostRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsPost(ctx context.Context) ApiApiAccountsMgmtV1OrganizationsPostRequest {
+ * ApiAccountsMgmtV1OrganizationsPost Create a new organization
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiApiAccountsMgmtV1OrganizationsPostRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsPost(ctx _context.Context) ApiApiAccountsMgmtV1OrganizationsPostRequest {
 	return ApiApiAccountsMgmtV1OrganizationsPostRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return Organization
-func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsPostExecute(r ApiApiAccountsMgmtV1OrganizationsPostRequest) (*Organization, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return Organization
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsPostExecute(r ApiApiAccountsMgmtV1OrganizationsPostRequest) (Organization, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *Organization
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  Organization
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1OrganizationsPost")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/organizations"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.organization == nil {
 		return localVarReturnValue, nil, reportError("organization is required and must be specified")
 	}
@@ -10897,7 +10835,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsPostExecute(r ApiApiAc
 	}
 	// body params
 	localVarPostBody = r.organization
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -10907,15 +10845,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsPostExecute(r ApiApiAc
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -10926,8 +10864,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsPostExecute(r ApiApiAc
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -10937,8 +10874,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsPostExecute(r ApiApiAc
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -10948,8 +10884,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsPostExecute(r ApiApiAc
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 409 {
@@ -10959,8 +10894,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsPostExecute(r ApiApiAc
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -10970,15 +10904,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsPostExecute(r ApiApiAc
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -10989,68 +10922,66 @@ func (a *DefaultApiService) ApiAccountsMgmtV1OrganizationsPostExecute(r ApiApiAc
 }
 
 type ApiApiAccountsMgmtV1PlansGetRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	page *int32
 	size *int32
 	search *string
 }
 
-// Page number of record list when record list exceeds specified page size
 func (r ApiApiAccountsMgmtV1PlansGetRequest) Page(page int32) ApiApiAccountsMgmtV1PlansGetRequest {
 	r.page = &page
 	return r
 }
-
-// Maximum number of records to return
 func (r ApiApiAccountsMgmtV1PlansGetRequest) Size(size int32) ApiApiAccountsMgmtV1PlansGetRequest {
 	r.size = &size
 	return r
 }
-
-// Specifies the search criteria. The syntax of this parameter is similar to the syntax of the _where_ clause of an SQL statement, using the names of the json attributes / column names of the account. For example, in order to retrieve all the accounts with a username starting with `my`:  ```sql username like 'my%' ```  The search criteria can also be applied on related resource. For example, in order to retrieve all the subscriptions labeled by `foo=bar`,  ```sql labels.key = 'foo' and labels.value = 'bar' ```  If the parameter isn't provided, or if the value is empty, then all the accounts that the user has permission to see will be returned.
 func (r ApiApiAccountsMgmtV1PlansGetRequest) Search(search string) ApiApiAccountsMgmtV1PlansGetRequest {
 	r.search = &search
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1PlansGetRequest) Execute() (*PlanList, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1PlansGetRequest) Execute() (PlanList, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1PlansGetExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1PlansGet Get all plans
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiApiAccountsMgmtV1PlansGetRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1PlansGet(ctx context.Context) ApiApiAccountsMgmtV1PlansGetRequest {
+ * ApiAccountsMgmtV1PlansGet Get all plans
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiApiAccountsMgmtV1PlansGetRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1PlansGet(ctx _context.Context) ApiApiAccountsMgmtV1PlansGetRequest {
 	return ApiApiAccountsMgmtV1PlansGetRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return PlanList
-func (a *DefaultApiService) ApiAccountsMgmtV1PlansGetExecute(r ApiApiAccountsMgmtV1PlansGetRequest) (*PlanList, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return PlanList
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1PlansGetExecute(r ApiApiAccountsMgmtV1PlansGetRequest) (PlanList, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *PlanList
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  PlanList
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1PlansGet")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/plans"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.page != nil {
 		localVarQueryParams.Add("page", parameterToString(*r.page, ""))
@@ -11078,7 +11009,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1PlansGetExecute(r ApiApiAccountsMgm
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -11088,15 +11019,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1PlansGetExecute(r ApiApiAccountsMgm
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -11107,8 +11038,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1PlansGetExecute(r ApiApiAccountsMgm
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -11118,8 +11048,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1PlansGetExecute(r ApiApiAccountsMgm
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -11129,15 +11058,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1PlansGetExecute(r ApiApiAccountsMgm
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -11148,23 +11076,23 @@ func (a *DefaultApiService) ApiAccountsMgmtV1PlansGetExecute(r ApiApiAccountsMgm
 }
 
 type ApiApiAccountsMgmtV1PlansIdGetRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	id string
 }
 
-func (r ApiApiAccountsMgmtV1PlansIdGetRequest) Execute() (*Plan, *http.Response, error) {
+
+func (r ApiApiAccountsMgmtV1PlansIdGetRequest) Execute() (Plan, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1PlansIdGetExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1PlansIdGet Get a plan by id
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The id of record
- @return ApiApiAccountsMgmtV1PlansIdGetRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1PlansIdGet(ctx context.Context, id string) ApiApiAccountsMgmtV1PlansIdGetRequest {
+ * ApiAccountsMgmtV1PlansIdGet Get a plan by id
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The id of record
+ * @return ApiApiAccountsMgmtV1PlansIdGetRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1PlansIdGet(ctx _context.Context, id string) ApiApiAccountsMgmtV1PlansIdGetRequest {
 	return ApiApiAccountsMgmtV1PlansIdGetRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -11172,27 +11100,31 @@ func (a *DefaultApiService) ApiAccountsMgmtV1PlansIdGet(ctx context.Context, id
 	}
 }
 
-// Execute executes the request
-//  @return Plan
-func (a *DefaultApiService) ApiAccountsMgmtV1PlansIdGetExecute(r ApiApiAccountsMgmtV1PlansIdGetRequest) (*Plan, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return Plan
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1PlansIdGetExecute(r ApiApiAccountsMgmtV1PlansIdGetRequest) (Plan, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *Plan
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  Plan
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1PlansIdGet")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/plans/{id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -11211,7 +11143,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1PlansIdGetExecute(r ApiApiAccountsM
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -11221,15 +11153,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1PlansIdGetExecute(r ApiApiAccountsM
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -11240,8 +11172,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1PlansIdGetExecute(r ApiApiAccountsM
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -11251,8 +11182,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1PlansIdGetExecute(r ApiApiAccountsM
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -11262,8 +11192,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1PlansIdGetExecute(r ApiApiAccountsM
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -11273,15 +11202,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1PlansIdGetExecute(r ApiApiAccountsM
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -11292,23 +11220,23 @@ func (a *DefaultApiService) ApiAccountsMgmtV1PlansIdGetExecute(r ApiApiAccountsM
 }
 
 type ApiApiAccountsMgmtV1PullSecretsExternalResourceIdDeleteRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	externalResourceId string
 }
 
-func (r ApiApiAccountsMgmtV1PullSecretsExternalResourceIdDeleteRequest) Execute() (*http.Response, error) {
+
+func (r ApiApiAccountsMgmtV1PullSecretsExternalResourceIdDeleteRequest) Execute() (*_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1PullSecretsExternalResourceIdDeleteExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1PullSecretsExternalResourceIdDelete Delete a pull secret
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param externalResourceId The external resource id of record
- @return ApiApiAccountsMgmtV1PullSecretsExternalResourceIdDeleteRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1PullSecretsExternalResourceIdDelete(ctx context.Context, externalResourceId string) ApiApiAccountsMgmtV1PullSecretsExternalResourceIdDeleteRequest {
+ * ApiAccountsMgmtV1PullSecretsExternalResourceIdDelete Delete a pull secret
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param externalResourceId The external resource id of record
+ * @return ApiApiAccountsMgmtV1PullSecretsExternalResourceIdDeleteRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1PullSecretsExternalResourceIdDelete(ctx _context.Context, externalResourceId string) ApiApiAccountsMgmtV1PullSecretsExternalResourceIdDeleteRequest {
 	return ApiApiAccountsMgmtV1PullSecretsExternalResourceIdDeleteRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -11316,25 +11244,29 @@ func (a *DefaultApiService) ApiAccountsMgmtV1PullSecretsExternalResourceIdDelete
 	}
 }
 
-// Execute executes the request
-func (a *DefaultApiService) ApiAccountsMgmtV1PullSecretsExternalResourceIdDeleteExecute(r ApiApiAccountsMgmtV1PullSecretsExternalResourceIdDeleteRequest) (*http.Response, error) {
+/*
+ * Execute executes the request
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1PullSecretsExternalResourceIdDeleteExecute(r ApiApiAccountsMgmtV1PullSecretsExternalResourceIdDeleteRequest) (*_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodDelete
+		localVarHTTPMethod   = _nethttp.MethodDelete
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1PullSecretsExternalResourceIdDelete")
 	if err != nil {
-		return nil, &GenericOpenAPIError{error: err.Error()}
+		return nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/pull_secrets/{externalResourceId}"
-	localVarPath = strings.Replace(localVarPath, "{"+"externalResourceId"+"}", url.PathEscape(parameterToString(r.externalResourceId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"externalResourceId"+"}", _neturl.PathEscape(parameterToString(r.externalResourceId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -11353,7 +11285,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1PullSecretsExternalResourceIdDelete
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return nil, err
 	}
@@ -11363,15 +11295,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1PullSecretsExternalResourceIdDelete
 		return localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -11382,8 +11314,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1PullSecretsExternalResourceIdDelete
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -11393,8 +11324,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1PullSecretsExternalResourceIdDelete
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -11404,8 +11334,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1PullSecretsExternalResourceIdDelete
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -11415,8 +11344,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1PullSecretsExternalResourceIdDelete
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarHTTPResponse, newErr
 	}
@@ -11425,54 +11353,56 @@ func (a *DefaultApiService) ApiAccountsMgmtV1PullSecretsExternalResourceIdDelete
 }
 
 type ApiApiAccountsMgmtV1PullSecretsPostRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	pullSecretRequest *PullSecretRequest
 }
 
-// Identifier of the resource in the external service that this pull secret relates to
 func (r ApiApiAccountsMgmtV1PullSecretsPostRequest) PullSecretRequest(pullSecretRequest PullSecretRequest) ApiApiAccountsMgmtV1PullSecretsPostRequest {
 	r.pullSecretRequest = &pullSecretRequest
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1PullSecretsPostRequest) Execute() (*AccessTokenCfg, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1PullSecretsPostRequest) Execute() (AccessTokenCfg, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1PullSecretsPostExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1PullSecretsPost Return access token generated from registries in docker format
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiApiAccountsMgmtV1PullSecretsPostRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1PullSecretsPost(ctx context.Context) ApiApiAccountsMgmtV1PullSecretsPostRequest {
+ * ApiAccountsMgmtV1PullSecretsPost Return access token generated from registries in docker format
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiApiAccountsMgmtV1PullSecretsPostRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1PullSecretsPost(ctx _context.Context) ApiApiAccountsMgmtV1PullSecretsPostRequest {
 	return ApiApiAccountsMgmtV1PullSecretsPostRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return AccessTokenCfg
-func (a *DefaultApiService) ApiAccountsMgmtV1PullSecretsPostExecute(r ApiApiAccountsMgmtV1PullSecretsPostRequest) (*AccessTokenCfg, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return AccessTokenCfg
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1PullSecretsPostExecute(r ApiApiAccountsMgmtV1PullSecretsPostRequest) (AccessTokenCfg, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *AccessTokenCfg
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  AccessTokenCfg
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1PullSecretsPost")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/pull_secrets"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.pullSecretRequest == nil {
 		return localVarReturnValue, nil, reportError("pullSecretRequest is required and must be specified")
 	}
@@ -11496,7 +11426,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1PullSecretsPostExecute(r ApiApiAcco
 	}
 	// body params
 	localVarPostBody = r.pullSecretRequest
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -11506,15 +11436,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1PullSecretsPostExecute(r ApiApiAcco
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -11525,8 +11455,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1PullSecretsPostExecute(r ApiApiAcco
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -11536,8 +11465,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1PullSecretsPostExecute(r ApiApiAcco
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -11547,8 +11475,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1PullSecretsPostExecute(r ApiApiAcco
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -11558,8 +11485,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1PullSecretsPostExecute(r ApiApiAcco
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -11569,15 +11495,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1PullSecretsPostExecute(r ApiApiAcco
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -11588,68 +11513,66 @@ func (a *DefaultApiService) ApiAccountsMgmtV1PullSecretsPostExecute(r ApiApiAcco
 }
 
 type ApiApiAccountsMgmtV1QuotaCostGetRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	search *string
 	fetchRelatedResources *bool
 	fetchCloudAccounts *bool
 }
 
-// Specifies the search criteria. The syntax of this parameter is similar to the syntax of the _where_ clause of an SQL statement, using the names of the json attributes / column names of the account. For example, in order to retrieve all the accounts with a username starting with `my`:  ```sql username like 'my%' ```  The search criteria can also be applied on related resource. For example, in order to retrieve all the subscriptions labeled by `foo=bar`,  ```sql labels.key = 'foo' and labels.value = 'bar' ```  If the parameter isn't provided, or if the value is empty, then all the accounts that the user has permission to see will be returned.
 func (r ApiApiAccountsMgmtV1QuotaCostGetRequest) Search(search string) ApiApiAccountsMgmtV1QuotaCostGetRequest {
 	r.search = &search
 	return r
 }
-
-// If true, includes the related resources in the output. Could slow request response time.
 func (r ApiApiAccountsMgmtV1QuotaCostGetRequest) FetchRelatedResources(fetchRelatedResources bool) ApiApiAccountsMgmtV1QuotaCostGetRequest {
 	r.fetchRelatedResources = &fetchRelatedResources
 	return r
 }
-
-// If true, includes the marketplace cloud accounts in the output. Could slow request response time.
 func (r ApiApiAccountsMgmtV1QuotaCostGetRequest) FetchCloudAccounts(fetchCloudAccounts bool) ApiApiAccountsMgmtV1QuotaCostGetRequest {
 	r.fetchCloudAccounts = &fetchCloudAccounts
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1QuotaCostGetRequest) Execute() (*QuotaCostList, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1QuotaCostGetRequest) Execute() (QuotaCostList, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1QuotaCostGetExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1QuotaCostGet Returns a summary of quota cost for the authenticated user
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiApiAccountsMgmtV1QuotaCostGetRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1QuotaCostGet(ctx context.Context) ApiApiAccountsMgmtV1QuotaCostGetRequest {
+ * ApiAccountsMgmtV1QuotaCostGet Returns a summary of quota cost for the authenticated user
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiApiAccountsMgmtV1QuotaCostGetRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1QuotaCostGet(ctx _context.Context) ApiApiAccountsMgmtV1QuotaCostGetRequest {
 	return ApiApiAccountsMgmtV1QuotaCostGetRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return QuotaCostList
-func (a *DefaultApiService) ApiAccountsMgmtV1QuotaCostGetExecute(r ApiApiAccountsMgmtV1QuotaCostGetRequest) (*QuotaCostList, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return QuotaCostList
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1QuotaCostGetExecute(r ApiApiAccountsMgmtV1QuotaCostGetRequest) (QuotaCostList, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *QuotaCostList
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  QuotaCostList
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1QuotaCostGet")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/quota_cost"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.search != nil {
 		localVarQueryParams.Add("search", parameterToString(*r.search, ""))
@@ -11677,7 +11600,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1QuotaCostGetExecute(r ApiApiAccount
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -11687,15 +11610,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1QuotaCostGetExecute(r ApiApiAccount
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -11706,8 +11629,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1QuotaCostGetExecute(r ApiApiAccount
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -11717,15 +11639,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1QuotaCostGetExecute(r ApiApiAccount
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -11736,68 +11657,66 @@ func (a *DefaultApiService) ApiAccountsMgmtV1QuotaCostGetExecute(r ApiApiAccount
 }
 
 type ApiApiAccountsMgmtV1QuotaRulesGetRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	page *int32
 	size *int32
 	search *string
 }
 
-// Page number of record list when record list exceeds specified page size
 func (r ApiApiAccountsMgmtV1QuotaRulesGetRequest) Page(page int32) ApiApiAccountsMgmtV1QuotaRulesGetRequest {
 	r.page = &page
 	return r
 }
-
-// Maximum number of records to return
 func (r ApiApiAccountsMgmtV1QuotaRulesGetRequest) Size(size int32) ApiApiAccountsMgmtV1QuotaRulesGetRequest {
 	r.size = &size
 	return r
 }
-
-// Specifies the search criteria. The syntax of this parameter is similar to the syntax of the _where_ clause of an SQL statement, using the names of the json attributes / column names of the account. For example, in order to retrieve all the accounts with a username starting with `my`:  ```sql username like 'my%' ```  The search criteria can also be applied on related resource. For example, in order to retrieve all the subscriptions labeled by `foo=bar`,  ```sql labels.key = 'foo' and labels.value = 'bar' ```  If the parameter isn't provided, or if the value is empty, then all the accounts that the user has permission to see will be returned.
 func (r ApiApiAccountsMgmtV1QuotaRulesGetRequest) Search(search string) ApiApiAccountsMgmtV1QuotaRulesGetRequest {
 	r.search = &search
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1QuotaRulesGetRequest) Execute() (*QuotaRulesList, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1QuotaRulesGetRequest) Execute() (QuotaRulesList, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1QuotaRulesGetExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1QuotaRulesGet Returns a list of UHC product Quota Rules
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiApiAccountsMgmtV1QuotaRulesGetRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1QuotaRulesGet(ctx context.Context) ApiApiAccountsMgmtV1QuotaRulesGetRequest {
+ * ApiAccountsMgmtV1QuotaRulesGet Returns a list of UHC product Quota Rules
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiApiAccountsMgmtV1QuotaRulesGetRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1QuotaRulesGet(ctx _context.Context) ApiApiAccountsMgmtV1QuotaRulesGetRequest {
 	return ApiApiAccountsMgmtV1QuotaRulesGetRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return QuotaRulesList
-func (a *DefaultApiService) ApiAccountsMgmtV1QuotaRulesGetExecute(r ApiApiAccountsMgmtV1QuotaRulesGetRequest) (*QuotaRulesList, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return QuotaRulesList
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1QuotaRulesGetExecute(r ApiApiAccountsMgmtV1QuotaRulesGetRequest) (QuotaRulesList, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *QuotaRulesList
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  QuotaRulesList
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1QuotaRulesGet")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/quota_rules"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.page != nil {
 		localVarQueryParams.Add("page", parameterToString(*r.page, ""))
@@ -11825,7 +11744,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1QuotaRulesGetExecute(r ApiApiAccoun
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -11835,15 +11754,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1QuotaRulesGetExecute(r ApiApiAccoun
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -11854,8 +11773,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1QuotaRulesGetExecute(r ApiApiAccoun
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -11865,8 +11783,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1QuotaRulesGetExecute(r ApiApiAccoun
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -11876,15 +11793,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1QuotaRulesGetExecute(r ApiApiAccoun
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -11895,68 +11811,66 @@ func (a *DefaultApiService) ApiAccountsMgmtV1QuotaRulesGetExecute(r ApiApiAccoun
 }
 
 type ApiApiAccountsMgmtV1QuotasGetRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	page *int32
 	size *int32
 	search *string
 }
 
-// Page number of record list when record list exceeds specified page size
 func (r ApiApiAccountsMgmtV1QuotasGetRequest) Page(page int32) ApiApiAccountsMgmtV1QuotasGetRequest {
 	r.page = &page
 	return r
 }
-
-// Maximum number of records to return
 func (r ApiApiAccountsMgmtV1QuotasGetRequest) Size(size int32) ApiApiAccountsMgmtV1QuotasGetRequest {
 	r.size = &size
 	return r
 }
-
-// Specifies the search criteria. The syntax of this parameter is similar to the syntax of the _where_ clause of an SQL statement, using the names of the json attributes / column names of the account. For example, in order to retrieve all the accounts with a username starting with `my`:  ```sql username like 'my%' ```  The search criteria can also be applied on related resource. For example, in order to retrieve all the subscriptions labeled by `foo=bar`,  ```sql labels.key = 'foo' and labels.value = 'bar' ```  If the parameter isn't provided, or if the value is empty, then all the accounts that the user has permission to see will be returned.
 func (r ApiApiAccountsMgmtV1QuotasGetRequest) Search(search string) ApiApiAccountsMgmtV1QuotasGetRequest {
 	r.search = &search
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1QuotasGetRequest) Execute() (*QuotaList, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1QuotasGetRequest) Execute() (QuotaList, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1QuotasGetExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1QuotasGet Returns a list of quotas
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiApiAccountsMgmtV1QuotasGetRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1QuotasGet(ctx context.Context) ApiApiAccountsMgmtV1QuotasGetRequest {
+ * ApiAccountsMgmtV1QuotasGet Returns a list of quotas
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiApiAccountsMgmtV1QuotasGetRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1QuotasGet(ctx _context.Context) ApiApiAccountsMgmtV1QuotasGetRequest {
 	return ApiApiAccountsMgmtV1QuotasGetRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return QuotaList
-func (a *DefaultApiService) ApiAccountsMgmtV1QuotasGetExecute(r ApiApiAccountsMgmtV1QuotasGetRequest) (*QuotaList, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return QuotaList
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1QuotasGetExecute(r ApiApiAccountsMgmtV1QuotasGetRequest) (QuotaList, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *QuotaList
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  QuotaList
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1QuotasGet")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/quotas"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.page != nil {
 		localVarQueryParams.Add("page", parameterToString(*r.page, ""))
@@ -11984,7 +11898,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1QuotasGetExecute(r ApiApiAccountsMg
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -11994,15 +11908,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1QuotasGetExecute(r ApiApiAccountsMg
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -12013,8 +11927,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1QuotasGetExecute(r ApiApiAccountsMg
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -12024,8 +11937,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1QuotasGetExecute(r ApiApiAccountsMg
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -12035,15 +11947,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1QuotasGetExecute(r ApiApiAccountsMg
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -12054,23 +11965,23 @@ func (a *DefaultApiService) ApiAccountsMgmtV1QuotasGetExecute(r ApiApiAccountsMg
 }
 
 type ApiApiAccountsMgmtV1QuotasIdDeleteRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	id string
 }
 
-func (r ApiApiAccountsMgmtV1QuotasIdDeleteRequest) Execute() (*http.Response, error) {
+
+func (r ApiApiAccountsMgmtV1QuotasIdDeleteRequest) Execute() (*_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1QuotasIdDeleteExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1QuotasIdDelete Delete a quota
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The id of record
- @return ApiApiAccountsMgmtV1QuotasIdDeleteRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1QuotasIdDelete(ctx context.Context, id string) ApiApiAccountsMgmtV1QuotasIdDeleteRequest {
+ * ApiAccountsMgmtV1QuotasIdDelete Delete a quota
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The id of record
+ * @return ApiApiAccountsMgmtV1QuotasIdDeleteRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1QuotasIdDelete(ctx _context.Context, id string) ApiApiAccountsMgmtV1QuotasIdDeleteRequest {
 	return ApiApiAccountsMgmtV1QuotasIdDeleteRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -12078,25 +11989,29 @@ func (a *DefaultApiService) ApiAccountsMgmtV1QuotasIdDelete(ctx context.Context,
 	}
 }
 
-// Execute executes the request
-func (a *DefaultApiService) ApiAccountsMgmtV1QuotasIdDeleteExecute(r ApiApiAccountsMgmtV1QuotasIdDeleteRequest) (*http.Response, error) {
+/*
+ * Execute executes the request
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1QuotasIdDeleteExecute(r ApiApiAccountsMgmtV1QuotasIdDeleteRequest) (*_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodDelete
+		localVarHTTPMethod   = _nethttp.MethodDelete
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1QuotasIdDelete")
 	if err != nil {
-		return nil, &GenericOpenAPIError{error: err.Error()}
+		return nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/quotas/{id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -12115,7 +12030,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1QuotasIdDeleteExecute(r ApiApiAccou
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return nil, err
 	}
@@ -12125,15 +12040,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1QuotasIdDeleteExecute(r ApiApiAccou
 		return localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -12144,8 +12059,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1QuotasIdDeleteExecute(r ApiApiAccou
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -12155,8 +12069,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1QuotasIdDeleteExecute(r ApiApiAccou
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -12166,8 +12079,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1QuotasIdDeleteExecute(r ApiApiAccou
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -12177,8 +12089,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1QuotasIdDeleteExecute(r ApiApiAccou
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarHTTPResponse, newErr
 	}
@@ -12187,23 +12098,23 @@ func (a *DefaultApiService) ApiAccountsMgmtV1QuotasIdDeleteExecute(r ApiApiAccou
 }
 
 type ApiApiAccountsMgmtV1QuotasIdGetRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	id string
 }
 
-func (r ApiApiAccountsMgmtV1QuotasIdGetRequest) Execute() (*Quota, *http.Response, error) {
+
+func (r ApiApiAccountsMgmtV1QuotasIdGetRequest) Execute() (Quota, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1QuotasIdGetExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1QuotasIdGet Get a quota
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The id of record
- @return ApiApiAccountsMgmtV1QuotasIdGetRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1QuotasIdGet(ctx context.Context, id string) ApiApiAccountsMgmtV1QuotasIdGetRequest {
+ * ApiAccountsMgmtV1QuotasIdGet Get a quota
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The id of record
+ * @return ApiApiAccountsMgmtV1QuotasIdGetRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1QuotasIdGet(ctx _context.Context, id string) ApiApiAccountsMgmtV1QuotasIdGetRequest {
 	return ApiApiAccountsMgmtV1QuotasIdGetRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -12211,27 +12122,31 @@ func (a *DefaultApiService) ApiAccountsMgmtV1QuotasIdGet(ctx context.Context, id
 	}
 }
 
-// Execute executes the request
-//  @return Quota
-func (a *DefaultApiService) ApiAccountsMgmtV1QuotasIdGetExecute(r ApiApiAccountsMgmtV1QuotasIdGetRequest) (*Quota, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return Quota
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1QuotasIdGetExecute(r ApiApiAccountsMgmtV1QuotasIdGetRequest) (Quota, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *Quota
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  Quota
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1QuotasIdGet")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/quotas/{id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -12250,7 +12165,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1QuotasIdGetExecute(r ApiApiAccounts
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -12260,15 +12175,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1QuotasIdGetExecute(r ApiApiAccounts
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -12279,8 +12194,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1QuotasIdGetExecute(r ApiApiAccounts
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -12290,8 +12204,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1QuotasIdGetExecute(r ApiApiAccounts
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -12301,8 +12214,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1QuotasIdGetExecute(r ApiApiAccounts
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -12312,15 +12224,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1QuotasIdGetExecute(r ApiApiAccounts
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -12331,30 +12242,28 @@ func (a *DefaultApiService) ApiAccountsMgmtV1QuotasIdGetExecute(r ApiApiAccounts
 }
 
 type ApiApiAccountsMgmtV1QuotasIdPatchRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	id string
 	quota *Quota
 }
 
-// Updated quota data
 func (r ApiApiAccountsMgmtV1QuotasIdPatchRequest) Quota(quota Quota) ApiApiAccountsMgmtV1QuotasIdPatchRequest {
 	r.quota = &quota
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1QuotasIdPatchRequest) Execute() (*Quota, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1QuotasIdPatchRequest) Execute() (Quota, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1QuotasIdPatchExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1QuotasIdPatch Update a quota
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The id of record
- @return ApiApiAccountsMgmtV1QuotasIdPatchRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1QuotasIdPatch(ctx context.Context, id string) ApiApiAccountsMgmtV1QuotasIdPatchRequest {
+ * ApiAccountsMgmtV1QuotasIdPatch Update a quota
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The id of record
+ * @return ApiApiAccountsMgmtV1QuotasIdPatchRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1QuotasIdPatch(ctx _context.Context, id string) ApiApiAccountsMgmtV1QuotasIdPatchRequest {
 	return ApiApiAccountsMgmtV1QuotasIdPatchRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -12362,27 +12271,31 @@ func (a *DefaultApiService) ApiAccountsMgmtV1QuotasIdPatch(ctx context.Context,
 	}
 }
 
-// Execute executes the request
-//  @return Quota
-func (a *DefaultApiService) ApiAccountsMgmtV1QuotasIdPatchExecute(r ApiApiAccountsMgmtV1QuotasIdPatchRequest) (*Quota, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return Quota
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1QuotasIdPatchExecute(r ApiApiAccountsMgmtV1QuotasIdPatchRequest) (Quota, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPatch
+		localVarHTTPMethod   = _nethttp.MethodPatch
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *Quota
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  Quota
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1QuotasIdPatch")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/quotas/{id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.quota == nil {
 		return localVarReturnValue, nil, reportError("quota is required and must be specified")
 	}
@@ -12406,7 +12319,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1QuotasIdPatchExecute(r ApiApiAccoun
 	}
 	// body params
 	localVarPostBody = r.quota
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -12416,15 +12329,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1QuotasIdPatchExecute(r ApiApiAccoun
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -12435,8 +12348,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1QuotasIdPatchExecute(r ApiApiAccoun
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -12446,8 +12358,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1QuotasIdPatchExecute(r ApiApiAccoun
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -12457,8 +12368,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1QuotasIdPatchExecute(r ApiApiAccoun
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -12468,8 +12378,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1QuotasIdPatchExecute(r ApiApiAccoun
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -12479,15 +12388,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1QuotasIdPatchExecute(r ApiApiAccoun
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -12498,54 +12406,56 @@ func (a *DefaultApiService) ApiAccountsMgmtV1QuotasIdPatchExecute(r ApiApiAccoun
 }
 
 type ApiApiAccountsMgmtV1QuotasPostRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	quota *Quota
 }
 
-// Quota data
 func (r ApiApiAccountsMgmtV1QuotasPostRequest) Quota(quota Quota) ApiApiAccountsMgmtV1QuotasPostRequest {
 	r.quota = &quota
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1QuotasPostRequest) Execute() (*Quota, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1QuotasPostRequest) Execute() (Quota, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1QuotasPostExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1QuotasPost Create a new quota
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiApiAccountsMgmtV1QuotasPostRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1QuotasPost(ctx context.Context) ApiApiAccountsMgmtV1QuotasPostRequest {
+ * ApiAccountsMgmtV1QuotasPost Create a new quota
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiApiAccountsMgmtV1QuotasPostRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1QuotasPost(ctx _context.Context) ApiApiAccountsMgmtV1QuotasPostRequest {
 	return ApiApiAccountsMgmtV1QuotasPostRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return Quota
-func (a *DefaultApiService) ApiAccountsMgmtV1QuotasPostExecute(r ApiApiAccountsMgmtV1QuotasPostRequest) (*Quota, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return Quota
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1QuotasPostExecute(r ApiApiAccountsMgmtV1QuotasPostRequest) (Quota, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *Quota
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  Quota
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1QuotasPost")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/quotas"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.quota == nil {
 		return localVarReturnValue, nil, reportError("quota is required and must be specified")
 	}
@@ -12569,7 +12479,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1QuotasPostExecute(r ApiApiAccountsM
 	}
 	// body params
 	localVarPostBody = r.quota
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -12579,15 +12489,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1QuotasPostExecute(r ApiApiAccountsM
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -12598,8 +12508,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1QuotasPostExecute(r ApiApiAccountsM
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -12609,8 +12518,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1QuotasPostExecute(r ApiApiAccountsM
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -12620,8 +12528,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1QuotasPostExecute(r ApiApiAccountsM
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 409 {
@@ -12631,8 +12538,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1QuotasPostExecute(r ApiApiAccountsM
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -12642,15 +12548,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1QuotasPostExecute(r ApiApiAccountsM
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -12661,7 +12566,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1QuotasPostExecute(r ApiApiAccountsM
 }
 
 type ApiApiAccountsMgmtV1RegistriesGetRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	page *int32
 	size *int32
@@ -12669,67 +12574,63 @@ type ApiApiAccountsMgmtV1RegistriesGetRequest struct {
 	orderBy *string
 }
 
-// Page number of record list when record list exceeds specified page size
 func (r ApiApiAccountsMgmtV1RegistriesGetRequest) Page(page int32) ApiApiAccountsMgmtV1RegistriesGetRequest {
 	r.page = &page
 	return r
 }
-
-// Maximum number of records to return
 func (r ApiApiAccountsMgmtV1RegistriesGetRequest) Size(size int32) ApiApiAccountsMgmtV1RegistriesGetRequest {
 	r.size = &size
 	return r
 }
-
-// Specifies the search criteria. The syntax of this parameter is similar to the syntax of the _where_ clause of an SQL statement, using the names of the json attributes / column names of the account. For example, in order to retrieve all the accounts with a username starting with `my`:  ```sql username like 'my%' ```  The search criteria can also be applied on related resource. For example, in order to retrieve all the subscriptions labeled by `foo=bar`,  ```sql labels.key = 'foo' and labels.value = 'bar' ```  If the parameter isn't provided, or if the value is empty, then all the accounts that the user has permission to see will be returned.
 func (r ApiApiAccountsMgmtV1RegistriesGetRequest) Search(search string) ApiApiAccountsMgmtV1RegistriesGetRequest {
 	r.search = &search
 	return r
 }
-
-// Specifies the order by criteria. The syntax of this parameter is similar to the syntax of the _order by_ clause of an SQL statement, but using the names of the json attributes / column of the account. For example, in order to retrieve all accounts ordered by username:  ```sql username asc ```  Or in order to retrieve all accounts ordered by username _and_ first name:  ```sql username asc, firstName asc ```  If the parameter isn't provided, or if the value is empty, then no explicit ordering will be applied.
 func (r ApiApiAccountsMgmtV1RegistriesGetRequest) OrderBy(orderBy string) ApiApiAccountsMgmtV1RegistriesGetRequest {
 	r.orderBy = &orderBy
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1RegistriesGetRequest) Execute() (*RegistryList, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1RegistriesGetRequest) Execute() (RegistryList, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1RegistriesGetExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1RegistriesGet Returns a list of registries
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiApiAccountsMgmtV1RegistriesGetRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1RegistriesGet(ctx context.Context) ApiApiAccountsMgmtV1RegistriesGetRequest {
+ * ApiAccountsMgmtV1RegistriesGet Returns a list of registries
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiApiAccountsMgmtV1RegistriesGetRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1RegistriesGet(ctx _context.Context) ApiApiAccountsMgmtV1RegistriesGetRequest {
 	return ApiApiAccountsMgmtV1RegistriesGetRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return RegistryList
-func (a *DefaultApiService) ApiAccountsMgmtV1RegistriesGetExecute(r ApiApiAccountsMgmtV1RegistriesGetRequest) (*RegistryList, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return RegistryList
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1RegistriesGetExecute(r ApiApiAccountsMgmtV1RegistriesGetRequest) (RegistryList, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *RegistryList
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  RegistryList
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1RegistriesGet")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/registries"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.page != nil {
 		localVarQueryParams.Add("page", parameterToString(*r.page, ""))
@@ -12760,7 +12661,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RegistriesGetExecute(r ApiApiAccoun
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -12770,15 +12671,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RegistriesGetExecute(r ApiApiAccoun
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -12789,8 +12690,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RegistriesGetExecute(r ApiApiAccoun
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -12800,8 +12700,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RegistriesGetExecute(r ApiApiAccoun
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -12811,15 +12710,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RegistriesGetExecute(r ApiApiAccoun
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -12830,23 +12728,23 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RegistriesGetExecute(r ApiApiAccoun
 }
 
 type ApiApiAccountsMgmtV1RegistriesIdGetRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	id string
 }
 
-func (r ApiApiAccountsMgmtV1RegistriesIdGetRequest) Execute() (*Registry, *http.Response, error) {
+
+func (r ApiApiAccountsMgmtV1RegistriesIdGetRequest) Execute() (Registry, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1RegistriesIdGetExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1RegistriesIdGet Get an registry by id
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The id of record
- @return ApiApiAccountsMgmtV1RegistriesIdGetRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1RegistriesIdGet(ctx context.Context, id string) ApiApiAccountsMgmtV1RegistriesIdGetRequest {
+ * ApiAccountsMgmtV1RegistriesIdGet Get an registry by id
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The id of record
+ * @return ApiApiAccountsMgmtV1RegistriesIdGetRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1RegistriesIdGet(ctx _context.Context, id string) ApiApiAccountsMgmtV1RegistriesIdGetRequest {
 	return ApiApiAccountsMgmtV1RegistriesIdGetRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -12854,27 +12752,31 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RegistriesIdGet(ctx context.Context
 	}
 }
 
-// Execute executes the request
-//  @return Registry
-func (a *DefaultApiService) ApiAccountsMgmtV1RegistriesIdGetExecute(r ApiApiAccountsMgmtV1RegistriesIdGetRequest) (*Registry, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return Registry
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1RegistriesIdGetExecute(r ApiApiAccountsMgmtV1RegistriesIdGetRequest) (Registry, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *Registry
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  Registry
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1RegistriesIdGet")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/registries/{id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -12893,7 +12795,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RegistriesIdGetExecute(r ApiApiAcco
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -12903,15 +12805,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RegistriesIdGetExecute(r ApiApiAcco
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -12922,8 +12824,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RegistriesIdGetExecute(r ApiApiAcco
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -12933,8 +12834,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RegistriesIdGetExecute(r ApiApiAcco
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -12944,8 +12844,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RegistriesIdGetExecute(r ApiApiAcco
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -12955,15 +12854,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RegistriesIdGetExecute(r ApiApiAcco
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -12974,7 +12872,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RegistriesIdGetExecute(r ApiApiAcco
 }
 
 type ApiApiAccountsMgmtV1RegistryCredentialsGetRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	page *int32
 	size *int32
@@ -12982,69 +12880,64 @@ type ApiApiAccountsMgmtV1RegistryCredentialsGetRequest struct {
 	orderBy *string
 }
 
-// Page number of record list when record list exceeds specified page size
 func (r ApiApiAccountsMgmtV1RegistryCredentialsGetRequest) Page(page int32) ApiApiAccountsMgmtV1RegistryCredentialsGetRequest {
 	r.page = &page
 	return r
 }
-
-// Maximum number of records to return
 func (r ApiApiAccountsMgmtV1RegistryCredentialsGetRequest) Size(size int32) ApiApiAccountsMgmtV1RegistryCredentialsGetRequest {
 	r.size = &size
 	return r
 }
-
-// Specifies the search criteria. The syntax of this parameter is similar to the syntax of the _where_ clause of an SQL statement, using the names of the json attributes / column names of the account. For example, in order to retrieve all the accounts with a username starting with `my`:  ```sql username like 'my%' ```  The search criteria can also be applied on related resource. For example, in order to retrieve all the subscriptions labeled by `foo=bar`,  ```sql labels.key = 'foo' and labels.value = 'bar' ```  If the parameter isn't provided, or if the value is empty, then all the accounts that the user has permission to see will be returned.
 func (r ApiApiAccountsMgmtV1RegistryCredentialsGetRequest) Search(search string) ApiApiAccountsMgmtV1RegistryCredentialsGetRequest {
 	r.search = &search
 	return r
 }
-
-// Specifies the order by criteria. The syntax of this parameter is similar to the syntax of the _order by_ clause of an SQL statement, but using the names of the json attributes / column of the account. For example, in order to retrieve all accounts ordered by username:  ```sql username asc ```  Or in order to retrieve all accounts ordered by username _and_ first name:  ```sql username asc, firstName asc ```  If the parameter isn't provided, or if the value is empty, then no explicit ordering will be applied.
 func (r ApiApiAccountsMgmtV1RegistryCredentialsGetRequest) OrderBy(orderBy string) ApiApiAccountsMgmtV1RegistryCredentialsGetRequest {
 	r.orderBy = &orderBy
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1RegistryCredentialsGetRequest) Execute() (*RegistryCredentialList, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1RegistryCredentialsGetRequest) Execute() (RegistryCredentialList, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1RegistryCredentialsGetExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1RegistryCredentialsGet Method for ApiAccountsMgmtV1RegistryCredentialsGet
-
-List Registry Credentials
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiApiAccountsMgmtV1RegistryCredentialsGetRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1RegistryCredentialsGet(ctx context.Context) ApiApiAccountsMgmtV1RegistryCredentialsGetRequest {
+ * ApiAccountsMgmtV1RegistryCredentialsGet Method for ApiAccountsMgmtV1RegistryCredentialsGet
+ * List Registry Credentials
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiApiAccountsMgmtV1RegistryCredentialsGetRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1RegistryCredentialsGet(ctx _context.Context) ApiApiAccountsMgmtV1RegistryCredentialsGetRequest {
 	return ApiApiAccountsMgmtV1RegistryCredentialsGetRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return RegistryCredentialList
-func (a *DefaultApiService) ApiAccountsMgmtV1RegistryCredentialsGetExecute(r ApiApiAccountsMgmtV1RegistryCredentialsGetRequest) (*RegistryCredentialList, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return RegistryCredentialList
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1RegistryCredentialsGetExecute(r ApiApiAccountsMgmtV1RegistryCredentialsGetRequest) (RegistryCredentialList, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *RegistryCredentialList
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  RegistryCredentialList
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1RegistryCredentialsGet")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/registry_credentials"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.page != nil {
 		localVarQueryParams.Add("page", parameterToString(*r.page, ""))
@@ -13075,7 +12968,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RegistryCredentialsGetExecute(r Api
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -13085,15 +12978,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RegistryCredentialsGetExecute(r Api
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -13104,8 +12997,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RegistryCredentialsGetExecute(r Api
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -13115,8 +13007,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RegistryCredentialsGetExecute(r Api
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -13126,15 +13017,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RegistryCredentialsGetExecute(r Api
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -13145,23 +13035,23 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RegistryCredentialsGetExecute(r Api
 }
 
 type ApiApiAccountsMgmtV1RegistryCredentialsIdDeleteRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	id string
 }
 
-func (r ApiApiAccountsMgmtV1RegistryCredentialsIdDeleteRequest) Execute() (*http.Response, error) {
+
+func (r ApiApiAccountsMgmtV1RegistryCredentialsIdDeleteRequest) Execute() (*_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1RegistryCredentialsIdDeleteExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1RegistryCredentialsIdDelete Delete a registry credential by id
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The id of record
- @return ApiApiAccountsMgmtV1RegistryCredentialsIdDeleteRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1RegistryCredentialsIdDelete(ctx context.Context, id string) ApiApiAccountsMgmtV1RegistryCredentialsIdDeleteRequest {
+ * ApiAccountsMgmtV1RegistryCredentialsIdDelete Delete a registry credential by id
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The id of record
+ * @return ApiApiAccountsMgmtV1RegistryCredentialsIdDeleteRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1RegistryCredentialsIdDelete(ctx _context.Context, id string) ApiApiAccountsMgmtV1RegistryCredentialsIdDeleteRequest {
 	return ApiApiAccountsMgmtV1RegistryCredentialsIdDeleteRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -13169,25 +13059,29 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RegistryCredentialsIdDelete(ctx con
 	}
 }
 
-// Execute executes the request
-func (a *DefaultApiService) ApiAccountsMgmtV1RegistryCredentialsIdDeleteExecute(r ApiApiAccountsMgmtV1RegistryCredentialsIdDeleteRequest) (*http.Response, error) {
+/*
+ * Execute executes the request
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1RegistryCredentialsIdDeleteExecute(r ApiApiAccountsMgmtV1RegistryCredentialsIdDeleteRequest) (*_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodDelete
+		localVarHTTPMethod   = _nethttp.MethodDelete
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1RegistryCredentialsIdDelete")
 	if err != nil {
-		return nil, &GenericOpenAPIError{error: err.Error()}
+		return nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/registry_credentials/{id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -13206,7 +13100,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RegistryCredentialsIdDeleteExecute(
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return nil, err
 	}
@@ -13216,15 +13110,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RegistryCredentialsIdDeleteExecute(
 		return localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -13235,8 +13129,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RegistryCredentialsIdDeleteExecute(
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -13246,8 +13139,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RegistryCredentialsIdDeleteExecute(
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -13257,8 +13149,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RegistryCredentialsIdDeleteExecute(
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -13268,8 +13159,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RegistryCredentialsIdDeleteExecute(
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarHTTPResponse, newErr
 	}
@@ -13278,23 +13168,23 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RegistryCredentialsIdDeleteExecute(
 }
 
 type ApiApiAccountsMgmtV1RegistryCredentialsIdGetRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	id string
 }
 
-func (r ApiApiAccountsMgmtV1RegistryCredentialsIdGetRequest) Execute() (*RegistryCredential, *http.Response, error) {
+
+func (r ApiApiAccountsMgmtV1RegistryCredentialsIdGetRequest) Execute() (RegistryCredential, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1RegistryCredentialsIdGetExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1RegistryCredentialsIdGet Get a registry credentials by id
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The id of record
- @return ApiApiAccountsMgmtV1RegistryCredentialsIdGetRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1RegistryCredentialsIdGet(ctx context.Context, id string) ApiApiAccountsMgmtV1RegistryCredentialsIdGetRequest {
+ * ApiAccountsMgmtV1RegistryCredentialsIdGet Get a registry credentials by id
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The id of record
+ * @return ApiApiAccountsMgmtV1RegistryCredentialsIdGetRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1RegistryCredentialsIdGet(ctx _context.Context, id string) ApiApiAccountsMgmtV1RegistryCredentialsIdGetRequest {
 	return ApiApiAccountsMgmtV1RegistryCredentialsIdGetRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -13302,27 +13192,31 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RegistryCredentialsIdGet(ctx contex
 	}
 }
 
-// Execute executes the request
-//  @return RegistryCredential
-func (a *DefaultApiService) ApiAccountsMgmtV1RegistryCredentialsIdGetExecute(r ApiApiAccountsMgmtV1RegistryCredentialsIdGetRequest) (*RegistryCredential, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return RegistryCredential
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1RegistryCredentialsIdGetExecute(r ApiApiAccountsMgmtV1RegistryCredentialsIdGetRequest) (RegistryCredential, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *RegistryCredential
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  RegistryCredential
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1RegistryCredentialsIdGet")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/registry_credentials/{id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -13341,7 +13235,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RegistryCredentialsIdGetExecute(r A
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -13351,15 +13245,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RegistryCredentialsIdGetExecute(r A
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -13370,8 +13264,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RegistryCredentialsIdGetExecute(r A
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -13381,8 +13274,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RegistryCredentialsIdGetExecute(r A
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -13392,8 +13284,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RegistryCredentialsIdGetExecute(r A
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -13403,15 +13294,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RegistryCredentialsIdGetExecute(r A
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -13422,30 +13312,28 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RegistryCredentialsIdGetExecute(r A
 }
 
 type ApiApiAccountsMgmtV1RegistryCredentialsIdPatchRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	id string
 	registryCredentialPatchRequest *RegistryCredentialPatchRequest
 }
 
-// Updated registry credential data
 func (r ApiApiAccountsMgmtV1RegistryCredentialsIdPatchRequest) RegistryCredentialPatchRequest(registryCredentialPatchRequest RegistryCredentialPatchRequest) ApiApiAccountsMgmtV1RegistryCredentialsIdPatchRequest {
 	r.registryCredentialPatchRequest = &registryCredentialPatchRequest
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1RegistryCredentialsIdPatchRequest) Execute() (*RegistryCredential, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1RegistryCredentialsIdPatchRequest) Execute() (RegistryCredential, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1RegistryCredentialsIdPatchExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1RegistryCredentialsIdPatch Update a registry credential
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The id of record
- @return ApiApiAccountsMgmtV1RegistryCredentialsIdPatchRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1RegistryCredentialsIdPatch(ctx context.Context, id string) ApiApiAccountsMgmtV1RegistryCredentialsIdPatchRequest {
+ * ApiAccountsMgmtV1RegistryCredentialsIdPatch Update a registry credential
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The id of record
+ * @return ApiApiAccountsMgmtV1RegistryCredentialsIdPatchRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1RegistryCredentialsIdPatch(ctx _context.Context, id string) ApiApiAccountsMgmtV1RegistryCredentialsIdPatchRequest {
 	return ApiApiAccountsMgmtV1RegistryCredentialsIdPatchRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -13453,27 +13341,31 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RegistryCredentialsIdPatch(ctx cont
 	}
 }
 
-// Execute executes the request
-//  @return RegistryCredential
-func (a *DefaultApiService) ApiAccountsMgmtV1RegistryCredentialsIdPatchExecute(r ApiApiAccountsMgmtV1RegistryCredentialsIdPatchRequest) (*RegistryCredential, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return RegistryCredential
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1RegistryCredentialsIdPatchExecute(r ApiApiAccountsMgmtV1RegistryCredentialsIdPatchRequest) (RegistryCredential, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPatch
+		localVarHTTPMethod   = _nethttp.MethodPatch
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *RegistryCredential
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  RegistryCredential
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1RegistryCredentialsIdPatch")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/registry_credentials/{id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.registryCredentialPatchRequest == nil {
 		return localVarReturnValue, nil, reportError("registryCredentialPatchRequest is required and must be specified")
 	}
@@ -13497,7 +13389,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RegistryCredentialsIdPatchExecute(r
 	}
 	// body params
 	localVarPostBody = r.registryCredentialPatchRequest
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -13507,15 +13399,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RegistryCredentialsIdPatchExecute(r
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -13526,8 +13418,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RegistryCredentialsIdPatchExecute(r
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -13537,8 +13428,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RegistryCredentialsIdPatchExecute(r
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -13548,8 +13438,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RegistryCredentialsIdPatchExecute(r
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -13559,8 +13448,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RegistryCredentialsIdPatchExecute(r
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -13570,15 +13458,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RegistryCredentialsIdPatchExecute(r
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -13589,54 +13476,56 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RegistryCredentialsIdPatchExecute(r
 }
 
 type ApiApiAccountsMgmtV1RegistryCredentialsPostRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	registryCredential *RegistryCredential
 }
 
-// Registry credential data
 func (r ApiApiAccountsMgmtV1RegistryCredentialsPostRequest) RegistryCredential(registryCredential RegistryCredential) ApiApiAccountsMgmtV1RegistryCredentialsPostRequest {
 	r.registryCredential = &registryCredential
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1RegistryCredentialsPostRequest) Execute() (*RegistryCredential, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1RegistryCredentialsPostRequest) Execute() (RegistryCredential, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1RegistryCredentialsPostExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1RegistryCredentialsPost Request the creation of a registry credential
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiApiAccountsMgmtV1RegistryCredentialsPostRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1RegistryCredentialsPost(ctx context.Context) ApiApiAccountsMgmtV1RegistryCredentialsPostRequest {
+ * ApiAccountsMgmtV1RegistryCredentialsPost Request the creation of a registry credential
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiApiAccountsMgmtV1RegistryCredentialsPostRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1RegistryCredentialsPost(ctx _context.Context) ApiApiAccountsMgmtV1RegistryCredentialsPostRequest {
 	return ApiApiAccountsMgmtV1RegistryCredentialsPostRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return RegistryCredential
-func (a *DefaultApiService) ApiAccountsMgmtV1RegistryCredentialsPostExecute(r ApiApiAccountsMgmtV1RegistryCredentialsPostRequest) (*RegistryCredential, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return RegistryCredential
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1RegistryCredentialsPostExecute(r ApiApiAccountsMgmtV1RegistryCredentialsPostRequest) (RegistryCredential, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *RegistryCredential
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  RegistryCredential
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1RegistryCredentialsPost")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/registry_credentials"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.registryCredential == nil {
 		return localVarReturnValue, nil, reportError("registryCredential is required and must be specified")
 	}
@@ -13660,7 +13549,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RegistryCredentialsPostExecute(r Ap
 	}
 	// body params
 	localVarPostBody = r.registryCredential
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -13670,15 +13559,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RegistryCredentialsPostExecute(r Ap
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -13689,8 +13578,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RegistryCredentialsPostExecute(r Ap
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -13700,8 +13588,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RegistryCredentialsPostExecute(r Ap
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -13711,8 +13598,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RegistryCredentialsPostExecute(r Ap
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 409 {
@@ -13722,8 +13608,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RegistryCredentialsPostExecute(r Ap
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -13733,15 +13618,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RegistryCredentialsPostExecute(r Ap
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -13752,7 +13636,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RegistryCredentialsPostExecute(r Ap
 }
 
 type ApiApiAccountsMgmtV1ReservedResourcesGetRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	page *int32
 	size *int32
@@ -13760,67 +13644,63 @@ type ApiApiAccountsMgmtV1ReservedResourcesGetRequest struct {
 	orderBy *string
 }
 
-// Page number of record list when record list exceeds specified page size
 func (r ApiApiAccountsMgmtV1ReservedResourcesGetRequest) Page(page int32) ApiApiAccountsMgmtV1ReservedResourcesGetRequest {
 	r.page = &page
 	return r
 }
-
-// Maximum number of records to return
 func (r ApiApiAccountsMgmtV1ReservedResourcesGetRequest) Size(size int32) ApiApiAccountsMgmtV1ReservedResourcesGetRequest {
 	r.size = &size
 	return r
 }
-
-// Specifies the search criteria. The syntax of this parameter is similar to the syntax of the _where_ clause of an SQL statement, using the names of the json attributes / column names of the account. For example, in order to retrieve all the accounts with a username starting with `my`:  ```sql username like 'my%' ```  The search criteria can also be applied on related resource. For example, in order to retrieve all the subscriptions labeled by `foo=bar`,  ```sql labels.key = 'foo' and labels.value = 'bar' ```  If the parameter isn't provided, or if the value is empty, then all the accounts that the user has permission to see will be returned.
 func (r ApiApiAccountsMgmtV1ReservedResourcesGetRequest) Search(search string) ApiApiAccountsMgmtV1ReservedResourcesGetRequest {
 	r.search = &search
 	return r
 }
-
-// Specifies the order by criteria. The syntax of this parameter is similar to the syntax of the _order by_ clause of an SQL statement, but using the names of the json attributes / column of the account. For example, in order to retrieve all accounts ordered by username:  ```sql username asc ```  Or in order to retrieve all accounts ordered by username _and_ first name:  ```sql username asc, firstName asc ```  If the parameter isn't provided, or if the value is empty, then no explicit ordering will be applied.
 func (r ApiApiAccountsMgmtV1ReservedResourcesGetRequest) OrderBy(orderBy string) ApiApiAccountsMgmtV1ReservedResourcesGetRequest {
 	r.orderBy = &orderBy
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1ReservedResourcesGetRequest) Execute() (*ReservedResourceList, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1ReservedResourcesGetRequest) Execute() (ReservedResourceList, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1ReservedResourcesGetExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1ReservedResourcesGet Returns a list of reserved resources
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiApiAccountsMgmtV1ReservedResourcesGetRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1ReservedResourcesGet(ctx context.Context) ApiApiAccountsMgmtV1ReservedResourcesGetRequest {
+ * ApiAccountsMgmtV1ReservedResourcesGet Returns a list of reserved resources
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiApiAccountsMgmtV1ReservedResourcesGetRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1ReservedResourcesGet(ctx _context.Context) ApiApiAccountsMgmtV1ReservedResourcesGetRequest {
 	return ApiApiAccountsMgmtV1ReservedResourcesGetRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return ReservedResourceList
-func (a *DefaultApiService) ApiAccountsMgmtV1ReservedResourcesGetExecute(r ApiApiAccountsMgmtV1ReservedResourcesGetRequest) (*ReservedResourceList, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return ReservedResourceList
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1ReservedResourcesGetExecute(r ApiApiAccountsMgmtV1ReservedResourcesGetRequest) (ReservedResourceList, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *ReservedResourceList
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  ReservedResourceList
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1ReservedResourcesGet")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/reserved_resources"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.page != nil {
 		localVarQueryParams.Add("page", parameterToString(*r.page, ""))
@@ -13851,7 +13731,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ReservedResourcesGetExecute(r ApiAp
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -13861,15 +13741,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ReservedResourcesGetExecute(r ApiAp
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -13880,8 +13760,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ReservedResourcesGetExecute(r ApiAp
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -13891,8 +13770,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ReservedResourcesGetExecute(r ApiAp
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -13902,15 +13780,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ReservedResourcesGetExecute(r ApiAp
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -13921,7 +13798,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ReservedResourcesGetExecute(r ApiAp
 }
 
 type ApiApiAccountsMgmtV1ResourceQuotaGetRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	page *int32
 	size *int32
@@ -13929,67 +13806,63 @@ type ApiApiAccountsMgmtV1ResourceQuotaGetRequest struct {
 	orderBy *string
 }
 
-// Page number of record list when record list exceeds specified page size
 func (r ApiApiAccountsMgmtV1ResourceQuotaGetRequest) Page(page int32) ApiApiAccountsMgmtV1ResourceQuotaGetRequest {
 	r.page = &page
 	return r
 }
-
-// Maximum number of records to return
 func (r ApiApiAccountsMgmtV1ResourceQuotaGetRequest) Size(size int32) ApiApiAccountsMgmtV1ResourceQuotaGetRequest {
 	r.size = &size
 	return r
 }
-
-// Specifies the search criteria. The syntax of this parameter is similar to the syntax of the _where_ clause of an SQL statement, using the names of the json attributes / column names of the account. For example, in order to retrieve all the accounts with a username starting with `my`:  ```sql username like 'my%' ```  The search criteria can also be applied on related resource. For example, in order to retrieve all the subscriptions labeled by `foo=bar`,  ```sql labels.key = 'foo' and labels.value = 'bar' ```  If the parameter isn't provided, or if the value is empty, then all the accounts that the user has permission to see will be returned.
 func (r ApiApiAccountsMgmtV1ResourceQuotaGetRequest) Search(search string) ApiApiAccountsMgmtV1ResourceQuotaGetRequest {
 	r.search = &search
 	return r
 }
-
-// Specifies the order by criteria. The syntax of this parameter is similar to the syntax of the _order by_ clause of an SQL statement, but using the names of the json attributes / column of the account. For example, in order to retrieve all accounts ordered by username:  ```sql username asc ```  Or in order to retrieve all accounts ordered by username _and_ first name:  ```sql username asc, firstName asc ```  If the parameter isn't provided, or if the value is empty, then no explicit ordering will be applied.
 func (r ApiApiAccountsMgmtV1ResourceQuotaGetRequest) OrderBy(orderBy string) ApiApiAccountsMgmtV1ResourceQuotaGetRequest {
 	r.orderBy = &orderBy
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1ResourceQuotaGetRequest) Execute() (*ResourceQuotaList, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1ResourceQuotaGetRequest) Execute() (ResourceQuotaList, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1ResourceQuotaGetExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1ResourceQuotaGet Returns a list of resource quota objects
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiApiAccountsMgmtV1ResourceQuotaGetRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1ResourceQuotaGet(ctx context.Context) ApiApiAccountsMgmtV1ResourceQuotaGetRequest {
+ * ApiAccountsMgmtV1ResourceQuotaGet Returns a list of resource quota objects
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiApiAccountsMgmtV1ResourceQuotaGetRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1ResourceQuotaGet(ctx _context.Context) ApiApiAccountsMgmtV1ResourceQuotaGetRequest {
 	return ApiApiAccountsMgmtV1ResourceQuotaGetRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return ResourceQuotaList
-func (a *DefaultApiService) ApiAccountsMgmtV1ResourceQuotaGetExecute(r ApiApiAccountsMgmtV1ResourceQuotaGetRequest) (*ResourceQuotaList, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return ResourceQuotaList
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1ResourceQuotaGetExecute(r ApiApiAccountsMgmtV1ResourceQuotaGetRequest) (ResourceQuotaList, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *ResourceQuotaList
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  ResourceQuotaList
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1ResourceQuotaGet")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/resource_quota"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.page != nil {
 		localVarQueryParams.Add("page", parameterToString(*r.page, ""))
@@ -14020,7 +13893,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ResourceQuotaGetExecute(r ApiApiAcc
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -14030,15 +13903,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ResourceQuotaGetExecute(r ApiApiAcc
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -14049,8 +13922,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ResourceQuotaGetExecute(r ApiApiAcc
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -14060,8 +13932,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ResourceQuotaGetExecute(r ApiApiAcc
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -14071,15 +13942,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ResourceQuotaGetExecute(r ApiApiAcc
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -14090,7 +13960,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1ResourceQuotaGetExecute(r ApiApiAcc
 }
 
 type ApiApiAccountsMgmtV1RoleBindingsGetRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	page *int32
 	size *int32
@@ -14098,67 +13968,63 @@ type ApiApiAccountsMgmtV1RoleBindingsGetRequest struct {
 	orderBy *string
 }
 
-// Page number of record list when record list exceeds specified page size
 func (r ApiApiAccountsMgmtV1RoleBindingsGetRequest) Page(page int32) ApiApiAccountsMgmtV1RoleBindingsGetRequest {
 	r.page = &page
 	return r
 }
-
-// Maximum number of records to return
 func (r ApiApiAccountsMgmtV1RoleBindingsGetRequest) Size(size int32) ApiApiAccountsMgmtV1RoleBindingsGetRequest {
 	r.size = &size
 	return r
 }
-
-// Specifies the search criteria. The syntax of this parameter is similar to the syntax of the _where_ clause of an SQL statement, using the names of the json attributes / column names of the account. For example, in order to retrieve all the accounts with a username starting with `my`:  ```sql username like 'my%' ```  The search criteria can also be applied on related resource. For example, in order to retrieve all the subscriptions labeled by `foo=bar`,  ```sql labels.key = 'foo' and labels.value = 'bar' ```  If the parameter isn't provided, or if the value is empty, then all the accounts that the user has permission to see will be returned.
 func (r ApiApiAccountsMgmtV1RoleBindingsGetRequest) Search(search string) ApiApiAccountsMgmtV1RoleBindingsGetRequest {
 	r.search = &search
 	return r
 }
-
-// Specifies the order by criteria. The syntax of this parameter is similar to the syntax of the _order by_ clause of an SQL statement, but using the names of the json attributes / column of the account. For example, in order to retrieve all accounts ordered by username:  ```sql username asc ```  Or in order to retrieve all accounts ordered by username _and_ first name:  ```sql username asc, firstName asc ```  If the parameter isn't provided, or if the value is empty, then no explicit ordering will be applied.
 func (r ApiApiAccountsMgmtV1RoleBindingsGetRequest) OrderBy(orderBy string) ApiApiAccountsMgmtV1RoleBindingsGetRequest {
 	r.orderBy = &orderBy
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1RoleBindingsGetRequest) Execute() (*RoleBindingList, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1RoleBindingsGetRequest) Execute() (RoleBindingList, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1RoleBindingsGetExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1RoleBindingsGet Returns a list of role bindings
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiApiAccountsMgmtV1RoleBindingsGetRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1RoleBindingsGet(ctx context.Context) ApiApiAccountsMgmtV1RoleBindingsGetRequest {
+ * ApiAccountsMgmtV1RoleBindingsGet Returns a list of role bindings
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiApiAccountsMgmtV1RoleBindingsGetRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1RoleBindingsGet(ctx _context.Context) ApiApiAccountsMgmtV1RoleBindingsGetRequest {
 	return ApiApiAccountsMgmtV1RoleBindingsGetRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return RoleBindingList
-func (a *DefaultApiService) ApiAccountsMgmtV1RoleBindingsGetExecute(r ApiApiAccountsMgmtV1RoleBindingsGetRequest) (*RoleBindingList, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return RoleBindingList
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1RoleBindingsGetExecute(r ApiApiAccountsMgmtV1RoleBindingsGetRequest) (RoleBindingList, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *RoleBindingList
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  RoleBindingList
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1RoleBindingsGet")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/role_bindings"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.page != nil {
 		localVarQueryParams.Add("page", parameterToString(*r.page, ""))
@@ -14189,7 +14055,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RoleBindingsGetExecute(r ApiApiAcco
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -14199,15 +14065,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RoleBindingsGetExecute(r ApiApiAcco
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -14218,8 +14084,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RoleBindingsGetExecute(r ApiApiAcco
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -14229,8 +14094,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RoleBindingsGetExecute(r ApiApiAcco
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -14240,15 +14104,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RoleBindingsGetExecute(r ApiApiAcco
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -14259,23 +14122,23 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RoleBindingsGetExecute(r ApiApiAcco
 }
 
 type ApiApiAccountsMgmtV1RoleBindingsIdDeleteRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	id string
 }
 
-func (r ApiApiAccountsMgmtV1RoleBindingsIdDeleteRequest) Execute() (*http.Response, error) {
+
+func (r ApiApiAccountsMgmtV1RoleBindingsIdDeleteRequest) Execute() (*_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1RoleBindingsIdDeleteExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1RoleBindingsIdDelete Delete a role binding
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The id of record
- @return ApiApiAccountsMgmtV1RoleBindingsIdDeleteRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1RoleBindingsIdDelete(ctx context.Context, id string) ApiApiAccountsMgmtV1RoleBindingsIdDeleteRequest {
+ * ApiAccountsMgmtV1RoleBindingsIdDelete Delete a role binding
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The id of record
+ * @return ApiApiAccountsMgmtV1RoleBindingsIdDeleteRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1RoleBindingsIdDelete(ctx _context.Context, id string) ApiApiAccountsMgmtV1RoleBindingsIdDeleteRequest {
 	return ApiApiAccountsMgmtV1RoleBindingsIdDeleteRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -14283,25 +14146,29 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RoleBindingsIdDelete(ctx context.Co
 	}
 }
 
-// Execute executes the request
-func (a *DefaultApiService) ApiAccountsMgmtV1RoleBindingsIdDeleteExecute(r ApiApiAccountsMgmtV1RoleBindingsIdDeleteRequest) (*http.Response, error) {
+/*
+ * Execute executes the request
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1RoleBindingsIdDeleteExecute(r ApiApiAccountsMgmtV1RoleBindingsIdDeleteRequest) (*_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodDelete
+		localVarHTTPMethod   = _nethttp.MethodDelete
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1RoleBindingsIdDelete")
 	if err != nil {
-		return nil, &GenericOpenAPIError{error: err.Error()}
+		return nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/role_bindings/{id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -14320,7 +14187,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RoleBindingsIdDeleteExecute(r ApiAp
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return nil, err
 	}
@@ -14330,15 +14197,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RoleBindingsIdDeleteExecute(r ApiAp
 		return localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -14349,8 +14216,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RoleBindingsIdDeleteExecute(r ApiAp
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -14360,8 +14226,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RoleBindingsIdDeleteExecute(r ApiAp
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -14371,8 +14236,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RoleBindingsIdDeleteExecute(r ApiAp
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -14382,8 +14246,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RoleBindingsIdDeleteExecute(r ApiAp
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarHTTPResponse, newErr
 	}
@@ -14392,23 +14255,23 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RoleBindingsIdDeleteExecute(r ApiAp
 }
 
 type ApiApiAccountsMgmtV1RoleBindingsIdGetRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	id string
 }
 
-func (r ApiApiAccountsMgmtV1RoleBindingsIdGetRequest) Execute() (*RoleBinding, *http.Response, error) {
+
+func (r ApiApiAccountsMgmtV1RoleBindingsIdGetRequest) Execute() (RoleBinding, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1RoleBindingsIdGetExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1RoleBindingsIdGet Get a role binding
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The id of record
- @return ApiApiAccountsMgmtV1RoleBindingsIdGetRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1RoleBindingsIdGet(ctx context.Context, id string) ApiApiAccountsMgmtV1RoleBindingsIdGetRequest {
+ * ApiAccountsMgmtV1RoleBindingsIdGet Get a role binding
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The id of record
+ * @return ApiApiAccountsMgmtV1RoleBindingsIdGetRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1RoleBindingsIdGet(ctx _context.Context, id string) ApiApiAccountsMgmtV1RoleBindingsIdGetRequest {
 	return ApiApiAccountsMgmtV1RoleBindingsIdGetRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -14416,27 +14279,31 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RoleBindingsIdGet(ctx context.Conte
 	}
 }
 
-// Execute executes the request
-//  @return RoleBinding
-func (a *DefaultApiService) ApiAccountsMgmtV1RoleBindingsIdGetExecute(r ApiApiAccountsMgmtV1RoleBindingsIdGetRequest) (*RoleBinding, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return RoleBinding
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1RoleBindingsIdGetExecute(r ApiApiAccountsMgmtV1RoleBindingsIdGetRequest) (RoleBinding, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *RoleBinding
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  RoleBinding
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1RoleBindingsIdGet")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/role_bindings/{id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -14455,7 +14322,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RoleBindingsIdGetExecute(r ApiApiAc
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -14465,15 +14332,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RoleBindingsIdGetExecute(r ApiApiAc
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -14484,8 +14351,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RoleBindingsIdGetExecute(r ApiApiAc
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -14495,8 +14361,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RoleBindingsIdGetExecute(r ApiApiAc
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -14506,8 +14371,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RoleBindingsIdGetExecute(r ApiApiAc
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -14517,15 +14381,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RoleBindingsIdGetExecute(r ApiApiAc
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -14536,30 +14399,28 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RoleBindingsIdGetExecute(r ApiApiAc
 }
 
 type ApiApiAccountsMgmtV1RoleBindingsIdPatchRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	id string
 	roleBindingRequest *RoleBindingRequest
 }
 
-// Updated role binding data
 func (r ApiApiAccountsMgmtV1RoleBindingsIdPatchRequest) RoleBindingRequest(roleBindingRequest RoleBindingRequest) ApiApiAccountsMgmtV1RoleBindingsIdPatchRequest {
 	r.roleBindingRequest = &roleBindingRequest
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1RoleBindingsIdPatchRequest) Execute() (*RoleBinding, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1RoleBindingsIdPatchRequest) Execute() (RoleBinding, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1RoleBindingsIdPatchExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1RoleBindingsIdPatch Update a role binding
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The id of record
- @return ApiApiAccountsMgmtV1RoleBindingsIdPatchRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1RoleBindingsIdPatch(ctx context.Context, id string) ApiApiAccountsMgmtV1RoleBindingsIdPatchRequest {
+ * ApiAccountsMgmtV1RoleBindingsIdPatch Update a role binding
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The id of record
+ * @return ApiApiAccountsMgmtV1RoleBindingsIdPatchRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1RoleBindingsIdPatch(ctx _context.Context, id string) ApiApiAccountsMgmtV1RoleBindingsIdPatchRequest {
 	return ApiApiAccountsMgmtV1RoleBindingsIdPatchRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -14567,27 +14428,31 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RoleBindingsIdPatch(ctx context.Con
 	}
 }
 
-// Execute executes the request
-//  @return RoleBinding
-func (a *DefaultApiService) ApiAccountsMgmtV1RoleBindingsIdPatchExecute(r ApiApiAccountsMgmtV1RoleBindingsIdPatchRequest) (*RoleBinding, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return RoleBinding
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1RoleBindingsIdPatchExecute(r ApiApiAccountsMgmtV1RoleBindingsIdPatchRequest) (RoleBinding, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPatch
+		localVarHTTPMethod   = _nethttp.MethodPatch
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *RoleBinding
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  RoleBinding
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1RoleBindingsIdPatch")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/role_bindings/{id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.roleBindingRequest == nil {
 		return localVarReturnValue, nil, reportError("roleBindingRequest is required and must be specified")
 	}
@@ -14611,7 +14476,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RoleBindingsIdPatchExecute(r ApiApi
 	}
 	// body params
 	localVarPostBody = r.roleBindingRequest
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -14621,15 +14486,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RoleBindingsIdPatchExecute(r ApiApi
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -14640,8 +14505,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RoleBindingsIdPatchExecute(r ApiApi
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -14651,8 +14515,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RoleBindingsIdPatchExecute(r ApiApi
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -14662,8 +14525,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RoleBindingsIdPatchExecute(r ApiApi
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -14673,8 +14535,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RoleBindingsIdPatchExecute(r ApiApi
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -14684,15 +14545,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RoleBindingsIdPatchExecute(r ApiApi
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -14703,54 +14563,56 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RoleBindingsIdPatchExecute(r ApiApi
 }
 
 type ApiApiAccountsMgmtV1RoleBindingsPostRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	roleBindingCreateRequest *RoleBindingCreateRequest
 }
 
-// Role binding data
 func (r ApiApiAccountsMgmtV1RoleBindingsPostRequest) RoleBindingCreateRequest(roleBindingCreateRequest RoleBindingCreateRequest) ApiApiAccountsMgmtV1RoleBindingsPostRequest {
 	r.roleBindingCreateRequest = &roleBindingCreateRequest
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1RoleBindingsPostRequest) Execute() (*RoleBinding, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1RoleBindingsPostRequest) Execute() (RoleBinding, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1RoleBindingsPostExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1RoleBindingsPost Create a new role binding
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiApiAccountsMgmtV1RoleBindingsPostRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1RoleBindingsPost(ctx context.Context) ApiApiAccountsMgmtV1RoleBindingsPostRequest {
+ * ApiAccountsMgmtV1RoleBindingsPost Create a new role binding
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiApiAccountsMgmtV1RoleBindingsPostRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1RoleBindingsPost(ctx _context.Context) ApiApiAccountsMgmtV1RoleBindingsPostRequest {
 	return ApiApiAccountsMgmtV1RoleBindingsPostRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return RoleBinding
-func (a *DefaultApiService) ApiAccountsMgmtV1RoleBindingsPostExecute(r ApiApiAccountsMgmtV1RoleBindingsPostRequest) (*RoleBinding, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return RoleBinding
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1RoleBindingsPostExecute(r ApiApiAccountsMgmtV1RoleBindingsPostRequest) (RoleBinding, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *RoleBinding
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  RoleBinding
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1RoleBindingsPost")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/role_bindings"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.roleBindingCreateRequest == nil {
 		return localVarReturnValue, nil, reportError("roleBindingCreateRequest is required and must be specified")
 	}
@@ -14774,7 +14636,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RoleBindingsPostExecute(r ApiApiAcc
 	}
 	// body params
 	localVarPostBody = r.roleBindingCreateRequest
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -14784,15 +14646,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RoleBindingsPostExecute(r ApiApiAcc
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -14803,8 +14665,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RoleBindingsPostExecute(r ApiApiAcc
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -14814,8 +14675,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RoleBindingsPostExecute(r ApiApiAcc
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -14825,8 +14685,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RoleBindingsPostExecute(r ApiApiAcc
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 409 {
@@ -14836,8 +14695,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RoleBindingsPostExecute(r ApiApiAcc
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -14847,15 +14705,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RoleBindingsPostExecute(r ApiApiAcc
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -14866,68 +14723,66 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RoleBindingsPostExecute(r ApiApiAcc
 }
 
 type ApiApiAccountsMgmtV1RolesGetRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	page *int32
 	size *int32
 	search *string
 }
 
-// Page number of record list when record list exceeds specified page size
 func (r ApiApiAccountsMgmtV1RolesGetRequest) Page(page int32) ApiApiAccountsMgmtV1RolesGetRequest {
 	r.page = &page
 	return r
 }
-
-// Maximum number of records to return
 func (r ApiApiAccountsMgmtV1RolesGetRequest) Size(size int32) ApiApiAccountsMgmtV1RolesGetRequest {
 	r.size = &size
 	return r
 }
-
-// Specifies the search criteria. The syntax of this parameter is similar to the syntax of the _where_ clause of an SQL statement, using the names of the json attributes / column names of the account. For example, in order to retrieve all the accounts with a username starting with `my`:  ```sql username like 'my%' ```  The search criteria can also be applied on related resource. For example, in order to retrieve all the subscriptions labeled by `foo=bar`,  ```sql labels.key = 'foo' and labels.value = 'bar' ```  If the parameter isn't provided, or if the value is empty, then all the accounts that the user has permission to see will be returned.
 func (r ApiApiAccountsMgmtV1RolesGetRequest) Search(search string) ApiApiAccountsMgmtV1RolesGetRequest {
 	r.search = &search
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1RolesGetRequest) Execute() (*RoleList, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1RolesGetRequest) Execute() (RoleList, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1RolesGetExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1RolesGet Returns a list of roles
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiApiAccountsMgmtV1RolesGetRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1RolesGet(ctx context.Context) ApiApiAccountsMgmtV1RolesGetRequest {
+ * ApiAccountsMgmtV1RolesGet Returns a list of roles
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiApiAccountsMgmtV1RolesGetRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1RolesGet(ctx _context.Context) ApiApiAccountsMgmtV1RolesGetRequest {
 	return ApiApiAccountsMgmtV1RolesGetRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return RoleList
-func (a *DefaultApiService) ApiAccountsMgmtV1RolesGetExecute(r ApiApiAccountsMgmtV1RolesGetRequest) (*RoleList, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return RoleList
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1RolesGetExecute(r ApiApiAccountsMgmtV1RolesGetRequest) (RoleList, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *RoleList
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  RoleList
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1RolesGet")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/roles"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.page != nil {
 		localVarQueryParams.Add("page", parameterToString(*r.page, ""))
@@ -14955,7 +14810,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RolesGetExecute(r ApiApiAccountsMgm
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -14965,15 +14820,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RolesGetExecute(r ApiApiAccountsMgm
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -14984,8 +14839,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RolesGetExecute(r ApiApiAccountsMgm
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -14995,8 +14849,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RolesGetExecute(r ApiApiAccountsMgm
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -15006,15 +14859,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RolesGetExecute(r ApiApiAccountsMgm
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -15025,23 +14877,23 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RolesGetExecute(r ApiApiAccountsMgm
 }
 
 type ApiApiAccountsMgmtV1RolesIdGetRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	id string
 }
 
-func (r ApiApiAccountsMgmtV1RolesIdGetRequest) Execute() (*Role, *http.Response, error) {
+
+func (r ApiApiAccountsMgmtV1RolesIdGetRequest) Execute() (Role, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1RolesIdGetExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1RolesIdGet Get a role by id
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The id of record
- @return ApiApiAccountsMgmtV1RolesIdGetRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1RolesIdGet(ctx context.Context, id string) ApiApiAccountsMgmtV1RolesIdGetRequest {
+ * ApiAccountsMgmtV1RolesIdGet Get a role by id
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The id of record
+ * @return ApiApiAccountsMgmtV1RolesIdGetRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1RolesIdGet(ctx _context.Context, id string) ApiApiAccountsMgmtV1RolesIdGetRequest {
 	return ApiApiAccountsMgmtV1RolesIdGetRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -15049,27 +14901,31 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RolesIdGet(ctx context.Context, id
 	}
 }
 
-// Execute executes the request
-//  @return Role
-func (a *DefaultApiService) ApiAccountsMgmtV1RolesIdGetExecute(r ApiApiAccountsMgmtV1RolesIdGetRequest) (*Role, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return Role
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1RolesIdGetExecute(r ApiApiAccountsMgmtV1RolesIdGetRequest) (Role, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *Role
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  Role
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1RolesIdGet")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/roles/{id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -15088,7 +14944,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RolesIdGetExecute(r ApiApiAccountsM
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -15098,15 +14954,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RolesIdGetExecute(r ApiApiAccountsM
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -15117,8 +14973,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RolesIdGetExecute(r ApiApiAccountsM
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -15128,8 +14983,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RolesIdGetExecute(r ApiApiAccountsM
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -15139,8 +14993,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RolesIdGetExecute(r ApiApiAccountsM
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -15150,15 +15003,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RolesIdGetExecute(r ApiApiAccountsM
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -15169,23 +15021,23 @@ func (a *DefaultApiService) ApiAccountsMgmtV1RolesIdGetExecute(r ApiApiAccountsM
 }
 
 type ApiApiAccountsMgmtV1SelfEntitlementProductPostRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	product string
 }
 
-func (r ApiApiAccountsMgmtV1SelfEntitlementProductPostRequest) Execute() (*SelfEntitlementStatus, *http.Response, error) {
+
+func (r ApiApiAccountsMgmtV1SelfEntitlementProductPostRequest) Execute() (SelfEntitlementStatus, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1SelfEntitlementProductPostExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1SelfEntitlementProductPost Create or renew the entitlement to support a product for the user's organization.
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param product The product for self_entitlement. The supported products are [rosa].
- @return ApiApiAccountsMgmtV1SelfEntitlementProductPostRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1SelfEntitlementProductPost(ctx context.Context, product string) ApiApiAccountsMgmtV1SelfEntitlementProductPostRequest {
+ * ApiAccountsMgmtV1SelfEntitlementProductPost Create or renew the entitlement to support a product for the user's organization.
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param product The product for self_entitlement. The supported products are [rosa].
+ * @return ApiApiAccountsMgmtV1SelfEntitlementProductPostRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SelfEntitlementProductPost(ctx _context.Context, product string) ApiApiAccountsMgmtV1SelfEntitlementProductPostRequest {
 	return ApiApiAccountsMgmtV1SelfEntitlementProductPostRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -15193,27 +15045,31 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SelfEntitlementProductPost(ctx cont
 	}
 }
 
-// Execute executes the request
-//  @return SelfEntitlementStatus
-func (a *DefaultApiService) ApiAccountsMgmtV1SelfEntitlementProductPostExecute(r ApiApiAccountsMgmtV1SelfEntitlementProductPostRequest) (*SelfEntitlementStatus, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return SelfEntitlementStatus
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SelfEntitlementProductPostExecute(r ApiApiAccountsMgmtV1SelfEntitlementProductPostRequest) (SelfEntitlementStatus, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *SelfEntitlementStatus
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  SelfEntitlementStatus
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1SelfEntitlementProductPost")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/self_entitlement/{product}"
-	localVarPath = strings.Replace(localVarPath, "{"+"product"+"}", url.PathEscape(parameterToString(r.product, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"product"+"}", _neturl.PathEscape(parameterToString(r.product, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -15232,7 +15088,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SelfEntitlementProductPostExecute(r
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -15242,15 +15098,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SelfEntitlementProductPostExecute(r
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -15261,8 +15117,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SelfEntitlementProductPostExecute(r
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -15272,8 +15127,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SelfEntitlementProductPostExecute(r
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -15283,8 +15137,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SelfEntitlementProductPostExecute(r
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -15294,8 +15147,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SelfEntitlementProductPostExecute(r
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -15305,15 +15157,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SelfEntitlementProductPostExecute(r
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -15324,54 +15175,56 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SelfEntitlementProductPostExecute(r
 }
 
 type ApiApiAccountsMgmtV1SkuRulesGetRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	search *string
 }
 
-// Specifies the search criteria. The syntax of this parameter is similar to the syntax of the _where_ clause of an SQL statement, using the names of the json attributes / column names of the account. For example, in order to retrieve all the accounts with a username starting with `my`:  ```sql username like 'my%' ```  The search criteria can also be applied on related resource. For example, in order to retrieve all the subscriptions labeled by `foo=bar`,  ```sql labels.key = 'foo' and labels.value = 'bar' ```  If the parameter isn't provided, or if the value is empty, then all the accounts that the user has permission to see will be returned.
 func (r ApiApiAccountsMgmtV1SkuRulesGetRequest) Search(search string) ApiApiAccountsMgmtV1SkuRulesGetRequest {
 	r.search = &search
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1SkuRulesGetRequest) Execute() (*SkuRulesList, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1SkuRulesGetRequest) Execute() (SkuRulesList, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1SkuRulesGetExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1SkuRulesGet Returns a list of UHC product SKU Rules
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiApiAccountsMgmtV1SkuRulesGetRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1SkuRulesGet(ctx context.Context) ApiApiAccountsMgmtV1SkuRulesGetRequest {
+ * ApiAccountsMgmtV1SkuRulesGet Returns a list of UHC product SKU Rules
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiApiAccountsMgmtV1SkuRulesGetRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SkuRulesGet(ctx _context.Context) ApiApiAccountsMgmtV1SkuRulesGetRequest {
 	return ApiApiAccountsMgmtV1SkuRulesGetRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return SkuRulesList
-func (a *DefaultApiService) ApiAccountsMgmtV1SkuRulesGetExecute(r ApiApiAccountsMgmtV1SkuRulesGetRequest) (*SkuRulesList, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return SkuRulesList
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SkuRulesGetExecute(r ApiApiAccountsMgmtV1SkuRulesGetRequest) (SkuRulesList, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *SkuRulesList
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  SkuRulesList
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1SkuRulesGet")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/sku_rules"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.search != nil {
 		localVarQueryParams.Add("search", parameterToString(*r.search, ""))
@@ -15393,7 +15246,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SkuRulesGetExecute(r ApiApiAccounts
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -15403,15 +15256,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SkuRulesGetExecute(r ApiApiAccounts
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -15422,8 +15275,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SkuRulesGetExecute(r ApiApiAccounts
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -15433,8 +15285,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SkuRulesGetExecute(r ApiApiAccounts
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -15444,15 +15295,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SkuRulesGetExecute(r ApiApiAccounts
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -15463,23 +15313,23 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SkuRulesGetExecute(r ApiApiAccounts
 }
 
 type ApiApiAccountsMgmtV1SkuRulesIdDeleteRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	id string
 }
 
-func (r ApiApiAccountsMgmtV1SkuRulesIdDeleteRequest) Execute() (*http.Response, error) {
+
+func (r ApiApiAccountsMgmtV1SkuRulesIdDeleteRequest) Execute() (*_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1SkuRulesIdDeleteExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1SkuRulesIdDelete Delete a sku rule
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The id of record
- @return ApiApiAccountsMgmtV1SkuRulesIdDeleteRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1SkuRulesIdDelete(ctx context.Context, id string) ApiApiAccountsMgmtV1SkuRulesIdDeleteRequest {
+ * ApiAccountsMgmtV1SkuRulesIdDelete Delete a sku rule
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The id of record
+ * @return ApiApiAccountsMgmtV1SkuRulesIdDeleteRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SkuRulesIdDelete(ctx _context.Context, id string) ApiApiAccountsMgmtV1SkuRulesIdDeleteRequest {
 	return ApiApiAccountsMgmtV1SkuRulesIdDeleteRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -15487,25 +15337,29 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SkuRulesIdDelete(ctx context.Contex
 	}
 }
 
-// Execute executes the request
-func (a *DefaultApiService) ApiAccountsMgmtV1SkuRulesIdDeleteExecute(r ApiApiAccountsMgmtV1SkuRulesIdDeleteRequest) (*http.Response, error) {
+/*
+ * Execute executes the request
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SkuRulesIdDeleteExecute(r ApiApiAccountsMgmtV1SkuRulesIdDeleteRequest) (*_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodDelete
+		localVarHTTPMethod   = _nethttp.MethodDelete
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1SkuRulesIdDelete")
 	if err != nil {
-		return nil, &GenericOpenAPIError{error: err.Error()}
+		return nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/sku_rules/{id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -15524,7 +15378,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SkuRulesIdDeleteExecute(r ApiApiAcc
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return nil, err
 	}
@@ -15534,15 +15388,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SkuRulesIdDeleteExecute(r ApiApiAcc
 		return localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -15553,8 +15407,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SkuRulesIdDeleteExecute(r ApiApiAcc
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -15564,8 +15417,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SkuRulesIdDeleteExecute(r ApiApiAcc
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -15575,8 +15427,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SkuRulesIdDeleteExecute(r ApiApiAcc
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -15586,8 +15437,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SkuRulesIdDeleteExecute(r ApiApiAcc
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarHTTPResponse, newErr
 	}
@@ -15596,23 +15446,23 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SkuRulesIdDeleteExecute(r ApiApiAcc
 }
 
 type ApiApiAccountsMgmtV1SkuRulesIdGetRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	id string
 }
 
-func (r ApiApiAccountsMgmtV1SkuRulesIdGetRequest) Execute() (*SkuRules, *http.Response, error) {
+
+func (r ApiApiAccountsMgmtV1SkuRulesIdGetRequest) Execute() (SkuRules, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1SkuRulesIdGetExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1SkuRulesIdGet Get a sku rules by id
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The id of record
- @return ApiApiAccountsMgmtV1SkuRulesIdGetRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1SkuRulesIdGet(ctx context.Context, id string) ApiApiAccountsMgmtV1SkuRulesIdGetRequest {
+ * ApiAccountsMgmtV1SkuRulesIdGet Get a sku rules by id
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The id of record
+ * @return ApiApiAccountsMgmtV1SkuRulesIdGetRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SkuRulesIdGet(ctx _context.Context, id string) ApiApiAccountsMgmtV1SkuRulesIdGetRequest {
 	return ApiApiAccountsMgmtV1SkuRulesIdGetRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -15620,27 +15470,31 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SkuRulesIdGet(ctx context.Context,
 	}
 }
 
-// Execute executes the request
-//  @return SkuRules
-func (a *DefaultApiService) ApiAccountsMgmtV1SkuRulesIdGetExecute(r ApiApiAccountsMgmtV1SkuRulesIdGetRequest) (*SkuRules, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return SkuRules
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SkuRulesIdGetExecute(r ApiApiAccountsMgmtV1SkuRulesIdGetRequest) (SkuRules, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *SkuRules
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  SkuRules
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1SkuRulesIdGet")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/sku_rules/{id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -15659,7 +15513,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SkuRulesIdGetExecute(r ApiApiAccoun
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -15669,15 +15523,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SkuRulesIdGetExecute(r ApiApiAccoun
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -15688,8 +15542,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SkuRulesIdGetExecute(r ApiApiAccoun
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -15699,8 +15552,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SkuRulesIdGetExecute(r ApiApiAccoun
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -15710,8 +15562,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SkuRulesIdGetExecute(r ApiApiAccoun
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -15721,15 +15572,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SkuRulesIdGetExecute(r ApiApiAccoun
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -15740,30 +15590,28 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SkuRulesIdGetExecute(r ApiApiAccoun
 }
 
 type ApiApiAccountsMgmtV1SkuRulesIdPatchRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	id string
 	skuRules *SkuRules
 }
 
-// Updated sku rule data
 func (r ApiApiAccountsMgmtV1SkuRulesIdPatchRequest) SkuRules(skuRules SkuRules) ApiApiAccountsMgmtV1SkuRulesIdPatchRequest {
 	r.skuRules = &skuRules
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1SkuRulesIdPatchRequest) Execute() (*SkuRules, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1SkuRulesIdPatchRequest) Execute() (SkuRules, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1SkuRulesIdPatchExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1SkuRulesIdPatch Update a sku rule
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The id of record
- @return ApiApiAccountsMgmtV1SkuRulesIdPatchRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1SkuRulesIdPatch(ctx context.Context, id string) ApiApiAccountsMgmtV1SkuRulesIdPatchRequest {
+ * ApiAccountsMgmtV1SkuRulesIdPatch Update a sku rule
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The id of record
+ * @return ApiApiAccountsMgmtV1SkuRulesIdPatchRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SkuRulesIdPatch(ctx _context.Context, id string) ApiApiAccountsMgmtV1SkuRulesIdPatchRequest {
 	return ApiApiAccountsMgmtV1SkuRulesIdPatchRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -15771,27 +15619,31 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SkuRulesIdPatch(ctx context.Context
 	}
 }
 
-// Execute executes the request
-//  @return SkuRules
-func (a *DefaultApiService) ApiAccountsMgmtV1SkuRulesIdPatchExecute(r ApiApiAccountsMgmtV1SkuRulesIdPatchRequest) (*SkuRules, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return SkuRules
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SkuRulesIdPatchExecute(r ApiApiAccountsMgmtV1SkuRulesIdPatchRequest) (SkuRules, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPatch
+		localVarHTTPMethod   = _nethttp.MethodPatch
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *SkuRules
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  SkuRules
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1SkuRulesIdPatch")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/sku_rules/{id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.skuRules == nil {
 		return localVarReturnValue, nil, reportError("skuRules is required and must be specified")
 	}
@@ -15815,7 +15667,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SkuRulesIdPatchExecute(r ApiApiAcco
 	}
 	// body params
 	localVarPostBody = r.skuRules
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -15825,15 +15677,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SkuRulesIdPatchExecute(r ApiApiAcco
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -15844,8 +15696,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SkuRulesIdPatchExecute(r ApiApiAcco
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -15855,8 +15706,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SkuRulesIdPatchExecute(r ApiApiAcco
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -15866,8 +15716,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SkuRulesIdPatchExecute(r ApiApiAcco
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -15877,8 +15726,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SkuRulesIdPatchExecute(r ApiApiAcco
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -15888,15 +15736,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SkuRulesIdPatchExecute(r ApiApiAcco
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -15907,54 +15754,56 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SkuRulesIdPatchExecute(r ApiApiAcco
 }
 
 type ApiApiAccountsMgmtV1SkuRulesPostRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	skuRules *SkuRules
 }
 
-// Sku rule data
 func (r ApiApiAccountsMgmtV1SkuRulesPostRequest) SkuRules(skuRules SkuRules) ApiApiAccountsMgmtV1SkuRulesPostRequest {
 	r.skuRules = &skuRules
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1SkuRulesPostRequest) Execute() (*SkuRules, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1SkuRulesPostRequest) Execute() (SkuRules, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1SkuRulesPostExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1SkuRulesPost Create a new sku rule
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiApiAccountsMgmtV1SkuRulesPostRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1SkuRulesPost(ctx context.Context) ApiApiAccountsMgmtV1SkuRulesPostRequest {
+ * ApiAccountsMgmtV1SkuRulesPost Create a new sku rule
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiApiAccountsMgmtV1SkuRulesPostRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SkuRulesPost(ctx _context.Context) ApiApiAccountsMgmtV1SkuRulesPostRequest {
 	return ApiApiAccountsMgmtV1SkuRulesPostRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return SkuRules
-func (a *DefaultApiService) ApiAccountsMgmtV1SkuRulesPostExecute(r ApiApiAccountsMgmtV1SkuRulesPostRequest) (*SkuRules, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return SkuRules
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SkuRulesPostExecute(r ApiApiAccountsMgmtV1SkuRulesPostRequest) (SkuRules, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *SkuRules
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  SkuRules
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1SkuRulesPost")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/sku_rules"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.skuRules == nil {
 		return localVarReturnValue, nil, reportError("skuRules is required and must be specified")
 	}
@@ -15978,7 +15827,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SkuRulesPostExecute(r ApiApiAccount
 	}
 	// body params
 	localVarPostBody = r.skuRules
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -15988,15 +15837,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SkuRulesPostExecute(r ApiApiAccount
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -16007,8 +15856,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SkuRulesPostExecute(r ApiApiAccount
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -16018,8 +15866,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SkuRulesPostExecute(r ApiApiAccount
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -16029,8 +15876,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SkuRulesPostExecute(r ApiApiAccount
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 409 {
@@ -16040,8 +15886,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SkuRulesPostExecute(r ApiApiAccount
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -16051,15 +15896,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SkuRulesPostExecute(r ApiApiAccount
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -16070,57 +15914,56 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SkuRulesPostExecute(r ApiApiAccount
 }
 
 type ApiApiAccountsMgmtV1SkusGetRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	search *string
 }
 
-// Specifies the search criteria. The syntax of this parameter is similar to the syntax of the _where_ clause of an SQL statement, using the names of the json attributes / column names of the account. For example, in order to retrieve all the accounts with a username starting with `my`:  ```sql username like 'my%' ```  The search criteria can also be applied on related resource. For example, in order to retrieve all the subscriptions labeled by `foo=bar`,  ```sql labels.key = 'foo' and labels.value = 'bar' ```  If the parameter isn't provided, or if the value is empty, then all the accounts that the user has permission to see will be returned.
 func (r ApiApiAccountsMgmtV1SkusGetRequest) Search(search string) ApiApiAccountsMgmtV1SkusGetRequest {
 	r.search = &search
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1SkusGetRequest) Execute() (*SkuList, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1SkusGetRequest) Execute() (SkuList, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1SkusGetExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1SkusGet Returns a list of UHC product SKUs
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiApiAccountsMgmtV1SkusGetRequest
-
-Deprecated
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1SkusGet(ctx context.Context) ApiApiAccountsMgmtV1SkusGetRequest {
+ * ApiAccountsMgmtV1SkusGet Returns a list of UHC product SKUs
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiApiAccountsMgmtV1SkusGetRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SkusGet(ctx _context.Context) ApiApiAccountsMgmtV1SkusGetRequest {
 	return ApiApiAccountsMgmtV1SkusGetRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return SkuList
-// Deprecated
-func (a *DefaultApiService) ApiAccountsMgmtV1SkusGetExecute(r ApiApiAccountsMgmtV1SkusGetRequest) (*SkuList, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return SkuList
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SkusGetExecute(r ApiApiAccountsMgmtV1SkusGetRequest) (SkuList, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *SkuList
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  SkuList
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1SkusGet")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/skus"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.search != nil {
 		localVarQueryParams.Add("search", parameterToString(*r.search, ""))
@@ -16142,7 +15985,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SkusGetExecute(r ApiApiAccountsMgmt
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -16152,15 +15995,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SkusGetExecute(r ApiApiAccountsMgmt
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -16171,8 +16014,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SkusGetExecute(r ApiApiAccountsMgmt
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -16182,8 +16024,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SkusGetExecute(r ApiApiAccountsMgmt
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -16193,15 +16034,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SkusGetExecute(r ApiApiAccountsMgmt
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -16212,25 +16052,23 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SkusGetExecute(r ApiApiAccountsMgmt
 }
 
 type ApiApiAccountsMgmtV1SkusIdGetRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	id string
 }
 
-func (r ApiApiAccountsMgmtV1SkusIdGetRequest) Execute() (*SKU, *http.Response, error) {
+
+func (r ApiApiAccountsMgmtV1SkusIdGetRequest) Execute() (SKU, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1SkusIdGetExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1SkusIdGet Get a sku by id
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The id of record
- @return ApiApiAccountsMgmtV1SkusIdGetRequest
-
-Deprecated
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1SkusIdGet(ctx context.Context, id string) ApiApiAccountsMgmtV1SkusIdGetRequest {
+ * ApiAccountsMgmtV1SkusIdGet Get a sku by id
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The id of record
+ * @return ApiApiAccountsMgmtV1SkusIdGetRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SkusIdGet(ctx _context.Context, id string) ApiApiAccountsMgmtV1SkusIdGetRequest {
 	return ApiApiAccountsMgmtV1SkusIdGetRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -16238,28 +16076,31 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SkusIdGet(ctx context.Context, id s
 	}
 }
 
-// Execute executes the request
-//  @return SKU
-// Deprecated
-func (a *DefaultApiService) ApiAccountsMgmtV1SkusIdGetExecute(r ApiApiAccountsMgmtV1SkusIdGetRequest) (*SKU, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return SKU
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SkusIdGetExecute(r ApiApiAccountsMgmtV1SkusIdGetRequest) (SKU, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *SKU
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  SKU
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1SkusIdGet")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/skus/{id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -16278,7 +16119,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SkusIdGetExecute(r ApiApiAccountsMg
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -16288,15 +16129,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SkusIdGetExecute(r ApiApiAccountsMg
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -16307,8 +16148,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SkusIdGetExecute(r ApiApiAccountsMg
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -16318,8 +16158,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SkusIdGetExecute(r ApiApiAccountsMg
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -16329,8 +16168,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SkusIdGetExecute(r ApiApiAccountsMg
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -16340,15 +16178,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SkusIdGetExecute(r ApiApiAccountsMg
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -16359,7 +16196,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SkusIdGetExecute(r ApiApiAccountsMg
 }
 
 type ApiApiAccountsMgmtV1SubscriptionsGetRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	page *int32
 	size *int32
@@ -16372,97 +16209,83 @@ type ApiApiAccountsMgmtV1SubscriptionsGetRequest struct {
 	labels *string
 }
 
-// Page number of record list when record list exceeds specified page size
 func (r ApiApiAccountsMgmtV1SubscriptionsGetRequest) Page(page int32) ApiApiAccountsMgmtV1SubscriptionsGetRequest {
 	r.page = &page
 	return r
 }
-
-// Maximum number of records to return
 func (r ApiApiAccountsMgmtV1SubscriptionsGetRequest) Size(size int32) ApiApiAccountsMgmtV1SubscriptionsGetRequest {
 	r.size = &size
 	return r
 }
-
-// Specifies the search criteria. The syntax of this parameter is similar to the syntax of the _where_ clause of an SQL statement, using the names of the json attributes / column names of the account. For example, in order to retrieve all the accounts with a username starting with `my`:  ```sql username like 'my%' ```  The search criteria can also be applied on related resource. For example, in order to retrieve all the subscriptions labeled by `foo=bar`,  ```sql labels.key = 'foo' and labels.value = 'bar' ```  If the parameter isn't provided, or if the value is empty, then all the accounts that the user has permission to see will be returned.
 func (r ApiApiAccountsMgmtV1SubscriptionsGetRequest) Search(search string) ApiApiAccountsMgmtV1SubscriptionsGetRequest {
 	r.search = &search
 	return r
 }
-
-// If true, includes the account reference information in the output. Could slow request response time.
 func (r ApiApiAccountsMgmtV1SubscriptionsGetRequest) FetchAccounts(fetchAccounts bool) ApiApiAccountsMgmtV1SubscriptionsGetRequest {
 	r.fetchAccounts = &fetchAccounts
 	return r
 }
-
-// If true, includes the labels on a subscription/organization/account in the output. Could slow request response time.
 func (r ApiApiAccountsMgmtV1SubscriptionsGetRequest) FetchLabels(fetchLabels bool) ApiApiAccountsMgmtV1SubscriptionsGetRequest {
 	r.fetchLabels = &fetchLabels
 	return r
 }
-
-// If true, includes the capabilities on a subscription in the output. Could slow request response time.
 func (r ApiApiAccountsMgmtV1SubscriptionsGetRequest) FetchCapabilities(fetchCapabilities bool) ApiApiAccountsMgmtV1SubscriptionsGetRequest {
 	r.fetchCapabilities = &fetchCapabilities
 	return r
 }
-
-// Supplies a comma-separated list of fields to be returned. Fields of sub-structures and of arrays use <structure>.<field> notation. <stucture>.* means all field of a structure Example: For each Subscription to get id, href, plan(id and kind) and labels (all fields)  ``` ocm get subscriptions --parameter fields=id,href,plan.id,plan.kind,labels.* --parameter fetchLabels=true ```
 func (r ApiApiAccountsMgmtV1SubscriptionsGetRequest) Fields(fields string) ApiApiAccountsMgmtV1SubscriptionsGetRequest {
 	r.fields = &fields
 	return r
 }
-
-// Specifies the order by criteria. The syntax of this parameter is similar to the syntax of the _order by_ clause of an SQL statement, but using the names of the json attributes / column of the account. For example, in order to retrieve all accounts ordered by username:  ```sql username asc ```  Or in order to retrieve all accounts ordered by username _and_ first name:  ```sql username asc, firstName asc ```  If the parameter isn't provided, or if the value is empty, then no explicit ordering will be applied.
 func (r ApiApiAccountsMgmtV1SubscriptionsGetRequest) OrderBy(orderBy string) ApiApiAccountsMgmtV1SubscriptionsGetRequest {
 	r.orderBy = &orderBy
 	return r
 }
-
-// Specifies the criteria to filter the subscription resource based on their labels. A label is represented as a `key=value` pair,  ``` labels = \"foo=bar\" ```  and multiple labels are separated by comma,  ``` labels = \"foo=bar,fooz=barz\" ```
 func (r ApiApiAccountsMgmtV1SubscriptionsGetRequest) Labels(labels string) ApiApiAccountsMgmtV1SubscriptionsGetRequest {
 	r.labels = &labels
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1SubscriptionsGetRequest) Execute() (*SubscriptionList, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1SubscriptionsGetRequest) Execute() (SubscriptionList, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1SubscriptionsGetExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1SubscriptionsGet Returns a list of subscriptions
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiApiAccountsMgmtV1SubscriptionsGetRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsGet(ctx context.Context) ApiApiAccountsMgmtV1SubscriptionsGetRequest {
+ * ApiAccountsMgmtV1SubscriptionsGet Returns a list of subscriptions
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiApiAccountsMgmtV1SubscriptionsGetRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsGet(ctx _context.Context) ApiApiAccountsMgmtV1SubscriptionsGetRequest {
 	return ApiApiAccountsMgmtV1SubscriptionsGetRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return SubscriptionList
-func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsGetExecute(r ApiApiAccountsMgmtV1SubscriptionsGetRequest) (*SubscriptionList, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return SubscriptionList
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsGetExecute(r ApiApiAccountsMgmtV1SubscriptionsGetRequest) (SubscriptionList, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *SubscriptionList
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  SubscriptionList
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1SubscriptionsGet")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/subscriptions"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.page != nil {
 		localVarQueryParams.Add("page", parameterToString(*r.page, ""))
@@ -16522,7 +16345,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsGetExecute(r ApiApiAcc
 			}
 		}
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -16532,15 +16355,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsGetExecute(r ApiApiAcc
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -16551,8 +16374,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsGetExecute(r ApiApiAcc
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -16562,8 +16384,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsGetExecute(r ApiApiAcc
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -16573,15 +16394,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsGetExecute(r ApiApiAcc
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -16592,23 +16412,23 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsGetExecute(r ApiApiAcc
 }
 
 type ApiApiAccountsMgmtV1SubscriptionsIdDeleteRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	id string
 }
 
-func (r ApiApiAccountsMgmtV1SubscriptionsIdDeleteRequest) Execute() (*http.Response, error) {
+
+func (r ApiApiAccountsMgmtV1SubscriptionsIdDeleteRequest) Execute() (*_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1SubscriptionsIdDeleteExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1SubscriptionsIdDelete Deletes a subscription by id
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The id of record
- @return ApiApiAccountsMgmtV1SubscriptionsIdDeleteRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdDelete(ctx context.Context, id string) ApiApiAccountsMgmtV1SubscriptionsIdDeleteRequest {
+ * ApiAccountsMgmtV1SubscriptionsIdDelete Deletes a subscription by id
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The id of record
+ * @return ApiApiAccountsMgmtV1SubscriptionsIdDeleteRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdDelete(ctx _context.Context, id string) ApiApiAccountsMgmtV1SubscriptionsIdDeleteRequest {
 	return ApiApiAccountsMgmtV1SubscriptionsIdDeleteRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -16616,25 +16436,29 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdDelete(ctx context.C
 	}
 }
 
-// Execute executes the request
-func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdDeleteExecute(r ApiApiAccountsMgmtV1SubscriptionsIdDeleteRequest) (*http.Response, error) {
+/*
+ * Execute executes the request
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdDeleteExecute(r ApiApiAccountsMgmtV1SubscriptionsIdDeleteRequest) (*_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodDelete
+		localVarHTTPMethod   = _nethttp.MethodDelete
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1SubscriptionsIdDelete")
 	if err != nil {
-		return nil, &GenericOpenAPIError{error: err.Error()}
+		return nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/subscriptions/{id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -16653,7 +16477,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdDeleteExecute(r ApiA
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return nil, err
 	}
@@ -16663,15 +16487,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdDeleteExecute(r ApiA
 		return localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -16682,8 +16506,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdDeleteExecute(r ApiA
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -16693,8 +16516,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdDeleteExecute(r ApiA
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -16704,8 +16526,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdDeleteExecute(r ApiA
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -16715,8 +16536,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdDeleteExecute(r ApiA
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarHTTPResponse, newErr
 	}
@@ -16725,7 +16545,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdDeleteExecute(r ApiA
 }
 
 type ApiApiAccountsMgmtV1SubscriptionsIdGetRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	id string
 	fetchAccounts *bool
@@ -16734,42 +16554,34 @@ type ApiApiAccountsMgmtV1SubscriptionsIdGetRequest struct {
 	fetchCpuAndSocket *bool
 }
 
-// If true, includes the account reference information in the output. Could slow request response time.
 func (r ApiApiAccountsMgmtV1SubscriptionsIdGetRequest) FetchAccounts(fetchAccounts bool) ApiApiAccountsMgmtV1SubscriptionsIdGetRequest {
 	r.fetchAccounts = &fetchAccounts
 	return r
 }
-
-// If true, includes the labels on a subscription/organization/account in the output. Could slow request response time.
 func (r ApiApiAccountsMgmtV1SubscriptionsIdGetRequest) FetchLabels(fetchLabels bool) ApiApiAccountsMgmtV1SubscriptionsIdGetRequest {
 	r.fetchLabels = &fetchLabels
 	return r
 }
-
-// If true, includes the capabilities on a subscription in the output. Could slow request response time.
 func (r ApiApiAccountsMgmtV1SubscriptionsIdGetRequest) FetchCapabilities(fetchCapabilities bool) ApiApiAccountsMgmtV1SubscriptionsIdGetRequest {
 	r.fetchCapabilities = &fetchCapabilities
 	return r
 }
-
-// If true, fetches, from the clusters service, the total numbers of CPU's and sockets under an obligation, and includes in the output. Could slow request response time.
 func (r ApiApiAccountsMgmtV1SubscriptionsIdGetRequest) FetchCpuAndSocket(fetchCpuAndSocket bool) ApiApiAccountsMgmtV1SubscriptionsIdGetRequest {
 	r.fetchCpuAndSocket = &fetchCpuAndSocket
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1SubscriptionsIdGetRequest) Execute() (*Subscription, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1SubscriptionsIdGetRequest) Execute() (Subscription, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1SubscriptionsIdGetExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1SubscriptionsIdGet Get a subscription by id
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The id of record
- @return ApiApiAccountsMgmtV1SubscriptionsIdGetRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdGet(ctx context.Context, id string) ApiApiAccountsMgmtV1SubscriptionsIdGetRequest {
+ * ApiAccountsMgmtV1SubscriptionsIdGet Get a subscription by id
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The id of record
+ * @return ApiApiAccountsMgmtV1SubscriptionsIdGetRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdGet(ctx _context.Context, id string) ApiApiAccountsMgmtV1SubscriptionsIdGetRequest {
 	return ApiApiAccountsMgmtV1SubscriptionsIdGetRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -16777,27 +16589,31 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdGet(ctx context.Cont
 	}
 }
 
-// Execute executes the request
-//  @return Subscription
-func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdGetExecute(r ApiApiAccountsMgmtV1SubscriptionsIdGetRequest) (*Subscription, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return Subscription
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdGetExecute(r ApiApiAccountsMgmtV1SubscriptionsIdGetRequest) (Subscription, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *Subscription
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  Subscription
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1SubscriptionsIdGet")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/subscriptions/{id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.fetchAccounts != nil {
 		localVarQueryParams.Add("fetchAccounts", parameterToString(*r.fetchAccounts, ""))
@@ -16828,7 +16644,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdGetExecute(r ApiApiA
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -16838,15 +16654,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdGetExecute(r ApiApiA
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -16857,8 +16673,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdGetExecute(r ApiApiA
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -16868,8 +16683,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdGetExecute(r ApiApiA
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -16879,8 +16693,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdGetExecute(r ApiApiA
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -16890,15 +16703,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdGetExecute(r ApiApiA
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -16909,7 +16721,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdGetExecute(r ApiApiA
 }
 
 type ApiApiAccountsMgmtV1SubscriptionsIdLabelsGetRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	id string
 	page *int32
@@ -16918,42 +16730,34 @@ type ApiApiAccountsMgmtV1SubscriptionsIdLabelsGetRequest struct {
 	orderBy *string
 }
 
-// Page number of record list when record list exceeds specified page size
 func (r ApiApiAccountsMgmtV1SubscriptionsIdLabelsGetRequest) Page(page int32) ApiApiAccountsMgmtV1SubscriptionsIdLabelsGetRequest {
 	r.page = &page
 	return r
 }
-
-// Maximum number of records to return
 func (r ApiApiAccountsMgmtV1SubscriptionsIdLabelsGetRequest) Size(size int32) ApiApiAccountsMgmtV1SubscriptionsIdLabelsGetRequest {
 	r.size = &size
 	return r
 }
-
-// Specifies the search criteria. The syntax of this parameter is similar to the syntax of the _where_ clause of an SQL statement, using the names of the json attributes / column names of the account. For example, in order to retrieve all the accounts with a username starting with `my`:  ```sql username like 'my%' ```  The search criteria can also be applied on related resource. For example, in order to retrieve all the subscriptions labeled by `foo=bar`,  ```sql labels.key = 'foo' and labels.value = 'bar' ```  If the parameter isn't provided, or if the value is empty, then all the accounts that the user has permission to see will be returned.
 func (r ApiApiAccountsMgmtV1SubscriptionsIdLabelsGetRequest) Search(search string) ApiApiAccountsMgmtV1SubscriptionsIdLabelsGetRequest {
 	r.search = &search
 	return r
 }
-
-// Specifies the order by criteria. The syntax of this parameter is similar to the syntax of the _order by_ clause of an SQL statement, but using the names of the json attributes / column of the account. For example, in order to retrieve all accounts ordered by username:  ```sql username asc ```  Or in order to retrieve all accounts ordered by username _and_ first name:  ```sql username asc, firstName asc ```  If the parameter isn't provided, or if the value is empty, then no explicit ordering will be applied.
 func (r ApiApiAccountsMgmtV1SubscriptionsIdLabelsGetRequest) OrderBy(orderBy string) ApiApiAccountsMgmtV1SubscriptionsIdLabelsGetRequest {
 	r.orderBy = &orderBy
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1SubscriptionsIdLabelsGetRequest) Execute() (*LabelList, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1SubscriptionsIdLabelsGetRequest) Execute() (LabelList, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1SubscriptionsIdLabelsGetExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1SubscriptionsIdLabelsGet Returns a list of labels
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The id of record
- @return ApiApiAccountsMgmtV1SubscriptionsIdLabelsGetRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdLabelsGet(ctx context.Context, id string) ApiApiAccountsMgmtV1SubscriptionsIdLabelsGetRequest {
+ * ApiAccountsMgmtV1SubscriptionsIdLabelsGet Returns a list of labels
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The id of record
+ * @return ApiApiAccountsMgmtV1SubscriptionsIdLabelsGetRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdLabelsGet(ctx _context.Context, id string) ApiApiAccountsMgmtV1SubscriptionsIdLabelsGetRequest {
 	return ApiApiAccountsMgmtV1SubscriptionsIdLabelsGetRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -16961,27 +16765,31 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdLabelsGet(ctx contex
 	}
 }
 
-// Execute executes the request
-//  @return LabelList
-func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdLabelsGetExecute(r ApiApiAccountsMgmtV1SubscriptionsIdLabelsGetRequest) (*LabelList, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return LabelList
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdLabelsGetExecute(r ApiApiAccountsMgmtV1SubscriptionsIdLabelsGetRequest) (LabelList, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *LabelList
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  LabelList
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1SubscriptionsIdLabelsGet")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/subscriptions/{id}/labels"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.page != nil {
 		localVarQueryParams.Add("page", parameterToString(*r.page, ""))
@@ -17012,7 +16820,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdLabelsGetExecute(r A
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -17022,15 +16830,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdLabelsGetExecute(r A
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -17041,8 +16849,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdLabelsGetExecute(r A
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -17052,8 +16859,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdLabelsGetExecute(r A
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -17063,15 +16869,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdLabelsGetExecute(r A
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -17082,25 +16887,25 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdLabelsGetExecute(r A
 }
 
 type ApiApiAccountsMgmtV1SubscriptionsIdLabelsKeyDeleteRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	id string
 	key string
 }
 
-func (r ApiApiAccountsMgmtV1SubscriptionsIdLabelsKeyDeleteRequest) Execute() (*http.Response, error) {
+
+func (r ApiApiAccountsMgmtV1SubscriptionsIdLabelsKeyDeleteRequest) Execute() (*_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1SubscriptionsIdLabelsKeyDeleteExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1SubscriptionsIdLabelsKeyDelete Delete a label
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The id of record
- @param key The key of the label
- @return ApiApiAccountsMgmtV1SubscriptionsIdLabelsKeyDeleteRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdLabelsKeyDelete(ctx context.Context, id string, key string) ApiApiAccountsMgmtV1SubscriptionsIdLabelsKeyDeleteRequest {
+ * ApiAccountsMgmtV1SubscriptionsIdLabelsKeyDelete Delete a label
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The id of record
+ * @param key The key of the label
+ * @return ApiApiAccountsMgmtV1SubscriptionsIdLabelsKeyDeleteRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdLabelsKeyDelete(ctx _context.Context, id string, key string) ApiApiAccountsMgmtV1SubscriptionsIdLabelsKeyDeleteRequest {
 	return ApiApiAccountsMgmtV1SubscriptionsIdLabelsKeyDeleteRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -17109,26 +16914,30 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdLabelsKeyDelete(ctx
 	}
 }
 
-// Execute executes the request
-func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdLabelsKeyDeleteExecute(r ApiApiAccountsMgmtV1SubscriptionsIdLabelsKeyDeleteRequest) (*http.Response, error) {
+/*
+ * Execute executes the request
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdLabelsKeyDeleteExecute(r ApiApiAccountsMgmtV1SubscriptionsIdLabelsKeyDeleteRequest) (*_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodDelete
+		localVarHTTPMethod   = _nethttp.MethodDelete
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1SubscriptionsIdLabelsKeyDelete")
 	if err != nil {
-		return nil, &GenericOpenAPIError{error: err.Error()}
+		return nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/subscriptions/{id}/labels/{key}"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"key"+"}", url.PathEscape(parameterToString(r.key, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"key"+"}", _neturl.PathEscape(parameterToString(r.key, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -17147,7 +16956,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdLabelsKeyDeleteExecu
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return nil, err
 	}
@@ -17157,15 +16966,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdLabelsKeyDeleteExecu
 		return localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -17176,8 +16985,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdLabelsKeyDeleteExecu
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -17187,8 +16995,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdLabelsKeyDeleteExecu
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -17198,8 +17005,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdLabelsKeyDeleteExecu
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -17209,8 +17015,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdLabelsKeyDeleteExecu
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarHTTPResponse, newErr
 	}
@@ -17219,25 +17024,25 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdLabelsKeyDeleteExecu
 }
 
 type ApiApiAccountsMgmtV1SubscriptionsIdLabelsKeyGetRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	id string
 	key string
 }
 
-func (r ApiApiAccountsMgmtV1SubscriptionsIdLabelsKeyGetRequest) Execute() (*Label, *http.Response, error) {
+
+func (r ApiApiAccountsMgmtV1SubscriptionsIdLabelsKeyGetRequest) Execute() (Label, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1SubscriptionsIdLabelsKeyGetExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1SubscriptionsIdLabelsKeyGet Get subscription labels by label key
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The id of record
- @param key The key of the label
- @return ApiApiAccountsMgmtV1SubscriptionsIdLabelsKeyGetRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdLabelsKeyGet(ctx context.Context, id string, key string) ApiApiAccountsMgmtV1SubscriptionsIdLabelsKeyGetRequest {
+ * ApiAccountsMgmtV1SubscriptionsIdLabelsKeyGet Get subscription labels by label key
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The id of record
+ * @param key The key of the label
+ * @return ApiApiAccountsMgmtV1SubscriptionsIdLabelsKeyGetRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdLabelsKeyGet(ctx _context.Context, id string, key string) ApiApiAccountsMgmtV1SubscriptionsIdLabelsKeyGetRequest {
 	return ApiApiAccountsMgmtV1SubscriptionsIdLabelsKeyGetRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -17246,28 +17051,32 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdLabelsKeyGet(ctx con
 	}
 }
 
-// Execute executes the request
-//  @return Label
-func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdLabelsKeyGetExecute(r ApiApiAccountsMgmtV1SubscriptionsIdLabelsKeyGetRequest) (*Label, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return Label
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdLabelsKeyGetExecute(r ApiApiAccountsMgmtV1SubscriptionsIdLabelsKeyGetRequest) (Label, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *Label
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  Label
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1SubscriptionsIdLabelsKeyGet")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/subscriptions/{id}/labels/{key}"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"key"+"}", url.PathEscape(parameterToString(r.key, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"key"+"}", _neturl.PathEscape(parameterToString(r.key, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -17286,7 +17095,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdLabelsKeyGetExecute(
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -17296,15 +17105,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdLabelsKeyGetExecute(
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -17315,8 +17124,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdLabelsKeyGetExecute(
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -17326,8 +17134,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdLabelsKeyGetExecute(
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -17337,8 +17144,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdLabelsKeyGetExecute(
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -17348,15 +17154,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdLabelsKeyGetExecute(
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -17367,32 +17172,30 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdLabelsKeyGetExecute(
 }
 
 type ApiApiAccountsMgmtV1SubscriptionsIdLabelsKeyPatchRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	id string
 	key string
 	label *Label
 }
 
-// Label data
 func (r ApiApiAccountsMgmtV1SubscriptionsIdLabelsKeyPatchRequest) Label(label Label) ApiApiAccountsMgmtV1SubscriptionsIdLabelsKeyPatchRequest {
 	r.label = &label
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1SubscriptionsIdLabelsKeyPatchRequest) Execute() (*Label, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1SubscriptionsIdLabelsKeyPatchRequest) Execute() (Label, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1SubscriptionsIdLabelsKeyPatchExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1SubscriptionsIdLabelsKeyPatch Create a new label or update an existing label
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The id of record
- @param key The key of the label
- @return ApiApiAccountsMgmtV1SubscriptionsIdLabelsKeyPatchRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdLabelsKeyPatch(ctx context.Context, id string, key string) ApiApiAccountsMgmtV1SubscriptionsIdLabelsKeyPatchRequest {
+ * ApiAccountsMgmtV1SubscriptionsIdLabelsKeyPatch Create a new label or update an existing label
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The id of record
+ * @param key The key of the label
+ * @return ApiApiAccountsMgmtV1SubscriptionsIdLabelsKeyPatchRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdLabelsKeyPatch(ctx _context.Context, id string, key string) ApiApiAccountsMgmtV1SubscriptionsIdLabelsKeyPatchRequest {
 	return ApiApiAccountsMgmtV1SubscriptionsIdLabelsKeyPatchRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -17401,28 +17204,32 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdLabelsKeyPatch(ctx c
 	}
 }
 
-// Execute executes the request
-//  @return Label
-func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdLabelsKeyPatchExecute(r ApiApiAccountsMgmtV1SubscriptionsIdLabelsKeyPatchRequest) (*Label, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return Label
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdLabelsKeyPatchExecute(r ApiApiAccountsMgmtV1SubscriptionsIdLabelsKeyPatchRequest) (Label, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPatch
+		localVarHTTPMethod   = _nethttp.MethodPatch
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *Label
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  Label
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1SubscriptionsIdLabelsKeyPatch")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/subscriptions/{id}/labels/{key}"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"key"+"}", url.PathEscape(parameterToString(r.key, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"key"+"}", _neturl.PathEscape(parameterToString(r.key, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.label == nil {
 		return localVarReturnValue, nil, reportError("label is required and must be specified")
 	}
@@ -17446,7 +17253,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdLabelsKeyPatchExecut
 	}
 	// body params
 	localVarPostBody = r.label
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -17456,15 +17263,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdLabelsKeyPatchExecut
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -17475,8 +17282,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdLabelsKeyPatchExecut
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -17486,8 +17292,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdLabelsKeyPatchExecut
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -17497,8 +17302,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdLabelsKeyPatchExecut
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 409 {
@@ -17508,8 +17312,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdLabelsKeyPatchExecut
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -17519,15 +17322,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdLabelsKeyPatchExecut
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -17538,30 +17340,28 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdLabelsKeyPatchExecut
 }
 
 type ApiApiAccountsMgmtV1SubscriptionsIdLabelsPostRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	id string
 	label *Label
 }
 
-// Label data
 func (r ApiApiAccountsMgmtV1SubscriptionsIdLabelsPostRequest) Label(label Label) ApiApiAccountsMgmtV1SubscriptionsIdLabelsPostRequest {
 	r.label = &label
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1SubscriptionsIdLabelsPostRequest) Execute() (*Label, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1SubscriptionsIdLabelsPostRequest) Execute() (Label, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1SubscriptionsIdLabelsPostExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1SubscriptionsIdLabelsPost Create a new label or update an existing label
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The id of record
- @return ApiApiAccountsMgmtV1SubscriptionsIdLabelsPostRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdLabelsPost(ctx context.Context, id string) ApiApiAccountsMgmtV1SubscriptionsIdLabelsPostRequest {
+ * ApiAccountsMgmtV1SubscriptionsIdLabelsPost Create a new label or update an existing label
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The id of record
+ * @return ApiApiAccountsMgmtV1SubscriptionsIdLabelsPostRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdLabelsPost(ctx _context.Context, id string) ApiApiAccountsMgmtV1SubscriptionsIdLabelsPostRequest {
 	return ApiApiAccountsMgmtV1SubscriptionsIdLabelsPostRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -17569,27 +17369,31 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdLabelsPost(ctx conte
 	}
 }
 
-// Execute executes the request
-//  @return Label
-func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdLabelsPostExecute(r ApiApiAccountsMgmtV1SubscriptionsIdLabelsPostRequest) (*Label, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return Label
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdLabelsPostExecute(r ApiApiAccountsMgmtV1SubscriptionsIdLabelsPostRequest) (Label, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *Label
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  Label
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1SubscriptionsIdLabelsPost")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/subscriptions/{id}/labels"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.label == nil {
 		return localVarReturnValue, nil, reportError("label is required and must be specified")
 	}
@@ -17613,7 +17417,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdLabelsPostExecute(r
 	}
 	// body params
 	localVarPostBody = r.label
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -17623,15 +17427,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdLabelsPostExecute(r
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -17642,8 +17446,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdLabelsPostExecute(r
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -17653,8 +17456,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdLabelsPostExecute(r
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -17664,8 +17466,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdLabelsPostExecute(r
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -17675,15 +17476,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdLabelsPostExecute(r
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -17694,7 +17494,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdLabelsPostExecute(r
 }
 
 type ApiApiAccountsMgmtV1SubscriptionsIdMetricsMetricNameGetRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	id string
 	metricName string
@@ -17702,31 +17502,27 @@ type ApiApiAccountsMgmtV1SubscriptionsIdMetricsMetricNameGetRequest struct {
 	fields *string
 }
 
-// The `search` paramter specifies the PromQL selector. The syntax is defined by Prometheus at https://prometheus.io/docs/prometheus/latest/querying/basics/#time-series-selectors. It only supports simple selections as shown in https://prometheus.io/docs/prometheus/latest/querying/examples/#simple-time-series-selection. For example, in order to retrieve subscription_sync_total with names starting with `managed` and with a channel = `production`:  ``` name=~'managed.*',channel='production' ```  If the parameter isn't provided, or if the value is empty, then all the records will be returned.
 func (r ApiApiAccountsMgmtV1SubscriptionsIdMetricsMetricNameGetRequest) Search(search string) ApiApiAccountsMgmtV1SubscriptionsIdMetricsMetricNameGetRequest {
 	r.search = &search
 	return r
 }
-
-// Supplies a comma-separated list of fields to be returned. Fields of sub-structures and of arrays use <structure>.<field> notation. <stucture>.* means all field of a structure Example: For each Subscription to get id, href, plan(id and kind) and labels (all fields)  ``` ocm get subscriptions --parameter fields=id,href,plan.id,plan.kind,labels.* --parameter fetchLabels=true ```
 func (r ApiApiAccountsMgmtV1SubscriptionsIdMetricsMetricNameGetRequest) Fields(fields string) ApiApiAccountsMgmtV1SubscriptionsIdMetricsMetricNameGetRequest {
 	r.fields = &fields
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1SubscriptionsIdMetricsMetricNameGetRequest) Execute() (*SubscriptionMetricList, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1SubscriptionsIdMetricsMetricNameGetRequest) Execute() (SubscriptionMetricList, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1SubscriptionsIdMetricsMetricNameGetExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1SubscriptionsIdMetricsMetricNameGet Get subscription's metrics by metric name
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The id of record
- @param metricName The name of the metric
- @return ApiApiAccountsMgmtV1SubscriptionsIdMetricsMetricNameGetRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdMetricsMetricNameGet(ctx context.Context, id string, metricName string) ApiApiAccountsMgmtV1SubscriptionsIdMetricsMetricNameGetRequest {
+ * ApiAccountsMgmtV1SubscriptionsIdMetricsMetricNameGet Get subscription's metrics by metric name
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The id of record
+ * @param metricName The name of the metric
+ * @return ApiApiAccountsMgmtV1SubscriptionsIdMetricsMetricNameGetRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdMetricsMetricNameGet(ctx _context.Context, id string, metricName string) ApiApiAccountsMgmtV1SubscriptionsIdMetricsMetricNameGetRequest {
 	return ApiApiAccountsMgmtV1SubscriptionsIdMetricsMetricNameGetRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -17735,28 +17531,32 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdMetricsMetricNameGet
 	}
 }
 
-// Execute executes the request
-//  @return SubscriptionMetricList
-func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdMetricsMetricNameGetExecute(r ApiApiAccountsMgmtV1SubscriptionsIdMetricsMetricNameGetRequest) (*SubscriptionMetricList, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return SubscriptionMetricList
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdMetricsMetricNameGetExecute(r ApiApiAccountsMgmtV1SubscriptionsIdMetricsMetricNameGetRequest) (SubscriptionMetricList, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *SubscriptionMetricList
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  SubscriptionMetricList
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1SubscriptionsIdMetricsMetricNameGet")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/subscriptions/{id}/metrics/{metric_name}"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"metric_name"+"}", url.PathEscape(parameterToString(r.metricName, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"metric_name"+"}", _neturl.PathEscape(parameterToString(r.metricName, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.search != nil {
 		localVarQueryParams.Add("search", parameterToString(*r.search, ""))
@@ -17781,7 +17581,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdMetricsMetricNameGet
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -17791,15 +17591,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdMetricsMetricNameGet
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -17810,8 +17610,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdMetricsMetricNameGet
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -17821,8 +17620,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdMetricsMetricNameGet
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -17832,8 +17630,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdMetricsMetricNameGet
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -17843,15 +17640,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdMetricsMetricNameGet
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -17862,30 +17658,28 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdMetricsMetricNameGet
 }
 
 type ApiApiAccountsMgmtV1SubscriptionsIdNotifyPostRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	id string
 	notificationRequest *NotificationRequest
 }
 
-// The contents of the notification to send to the owner of a subscription in addition to the set of template parameters which are sent automatically ACCOUNT_USERNAME, FIRST_NAME, LAST_NAME, ORGANIZATION_NAME, ORGANIZATION_EXTERNAL_ID
 func (r ApiApiAccountsMgmtV1SubscriptionsIdNotifyPostRequest) NotificationRequest(notificationRequest NotificationRequest) ApiApiAccountsMgmtV1SubscriptionsIdNotifyPostRequest {
 	r.notificationRequest = &notificationRequest
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1SubscriptionsIdNotifyPostRequest) Execute() (*http.Response, error) {
+func (r ApiApiAccountsMgmtV1SubscriptionsIdNotifyPostRequest) Execute() (*_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1SubscriptionsIdNotifyPostExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1SubscriptionsIdNotifyPost Notify the owner of a subscription
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The id of record
- @return ApiApiAccountsMgmtV1SubscriptionsIdNotifyPostRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdNotifyPost(ctx context.Context, id string) ApiApiAccountsMgmtV1SubscriptionsIdNotifyPostRequest {
+ * ApiAccountsMgmtV1SubscriptionsIdNotifyPost Notify the owner of a subscription
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The id of record
+ * @return ApiApiAccountsMgmtV1SubscriptionsIdNotifyPostRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdNotifyPost(ctx _context.Context, id string) ApiApiAccountsMgmtV1SubscriptionsIdNotifyPostRequest {
 	return ApiApiAccountsMgmtV1SubscriptionsIdNotifyPostRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -17893,25 +17687,29 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdNotifyPost(ctx conte
 	}
 }
 
-// Execute executes the request
-func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdNotifyPostExecute(r ApiApiAccountsMgmtV1SubscriptionsIdNotifyPostRequest) (*http.Response, error) {
+/*
+ * Execute executes the request
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdNotifyPostExecute(r ApiApiAccountsMgmtV1SubscriptionsIdNotifyPostRequest) (*_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1SubscriptionsIdNotifyPost")
 	if err != nil {
-		return nil, &GenericOpenAPIError{error: err.Error()}
+		return nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/subscriptions/{id}/notify"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.notificationRequest == nil {
 		return nil, reportError("notificationRequest is required and must be specified")
 	}
@@ -17935,7 +17733,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdNotifyPostExecute(r
 	}
 	// body params
 	localVarPostBody = r.notificationRequest
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return nil, err
 	}
@@ -17945,15 +17743,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdNotifyPostExecute(r
 		return localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -17964,8 +17762,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdNotifyPostExecute(r
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -17975,8 +17772,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdNotifyPostExecute(r
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -17986,8 +17782,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdNotifyPostExecute(r
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -17997,8 +17792,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdNotifyPostExecute(r
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarHTTPResponse, newErr
 	}
@@ -18007,30 +17801,28 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdNotifyPostExecute(r
 }
 
 type ApiApiAccountsMgmtV1SubscriptionsIdPatchRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	id string
 	subscriptionPatchRequest *SubscriptionPatchRequest
 }
 
-// Updated subscription data
 func (r ApiApiAccountsMgmtV1SubscriptionsIdPatchRequest) SubscriptionPatchRequest(subscriptionPatchRequest SubscriptionPatchRequest) ApiApiAccountsMgmtV1SubscriptionsIdPatchRequest {
 	r.subscriptionPatchRequest = &subscriptionPatchRequest
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1SubscriptionsIdPatchRequest) Execute() (*Subscription, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1SubscriptionsIdPatchRequest) Execute() (Subscription, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1SubscriptionsIdPatchExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1SubscriptionsIdPatch Update a subscription
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The id of record
- @return ApiApiAccountsMgmtV1SubscriptionsIdPatchRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdPatch(ctx context.Context, id string) ApiApiAccountsMgmtV1SubscriptionsIdPatchRequest {
+ * ApiAccountsMgmtV1SubscriptionsIdPatch Update a subscription
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The id of record
+ * @return ApiApiAccountsMgmtV1SubscriptionsIdPatchRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdPatch(ctx _context.Context, id string) ApiApiAccountsMgmtV1SubscriptionsIdPatchRequest {
 	return ApiApiAccountsMgmtV1SubscriptionsIdPatchRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -18038,27 +17830,31 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdPatch(ctx context.Co
 	}
 }
 
-// Execute executes the request
-//  @return Subscription
-func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdPatchExecute(r ApiApiAccountsMgmtV1SubscriptionsIdPatchRequest) (*Subscription, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return Subscription
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdPatchExecute(r ApiApiAccountsMgmtV1SubscriptionsIdPatchRequest) (Subscription, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPatch
+		localVarHTTPMethod   = _nethttp.MethodPatch
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *Subscription
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  Subscription
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1SubscriptionsIdPatch")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/subscriptions/{id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.subscriptionPatchRequest == nil {
 		return localVarReturnValue, nil, reportError("subscriptionPatchRequest is required and must be specified")
 	}
@@ -18082,7 +17878,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdPatchExecute(r ApiAp
 	}
 	// body params
 	localVarPostBody = r.subscriptionPatchRequest
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -18092,15 +17888,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdPatchExecute(r ApiAp
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -18111,8 +17907,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdPatchExecute(r ApiAp
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -18122,8 +17917,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdPatchExecute(r ApiAp
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -18133,8 +17927,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdPatchExecute(r ApiAp
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -18144,8 +17937,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdPatchExecute(r ApiAp
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -18155,15 +17947,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdPatchExecute(r ApiAp
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -18174,7 +17965,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdPatchExecute(r ApiAp
 }
 
 type ApiApiAccountsMgmtV1SubscriptionsIdReservedResourcesGetRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	id string
 	page *int32
@@ -18183,42 +17974,34 @@ type ApiApiAccountsMgmtV1SubscriptionsIdReservedResourcesGetRequest struct {
 	orderBy *string
 }
 
-// Page number of record list when record list exceeds specified page size
 func (r ApiApiAccountsMgmtV1SubscriptionsIdReservedResourcesGetRequest) Page(page int32) ApiApiAccountsMgmtV1SubscriptionsIdReservedResourcesGetRequest {
 	r.page = &page
 	return r
 }
-
-// Maximum number of records to return
 func (r ApiApiAccountsMgmtV1SubscriptionsIdReservedResourcesGetRequest) Size(size int32) ApiApiAccountsMgmtV1SubscriptionsIdReservedResourcesGetRequest {
 	r.size = &size
 	return r
 }
-
-// Specifies the search criteria. The syntax of this parameter is similar to the syntax of the _where_ clause of an SQL statement, using the names of the json attributes / column names of the account. For example, in order to retrieve all the accounts with a username starting with `my`:  ```sql username like 'my%' ```  The search criteria can also be applied on related resource. For example, in order to retrieve all the subscriptions labeled by `foo=bar`,  ```sql labels.key = 'foo' and labels.value = 'bar' ```  If the parameter isn't provided, or if the value is empty, then all the accounts that the user has permission to see will be returned.
 func (r ApiApiAccountsMgmtV1SubscriptionsIdReservedResourcesGetRequest) Search(search string) ApiApiAccountsMgmtV1SubscriptionsIdReservedResourcesGetRequest {
 	r.search = &search
 	return r
 }
-
-// Specifies the order by criteria. The syntax of this parameter is similar to the syntax of the _order by_ clause of an SQL statement, but using the names of the json attributes / column of the account. For example, in order to retrieve all accounts ordered by username:  ```sql username asc ```  Or in order to retrieve all accounts ordered by username _and_ first name:  ```sql username asc, firstName asc ```  If the parameter isn't provided, or if the value is empty, then no explicit ordering will be applied.
 func (r ApiApiAccountsMgmtV1SubscriptionsIdReservedResourcesGetRequest) OrderBy(orderBy string) ApiApiAccountsMgmtV1SubscriptionsIdReservedResourcesGetRequest {
 	r.orderBy = &orderBy
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1SubscriptionsIdReservedResourcesGetRequest) Execute() (*ReservedResourceList, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1SubscriptionsIdReservedResourcesGetRequest) Execute() (ReservedResourceList, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1SubscriptionsIdReservedResourcesGetExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1SubscriptionsIdReservedResourcesGet Returns a list of reserved resources
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The id of record
- @return ApiApiAccountsMgmtV1SubscriptionsIdReservedResourcesGetRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdReservedResourcesGet(ctx context.Context, id string) ApiApiAccountsMgmtV1SubscriptionsIdReservedResourcesGetRequest {
+ * ApiAccountsMgmtV1SubscriptionsIdReservedResourcesGet Returns a list of reserved resources
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The id of record
+ * @return ApiApiAccountsMgmtV1SubscriptionsIdReservedResourcesGetRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdReservedResourcesGet(ctx _context.Context, id string) ApiApiAccountsMgmtV1SubscriptionsIdReservedResourcesGetRequest {
 	return ApiApiAccountsMgmtV1SubscriptionsIdReservedResourcesGetRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -18226,27 +18009,31 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdReservedResourcesGet
 	}
 }
 
-// Execute executes the request
-//  @return ReservedResourceList
-func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdReservedResourcesGetExecute(r ApiApiAccountsMgmtV1SubscriptionsIdReservedResourcesGetRequest) (*ReservedResourceList, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return ReservedResourceList
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdReservedResourcesGetExecute(r ApiApiAccountsMgmtV1SubscriptionsIdReservedResourcesGetRequest) (ReservedResourceList, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *ReservedResourceList
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  ReservedResourceList
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1SubscriptionsIdReservedResourcesGet")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/subscriptions/{id}/reserved_resources"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.page != nil {
 		localVarQueryParams.Add("page", parameterToString(*r.page, ""))
@@ -18277,7 +18064,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdReservedResourcesGet
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -18287,15 +18074,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdReservedResourcesGet
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -18306,8 +18093,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdReservedResourcesGet
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -18317,8 +18103,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdReservedResourcesGet
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -18328,15 +18113,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdReservedResourcesGet
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -18347,37 +18131,33 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdReservedResourcesGet
 }
 
 type ApiApiAccountsMgmtV1SubscriptionsIdSupportCasesGetRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	id string
 	page *int32
 	size *int32
 }
 
-// Page number of record list when record list exceeds specified page size
 func (r ApiApiAccountsMgmtV1SubscriptionsIdSupportCasesGetRequest) Page(page int32) ApiApiAccountsMgmtV1SubscriptionsIdSupportCasesGetRequest {
 	r.page = &page
 	return r
 }
-
-// Maximum number of records to return
 func (r ApiApiAccountsMgmtV1SubscriptionsIdSupportCasesGetRequest) Size(size int32) ApiApiAccountsMgmtV1SubscriptionsIdSupportCasesGetRequest {
 	r.size = &size
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1SubscriptionsIdSupportCasesGetRequest) Execute() (*http.Response, error) {
+func (r ApiApiAccountsMgmtV1SubscriptionsIdSupportCasesGetRequest) Execute() (*_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1SubscriptionsIdSupportCasesGetExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1SubscriptionsIdSupportCasesGet Returns a list of open support creates opened against the external cluster id of this subscrption
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The id of record
- @return ApiApiAccountsMgmtV1SubscriptionsIdSupportCasesGetRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdSupportCasesGet(ctx context.Context, id string) ApiApiAccountsMgmtV1SubscriptionsIdSupportCasesGetRequest {
+ * ApiAccountsMgmtV1SubscriptionsIdSupportCasesGet Returns a list of open support creates opened against the external cluster id of this subscrption
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The id of record
+ * @return ApiApiAccountsMgmtV1SubscriptionsIdSupportCasesGetRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdSupportCasesGet(ctx _context.Context, id string) ApiApiAccountsMgmtV1SubscriptionsIdSupportCasesGetRequest {
 	return ApiApiAccountsMgmtV1SubscriptionsIdSupportCasesGetRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -18385,25 +18165,29 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdSupportCasesGet(ctx
 	}
 }
 
-// Execute executes the request
-func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdSupportCasesGetExecute(r ApiApiAccountsMgmtV1SubscriptionsIdSupportCasesGetRequest) (*http.Response, error) {
+/*
+ * Execute executes the request
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdSupportCasesGetExecute(r ApiApiAccountsMgmtV1SubscriptionsIdSupportCasesGetRequest) (*_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1SubscriptionsIdSupportCasesGet")
 	if err != nil {
-		return nil, &GenericOpenAPIError{error: err.Error()}
+		return nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/subscriptions/{id}/support_cases"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.page != nil {
 		localVarQueryParams.Add("page", parameterToString(*r.page, ""))
@@ -18428,7 +18212,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdSupportCasesGetExecu
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return nil, err
 	}
@@ -18438,15 +18222,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdSupportCasesGetExecu
 		return localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -18457,8 +18241,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdSupportCasesGetExecu
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -18468,8 +18251,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdSupportCasesGetExecu
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -18479,8 +18261,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdSupportCasesGetExecu
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarHTTPResponse, newErr
 	}
@@ -18489,54 +18270,56 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsIdSupportCasesGetExecu
 }
 
 type ApiApiAccountsMgmtV1SubscriptionsPostRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	subscriptionCreateRequest *SubscriptionCreateRequest
 }
 
-// Subscription Creation data
 func (r ApiApiAccountsMgmtV1SubscriptionsPostRequest) SubscriptionCreateRequest(subscriptionCreateRequest SubscriptionCreateRequest) ApiApiAccountsMgmtV1SubscriptionsPostRequest {
 	r.subscriptionCreateRequest = &subscriptionCreateRequest
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1SubscriptionsPostRequest) Execute() (*Subscription, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1SubscriptionsPostRequest) Execute() (Subscription, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1SubscriptionsPostExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1SubscriptionsPost Create a new subscription
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiApiAccountsMgmtV1SubscriptionsPostRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsPost(ctx context.Context) ApiApiAccountsMgmtV1SubscriptionsPostRequest {
+ * ApiAccountsMgmtV1SubscriptionsPost Create a new subscription
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiApiAccountsMgmtV1SubscriptionsPostRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsPost(ctx _context.Context) ApiApiAccountsMgmtV1SubscriptionsPostRequest {
 	return ApiApiAccountsMgmtV1SubscriptionsPostRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return Subscription
-func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsPostExecute(r ApiApiAccountsMgmtV1SubscriptionsPostRequest) (*Subscription, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return Subscription
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsPostExecute(r ApiApiAccountsMgmtV1SubscriptionsPostRequest) (Subscription, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *Subscription
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  Subscription
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1SubscriptionsPost")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/subscriptions"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.subscriptionCreateRequest == nil {
 		return localVarReturnValue, nil, reportError("subscriptionCreateRequest is required and must be specified")
 	}
@@ -18560,7 +18343,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsPostExecute(r ApiApiAc
 	}
 	// body params
 	localVarPostBody = r.subscriptionCreateRequest
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -18570,15 +18353,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsPostExecute(r ApiApiAc
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -18589,8 +18372,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsPostExecute(r ApiApiAc
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -18600,8 +18382,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsPostExecute(r ApiApiAc
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -18611,8 +18392,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsPostExecute(r ApiApiAc
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 409 {
@@ -18622,8 +18402,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsPostExecute(r ApiApiAc
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -18633,15 +18412,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsPostExecute(r ApiApiAc
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -18652,25 +18430,25 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsPostExecute(r ApiApiAc
 }
 
 type ApiApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsAccountIdDeleteRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	subId string
 	accountId string
 }
 
-func (r ApiApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsAccountIdDeleteRequest) Execute() (*http.Response, error) {
+
+func (r ApiApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsAccountIdDeleteRequest) Execute() (*_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsAccountIdDeleteExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsAccountIdDelete Deletes a notification contact by subscription and account id
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param subId The id of subscription
- @param accountId The id of account
- @return ApiApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsAccountIdDeleteRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsAccountIdDelete(ctx context.Context, subId string, accountId string) ApiApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsAccountIdDeleteRequest {
+ * ApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsAccountIdDelete Deletes a notification contact by subscription and account id
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param subId The id of subscription
+ * @param accountId The id of account
+ * @return ApiApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsAccountIdDeleteRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsAccountIdDelete(ctx _context.Context, subId string, accountId string) ApiApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsAccountIdDeleteRequest {
 	return ApiApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsAccountIdDeleteRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -18679,26 +18457,30 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdNotificationConta
 	}
 }
 
-// Execute executes the request
-func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsAccountIdDeleteExecute(r ApiApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsAccountIdDeleteRequest) (*http.Response, error) {
+/*
+ * Execute executes the request
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsAccountIdDeleteExecute(r ApiApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsAccountIdDeleteRequest) (*_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodDelete
+		localVarHTTPMethod   = _nethttp.MethodDelete
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsAccountIdDelete")
 	if err != nil {
-		return nil, &GenericOpenAPIError{error: err.Error()}
+		return nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/subscriptions/{subId}/notification_contacts/{accountId}"
-	localVarPath = strings.Replace(localVarPath, "{"+"subId"+"}", url.PathEscape(parameterToString(r.subId, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"accountId"+"}", url.PathEscape(parameterToString(r.accountId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"subId"+"}", _neturl.PathEscape(parameterToString(r.subId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"accountId"+"}", _neturl.PathEscape(parameterToString(r.accountId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -18717,7 +18499,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdNotificationConta
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return nil, err
 	}
@@ -18727,15 +18509,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdNotificationConta
 		return localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -18746,8 +18528,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdNotificationConta
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -18757,8 +18538,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdNotificationConta
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -18768,8 +18548,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdNotificationConta
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -18779,8 +18558,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdNotificationConta
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarHTTPResponse, newErr
 	}
@@ -18789,7 +18567,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdNotificationConta
 }
 
 type ApiApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsGetRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	subId string
 	page *int32
@@ -18799,48 +18577,38 @@ type ApiApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsGetRequest struct
 	orderBy *string
 }
 
-// Page number of record list when record list exceeds specified page size
 func (r ApiApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsGetRequest) Page(page int32) ApiApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsGetRequest {
 	r.page = &page
 	return r
 }
-
-// Maximum number of records to return
 func (r ApiApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsGetRequest) Size(size int32) ApiApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsGetRequest {
 	r.size = &size
 	return r
 }
-
-// Specifies the search criteria. The syntax of this parameter is similar to the syntax of the _where_ clause of an SQL statement, using the names of the json attributes / column names of the account. For example, in order to retrieve all the accounts with a username starting with `my`:  ```sql username like 'my%' ```  The search criteria can also be applied on related resource. For example, in order to retrieve all the subscriptions labeled by `foo=bar`,  ```sql labels.key = 'foo' and labels.value = 'bar' ```  If the parameter isn't provided, or if the value is empty, then all the accounts that the user has permission to see will be returned.
 func (r ApiApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsGetRequest) Search(search string) ApiApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsGetRequest {
 	r.search = &search
 	return r
 }
-
-// Supplies a comma-separated list of fields to be returned. Fields of sub-structures and of arrays use <structure>.<field> notation. <stucture>.* means all field of a structure Example: For each Subscription to get id, href, plan(id and kind) and labels (all fields)  ``` ocm get subscriptions --parameter fields=id,href,plan.id,plan.kind,labels.* --parameter fetchLabels=true ```
 func (r ApiApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsGetRequest) Fields(fields string) ApiApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsGetRequest {
 	r.fields = &fields
 	return r
 }
-
-// Specifies the order by criteria. The syntax of this parameter is similar to the syntax of the _order by_ clause of an SQL statement, but using the names of the json attributes / column of the account. For example, in order to retrieve all accounts ordered by username:  ```sql username asc ```  Or in order to retrieve all accounts ordered by username _and_ first name:  ```sql username asc, firstName asc ```  If the parameter isn't provided, or if the value is empty, then no explicit ordering will be applied.
 func (r ApiApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsGetRequest) OrderBy(orderBy string) ApiApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsGetRequest {
 	r.orderBy = &orderBy
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsGetRequest) Execute() (*AccountList, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsGetRequest) Execute() (AccountList, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsGetExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsGet Returns a list of notification contacts for the given subscription
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param subId The id of subscription
- @return ApiApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsGetRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsGet(ctx context.Context, subId string) ApiApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsGetRequest {
+ * ApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsGet Returns a list of notification contacts for the given subscription
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param subId The id of subscription
+ * @return ApiApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsGetRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsGet(ctx _context.Context, subId string) ApiApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsGetRequest {
 	return ApiApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsGetRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -18848,27 +18616,31 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdNotificationConta
 	}
 }
 
-// Execute executes the request
-//  @return AccountList
-func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsGetExecute(r ApiApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsGetRequest) (*AccountList, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return AccountList
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsGetExecute(r ApiApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsGetRequest) (AccountList, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *AccountList
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  AccountList
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsGet")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/subscriptions/{subId}/notification_contacts"
-	localVarPath = strings.Replace(localVarPath, "{"+"subId"+"}", url.PathEscape(parameterToString(r.subId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"subId"+"}", _neturl.PathEscape(parameterToString(r.subId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.page != nil {
 		localVarQueryParams.Add("page", parameterToString(*r.page, ""))
@@ -18902,7 +18674,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdNotificationConta
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -18912,15 +18684,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdNotificationConta
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -18931,8 +18703,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdNotificationConta
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -18942,8 +18713,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdNotificationConta
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -18953,15 +18723,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdNotificationConta
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -18972,30 +18741,28 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdNotificationConta
 }
 
 type ApiApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsPostRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	subId string
 	notificationContactCreateRequest *NotificationContactCreateRequest
 }
 
-// Add a notification contact by an account's username
 func (r ApiApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsPostRequest) NotificationContactCreateRequest(notificationContactCreateRequest NotificationContactCreateRequest) ApiApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsPostRequest {
 	r.notificationContactCreateRequest = &notificationContactCreateRequest
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsPostRequest) Execute() (*Account, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsPostRequest) Execute() (Account, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsPostExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsPost Add an account as a notification contact to this subscription
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param subId The id of subscription
- @return ApiApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsPostRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsPost(ctx context.Context, subId string) ApiApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsPostRequest {
+ * ApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsPost Add an account as a notification contact to this subscription
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param subId The id of subscription
+ * @return ApiApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsPostRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsPost(ctx _context.Context, subId string) ApiApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsPostRequest {
 	return ApiApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsPostRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -19003,27 +18770,31 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdNotificationConta
 	}
 }
 
-// Execute executes the request
-//  @return Account
-func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsPostExecute(r ApiApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsPostRequest) (*Account, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return Account
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsPostExecute(r ApiApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsPostRequest) (Account, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *Account
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  Account
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsPost")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/subscriptions/{subId}/notification_contacts"
-	localVarPath = strings.Replace(localVarPath, "{"+"subId"+"}", url.PathEscape(parameterToString(r.subId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"subId"+"}", _neturl.PathEscape(parameterToString(r.subId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.notificationContactCreateRequest == nil {
 		return localVarReturnValue, nil, reportError("notificationContactCreateRequest is required and must be specified")
 	}
@@ -19047,7 +18818,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdNotificationConta
 	}
 	// body params
 	localVarPostBody = r.notificationContactCreateRequest
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -19057,15 +18828,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdNotificationConta
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -19076,8 +18847,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdNotificationConta
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -19087,8 +18857,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdNotificationConta
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -19098,8 +18867,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdNotificationConta
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 409 {
@@ -19109,8 +18877,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdNotificationConta
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -19120,15 +18887,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdNotificationConta
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -19139,25 +18905,25 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdNotificationConta
 }
 
 type ApiApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdDeleteRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	subId string
 	reservedResourceId string
 }
 
-func (r ApiApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdDeleteRequest) Execute() (*http.Response, error) {
+
+func (r ApiApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdDeleteRequest) Execute() (*_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdDeleteExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdDelete Delete reserved resources by id
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param subId The id of subscription
- @param reservedResourceId The id of reserved resource
- @return ApiApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdDeleteRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdDelete(ctx context.Context, subId string, reservedResourceId string) ApiApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdDeleteRequest {
+ * ApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdDelete Delete reserved resources by id
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param subId The id of subscription
+ * @param reservedResourceId The id of reserved resource
+ * @return ApiApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdDeleteRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdDelete(ctx _context.Context, subId string, reservedResourceId string) ApiApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdDeleteRequest {
 	return ApiApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdDeleteRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -19166,26 +18932,30 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdReservedResources
 	}
 }
 
-// Execute executes the request
-func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdDeleteExecute(r ApiApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdDeleteRequest) (*http.Response, error) {
+/*
+ * Execute executes the request
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdDeleteExecute(r ApiApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdDeleteRequest) (*_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodDelete
+		localVarHTTPMethod   = _nethttp.MethodDelete
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdDelete")
 	if err != nil {
-		return nil, &GenericOpenAPIError{error: err.Error()}
+		return nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/subscriptions/{subId}/reserved_resources/{reservedResourceId}"
-	localVarPath = strings.Replace(localVarPath, "{"+"subId"+"}", url.PathEscape(parameterToString(r.subId, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"reservedResourceId"+"}", url.PathEscape(parameterToString(r.reservedResourceId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"subId"+"}", _neturl.PathEscape(parameterToString(r.subId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"reservedResourceId"+"}", _neturl.PathEscape(parameterToString(r.reservedResourceId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -19204,7 +18974,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdReservedResources
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return nil, err
 	}
@@ -19214,15 +18984,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdReservedResources
 		return localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -19233,8 +19003,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdReservedResources
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -19244,8 +19013,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdReservedResources
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -19255,8 +19023,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdReservedResources
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -19266,8 +19033,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdReservedResources
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarHTTPResponse, newErr
 	}
@@ -19276,25 +19042,25 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdReservedResources
 }
 
 type ApiApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdGetRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	subId string
 	reservedResourceId string
 }
 
-func (r ApiApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdGetRequest) Execute() (*ReservedResource, *http.Response, error) {
+
+func (r ApiApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdGetRequest) Execute() (ReservedResource, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdGetExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdGet Get reserved resources by id
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param subId The id of subscription
- @param reservedResourceId The id of reserved resource
- @return ApiApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdGetRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdGet(ctx context.Context, subId string, reservedResourceId string) ApiApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdGetRequest {
+ * ApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdGet Get reserved resources by id
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param subId The id of subscription
+ * @param reservedResourceId The id of reserved resource
+ * @return ApiApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdGetRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdGet(ctx _context.Context, subId string, reservedResourceId string) ApiApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdGetRequest {
 	return ApiApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdGetRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -19303,28 +19069,32 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdReservedResources
 	}
 }
 
-// Execute executes the request
-//  @return ReservedResource
-func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdGetExecute(r ApiApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdGetRequest) (*ReservedResource, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return ReservedResource
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdGetExecute(r ApiApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdGetRequest) (ReservedResource, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *ReservedResource
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  ReservedResource
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdGet")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/subscriptions/{subId}/reserved_resources/{reservedResourceId}"
-	localVarPath = strings.Replace(localVarPath, "{"+"subId"+"}", url.PathEscape(parameterToString(r.subId, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"reservedResourceId"+"}", url.PathEscape(parameterToString(r.reservedResourceId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"subId"+"}", _neturl.PathEscape(parameterToString(r.subId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"reservedResourceId"+"}", _neturl.PathEscape(parameterToString(r.reservedResourceId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -19343,7 +19113,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdReservedResources
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -19353,15 +19123,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdReservedResources
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -19372,8 +19142,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdReservedResources
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -19383,8 +19152,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdReservedResources
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -19394,8 +19162,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdReservedResources
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -19405,15 +19172,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdReservedResources
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -19424,32 +19190,30 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdReservedResources
 }
 
 type ApiApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdPatchRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	subId string
 	reservedResourceId string
 	reservedResourcePatchRequest *ReservedResourcePatchRequest
 }
 
-// Updated reserved resource data
 func (r ApiApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdPatchRequest) ReservedResourcePatchRequest(reservedResourcePatchRequest ReservedResourcePatchRequest) ApiApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdPatchRequest {
 	r.reservedResourcePatchRequest = &reservedResourcePatchRequest
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdPatchRequest) Execute() (*ReservedResource, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdPatchRequest) Execute() (ReservedResource, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdPatchExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdPatch Update a reserved resource
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param subId The id of subscription
- @param reservedResourceId The id of reserved resource
- @return ApiApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdPatchRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdPatch(ctx context.Context, subId string, reservedResourceId string) ApiApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdPatchRequest {
+ * ApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdPatch Update a reserved resource
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param subId The id of subscription
+ * @param reservedResourceId The id of reserved resource
+ * @return ApiApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdPatchRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdPatch(ctx _context.Context, subId string, reservedResourceId string) ApiApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdPatchRequest {
 	return ApiApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdPatchRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -19458,28 +19222,32 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdReservedResources
 	}
 }
 
-// Execute executes the request
-//  @return ReservedResource
-func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdPatchExecute(r ApiApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdPatchRequest) (*ReservedResource, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return ReservedResource
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdPatchExecute(r ApiApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdPatchRequest) (ReservedResource, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPatch
+		localVarHTTPMethod   = _nethttp.MethodPatch
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *ReservedResource
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  ReservedResource
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdPatch")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/subscriptions/{subId}/reserved_resources/{reservedResourceId}"
-	localVarPath = strings.Replace(localVarPath, "{"+"subId"+"}", url.PathEscape(parameterToString(r.subId, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"reservedResourceId"+"}", url.PathEscape(parameterToString(r.reservedResourceId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"subId"+"}", _neturl.PathEscape(parameterToString(r.subId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"reservedResourceId"+"}", _neturl.PathEscape(parameterToString(r.reservedResourceId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.reservedResourcePatchRequest == nil {
 		return localVarReturnValue, nil, reportError("reservedResourcePatchRequest is required and must be specified")
 	}
@@ -19503,7 +19271,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdReservedResources
 	}
 	// body params
 	localVarPostBody = r.reservedResourcePatchRequest
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -19513,15 +19281,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdReservedResources
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -19532,8 +19300,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdReservedResources
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -19543,8 +19310,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdReservedResources
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -19554,8 +19320,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdReservedResources
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -19565,8 +19330,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdReservedResources
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -19576,15 +19340,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdReservedResources
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -19595,7 +19358,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdReservedResources
 }
 
 type ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsGetRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	subId string
 	page *int32
@@ -19605,48 +19368,38 @@ type ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsGetRequest struct {
 	fetchAccounts *bool
 }
 
-// Page number of record list when record list exceeds specified page size
 func (r ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsGetRequest) Page(page int32) ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsGetRequest {
 	r.page = &page
 	return r
 }
-
-// Maximum number of records to return
 func (r ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsGetRequest) Size(size int32) ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsGetRequest {
 	r.size = &size
 	return r
 }
-
-// Specifies the search criteria. The syntax of this parameter is similar to the syntax of the _where_ clause of an SQL statement, using the names of the json attributes / column names of the account. For example, in order to retrieve all the accounts with a username starting with `my`:  ```sql username like 'my%' ```  The search criteria can also be applied on related resource. For example, in order to retrieve all the subscriptions labeled by `foo=bar`,  ```sql labels.key = 'foo' and labels.value = 'bar' ```  If the parameter isn't provided, or if the value is empty, then all the accounts that the user has permission to see will be returned.
 func (r ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsGetRequest) Search(search string) ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsGetRequest {
 	r.search = &search
 	return r
 }
-
-// Specifies the order by criteria. The syntax of this parameter is similar to the syntax of the _order by_ clause of an SQL statement, but using the names of the json attributes / column of the account. For example, in order to retrieve all accounts ordered by username:  ```sql username asc ```  Or in order to retrieve all accounts ordered by username _and_ first name:  ```sql username asc, firstName asc ```  If the parameter isn't provided, or if the value is empty, then no explicit ordering will be applied.
 func (r ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsGetRequest) OrderBy(orderBy string) ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsGetRequest {
 	r.orderBy = &orderBy
 	return r
 }
-
-// If true, includes the account reference information in the output. Could slow request response time.
 func (r ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsGetRequest) FetchAccounts(fetchAccounts bool) ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsGetRequest {
 	r.fetchAccounts = &fetchAccounts
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsGetRequest) Execute() (*SubscriptionRoleBindingList, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsGetRequest) Execute() (SubscriptionRoleBindingList, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsGetExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsGet Get subscription role bindings
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param subId The id of subscription
- @return ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsGetRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsGet(ctx context.Context, subId string) ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsGetRequest {
+ * ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsGet Get subscription role bindings
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param subId The id of subscription
+ * @return ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsGetRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsGet(ctx _context.Context, subId string) ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsGetRequest {
 	return ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsGetRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -19654,27 +19407,31 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsGet(c
 	}
 }
 
-// Execute executes the request
-//  @return SubscriptionRoleBindingList
-func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsGetExecute(r ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsGetRequest) (*SubscriptionRoleBindingList, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return SubscriptionRoleBindingList
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsGetExecute(r ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsGetRequest) (SubscriptionRoleBindingList, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *SubscriptionRoleBindingList
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  SubscriptionRoleBindingList
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsGet")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/subscriptions/{subId}/role_bindings"
-	localVarPath = strings.Replace(localVarPath, "{"+"subId"+"}", url.PathEscape(parameterToString(r.subId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"subId"+"}", _neturl.PathEscape(parameterToString(r.subId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.page != nil {
 		localVarQueryParams.Add("page", parameterToString(*r.page, ""))
@@ -19708,7 +19465,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsGetEx
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -19718,15 +19475,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsGetEx
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -19737,8 +19494,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsGetEx
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -19748,8 +19504,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsGetEx
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -19759,15 +19514,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsGetEx
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -19778,25 +19532,25 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsGetEx
 }
 
 type ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdDeleteRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	id string
 	subId string
 }
 
-func (r ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdDeleteRequest) Execute() (*http.Response, error) {
+
+func (r ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdDeleteRequest) Execute() (*_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdDeleteExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdDelete Delete a subscription role binding
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The id of record
- @param subId The id of subscription
- @return ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdDeleteRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdDelete(ctx context.Context, id string, subId string) ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdDeleteRequest {
+ * ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdDelete Delete a subscription role binding
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The id of record
+ * @param subId The id of subscription
+ * @return ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdDeleteRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdDelete(ctx _context.Context, id string, subId string) ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdDeleteRequest {
 	return ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdDeleteRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -19805,26 +19559,30 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdDel
 	}
 }
 
-// Execute executes the request
-func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdDeleteExecute(r ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdDeleteRequest) (*http.Response, error) {
+/*
+ * Execute executes the request
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdDeleteExecute(r ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdDeleteRequest) (*_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodDelete
+		localVarHTTPMethod   = _nethttp.MethodDelete
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdDelete")
 	if err != nil {
-		return nil, &GenericOpenAPIError{error: err.Error()}
+		return nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/subscriptions/{subId}/role_bindings/{id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"subId"+"}", url.PathEscape(parameterToString(r.subId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"subId"+"}", _neturl.PathEscape(parameterToString(r.subId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -19843,7 +19601,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdDel
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return nil, err
 	}
@@ -19853,15 +19611,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdDel
 		return localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -19872,8 +19630,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdDel
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -19883,8 +19640,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdDel
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -19894,8 +19650,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdDel
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -19905,8 +19660,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdDel
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarHTTPResponse, newErr
 	}
@@ -19915,25 +19669,25 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdDel
 }
 
 type ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdGetRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	id string
 	subId string
 }
 
-func (r ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdGetRequest) Execute() (*SubscriptionRoleBinding, *http.Response, error) {
+
+func (r ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdGetRequest) Execute() (SubscriptionRoleBinding, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdGetExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdGet Get a Subscription Role Binding by id
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The id of record
- @param subId The id of subscription
- @return ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdGetRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdGet(ctx context.Context, id string, subId string) ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdGetRequest {
+ * ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdGet Get a Subscription Role Binding by id
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The id of record
+ * @param subId The id of subscription
+ * @return ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdGetRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdGet(ctx _context.Context, id string, subId string) ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdGetRequest {
 	return ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdGetRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -19942,28 +19696,32 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdGet
 	}
 }
 
-// Execute executes the request
-//  @return SubscriptionRoleBinding
-func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdGetExecute(r ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdGetRequest) (*SubscriptionRoleBinding, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return SubscriptionRoleBinding
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdGetExecute(r ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdGetRequest) (SubscriptionRoleBinding, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *SubscriptionRoleBinding
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  SubscriptionRoleBinding
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdGet")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/subscriptions/{subId}/role_bindings/{id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"subId"+"}", url.PathEscape(parameterToString(r.subId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"subId"+"}", _neturl.PathEscape(parameterToString(r.subId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -19982,7 +19740,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdGet
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -19992,15 +19750,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdGet
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -20011,8 +19769,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdGet
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -20022,8 +19779,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdGet
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -20033,8 +19789,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdGet
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -20044,15 +19799,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdGet
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -20063,30 +19817,28 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdGet
 }
 
 type ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsPostRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	subId string
 	subscriptionRoleBindingCreateRequest *SubscriptionRoleBindingCreateRequest
 }
 
-// Subscription role binding data
 func (r ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsPostRequest) SubscriptionRoleBindingCreateRequest(subscriptionRoleBindingCreateRequest SubscriptionRoleBindingCreateRequest) ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsPostRequest {
 	r.subscriptionRoleBindingCreateRequest = &subscriptionRoleBindingCreateRequest
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsPostRequest) Execute() (*SubscriptionRoleBinding, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsPostRequest) Execute() (SubscriptionRoleBinding, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsPostExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsPost Create a new subscription role binding
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param subId The id of subscription
- @return ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsPostRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsPost(ctx context.Context, subId string) ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsPostRequest {
+ * ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsPost Create a new subscription role binding
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param subId The id of subscription
+ * @return ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsPostRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsPost(ctx _context.Context, subId string) ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsPostRequest {
 	return ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsPostRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -20094,27 +19846,31 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsPost(
 	}
 }
 
-// Execute executes the request
-//  @return SubscriptionRoleBinding
-func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsPostExecute(r ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsPostRequest) (*SubscriptionRoleBinding, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return SubscriptionRoleBinding
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsPostExecute(r ApiApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsPostRequest) (SubscriptionRoleBinding, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *SubscriptionRoleBinding
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  SubscriptionRoleBinding
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsPost")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/subscriptions/{subId}/role_bindings"
-	localVarPath = strings.Replace(localVarPath, "{"+"subId"+"}", url.PathEscape(parameterToString(r.subId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"subId"+"}", _neturl.PathEscape(parameterToString(r.subId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.subscriptionRoleBindingCreateRequest == nil {
 		return localVarReturnValue, nil, reportError("subscriptionRoleBindingCreateRequest is required and must be specified")
 	}
@@ -20138,7 +19894,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsPostE
 	}
 	// body params
 	localVarPostBody = r.subscriptionRoleBindingCreateRequest
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -20148,15 +19904,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsPostE
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -20167,8 +19923,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsPostE
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -20178,8 +19933,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsPostE
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -20189,8 +19943,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsPostE
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 409 {
@@ -20200,8 +19953,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsPostE
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -20211,15 +19963,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsPostE
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -20230,23 +19981,23 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsPostE
 }
 
 type ApiApiAccountsMgmtV1SupportCasesCaseIdDeleteRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	caseId string
 }
 
-func (r ApiApiAccountsMgmtV1SupportCasesCaseIdDeleteRequest) Execute() (*http.Response, error) {
+
+func (r ApiApiAccountsMgmtV1SupportCasesCaseIdDeleteRequest) Execute() (*_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1SupportCasesCaseIdDeleteExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1SupportCasesCaseIdDelete Delete a support case
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param caseId The id of a support case
- @return ApiApiAccountsMgmtV1SupportCasesCaseIdDeleteRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1SupportCasesCaseIdDelete(ctx context.Context, caseId string) ApiApiAccountsMgmtV1SupportCasesCaseIdDeleteRequest {
+ * ApiAccountsMgmtV1SupportCasesCaseIdDelete Delete a support case
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param caseId The id of a support case
+ * @return ApiApiAccountsMgmtV1SupportCasesCaseIdDeleteRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SupportCasesCaseIdDelete(ctx _context.Context, caseId string) ApiApiAccountsMgmtV1SupportCasesCaseIdDeleteRequest {
 	return ApiApiAccountsMgmtV1SupportCasesCaseIdDeleteRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -20254,25 +20005,29 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SupportCasesCaseIdDelete(ctx contex
 	}
 }
 
-// Execute executes the request
-func (a *DefaultApiService) ApiAccountsMgmtV1SupportCasesCaseIdDeleteExecute(r ApiApiAccountsMgmtV1SupportCasesCaseIdDeleteRequest) (*http.Response, error) {
+/*
+ * Execute executes the request
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SupportCasesCaseIdDeleteExecute(r ApiApiAccountsMgmtV1SupportCasesCaseIdDeleteRequest) (*_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodDelete
+		localVarHTTPMethod   = _nethttp.MethodDelete
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1SupportCasesCaseIdDelete")
 	if err != nil {
-		return nil, &GenericOpenAPIError{error: err.Error()}
+		return nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/support_cases/{caseId}"
-	localVarPath = strings.Replace(localVarPath, "{"+"caseId"+"}", url.PathEscape(parameterToString(r.caseId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"caseId"+"}", _neturl.PathEscape(parameterToString(r.caseId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -20291,7 +20046,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SupportCasesCaseIdDeleteExecute(r A
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return nil, err
 	}
@@ -20301,15 +20056,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SupportCasesCaseIdDeleteExecute(r A
 		return localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -20320,8 +20075,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SupportCasesCaseIdDeleteExecute(r A
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -20331,8 +20085,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SupportCasesCaseIdDeleteExecute(r A
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -20342,8 +20095,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SupportCasesCaseIdDeleteExecute(r A
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 405 {
@@ -20353,8 +20105,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SupportCasesCaseIdDeleteExecute(r A
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -20364,8 +20115,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SupportCasesCaseIdDeleteExecute(r A
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarHTTPResponse, newErr
 	}
@@ -20374,54 +20124,56 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SupportCasesCaseIdDeleteExecute(r A
 }
 
 type ApiApiAccountsMgmtV1SupportCasesPostRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	supportCasesRequest *SupportCasesRequest
 }
 
-// The contents of the support case to be created
 func (r ApiApiAccountsMgmtV1SupportCasesPostRequest) SupportCasesRequest(supportCasesRequest SupportCasesRequest) ApiApiAccountsMgmtV1SupportCasesPostRequest {
 	r.supportCasesRequest = &supportCasesRequest
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1SupportCasesPostRequest) Execute() (*SupportCasesCreatedResponse, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1SupportCasesPostRequest) Execute() (SupportCasesCreatedResponse, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1SupportCasesPostExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1SupportCasesPost create a support case for the subscription
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiApiAccountsMgmtV1SupportCasesPostRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1SupportCasesPost(ctx context.Context) ApiApiAccountsMgmtV1SupportCasesPostRequest {
+ * ApiAccountsMgmtV1SupportCasesPost create a support case for the subscription
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiApiAccountsMgmtV1SupportCasesPostRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SupportCasesPost(ctx _context.Context) ApiApiAccountsMgmtV1SupportCasesPostRequest {
 	return ApiApiAccountsMgmtV1SupportCasesPostRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return SupportCasesCreatedResponse
-func (a *DefaultApiService) ApiAccountsMgmtV1SupportCasesPostExecute(r ApiApiAccountsMgmtV1SupportCasesPostRequest) (*SupportCasesCreatedResponse, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return SupportCasesCreatedResponse
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1SupportCasesPostExecute(r ApiApiAccountsMgmtV1SupportCasesPostRequest) (SupportCasesCreatedResponse, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *SupportCasesCreatedResponse
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  SupportCasesCreatedResponse
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1SupportCasesPost")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/support_cases"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.supportCasesRequest == nil {
 		return localVarReturnValue, nil, reportError("supportCasesRequest is required and must be specified")
 	}
@@ -20445,7 +20197,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SupportCasesPostExecute(r ApiApiAcc
 	}
 	// body params
 	localVarPostBody = r.supportCasesRequest
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -20455,15 +20207,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SupportCasesPostExecute(r ApiApiAcc
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -20474,8 +20226,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SupportCasesPostExecute(r ApiApiAcc
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -20485,8 +20236,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SupportCasesPostExecute(r ApiApiAcc
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -20496,8 +20246,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SupportCasesPostExecute(r ApiApiAcc
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -20507,15 +20256,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SupportCasesPostExecute(r ApiApiAcc
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -20526,54 +20274,56 @@ func (a *DefaultApiService) ApiAccountsMgmtV1SupportCasesPostExecute(r ApiApiAcc
 }
 
 type ApiApiAccountsMgmtV1TokenAuthorizationPostRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	tokenAuthorizationRequest *TokenAuthorizationRequest
 }
 
-// Token authorization data
 func (r ApiApiAccountsMgmtV1TokenAuthorizationPostRequest) TokenAuthorizationRequest(tokenAuthorizationRequest TokenAuthorizationRequest) ApiApiAccountsMgmtV1TokenAuthorizationPostRequest {
 	r.tokenAuthorizationRequest = &tokenAuthorizationRequest
 	return r
 }
 
-func (r ApiApiAccountsMgmtV1TokenAuthorizationPostRequest) Execute() (*TokenAuthorizationResponse, *http.Response, error) {
+func (r ApiApiAccountsMgmtV1TokenAuthorizationPostRequest) Execute() (TokenAuthorizationResponse, *_nethttp.Response, error) {
 	return r.ApiService.ApiAccountsMgmtV1TokenAuthorizationPostExecute(r)
 }
 
 /*
-ApiAccountsMgmtV1TokenAuthorizationPost Finds the account owner of the provided token
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiApiAccountsMgmtV1TokenAuthorizationPostRequest
-*/
-func (a *DefaultApiService) ApiAccountsMgmtV1TokenAuthorizationPost(ctx context.Context) ApiApiAccountsMgmtV1TokenAuthorizationPostRequest {
+ * ApiAccountsMgmtV1TokenAuthorizationPost Finds the account owner of the provided token
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiApiAccountsMgmtV1TokenAuthorizationPostRequest
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1TokenAuthorizationPost(ctx _context.Context) ApiApiAccountsMgmtV1TokenAuthorizationPostRequest {
 	return ApiApiAccountsMgmtV1TokenAuthorizationPostRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return TokenAuthorizationResponse
-func (a *DefaultApiService) ApiAccountsMgmtV1TokenAuthorizationPostExecute(r ApiApiAccountsMgmtV1TokenAuthorizationPostRequest) (*TokenAuthorizationResponse, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return TokenAuthorizationResponse
+ */
+func (a *DefaultApiService) ApiAccountsMgmtV1TokenAuthorizationPostExecute(r ApiApiAccountsMgmtV1TokenAuthorizationPostRequest) (TokenAuthorizationResponse, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *TokenAuthorizationResponse
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  TokenAuthorizationResponse
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAccountsMgmtV1TokenAuthorizationPost")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/accounts_mgmt/v1/token_authorization"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.tokenAuthorizationRequest == nil {
 		return localVarReturnValue, nil, reportError("tokenAuthorizationRequest is required and must be specified")
 	}
@@ -20597,7 +20347,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1TokenAuthorizationPostExecute(r Api
 	}
 	// body params
 	localVarPostBody = r.tokenAuthorizationRequest
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -20607,15 +20357,15 @@ func (a *DefaultApiService) ApiAccountsMgmtV1TokenAuthorizationPostExecute(r Api
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -20626,8 +20376,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1TokenAuthorizationPostExecute(r Api
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -20637,8 +20386,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1TokenAuthorizationPostExecute(r Api
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -20648,8 +20396,7 @@ func (a *DefaultApiService) ApiAccountsMgmtV1TokenAuthorizationPostExecute(r Api
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -20659,15 +20406,14 @@ func (a *DefaultApiService) ApiAccountsMgmtV1TokenAuthorizationPostExecute(r Api
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -20678,54 +20424,56 @@ func (a *DefaultApiService) ApiAccountsMgmtV1TokenAuthorizationPostExecute(r Api
 }
 
 type ApiApiAuthorizationsV1AccessReviewPostRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	accessReview *AccessReview
 }
 
-// Access review data
 func (r ApiApiAuthorizationsV1AccessReviewPostRequest) AccessReview(accessReview AccessReview) ApiApiAuthorizationsV1AccessReviewPostRequest {
 	r.accessReview = &accessReview
 	return r
 }
 
-func (r ApiApiAuthorizationsV1AccessReviewPostRequest) Execute() (*AccessReviewResponse, *http.Response, error) {
+func (r ApiApiAuthorizationsV1AccessReviewPostRequest) Execute() (AccessReviewResponse, *_nethttp.Response, error) {
 	return r.ApiService.ApiAuthorizationsV1AccessReviewPostExecute(r)
 }
 
 /*
-ApiAuthorizationsV1AccessReviewPost Review an account's access to perform an action on a particular resource or resource type
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiApiAuthorizationsV1AccessReviewPostRequest
-*/
-func (a *DefaultApiService) ApiAuthorizationsV1AccessReviewPost(ctx context.Context) ApiApiAuthorizationsV1AccessReviewPostRequest {
+ * ApiAuthorizationsV1AccessReviewPost Review an account's access to perform an action on a particular resource or resource type
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiApiAuthorizationsV1AccessReviewPostRequest
+ */
+func (a *DefaultApiService) ApiAuthorizationsV1AccessReviewPost(ctx _context.Context) ApiApiAuthorizationsV1AccessReviewPostRequest {
 	return ApiApiAuthorizationsV1AccessReviewPostRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return AccessReviewResponse
-func (a *DefaultApiService) ApiAuthorizationsV1AccessReviewPostExecute(r ApiApiAuthorizationsV1AccessReviewPostRequest) (*AccessReviewResponse, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return AccessReviewResponse
+ */
+func (a *DefaultApiService) ApiAuthorizationsV1AccessReviewPostExecute(r ApiApiAuthorizationsV1AccessReviewPostRequest) (AccessReviewResponse, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *AccessReviewResponse
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  AccessReviewResponse
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAuthorizationsV1AccessReviewPost")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/authorizations/v1/access_review"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.accessReview == nil {
 		return localVarReturnValue, nil, reportError("accessReview is required and must be specified")
 	}
@@ -20749,7 +20497,7 @@ func (a *DefaultApiService) ApiAuthorizationsV1AccessReviewPostExecute(r ApiApiA
 	}
 	// body params
 	localVarPostBody = r.accessReview
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -20759,15 +20507,15 @@ func (a *DefaultApiService) ApiAuthorizationsV1AccessReviewPostExecute(r ApiApiA
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -20778,8 +20526,7 @@ func (a *DefaultApiService) ApiAuthorizationsV1AccessReviewPostExecute(r ApiApiA
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -20789,8 +20536,7 @@ func (a *DefaultApiService) ApiAuthorizationsV1AccessReviewPostExecute(r ApiApiA
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -20800,8 +20546,7 @@ func (a *DefaultApiService) ApiAuthorizationsV1AccessReviewPostExecute(r ApiApiA
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 422 {
@@ -20811,8 +20556,7 @@ func (a *DefaultApiService) ApiAuthorizationsV1AccessReviewPostExecute(r ApiApiA
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -20822,15 +20566,14 @@ func (a *DefaultApiService) ApiAuthorizationsV1AccessReviewPostExecute(r ApiApiA
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -20841,54 +20584,56 @@ func (a *DefaultApiService) ApiAuthorizationsV1AccessReviewPostExecute(r ApiApiA
 }
 
 type ApiApiAuthorizationsV1CapabilityReviewPostRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	capabilityReviewRequest *CapabilityReviewRequest
 }
 
-// Capability review data
 func (r ApiApiAuthorizationsV1CapabilityReviewPostRequest) CapabilityReviewRequest(capabilityReviewRequest CapabilityReviewRequest) ApiApiAuthorizationsV1CapabilityReviewPostRequest {
 	r.capabilityReviewRequest = &capabilityReviewRequest
 	return r
 }
 
-func (r ApiApiAuthorizationsV1CapabilityReviewPostRequest) Execute() (*CapabilityReview, *http.Response, error) {
+func (r ApiApiAuthorizationsV1CapabilityReviewPostRequest) Execute() (CapabilityReview, *_nethttp.Response, error) {
 	return r.ApiService.ApiAuthorizationsV1CapabilityReviewPostExecute(r)
 }
 
 /*
-ApiAuthorizationsV1CapabilityReviewPost Review an account's capabilities
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiApiAuthorizationsV1CapabilityReviewPostRequest
-*/
-func (a *DefaultApiService) ApiAuthorizationsV1CapabilityReviewPost(ctx context.Context) ApiApiAuthorizationsV1CapabilityReviewPostRequest {
+ * ApiAuthorizationsV1CapabilityReviewPost Review an account's capabilities
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiApiAuthorizationsV1CapabilityReviewPostRequest
+ */
+func (a *DefaultApiService) ApiAuthorizationsV1CapabilityReviewPost(ctx _context.Context) ApiApiAuthorizationsV1CapabilityReviewPostRequest {
 	return ApiApiAuthorizationsV1CapabilityReviewPostRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return CapabilityReview
-func (a *DefaultApiService) ApiAuthorizationsV1CapabilityReviewPostExecute(r ApiApiAuthorizationsV1CapabilityReviewPostRequest) (*CapabilityReview, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return CapabilityReview
+ */
+func (a *DefaultApiService) ApiAuthorizationsV1CapabilityReviewPostExecute(r ApiApiAuthorizationsV1CapabilityReviewPostRequest) (CapabilityReview, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *CapabilityReview
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  CapabilityReview
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAuthorizationsV1CapabilityReviewPost")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/authorizations/v1/capability_review"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.capabilityReviewRequest == nil {
 		return localVarReturnValue, nil, reportError("capabilityReviewRequest is required and must be specified")
 	}
@@ -20912,7 +20657,7 @@ func (a *DefaultApiService) ApiAuthorizationsV1CapabilityReviewPostExecute(r Api
 	}
 	// body params
 	localVarPostBody = r.capabilityReviewRequest
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -20922,15 +20667,15 @@ func (a *DefaultApiService) ApiAuthorizationsV1CapabilityReviewPostExecute(r Api
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -20941,8 +20686,7 @@ func (a *DefaultApiService) ApiAuthorizationsV1CapabilityReviewPostExecute(r Api
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -20952,8 +20696,7 @@ func (a *DefaultApiService) ApiAuthorizationsV1CapabilityReviewPostExecute(r Api
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -20963,8 +20706,7 @@ func (a *DefaultApiService) ApiAuthorizationsV1CapabilityReviewPostExecute(r Api
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -20974,15 +20716,14 @@ func (a *DefaultApiService) ApiAuthorizationsV1CapabilityReviewPostExecute(r Api
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -20993,54 +20734,56 @@ func (a *DefaultApiService) ApiAuthorizationsV1CapabilityReviewPostExecute(r Api
 }
 
 type ApiApiAuthorizationsV1ExportControlReviewPostRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	exportControlReviewRequest *ExportControlReviewRequest
 }
 
-// Export control review data
 func (r ApiApiAuthorizationsV1ExportControlReviewPostRequest) ExportControlReviewRequest(exportControlReviewRequest ExportControlReviewRequest) ApiApiAuthorizationsV1ExportControlReviewPostRequest {
 	r.exportControlReviewRequest = &exportControlReviewRequest
 	return r
 }
 
-func (r ApiApiAuthorizationsV1ExportControlReviewPostRequest) Execute() (*ExportControlReview, *http.Response, error) {
+func (r ApiApiAuthorizationsV1ExportControlReviewPostRequest) Execute() (ExportControlReview, *_nethttp.Response, error) {
 	return r.ApiService.ApiAuthorizationsV1ExportControlReviewPostExecute(r)
 }
 
 /*
-ApiAuthorizationsV1ExportControlReviewPost Determine whether a user is restricted from downloading Red Hat software based on export control compliance. 
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiApiAuthorizationsV1ExportControlReviewPostRequest
-*/
-func (a *DefaultApiService) ApiAuthorizationsV1ExportControlReviewPost(ctx context.Context) ApiApiAuthorizationsV1ExportControlReviewPostRequest {
+ * ApiAuthorizationsV1ExportControlReviewPost Determine whether a user is restricted from downloading Red Hat software based on export control compliance. 
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiApiAuthorizationsV1ExportControlReviewPostRequest
+ */
+func (a *DefaultApiService) ApiAuthorizationsV1ExportControlReviewPost(ctx _context.Context) ApiApiAuthorizationsV1ExportControlReviewPostRequest {
 	return ApiApiAuthorizationsV1ExportControlReviewPostRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return ExportControlReview
-func (a *DefaultApiService) ApiAuthorizationsV1ExportControlReviewPostExecute(r ApiApiAuthorizationsV1ExportControlReviewPostRequest) (*ExportControlReview, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return ExportControlReview
+ */
+func (a *DefaultApiService) ApiAuthorizationsV1ExportControlReviewPostExecute(r ApiApiAuthorizationsV1ExportControlReviewPostRequest) (ExportControlReview, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *ExportControlReview
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  ExportControlReview
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAuthorizationsV1ExportControlReviewPost")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/authorizations/v1/export_control_review"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.exportControlReviewRequest == nil {
 		return localVarReturnValue, nil, reportError("exportControlReviewRequest is required and must be specified")
 	}
@@ -21064,7 +20807,7 @@ func (a *DefaultApiService) ApiAuthorizationsV1ExportControlReviewPostExecute(r
 	}
 	// body params
 	localVarPostBody = r.exportControlReviewRequest
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -21074,15 +20817,15 @@ func (a *DefaultApiService) ApiAuthorizationsV1ExportControlReviewPostExecute(r
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -21093,8 +20836,7 @@ func (a *DefaultApiService) ApiAuthorizationsV1ExportControlReviewPostExecute(r
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -21104,8 +20846,7 @@ func (a *DefaultApiService) ApiAuthorizationsV1ExportControlReviewPostExecute(r
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -21115,8 +20856,7 @@ func (a *DefaultApiService) ApiAuthorizationsV1ExportControlReviewPostExecute(r
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -21126,15 +20866,14 @@ func (a *DefaultApiService) ApiAuthorizationsV1ExportControlReviewPostExecute(r
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -21145,54 +20884,56 @@ func (a *DefaultApiService) ApiAuthorizationsV1ExportControlReviewPostExecute(r
 }
 
 type ApiApiAuthorizationsV1FeatureReviewPostRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	featureReview *FeatureReview
 }
 
-// Feature review data
 func (r ApiApiAuthorizationsV1FeatureReviewPostRequest) FeatureReview(featureReview FeatureReview) ApiApiAuthorizationsV1FeatureReviewPostRequest {
 	r.featureReview = &featureReview
 	return r
 }
 
-func (r ApiApiAuthorizationsV1FeatureReviewPostRequest) Execute() (*FeatureReviewResponse, *http.Response, error) {
+func (r ApiApiAuthorizationsV1FeatureReviewPostRequest) Execute() (FeatureReviewResponse, *_nethttp.Response, error) {
 	return r.ApiService.ApiAuthorizationsV1FeatureReviewPostExecute(r)
 }
 
 /*
-ApiAuthorizationsV1FeatureReviewPost Review feature to perform an action on it such as toggle a feature on/off
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiApiAuthorizationsV1FeatureReviewPostRequest
-*/
-func (a *DefaultApiService) ApiAuthorizationsV1FeatureReviewPost(ctx context.Context) ApiApiAuthorizationsV1FeatureReviewPostRequest {
+ * ApiAuthorizationsV1FeatureReviewPost Review feature to perform an action on it such as toggle a feature on/off
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiApiAuthorizationsV1FeatureReviewPostRequest
+ */
+func (a *DefaultApiService) ApiAuthorizationsV1FeatureReviewPost(ctx _context.Context) ApiApiAuthorizationsV1FeatureReviewPostRequest {
 	return ApiApiAuthorizationsV1FeatureReviewPostRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return FeatureReviewResponse
-func (a *DefaultApiService) ApiAuthorizationsV1FeatureReviewPostExecute(r ApiApiAuthorizationsV1FeatureReviewPostRequest) (*FeatureReviewResponse, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return FeatureReviewResponse
+ */
+func (a *DefaultApiService) ApiAuthorizationsV1FeatureReviewPostExecute(r ApiApiAuthorizationsV1FeatureReviewPostRequest) (FeatureReviewResponse, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *FeatureReviewResponse
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  FeatureReviewResponse
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAuthorizationsV1FeatureReviewPost")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/authorizations/v1/feature_review"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.featureReview == nil {
 		return localVarReturnValue, nil, reportError("featureReview is required and must be specified")
 	}
@@ -21216,7 +20957,7 @@ func (a *DefaultApiService) ApiAuthorizationsV1FeatureReviewPostExecute(r ApiApi
 	}
 	// body params
 	localVarPostBody = r.featureReview
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -21226,15 +20967,15 @@ func (a *DefaultApiService) ApiAuthorizationsV1FeatureReviewPostExecute(r ApiApi
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -21245,8 +20986,7 @@ func (a *DefaultApiService) ApiAuthorizationsV1FeatureReviewPostExecute(r ApiApi
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -21256,8 +20996,7 @@ func (a *DefaultApiService) ApiAuthorizationsV1FeatureReviewPostExecute(r ApiApi
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -21267,8 +21006,7 @@ func (a *DefaultApiService) ApiAuthorizationsV1FeatureReviewPostExecute(r ApiApi
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -21278,15 +21016,14 @@ func (a *DefaultApiService) ApiAuthorizationsV1FeatureReviewPostExecute(r ApiApi
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -21297,64 +21034,61 @@ func (a *DefaultApiService) ApiAuthorizationsV1FeatureReviewPostExecute(r ApiApi
 }
 
 type ApiApiAuthorizationsV1ResourceReviewPostRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	resourceReviewRequest *ResourceReviewRequest
 	reduceClusterList *bool
 }
 
-// Resource review data
 func (r ApiApiAuthorizationsV1ResourceReviewPostRequest) ResourceReviewRequest(resourceReviewRequest ResourceReviewRequest) ApiApiAuthorizationsV1ResourceReviewPostRequest {
 	r.resourceReviewRequest = &resourceReviewRequest
 	return r
 }
-
-// If true, When returning a list of cluster_ids/cluster_uuids/subscription_ids, if those are already included in one of the organizations provided in organization_ids, do not include it in the list.
 func (r ApiApiAuthorizationsV1ResourceReviewPostRequest) ReduceClusterList(reduceClusterList bool) ApiApiAuthorizationsV1ResourceReviewPostRequest {
 	r.reduceClusterList = &reduceClusterList
 	return r
 }
 
-func (r ApiApiAuthorizationsV1ResourceReviewPostRequest) Execute() (*ResourceReview, *http.Response, error) {
+func (r ApiApiAuthorizationsV1ResourceReviewPostRequest) Execute() (ResourceReview, *_nethttp.Response, error) {
 	return r.ApiService.ApiAuthorizationsV1ResourceReviewPostExecute(r)
 }
 
 /*
-ApiAuthorizationsV1ResourceReviewPost Obtain resource ids for resources an account may perform the specified action upon. Resource ids returned as [\"*\"] is shorthand for all ids.
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiApiAuthorizationsV1ResourceReviewPostRequest
-
-Deprecated
-*/
-func (a *DefaultApiService) ApiAuthorizationsV1ResourceReviewPost(ctx context.Context) ApiApiAuthorizationsV1ResourceReviewPostRequest {
+ * ApiAuthorizationsV1ResourceReviewPost Obtain resource ids for resources an account may perform the specified action upon. Resource ids returned as [\"*\"] is shorthand for all ids.
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiApiAuthorizationsV1ResourceReviewPostRequest
+ */
+func (a *DefaultApiService) ApiAuthorizationsV1ResourceReviewPost(ctx _context.Context) ApiApiAuthorizationsV1ResourceReviewPostRequest {
 	return ApiApiAuthorizationsV1ResourceReviewPostRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return ResourceReview
-// Deprecated
-func (a *DefaultApiService) ApiAuthorizationsV1ResourceReviewPostExecute(r ApiApiAuthorizationsV1ResourceReviewPostRequest) (*ResourceReview, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return ResourceReview
+ */
+func (a *DefaultApiService) ApiAuthorizationsV1ResourceReviewPostExecute(r ApiApiAuthorizationsV1ResourceReviewPostRequest) (ResourceReview, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *ResourceReview
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  ResourceReview
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAuthorizationsV1ResourceReviewPost")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/authorizations/v1/resource_review"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.resourceReviewRequest == nil {
 		return localVarReturnValue, nil, reportError("resourceReviewRequest is required and must be specified")
 	}
@@ -21381,7 +21115,7 @@ func (a *DefaultApiService) ApiAuthorizationsV1ResourceReviewPostExecute(r ApiAp
 	}
 	// body params
 	localVarPostBody = r.resourceReviewRequest
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -21391,15 +21125,15 @@ func (a *DefaultApiService) ApiAuthorizationsV1ResourceReviewPostExecute(r ApiAp
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -21410,8 +21144,7 @@ func (a *DefaultApiService) ApiAuthorizationsV1ResourceReviewPostExecute(r ApiAp
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -21421,8 +21154,7 @@ func (a *DefaultApiService) ApiAuthorizationsV1ResourceReviewPostExecute(r ApiAp
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -21432,8 +21164,7 @@ func (a *DefaultApiService) ApiAuthorizationsV1ResourceReviewPostExecute(r ApiAp
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 422 {
@@ -21443,8 +21174,7 @@ func (a *DefaultApiService) ApiAuthorizationsV1ResourceReviewPostExecute(r ApiAp
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -21454,15 +21184,14 @@ func (a *DefaultApiService) ApiAuthorizationsV1ResourceReviewPostExecute(r ApiAp
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -21473,54 +21202,56 @@ func (a *DefaultApiService) ApiAuthorizationsV1ResourceReviewPostExecute(r ApiAp
 }
 
 type ApiApiAuthorizationsV1SelfAccessReviewPostRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	selfAccessReview *SelfAccessReview
 }
 
-// Self access review data
 func (r ApiApiAuthorizationsV1SelfAccessReviewPostRequest) SelfAccessReview(selfAccessReview SelfAccessReview) ApiApiAuthorizationsV1SelfAccessReviewPostRequest {
 	r.selfAccessReview = &selfAccessReview
 	return r
 }
 
-func (r ApiApiAuthorizationsV1SelfAccessReviewPostRequest) Execute() (*AccessReviewResponse, *http.Response, error) {
+func (r ApiApiAuthorizationsV1SelfAccessReviewPostRequest) Execute() (AccessReviewResponse, *_nethttp.Response, error) {
 	return r.ApiService.ApiAuthorizationsV1SelfAccessReviewPostExecute(r)
 }
 
 /*
-ApiAuthorizationsV1SelfAccessReviewPost Review your ability to perform an action on a particular resource or resource type
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiApiAuthorizationsV1SelfAccessReviewPostRequest
-*/
-func (a *DefaultApiService) ApiAuthorizationsV1SelfAccessReviewPost(ctx context.Context) ApiApiAuthorizationsV1SelfAccessReviewPostRequest {
+ * ApiAuthorizationsV1SelfAccessReviewPost Review your ability to perform an action on a particular resource or resource type
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiApiAuthorizationsV1SelfAccessReviewPostRequest
+ */
+func (a *DefaultApiService) ApiAuthorizationsV1SelfAccessReviewPost(ctx _context.Context) ApiApiAuthorizationsV1SelfAccessReviewPostRequest {
 	return ApiApiAuthorizationsV1SelfAccessReviewPostRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return AccessReviewResponse
-func (a *DefaultApiService) ApiAuthorizationsV1SelfAccessReviewPostExecute(r ApiApiAuthorizationsV1SelfAccessReviewPostRequest) (*AccessReviewResponse, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return AccessReviewResponse
+ */
+func (a *DefaultApiService) ApiAuthorizationsV1SelfAccessReviewPostExecute(r ApiApiAuthorizationsV1SelfAccessReviewPostRequest) (AccessReviewResponse, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *AccessReviewResponse
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  AccessReviewResponse
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAuthorizationsV1SelfAccessReviewPost")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/authorizations/v1/self_access_review"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.selfAccessReview == nil {
 		return localVarReturnValue, nil, reportError("selfAccessReview is required and must be specified")
 	}
@@ -21544,7 +21275,7 @@ func (a *DefaultApiService) ApiAuthorizationsV1SelfAccessReviewPostExecute(r Api
 	}
 	// body params
 	localVarPostBody = r.selfAccessReview
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -21554,15 +21285,15 @@ func (a *DefaultApiService) ApiAuthorizationsV1SelfAccessReviewPostExecute(r Api
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -21573,8 +21304,7 @@ func (a *DefaultApiService) ApiAuthorizationsV1SelfAccessReviewPostExecute(r Api
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -21584,8 +21314,7 @@ func (a *DefaultApiService) ApiAuthorizationsV1SelfAccessReviewPostExecute(r Api
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -21595,8 +21324,7 @@ func (a *DefaultApiService) ApiAuthorizationsV1SelfAccessReviewPostExecute(r Api
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 422 {
@@ -21606,8 +21334,7 @@ func (a *DefaultApiService) ApiAuthorizationsV1SelfAccessReviewPostExecute(r Api
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -21617,15 +21344,14 @@ func (a *DefaultApiService) ApiAuthorizationsV1SelfAccessReviewPostExecute(r Api
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -21636,54 +21362,56 @@ func (a *DefaultApiService) ApiAuthorizationsV1SelfAccessReviewPostExecute(r Api
 }
 
 type ApiApiAuthorizationsV1SelfFeatureReviewPostRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	selfFeatureReview *SelfFeatureReview
 }
 
-// Self feature review data
 func (r ApiApiAuthorizationsV1SelfFeatureReviewPostRequest) SelfFeatureReview(selfFeatureReview SelfFeatureReview) ApiApiAuthorizationsV1SelfFeatureReviewPostRequest {
 	r.selfFeatureReview = &selfFeatureReview
 	return r
 }
 
-func (r ApiApiAuthorizationsV1SelfFeatureReviewPostRequest) Execute() (*FeatureReviewResponse, *http.Response, error) {
+func (r ApiApiAuthorizationsV1SelfFeatureReviewPostRequest) Execute() (FeatureReviewResponse, *_nethttp.Response, error) {
 	return r.ApiService.ApiAuthorizationsV1SelfFeatureReviewPostExecute(r)
 }
 
 /*
-ApiAuthorizationsV1SelfFeatureReviewPost Review your ability to toggle a feature
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiApiAuthorizationsV1SelfFeatureReviewPostRequest
-*/
-func (a *DefaultApiService) ApiAuthorizationsV1SelfFeatureReviewPost(ctx context.Context) ApiApiAuthorizationsV1SelfFeatureReviewPostRequest {
+ * ApiAuthorizationsV1SelfFeatureReviewPost Review your ability to toggle a feature
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiApiAuthorizationsV1SelfFeatureReviewPostRequest
+ */
+func (a *DefaultApiService) ApiAuthorizationsV1SelfFeatureReviewPost(ctx _context.Context) ApiApiAuthorizationsV1SelfFeatureReviewPostRequest {
 	return ApiApiAuthorizationsV1SelfFeatureReviewPostRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return FeatureReviewResponse
-func (a *DefaultApiService) ApiAuthorizationsV1SelfFeatureReviewPostExecute(r ApiApiAuthorizationsV1SelfFeatureReviewPostRequest) (*FeatureReviewResponse, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return FeatureReviewResponse
+ */
+func (a *DefaultApiService) ApiAuthorizationsV1SelfFeatureReviewPostExecute(r ApiApiAuthorizationsV1SelfFeatureReviewPostRequest) (FeatureReviewResponse, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *FeatureReviewResponse
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  FeatureReviewResponse
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAuthorizationsV1SelfFeatureReviewPost")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/authorizations/v1/self_feature_review"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.selfFeatureReview == nil {
 		return localVarReturnValue, nil, reportError("selfFeatureReview is required and must be specified")
 	}
@@ -21707,7 +21435,7 @@ func (a *DefaultApiService) ApiAuthorizationsV1SelfFeatureReviewPostExecute(r Ap
 	}
 	// body params
 	localVarPostBody = r.selfFeatureReview
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -21717,15 +21445,15 @@ func (a *DefaultApiService) ApiAuthorizationsV1SelfFeatureReviewPostExecute(r Ap
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -21736,8 +21464,7 @@ func (a *DefaultApiService) ApiAuthorizationsV1SelfFeatureReviewPostExecute(r Ap
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -21747,8 +21474,7 @@ func (a *DefaultApiService) ApiAuthorizationsV1SelfFeatureReviewPostExecute(r Ap
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -21758,8 +21484,7 @@ func (a *DefaultApiService) ApiAuthorizationsV1SelfFeatureReviewPostExecute(r Ap
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -21769,15 +21494,14 @@ func (a *DefaultApiService) ApiAuthorizationsV1SelfFeatureReviewPostExecute(r Ap
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -21788,61 +21512,61 @@ func (a *DefaultApiService) ApiAuthorizationsV1SelfFeatureReviewPostExecute(r Ap
 }
 
 type ApiApiAuthorizationsV1SelfResourceReviewPostRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	selfResourceReviewRequest *SelfResourceReviewRequest
 	reduceClusterList *bool
 }
 
-// Self resource review data
 func (r ApiApiAuthorizationsV1SelfResourceReviewPostRequest) SelfResourceReviewRequest(selfResourceReviewRequest SelfResourceReviewRequest) ApiApiAuthorizationsV1SelfResourceReviewPostRequest {
 	r.selfResourceReviewRequest = &selfResourceReviewRequest
 	return r
 }
-
-// If true, When returning a list of cluster_ids/cluster_uuids/subscription_ids, if those are already included in one of the organizations provided in organization_ids, do not include it in the list.
 func (r ApiApiAuthorizationsV1SelfResourceReviewPostRequest) ReduceClusterList(reduceClusterList bool) ApiApiAuthorizationsV1SelfResourceReviewPostRequest {
 	r.reduceClusterList = &reduceClusterList
 	return r
 }
 
-func (r ApiApiAuthorizationsV1SelfResourceReviewPostRequest) Execute() (*SelfResourceReview, *http.Response, error) {
+func (r ApiApiAuthorizationsV1SelfResourceReviewPostRequest) Execute() (SelfResourceReview, *_nethttp.Response, error) {
 	return r.ApiService.ApiAuthorizationsV1SelfResourceReviewPostExecute(r)
 }
 
 /*
-ApiAuthorizationsV1SelfResourceReviewPost Obtain resource ids for resources you may perform the specified action upon. Resource ids returned as [\"*\"] is shorthand for all ids.
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiApiAuthorizationsV1SelfResourceReviewPostRequest
-*/
-func (a *DefaultApiService) ApiAuthorizationsV1SelfResourceReviewPost(ctx context.Context) ApiApiAuthorizationsV1SelfResourceReviewPostRequest {
+ * ApiAuthorizationsV1SelfResourceReviewPost Obtain resource ids for resources you may perform the specified action upon. Resource ids returned as [\"*\"] is shorthand for all ids.
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiApiAuthorizationsV1SelfResourceReviewPostRequest
+ */
+func (a *DefaultApiService) ApiAuthorizationsV1SelfResourceReviewPost(ctx _context.Context) ApiApiAuthorizationsV1SelfResourceReviewPostRequest {
 	return ApiApiAuthorizationsV1SelfResourceReviewPostRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return SelfResourceReview
-func (a *DefaultApiService) ApiAuthorizationsV1SelfResourceReviewPostExecute(r ApiApiAuthorizationsV1SelfResourceReviewPostRequest) (*SelfResourceReview, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return SelfResourceReview
+ */
+func (a *DefaultApiService) ApiAuthorizationsV1SelfResourceReviewPostExecute(r ApiApiAuthorizationsV1SelfResourceReviewPostRequest) (SelfResourceReview, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *SelfResourceReview
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  SelfResourceReview
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAuthorizationsV1SelfResourceReviewPost")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/authorizations/v1/self_resource_review"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.selfResourceReviewRequest == nil {
 		return localVarReturnValue, nil, reportError("selfResourceReviewRequest is required and must be specified")
 	}
@@ -21869,7 +21593,7 @@ func (a *DefaultApiService) ApiAuthorizationsV1SelfResourceReviewPostExecute(r A
 	}
 	// body params
 	localVarPostBody = r.selfResourceReviewRequest
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -21879,15 +21603,15 @@ func (a *DefaultApiService) ApiAuthorizationsV1SelfResourceReviewPostExecute(r A
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -21898,8 +21622,7 @@ func (a *DefaultApiService) ApiAuthorizationsV1SelfResourceReviewPostExecute(r A
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -21909,8 +21632,7 @@ func (a *DefaultApiService) ApiAuthorizationsV1SelfResourceReviewPostExecute(r A
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -21920,8 +21642,7 @@ func (a *DefaultApiService) ApiAuthorizationsV1SelfResourceReviewPostExecute(r A
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 422 {
@@ -21931,8 +21652,7 @@ func (a *DefaultApiService) ApiAuthorizationsV1SelfResourceReviewPostExecute(r A
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -21942,15 +21662,14 @@ func (a *DefaultApiService) ApiAuthorizationsV1SelfResourceReviewPostExecute(r A
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -21961,54 +21680,56 @@ func (a *DefaultApiService) ApiAuthorizationsV1SelfResourceReviewPostExecute(r A
 }
 
 type ApiApiAuthorizationsV1TermsReviewPostRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	termsReview *TermsReview
 }
 
-// Data to check terms for
 func (r ApiApiAuthorizationsV1TermsReviewPostRequest) TermsReview(termsReview TermsReview) ApiApiAuthorizationsV1TermsReviewPostRequest {
 	r.termsReview = &termsReview
 	return r
 }
 
-func (r ApiApiAuthorizationsV1TermsReviewPostRequest) Execute() (*TermsReviewResponse, *http.Response, error) {
+func (r ApiApiAuthorizationsV1TermsReviewPostRequest) Execute() (TermsReviewResponse, *_nethttp.Response, error) {
 	return r.ApiService.ApiAuthorizationsV1TermsReviewPostExecute(r)
 }
 
 /*
-ApiAuthorizationsV1TermsReviewPost Review an account's status of Terms
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiApiAuthorizationsV1TermsReviewPostRequest
-*/
-func (a *DefaultApiService) ApiAuthorizationsV1TermsReviewPost(ctx context.Context) ApiApiAuthorizationsV1TermsReviewPostRequest {
+ * ApiAuthorizationsV1TermsReviewPost Review an account's status of Terms
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiApiAuthorizationsV1TermsReviewPostRequest
+ */
+func (a *DefaultApiService) ApiAuthorizationsV1TermsReviewPost(ctx _context.Context) ApiApiAuthorizationsV1TermsReviewPostRequest {
 	return ApiApiAuthorizationsV1TermsReviewPostRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return TermsReviewResponse
-func (a *DefaultApiService) ApiAuthorizationsV1TermsReviewPostExecute(r ApiApiAuthorizationsV1TermsReviewPostRequest) (*TermsReviewResponse, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return TermsReviewResponse
+ */
+func (a *DefaultApiService) ApiAuthorizationsV1TermsReviewPostExecute(r ApiApiAuthorizationsV1TermsReviewPostRequest) (TermsReviewResponse, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *TermsReviewResponse
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  TermsReviewResponse
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.ApiAuthorizationsV1TermsReviewPost")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/authorizations/v1/terms_review"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.termsReview == nil {
 		return localVarReturnValue, nil, reportError("termsReview is required and must be specified")
 	}
@@ -22032,7 +21753,7 @@ func (a *DefaultApiService) ApiAuthorizationsV1TermsReviewPostExecute(r ApiApiAu
 	}
 	// body params
 	localVarPostBody = r.termsReview
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -22042,15 +21763,15 @@ func (a *DefaultApiService) ApiAuthorizationsV1TermsReviewPostExecute(r ApiApiAu
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -22061,8 +21782,7 @@ func (a *DefaultApiService) ApiAuthorizationsV1TermsReviewPostExecute(r ApiApiAu
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -22072,8 +21792,7 @@ func (a *DefaultApiService) ApiAuthorizationsV1TermsReviewPostExecute(r ApiApiAu
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -22083,8 +21802,7 @@ func (a *DefaultApiService) ApiAuthorizationsV1TermsReviewPostExecute(r ApiApiAu
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 422 {
@@ -22094,8 +21812,7 @@ func (a *DefaultApiService) ApiAuthorizationsV1TermsReviewPostExecute(r ApiApiAu
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -22105,15 +21822,14 @@ func (a *DefaultApiService) ApiAuthorizationsV1TermsReviewPostExecute(r ApiApiAu
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/client.go b/app-services-sdk-go/accountmgmt/apiv1/client/client.go
index 9c2e81cf..1a91ce47 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/client.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/client.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -107,7 +107,7 @@ func selectHeaderAccept(accepts []string) string {
 // contains is a case insensitive match, finding needle in a haystack
 func contains(haystack []string, needle string) bool {
 	for _, a := range haystack {
-		if strings.EqualFold(a, needle) {
+		if strings.ToLower(a) == strings.ToLower(needle) {
 			return true
 		}
 	}
@@ -123,7 +123,7 @@ func typeCheckParameter(obj interface{}, expected string, name string) error {
 
 	// Check the type is as expected.
 	if reflect.TypeOf(obj).String() != expected {
-		return fmt.Errorf("expected %s to be of type %s but received %s", name, expected, reflect.TypeOf(obj).String())
+		return fmt.Errorf("Expected %s to be of type %s but received %s.", name, expected, reflect.TypeOf(obj).String())
 	}
 	return nil
 }
@@ -192,12 +192,6 @@ func (c *APIClient) GetConfig() *Configuration {
 	return c.cfg
 }
 
-type formFile struct {
-		fileBytes []byte
-		fileName string
-		formFileName string
-}
-
 // prepareRequest build the request
 func (c *APIClient) prepareRequest(
 	ctx context.Context,
@@ -206,7 +200,9 @@ func (c *APIClient) prepareRequest(
 	headerParams map[string]string,
 	queryParams url.Values,
 	formParams url.Values,
-	formFiles []formFile) (localVarRequest *http.Request, err error) {
+	formFileName string,
+	fileName string,
+	fileBytes []byte) (localVarRequest *http.Request, err error) {
 
 	var body *bytes.Buffer
 
@@ -225,7 +221,7 @@ func (c *APIClient) prepareRequest(
 	}
 
 	// add form parameters and file if available.
-	if strings.HasPrefix(headerParams["Content-Type"], "multipart/form-data") && len(formParams) > 0 || (len(formFiles) > 0) {
+	if strings.HasPrefix(headerParams["Content-Type"], "multipart/form-data") && len(formParams) > 0 || (len(fileBytes) > 0 && fileName != "") {
 		if body != nil {
 			return nil, errors.New("Cannot specify postBody and multipart form at the same time.")
 		}
@@ -244,17 +240,16 @@ func (c *APIClient) prepareRequest(
 				}
 			}
 		}
-		for _, formFile := range formFiles {
-			if len(formFile.fileBytes) > 0 && formFile.fileName != "" {
-				w.Boundary()
-				part, err := w.CreateFormFile(formFile.formFileName, filepath.Base(formFile.fileName))
-				if err != nil {
-						return nil, err
-				}
-				_, err = part.Write(formFile.fileBytes)
-				if err != nil {
-						return nil, err
-				}
+		if len(fileBytes) > 0 && fileName != "" {
+			w.Boundary()
+			//_, fileNm := filepath.Split(fileName)
+			part, err := w.CreateFormFile(formFileName, filepath.Base(fileName))
+			if err != nil {
+				return nil, err
+			}
+			_, err = part.Write(fileBytes)
+			if err != nil {
+				return nil, err
 			}
 		}
 
@@ -317,7 +312,7 @@ func (c *APIClient) prepareRequest(
 	if len(headerParams) > 0 {
 		headers := http.Header{}
 		for h, v := range headerParams {
-			headers[h] = []string{v}
+			headers.Set(h, v)
 		}
 		localVarRequest.Header = headers
 	}
@@ -374,9 +369,6 @@ func (c *APIClient) decode(v interface{}, b []byte, contentType string) (err err
 			return
 		}
 		_, err = (*f).Write(b)
-		if err != nil {
-			return
-		}
 		_, err = (*f).Seek(0, io.SeekStart)
 		return
 	}
@@ -405,14 +397,11 @@ func (c *APIClient) decode(v interface{}, b []byte, contentType string) (err err
 
 // Add a file to the multipart request
 func addFile(w *multipart.Writer, fieldName, path string) error {
-	file, err := os.Open(filepath.Clean(path))
-	if err != nil {
-		return err
-	}
-	err = file.Close()
+	file, err := os.Open(path)
 	if err != nil {
 		return err
 	}
+	defer file.Close()
 
 	part, err := w.CreateFormFile(fieldName, filepath.Base(path))
 	if err != nil {
@@ -428,13 +417,6 @@ func reportError(format string, a ...interface{}) error {
 	return fmt.Errorf(format, a...)
 }
 
-// A wrapper for strict JSON decoding
-func newStrictDecoder(data []byte) *json.Decoder {
-	dec := json.NewDecoder(bytes.NewBuffer(data))
-	dec.DisallowUnknownFields()
-	return dec
-}
-
 // Set request body from an interface{}
 func setBody(body interface{}, contentType string) (bodyBuf *bytes.Buffer, err error) {
 	if bodyBuf == nil {
@@ -462,7 +444,7 @@ func setBody(body interface{}, contentType string) (bodyBuf *bytes.Buffer, err e
 	}
 
 	if bodyBuf.Len() == 0 {
-		err = fmt.Errorf("invalid body type %s\n", contentType)
+		err = fmt.Errorf("Invalid body type %s\n", contentType)
 		return nil, err
 	}
 	return bodyBuf, nil
@@ -564,23 +546,3 @@ func (e GenericOpenAPIError) Body() []byte {
 func (e GenericOpenAPIError) Model() interface{} {
 	return e.model
 }
-
-// format error message using title and detail when model implements rfc7807
-func formatErrorMessage(status string, v interface{}) string {
-
-    str := ""
-    metaValue := reflect.ValueOf(v).Elem()
-
-    field := metaValue.FieldByName("Title")
-    if field != (reflect.Value{}) {
-        str = fmt.Sprintf("%s", field.Interface())
-    }
-
-    field = metaValue.FieldByName("Detail")
-    if field != (reflect.Value{}) {
-        str = fmt.Sprintf("%s (%s)", str, field.Interface())
-    }
-
-    // status title (detail)
-    return fmt.Sprintf("%s %s", status, str)
-}
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/configuration.go b/app-services-sdk-go/accountmgmt/apiv1/client/configuration.go
index 3d9491f2..dd039d4d 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/configuration.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/configuration.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -131,7 +131,7 @@ func (c *Configuration) AddDefaultHeader(key string, value string) {
 // URL formats template on a index using given variables
 func (sc ServerConfigurations) URL(index int, variables map[string]string) (string, error) {
 	if index < 0 || len(sc) <= index {
-		return "", fmt.Errorf("index %v out of range %v", index, len(sc)-1)
+		return "", fmt.Errorf("Index %v out of range %v", index, len(sc)-1)
 	}
 	server := sc[index]
 	url := server.URL
@@ -146,7 +146,7 @@ func (sc ServerConfigurations) URL(index int, variables map[string]string) (stri
 				}
 			}
 			if !found {
-				return "", fmt.Errorf("the variable %s in the server URL has invalid value %v. Must be %v", name, value, variable.EnumValues)
+				return "", fmt.Errorf("The variable %s in the server URL has invalid value %v. Must be %v", name, value, variable.EnumValues)
 			}
 			url = strings.Replace(url, "{"+name+"}", value, -1)
 		} else {
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/docs/AccessTokenCfg.md b/app-services-sdk-go/accountmgmt/apiv1/client/docs/AccessTokenCfg.md
index 9875046a..5a748c5e 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/docs/AccessTokenCfg.md
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/docs/AccessTokenCfg.md
@@ -4,13 +4,13 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Auths** | **map[string]interface{}** |  | 
+**Auths** | **map[string]map[string]interface{}** |  | 
 
 ## Methods
 
 ### NewAccessTokenCfg
 
-`func NewAccessTokenCfg(auths map[string]interface{}, ) *AccessTokenCfg`
+`func NewAccessTokenCfg(auths map[string]map[string]interface{}, ) *AccessTokenCfg`
 
 NewAccessTokenCfg instantiates a new AccessTokenCfg object
 This constructor will assign default values to properties that have it defined,
@@ -27,20 +27,20 @@ but it doesn't guarantee that properties required by API are set
 
 ### GetAuths
 
-`func (o *AccessTokenCfg) GetAuths() map[string]interface{}`
+`func (o *AccessTokenCfg) GetAuths() map[string]map[string]interface{}`
 
 GetAuths returns the Auths field if non-nil, zero value otherwise.
 
 ### GetAuthsOk
 
-`func (o *AccessTokenCfg) GetAuthsOk() (*map[string]interface{}, bool)`
+`func (o *AccessTokenCfg) GetAuthsOk() (*map[string]map[string]interface{}, bool)`
 
 GetAuthsOk returns a tuple with the Auths field if it's non-nil, zero value otherwise
 and a boolean to check if the value has been set.
 
 ### SetAuths
 
-`func (o *AccessTokenCfg) SetAuths(v map[string]interface{})`
+`func (o *AccessTokenCfg) SetAuths(v map[string]map[string]interface{})`
 
 SetAuths sets Auths field to given value.
 
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/docs/AppServicesApi.md b/app-services-sdk-go/accountmgmt/apiv1/client/docs/AppServicesApi.md
index 303edd37..7b222328 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/docs/AppServicesApi.md
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/docs/AppServicesApi.md
@@ -32,8 +32,8 @@ import (
 func main() {
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.AppServicesApi.ApiAccountsMgmtV1AccessTokenPost(context.Background()).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.AppServicesApi.ApiAccountsMgmtV1AccessTokenPost(context.Background()).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `AppServicesApi.ApiAccountsMgmtV1AccessTokenPost``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -92,8 +92,8 @@ func main() {
     fetchLabels := true // bool | If true, includes the labels on a subscription/organization/account in the output. Could slow request response time. (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.AppServicesApi.ApiAccountsMgmtV1CurrentAccountGet(context.Background()).FetchLabels(fetchLabels).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.AppServicesApi.ApiAccountsMgmtV1CurrentAccountGet(context.Background()).FetchLabels(fetchLabels).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `AppServicesApi.ApiAccountsMgmtV1CurrentAccountGet``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -160,8 +160,8 @@ func main() {
     fetchCloudAccounts := true // bool | If true, includes the marketplace cloud accounts in the output. Could slow request response time. (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.AppServicesApi.ApiAccountsMgmtV1OrganizationsOrgIdQuotaCostGet(context.Background(), orgId).Search(search).FetchRelatedResources(fetchRelatedResources).ForceRecalc(forceRecalc).FetchCloudAccounts(fetchCloudAccounts).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.AppServicesApi.ApiAccountsMgmtV1OrganizationsOrgIdQuotaCostGet(context.Background(), orgId).Search(search).FetchRelatedResources(fetchRelatedResources).ForceRecalc(forceRecalc).FetchCloudAccounts(fetchCloudAccounts).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `AppServicesApi.ApiAccountsMgmtV1OrganizationsOrgIdQuotaCostGet``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -232,8 +232,8 @@ func main() {
     selfTermsReview := *openapiclient.NewSelfTermsReview() // SelfTermsReview | Data to check self terms for
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.AppServicesApi.ApiAuthorizationsV1SelfTermsReviewPost(context.Background()).SelfTermsReview(selfTermsReview).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.AppServicesApi.ApiAuthorizationsV1SelfTermsReviewPost(context.Background()).SelfTermsReview(selfTermsReview).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `AppServicesApi.ApiAuthorizationsV1SelfTermsReviewPost``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/docs/DefaultApi.md b/app-services-sdk-go/accountmgmt/apiv1/client/docs/DefaultApi.md
index 1cb0386d..3ebac7ce 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/docs/DefaultApi.md
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/docs/DefaultApi.md
@@ -164,8 +164,8 @@ func main() {
     fetchCapabilities := true // bool | If true, includes the capabilities on a subscription in the output. Could slow request response time. (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1AccountsGet(context.Background()).Page(page).Size(size).Search(search).OrderBy(orderBy).Fields(fields).FetchLabels(fetchLabels).FetchCapabilities(fetchCapabilities).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1AccountsGet(context.Background()).Page(page).Size(size).Search(search).OrderBy(orderBy).Fields(fields).FetchLabels(fetchLabels).FetchCapabilities(fetchCapabilities).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1AccountsGet``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -237,8 +237,8 @@ func main() {
     fetchRhit := true // bool | If true, includes the RHIT account_id in the output. Could slow request response time. (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1AccountsIdGet(context.Background(), id).FetchLabels(fetchLabels).FetchCapabilities(fetchCapabilities).FetchRhit(fetchRhit).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1AccountsIdGet(context.Background(), id).FetchLabels(fetchLabels).FetchCapabilities(fetchCapabilities).FetchRhit(fetchRhit).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1AccountsIdGet``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -312,8 +312,8 @@ func main() {
     orderBy := "orderBy_example" // string | Specifies the order by criteria. The syntax of this parameter is similar to the syntax of the _order by_ clause of an SQL statement, but using the names of the json attributes / column of the account. For example, in order to retrieve all accounts ordered by username:  ```sql username asc ```  Or in order to retrieve all accounts ordered by username _and_ first name:  ```sql username asc, firstName asc ```  If the parameter isn't provided, or if the value is empty, then no explicit ordering will be applied. (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1AccountsIdLabelsGet(context.Background(), id).Page(page).Size(size).Search(search).OrderBy(orderBy).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1AccountsIdLabelsGet(context.Background(), id).Page(page).Size(size).Search(search).OrderBy(orderBy).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1AccountsIdLabelsGet``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -385,8 +385,8 @@ func main() {
     key := "key_example" // string | The key of the label
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1AccountsIdLabelsKeyDelete(context.Background(), id, key).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1AccountsIdLabelsKeyDelete(context.Background(), id, key).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1AccountsIdLabelsKeyDelete``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -454,8 +454,8 @@ func main() {
     key := "key_example" // string | The key of the label
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1AccountsIdLabelsKeyGet(context.Background(), id, key).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1AccountsIdLabelsKeyGet(context.Background(), id, key).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1AccountsIdLabelsKeyGet``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -526,8 +526,8 @@ func main() {
     label := *openapiclient.NewLabel(false, "Key_example", "Value_example") // Label | Label data
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1AccountsIdLabelsKeyPatch(context.Background(), id, key).Label(label).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1AccountsIdLabelsKeyPatch(context.Background(), id, key).Label(label).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1AccountsIdLabelsKeyPatch``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -598,8 +598,8 @@ func main() {
     label := *openapiclient.NewLabel(false, "Key_example", "Value_example") // Label | Label data
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1AccountsIdLabelsPost(context.Background(), id).Label(label).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1AccountsIdLabelsPost(context.Background(), id).Label(label).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1AccountsIdLabelsPost``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -668,8 +668,8 @@ func main() {
     accountPatchRequest := *openapiclient.NewAccountPatchRequest() // AccountPatchRequest | Updated account data
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1AccountsIdPatch(context.Background(), id).AccountPatchRequest(accountPatchRequest).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1AccountsIdPatch(context.Background(), id).AccountPatchRequest(accountPatchRequest).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1AccountsIdPatch``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -738,8 +738,8 @@ func main() {
     dryRun := true // bool | If true, instructs API to avoid making any changes, but rather run through validations only. (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1AccountsPost(context.Background()).Account(account).DryRun(dryRun).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1AccountsPost(context.Background()).Account(account).DryRun(dryRun).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1AccountsPost``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -803,8 +803,8 @@ func main() {
     certificatesRequest := *openapiclient.NewCertificatesRequest("Type_example") // CertificatesRequest | # The payload depends on the type of the requested certificate The examples for supported types: * {\"type\": \"sca\", \"arch\": \"x86_64\"} 
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1CertificatesPost(context.Background()).CertificatesRequest(certificatesRequest).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1CertificatesPost(context.Background()).CertificatesRequest(certificatesRequest).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1CertificatesPost``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -869,8 +869,8 @@ func main() {
     search := "search_example" // string | Specifies the search criteria. The syntax of this parameter is similar to the syntax of the _where_ clause of an SQL statement, using the names of the json attributes / column names of the account. For example, in order to retrieve all the accounts with a username starting with `my`:  ```sql username like 'my%' ```  The search criteria can also be applied on related resource. For example, in order to retrieve all the subscriptions labeled by `foo=bar`,  ```sql labels.key = 'foo' and labels.value = 'bar' ```  If the parameter isn't provided, or if the value is empty, then all the accounts that the user has permission to see will be returned. (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1CloudResourcesGet(context.Background()).Page(page).Size(size).Search(search).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1CloudResourcesGet(context.Background()).Page(page).Size(size).Search(search).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1CloudResourcesGet``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -935,8 +935,8 @@ func main() {
     id := "id_example" // string | The id of record
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1CloudResourcesIdDelete(context.Background(), id).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1CloudResourcesIdDelete(context.Background(), id).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1CloudResourcesIdDelete``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -1001,8 +1001,8 @@ func main() {
     id := "id_example" // string | The id of record
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1CloudResourcesIdGet(context.Background(), id).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1CloudResourcesIdGet(context.Background(), id).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1CloudResourcesIdGet``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -1070,8 +1070,8 @@ func main() {
     cloudResource := *openapiclient.NewCloudResource() // CloudResource | Updated cloud resource data
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1CloudResourcesIdPatch(context.Background(), id).CloudResource(cloudResource).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1CloudResourcesIdPatch(context.Background(), id).CloudResource(cloudResource).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1CloudResourcesIdPatch``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -1139,8 +1139,8 @@ func main() {
     cloudResource := *openapiclient.NewCloudResource() // CloudResource | Cloud resource data
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1CloudResourcesPost(context.Background()).CloudResource(cloudResource).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1CloudResourcesPost(context.Background()).CloudResource(cloudResource).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1CloudResourcesPost``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -1203,8 +1203,8 @@ func main() {
     clusterAuthorizationRequest := *openapiclient.NewClusterAuthorizationRequest("AccountUsername_example", "ClusterId_example") // ClusterAuthorizationRequest | Cluster and authorization data
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1ClusterAuthorizationsPost(context.Background()).ClusterAuthorizationRequest(clusterAuthorizationRequest).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1ClusterAuthorizationsPost(context.Background()).ClusterAuthorizationRequest(clusterAuthorizationRequest).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1ClusterAuthorizationsPost``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -1267,8 +1267,8 @@ func main() {
     clusterRegistrationRequest := *openapiclient.NewClusterRegistrationRequest() // ClusterRegistrationRequest | Cluster and authorization data
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1ClusterRegistrationsPost(context.Background()).ClusterRegistrationRequest(clusterRegistrationRequest).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1ClusterRegistrationsPost(context.Background()).ClusterRegistrationRequest(clusterRegistrationRequest).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1ClusterRegistrationsPost``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -1334,8 +1334,8 @@ func main() {
     orderBy := "orderBy_example" // string | Specifies the order by criteria. The syntax of this parameter is similar to the syntax of the _order by_ clause of an SQL statement, but using the names of the json attributes / column of the account. For example, in order to retrieve all accounts ordered by username:  ```sql username asc ```  Or in order to retrieve all accounts ordered by username _and_ first name:  ```sql username asc, firstName asc ```  If the parameter isn't provided, or if the value is empty, then no explicit ordering will be applied. (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1ClusterTransfersGet(context.Background()).Page(page).Size(size).Search(search).OrderBy(orderBy).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1ClusterTransfersGet(context.Background()).Page(page).Size(size).Search(search).OrderBy(orderBy).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1ClusterTransfersGet``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -1402,8 +1402,8 @@ func main() {
     clusterTransferPatchRequest := *openapiclient.NewClusterTransferPatchRequest() // ClusterTransferPatchRequest | Updated cluster transfer
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1ClusterTransfersIdPatch(context.Background(), id).ClusterTransferPatchRequest(clusterTransferPatchRequest).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1ClusterTransfersIdPatch(context.Background(), id).ClusterTransferPatchRequest(clusterTransferPatchRequest).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1ClusterTransfersIdPatch``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -1471,8 +1471,8 @@ func main() {
     clusterTransferRequest := *openapiclient.NewClusterTransferRequest() // ClusterTransferRequest | The contents of the cluster transfer creation request
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1ClusterTransfersPost(context.Background()).ClusterTransferRequest(clusterTransferRequest).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1ClusterTransfersPost(context.Background()).ClusterTransferRequest(clusterTransferRequest).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1ClusterTransfersPost``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -1537,8 +1537,8 @@ func main() {
     search := "search_example" // string | Specifies the search criteria. The syntax of this parameter is similar to the syntax of the _where_ clause of an SQL statement, using the names of the json attributes / column names of the account. For example, in order to retrieve all the accounts with a username starting with `my`:  ```sql username like 'my%' ```  The search criteria can also be applied on related resource. For example, in order to retrieve all the subscriptions labeled by `foo=bar`,  ```sql labels.key = 'foo' and labels.value = 'bar' ```  If the parameter isn't provided, or if the value is empty, then all the accounts that the user has permission to see will be returned. (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1ConfigSkusGet(context.Background()).Page(page).Size(size).Search(search).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1ConfigSkusGet(context.Background()).Page(page).Size(size).Search(search).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1ConfigSkusGet``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -1603,8 +1603,8 @@ func main() {
     id := "id_example" // string | The id of record
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1ConfigSkusIdDelete(context.Background(), id).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1ConfigSkusIdDelete(context.Background(), id).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1ConfigSkusIdDelete``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -1669,8 +1669,8 @@ func main() {
     id := "id_example" // string | The id of record
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1ConfigSkusIdGet(context.Background(), id).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1ConfigSkusIdGet(context.Background(), id).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1ConfigSkusIdGet``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -1738,8 +1738,8 @@ func main() {
     sKU := *openapiclient.NewSKU() // SKU | Updated sku data
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1ConfigSkusIdPatch(context.Background(), id).SKU(sKU).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1ConfigSkusIdPatch(context.Background(), id).SKU(sKU).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1ConfigSkusIdPatch``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -1807,8 +1807,8 @@ func main() {
     sKU := *openapiclient.NewSKU() // SKU | Sku data
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1ConfigSkusPost(context.Background()).SKU(sKU).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1ConfigSkusPost(context.Background()).SKU(sKU).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1ConfigSkusPost``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -1874,8 +1874,8 @@ func main() {
     orderBy := "orderBy_example" // string | Specifies the order by criteria. The syntax of this parameter is similar to the syntax of the _order by_ clause of an SQL statement, but using the names of the json attributes / column of the account. For example, in order to retrieve all accounts ordered by username:  ```sql username asc ```  Or in order to retrieve all accounts ordered by username _and_ first name:  ```sql username asc, firstName asc ```  If the parameter isn't provided, or if the value is empty, then no explicit ordering will be applied. (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1DeletedSubscriptionsGet(context.Background()).Page(page).Size(size).Search(search).OrderBy(orderBy).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1DeletedSubscriptionsGet(context.Background()).Page(page).Size(size).Search(search).OrderBy(orderBy).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1DeletedSubscriptionsGet``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -1943,8 +1943,8 @@ func main() {
     search := "search_example" // string | Specifies the search criteria. The syntax of this parameter is similar to the syntax of the _where_ clause of an SQL statement, using the names of the json attributes / column names of the account. For example, in order to retrieve all the accounts with a username starting with `my`:  ```sql username like 'my%' ```  The search criteria can also be applied on related resource. For example, in order to retrieve all the subscriptions labeled by `foo=bar`,  ```sql labels.key = 'foo' and labels.value = 'bar' ```  If the parameter isn't provided, or if the value is empty, then all the accounts that the user has permission to see will be returned. (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1ErrorsGet(context.Background()).Page(page).Size(size).Search(search).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1ErrorsGet(context.Background()).Page(page).Size(size).Search(search).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1ErrorsGet``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -2009,8 +2009,8 @@ func main() {
     id := "id_example" // string | The id of record
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1ErrorsIdGet(context.Background(), id).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1ErrorsIdGet(context.Background(), id).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1ErrorsIdGet``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -2078,8 +2078,8 @@ func main() {
     featureToggleQueryRequest := *openapiclient.NewFeatureToggleQueryRequest("OrganizationId_example") // FeatureToggleQueryRequest | The context of the query
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1FeatureTogglesIdQueryPost(context.Background(), id).FeatureToggleQueryRequest(featureToggleQueryRequest).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1FeatureTogglesIdQueryPost(context.Background(), id).FeatureToggleQueryRequest(featureToggleQueryRequest).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1FeatureTogglesIdQueryPost``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -2150,8 +2150,8 @@ func main() {
     orderBy := "orderBy_example" // string | Specifies the order by criteria. The syntax of this parameter is similar to the syntax of the _order by_ clause of an SQL statement, but using the names of the json attributes / column of the account. For example, in order to retrieve all accounts ordered by username:  ```sql username asc ```  Or in order to retrieve all accounts ordered by username _and_ first name:  ```sql username asc, firstName asc ```  If the parameter isn't provided, or if the value is empty, then no explicit ordering will be applied. (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1LabelsGet(context.Background()).Page(page).Size(size).Search(search).OrderBy(orderBy).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1LabelsGet(context.Background()).Page(page).Size(size).Search(search).OrderBy(orderBy).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1LabelsGet``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -2216,8 +2216,8 @@ import (
 func main() {
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1LandingPageSelfServiceGet(context.Background()).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1LandingPageSelfServiceGet(context.Background()).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1LandingPageSelfServiceGet``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -2276,8 +2276,8 @@ func main() {
     search := "search_example" // string | Specifies the search criteria. The syntax of this parameter is similar to the syntax of the _where_ clause of an SQL statement, using the names of the json attributes / column names of the account. For example, in order to retrieve all the accounts with a username starting with `my`:  ```sql username like 'my%' ```  The search criteria can also be applied on related resource. For example, in order to retrieve all the subscriptions labeled by `foo=bar`,  ```sql labels.key = 'foo' and labels.value = 'bar' ```  If the parameter isn't provided, or if the value is empty, then all the accounts that the user has permission to see will be returned. (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1MetricsGet(context.Background()).Search(search).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1MetricsGet(context.Background()).Search(search).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1MetricsGet``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -2340,8 +2340,8 @@ func main() {
     notificationRequest := *openapiclient.NewNotificationRequest("TemplateName_example") // NotificationRequest | The contents of the notification to send to the owner of a cluster/subscription in addition to the set of template parameters which are sent automatically ACCOUNT_USERNAME, FIRST_NAME, LAST_NAME, ORGANIZATION_NAME, ORGANIZATION_EXTERNAL_ID
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1NotifyPost(context.Background()).NotificationRequest(notificationRequest).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1NotifyPost(context.Background()).NotificationRequest(notificationRequest).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1NotifyPost``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -2408,8 +2408,8 @@ func main() {
     fields := "fields_example" // string | Supplies a comma-separated list of fields to be returned. Fields of sub-structures and of arrays use <structure>.<field> notation. <stucture>.* means all field of a structure Example: For each Subscription to get id, href, plan(id and kind) and labels (all fields)  ``` ocm get subscriptions --parameter fields=id,href,plan.id,plan.kind,labels.* --parameter fetchLabels=true ``` (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1OrganizationsGet(context.Background()).Page(page).Size(size).Search(search).OrderBy(orderBy).FetchLabels(fetchLabels).FetchCapabilities(fetchCapabilities).Fields(fields).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1OrganizationsGet(context.Background()).Page(page).Size(size).Search(search).OrderBy(orderBy).FetchLabels(fetchLabels).FetchCapabilities(fetchCapabilities).Fields(fields).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1OrganizationsGet``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -2480,8 +2480,8 @@ func main() {
     fetchCapabilities := true // bool | If true, includes the capabilities on a subscription in the output. Could slow request response time. (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1OrganizationsIdGet(context.Background(), id).FetchLabels(fetchLabels).FetchCapabilities(fetchCapabilities).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1OrganizationsIdGet(context.Background(), id).FetchLabels(fetchLabels).FetchCapabilities(fetchCapabilities).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1OrganizationsIdGet``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -2554,8 +2554,8 @@ func main() {
     orderBy := "orderBy_example" // string | Specifies the order by criteria. The syntax of this parameter is similar to the syntax of the _order by_ clause of an SQL statement, but using the names of the json attributes / column of the account. For example, in order to retrieve all accounts ordered by username:  ```sql username asc ```  Or in order to retrieve all accounts ordered by username _and_ first name:  ```sql username asc, firstName asc ```  If the parameter isn't provided, or if the value is empty, then no explicit ordering will be applied. (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1OrganizationsIdLabelsGet(context.Background(), id).Page(page).Size(size).Search(search).OrderBy(orderBy).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1OrganizationsIdLabelsGet(context.Background(), id).Page(page).Size(size).Search(search).OrderBy(orderBy).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1OrganizationsIdLabelsGet``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -2627,8 +2627,8 @@ func main() {
     key := "key_example" // string | The key of the label
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1OrganizationsIdLabelsKeyDelete(context.Background(), id, key).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1OrganizationsIdLabelsKeyDelete(context.Background(), id, key).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1OrganizationsIdLabelsKeyDelete``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -2696,8 +2696,8 @@ func main() {
     key := "key_example" // string | The key of the label
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1OrganizationsIdLabelsKeyGet(context.Background(), id, key).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1OrganizationsIdLabelsKeyGet(context.Background(), id, key).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1OrganizationsIdLabelsKeyGet``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -2768,8 +2768,8 @@ func main() {
     label := *openapiclient.NewLabel(false, "Key_example", "Value_example") // Label | Label data
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1OrganizationsIdLabelsKeyPatch(context.Background(), id, key).Label(label).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1OrganizationsIdLabelsKeyPatch(context.Background(), id, key).Label(label).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1OrganizationsIdLabelsKeyPatch``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -2840,8 +2840,8 @@ func main() {
     label := *openapiclient.NewLabel(false, "Key_example", "Value_example") // Label | Label data
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1OrganizationsIdLabelsPost(context.Background(), id).Label(label).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1OrganizationsIdLabelsPost(context.Background(), id).Label(label).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1OrganizationsIdLabelsPost``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -2910,8 +2910,8 @@ func main() {
     organizationPatchRequest := *openapiclient.NewOrganizationPatchRequest() // OrganizationPatchRequest | Updated organization data
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1OrganizationsIdPatch(context.Background(), id).OrganizationPatchRequest(organizationPatchRequest).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1OrganizationsIdPatch(context.Background(), id).OrganizationPatchRequest(organizationPatchRequest).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1OrganizationsIdPatch``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -2979,8 +2979,8 @@ func main() {
     id := "id_example" // string | The id of record
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1OrganizationsIdSummaryDashboardGet(context.Background(), id).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1OrganizationsIdSummaryDashboardGet(context.Background(), id).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1OrganizationsIdSummaryDashboardGet``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -3048,8 +3048,8 @@ func main() {
     acctGrpAsgnId := "acctGrpAsgnId_example" // string | The id of account group assignment
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdDelete(context.Background(), orgId, acctGrpAsgnId).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdDelete(context.Background(), orgId, acctGrpAsgnId).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdDelete``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -3117,8 +3117,8 @@ func main() {
     acctGrpAsgnId := "acctGrpAsgnId_example" // string | The id of account group assignment
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdGet(context.Background(), orgId, acctGrpAsgnId).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdGet(context.Background(), orgId, acctGrpAsgnId).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdGet``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -3191,8 +3191,8 @@ func main() {
     orderBy := "orderBy_example" // string | Specifies the order by criteria. The syntax of this parameter is similar to the syntax of the _order by_ clause of an SQL statement, but using the names of the json attributes / column of the account. For example, in order to retrieve all accounts ordered by username:  ```sql username asc ```  Or in order to retrieve all accounts ordered by username _and_ first name:  ```sql username asc, firstName asc ```  If the parameter isn't provided, or if the value is empty, then no explicit ordering will be applied. (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsGet(context.Background(), orgId).Page(page).Size(size).Search(search).OrderBy(orderBy).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsGet(context.Background(), orgId).Page(page).Size(size).Search(search).OrderBy(orderBy).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsGet``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -3264,8 +3264,8 @@ func main() {
     accountGroupAssignment := *openapiclient.NewAccountGroupAssignment("AccountGroupId_example", "AccountId_example") // AccountGroupAssignment | New AccountGroup data
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsPost(context.Background(), orgId).AccountGroupAssignment(accountGroupAssignment).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsPost(context.Background(), orgId).AccountGroupAssignment(accountGroupAssignment).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsPost``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -3334,8 +3334,8 @@ func main() {
     acctGrpId := "acctGrpId_example" // string | The id of account group
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdDelete(context.Background(), orgId, acctGrpId).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdDelete(context.Background(), orgId, acctGrpId).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdDelete``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -3403,8 +3403,8 @@ func main() {
     acctGrpId := "acctGrpId_example" // string | The id of account group
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdGet(context.Background(), orgId, acctGrpId).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdGet(context.Background(), orgId, acctGrpId).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdGet``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -3475,8 +3475,8 @@ func main() {
     accountGroupRequest := *openapiclient.NewAccountGroupRequest("Description_example", "Name_example") // AccountGroupRequest | Updated account group data
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdPatch(context.Background(), orgId, acctGrpId).AccountGroupRequest(accountGroupRequest).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdPatch(context.Background(), orgId, acctGrpId).AccountGroupRequest(accountGroupRequest).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdPatch``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -3550,8 +3550,8 @@ func main() {
     orderBy := "orderBy_example" // string | Specifies the order by criteria. The syntax of this parameter is similar to the syntax of the _order by_ clause of an SQL statement, but using the names of the json attributes / column of the account. For example, in order to retrieve all accounts ordered by username:  ```sql username asc ```  Or in order to retrieve all accounts ordered by username _and_ first name:  ```sql username asc, firstName asc ```  If the parameter isn't provided, or if the value is empty, then no explicit ordering will be applied. (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsGet(context.Background(), orgId).Page(page).Size(size).Search(search).OrderBy(orderBy).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsGet(context.Background(), orgId).Page(page).Size(size).Search(search).OrderBy(orderBy).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsGet``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -3623,8 +3623,8 @@ func main() {
     accountGroupRequest := *openapiclient.NewAccountGroupRequest("Description_example", "Name_example") // AccountGroupRequest | New AccountGroup data
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsPost(context.Background(), orgId).AccountGroupRequest(accountGroupRequest).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsPost(context.Background(), orgId).AccountGroupRequest(accountGroupRequest).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsPost``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -3693,8 +3693,8 @@ func main() {
     forceRecalc := true // bool | If true, includes that ConsumedQuota should be recalculated. (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1OrganizationsOrgIdConsumedQuotaGet(context.Background(), orgId).ForceRecalc(forceRecalc).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1OrganizationsOrgIdConsumedQuotaGet(context.Background(), orgId).ForceRecalc(forceRecalc).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1OrganizationsOrgIdConsumedQuotaGet``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -3766,8 +3766,8 @@ func main() {
     orderBy := "orderBy_example" // string | Specifies the order by criteria. The syntax of this parameter is similar to the syntax of the _order by_ clause of an SQL statement, but using the names of the json attributes / column of the account. For example, in order to retrieve all accounts ordered by username:  ```sql username asc ```  Or in order to retrieve all accounts ordered by username _and_ first name:  ```sql username asc, firstName asc ```  If the parameter isn't provided, or if the value is empty, then no explicit ordering will be applied. (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaGet(context.Background(), orgId).Page(page).Size(size).Search(search).OrderBy(orderBy).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaGet(context.Background(), orgId).Page(page).Size(size).Search(search).OrderBy(orderBy).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaGet``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -3839,8 +3839,8 @@ func main() {
     resourceQuotaRequest := *openapiclient.NewResourceQuotaRequest("Sku_example", int32(123)) // ResourceQuotaRequest | Resource quota data
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaPost(context.Background(), orgId).ResourceQuotaRequest(resourceQuotaRequest).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaPost(context.Background(), orgId).ResourceQuotaRequest(resourceQuotaRequest).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaPost``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -3909,8 +3909,8 @@ func main() {
     quotaId := "quotaId_example" // string | The id of quota
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdDelete(context.Background(), orgId, quotaId).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdDelete(context.Background(), orgId, quotaId).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdDelete``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -3978,8 +3978,8 @@ func main() {
     quotaId := "quotaId_example" // string | The id of quota
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdGet(context.Background(), orgId, quotaId).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdGet(context.Background(), orgId, quotaId).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdGet``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -4050,8 +4050,8 @@ func main() {
     resourceQuotaRequest := *openapiclient.NewResourceQuotaRequest("Sku_example", int32(123)) // ResourceQuotaRequest | Updated resource quota data
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdPatch(context.Background(), orgId, quotaId).ResourceQuotaRequest(resourceQuotaRequest).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdPatch(context.Background(), orgId, quotaId).ResourceQuotaRequest(resourceQuotaRequest).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdPatch``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -4121,8 +4121,8 @@ func main() {
     organization := *openapiclient.NewOrganization() // Organization | Organization data
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1OrganizationsPost(context.Background()).Organization(organization).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1OrganizationsPost(context.Background()).Organization(organization).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1OrganizationsPost``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -4187,8 +4187,8 @@ func main() {
     search := "search_example" // string | Specifies the search criteria. The syntax of this parameter is similar to the syntax of the _where_ clause of an SQL statement, using the names of the json attributes / column names of the account. For example, in order to retrieve all the accounts with a username starting with `my`:  ```sql username like 'my%' ```  The search criteria can also be applied on related resource. For example, in order to retrieve all the subscriptions labeled by `foo=bar`,  ```sql labels.key = 'foo' and labels.value = 'bar' ```  If the parameter isn't provided, or if the value is empty, then all the accounts that the user has permission to see will be returned. (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1PlansGet(context.Background()).Page(page).Size(size).Search(search).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1PlansGet(context.Background()).Page(page).Size(size).Search(search).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1PlansGet``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -4253,8 +4253,8 @@ func main() {
     id := "id_example" // string | The id of record
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1PlansIdGet(context.Background(), id).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1PlansIdGet(context.Background(), id).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1PlansIdGet``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -4321,8 +4321,8 @@ func main() {
     externalResourceId := "externalResourceId_example" // string | The external resource id of record
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1PullSecretsExternalResourceIdDelete(context.Background(), externalResourceId).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1PullSecretsExternalResourceIdDelete(context.Background(), externalResourceId).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1PullSecretsExternalResourceIdDelete``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -4387,8 +4387,8 @@ func main() {
     pullSecretRequest := *openapiclient.NewPullSecretRequest("ExternalResourceId_example") // PullSecretRequest | Identifier of the resource in the external service that this pull secret relates to
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1PullSecretsPost(context.Background()).PullSecretRequest(pullSecretRequest).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1PullSecretsPost(context.Background()).PullSecretRequest(pullSecretRequest).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1PullSecretsPost``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -4453,8 +4453,8 @@ func main() {
     fetchCloudAccounts := true // bool | If true, includes the marketplace cloud accounts in the output. Could slow request response time. (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1QuotaCostGet(context.Background()).Search(search).FetchRelatedResources(fetchRelatedResources).FetchCloudAccounts(fetchCloudAccounts).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1QuotaCostGet(context.Background()).Search(search).FetchRelatedResources(fetchRelatedResources).FetchCloudAccounts(fetchCloudAccounts).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1QuotaCostGet``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -4521,8 +4521,8 @@ func main() {
     search := "search_example" // string | Specifies the search criteria. The syntax of this parameter is similar to the syntax of the _where_ clause of an SQL statement, using the names of the json attributes / column names of the account. For example, in order to retrieve all the accounts with a username starting with `my`:  ```sql username like 'my%' ```  The search criteria can also be applied on related resource. For example, in order to retrieve all the subscriptions labeled by `foo=bar`,  ```sql labels.key = 'foo' and labels.value = 'bar' ```  If the parameter isn't provided, or if the value is empty, then all the accounts that the user has permission to see will be returned. (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1QuotaRulesGet(context.Background()).Page(page).Size(size).Search(search).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1QuotaRulesGet(context.Background()).Page(page).Size(size).Search(search).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1QuotaRulesGet``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -4589,8 +4589,8 @@ func main() {
     search := "search_example" // string | Specifies the search criteria. The syntax of this parameter is similar to the syntax of the _where_ clause of an SQL statement, using the names of the json attributes / column names of the account. For example, in order to retrieve all the accounts with a username starting with `my`:  ```sql username like 'my%' ```  The search criteria can also be applied on related resource. For example, in order to retrieve all the subscriptions labeled by `foo=bar`,  ```sql labels.key = 'foo' and labels.value = 'bar' ```  If the parameter isn't provided, or if the value is empty, then all the accounts that the user has permission to see will be returned. (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1QuotasGet(context.Background()).Page(page).Size(size).Search(search).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1QuotasGet(context.Background()).Page(page).Size(size).Search(search).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1QuotasGet``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -4655,8 +4655,8 @@ func main() {
     id := "id_example" // string | The id of record
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1QuotasIdDelete(context.Background(), id).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1QuotasIdDelete(context.Background(), id).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1QuotasIdDelete``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -4721,8 +4721,8 @@ func main() {
     id := "id_example" // string | The id of record
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1QuotasIdGet(context.Background(), id).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1QuotasIdGet(context.Background(), id).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1QuotasIdGet``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -4790,8 +4790,8 @@ func main() {
     quota := *openapiclient.NewQuota() // Quota | Updated quota data
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1QuotasIdPatch(context.Background(), id).Quota(quota).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1QuotasIdPatch(context.Background(), id).Quota(quota).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1QuotasIdPatch``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -4859,8 +4859,8 @@ func main() {
     quota := *openapiclient.NewQuota() // Quota | Quota data
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1QuotasPost(context.Background()).Quota(quota).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1QuotasPost(context.Background()).Quota(quota).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1QuotasPost``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -4926,8 +4926,8 @@ func main() {
     orderBy := "orderBy_example" // string | Specifies the order by criteria. The syntax of this parameter is similar to the syntax of the _order by_ clause of an SQL statement, but using the names of the json attributes / column of the account. For example, in order to retrieve all accounts ordered by username:  ```sql username asc ```  Or in order to retrieve all accounts ordered by username _and_ first name:  ```sql username asc, firstName asc ```  If the parameter isn't provided, or if the value is empty, then no explicit ordering will be applied. (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1RegistriesGet(context.Background()).Page(page).Size(size).Search(search).OrderBy(orderBy).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1RegistriesGet(context.Background()).Page(page).Size(size).Search(search).OrderBy(orderBy).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1RegistriesGet``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -4993,8 +4993,8 @@ func main() {
     id := "id_example" // string | The id of record
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1RegistriesIdGet(context.Background(), id).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1RegistriesIdGet(context.Background(), id).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1RegistriesIdGet``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -5066,8 +5066,8 @@ func main() {
     orderBy := "orderBy_example" // string | Specifies the order by criteria. The syntax of this parameter is similar to the syntax of the _order by_ clause of an SQL statement, but using the names of the json attributes / column of the account. For example, in order to retrieve all accounts ordered by username:  ```sql username asc ```  Or in order to retrieve all accounts ordered by username _and_ first name:  ```sql username asc, firstName asc ```  If the parameter isn't provided, or if the value is empty, then no explicit ordering will be applied. (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1RegistryCredentialsGet(context.Background()).Page(page).Size(size).Search(search).OrderBy(orderBy).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1RegistryCredentialsGet(context.Background()).Page(page).Size(size).Search(search).OrderBy(orderBy).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1RegistryCredentialsGet``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -5133,8 +5133,8 @@ func main() {
     id := "id_example" // string | The id of record
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1RegistryCredentialsIdDelete(context.Background(), id).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1RegistryCredentialsIdDelete(context.Background(), id).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1RegistryCredentialsIdDelete``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -5199,8 +5199,8 @@ func main() {
     id := "id_example" // string | The id of record
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1RegistryCredentialsIdGet(context.Background(), id).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1RegistryCredentialsIdGet(context.Background(), id).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1RegistryCredentialsIdGet``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -5268,8 +5268,8 @@ func main() {
     registryCredentialPatchRequest := *openapiclient.NewRegistryCredentialPatchRequest() // RegistryCredentialPatchRequest | Updated registry credential data
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1RegistryCredentialsIdPatch(context.Background(), id).RegistryCredentialPatchRequest(registryCredentialPatchRequest).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1RegistryCredentialsIdPatch(context.Background(), id).RegistryCredentialPatchRequest(registryCredentialPatchRequest).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1RegistryCredentialsIdPatch``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -5337,8 +5337,8 @@ func main() {
     registryCredential := *openapiclient.NewRegistryCredential() // RegistryCredential | Registry credential data
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1RegistryCredentialsPost(context.Background()).RegistryCredential(registryCredential).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1RegistryCredentialsPost(context.Background()).RegistryCredential(registryCredential).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1RegistryCredentialsPost``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -5404,8 +5404,8 @@ func main() {
     orderBy := "orderBy_example" // string | Specifies the order by criteria. The syntax of this parameter is similar to the syntax of the _order by_ clause of an SQL statement, but using the names of the json attributes / column of the account. For example, in order to retrieve all accounts ordered by username:  ```sql username asc ```  Or in order to retrieve all accounts ordered by username _and_ first name:  ```sql username asc, firstName asc ```  If the parameter isn't provided, or if the value is empty, then no explicit ordering will be applied. (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1ReservedResourcesGet(context.Background()).Page(page).Size(size).Search(search).OrderBy(orderBy).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1ReservedResourcesGet(context.Background()).Page(page).Size(size).Search(search).OrderBy(orderBy).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1ReservedResourcesGet``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -5474,8 +5474,8 @@ func main() {
     orderBy := "orderBy_example" // string | Specifies the order by criteria. The syntax of this parameter is similar to the syntax of the _order by_ clause of an SQL statement, but using the names of the json attributes / column of the account. For example, in order to retrieve all accounts ordered by username:  ```sql username asc ```  Or in order to retrieve all accounts ordered by username _and_ first name:  ```sql username asc, firstName asc ```  If the parameter isn't provided, or if the value is empty, then no explicit ordering will be applied. (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1ResourceQuotaGet(context.Background()).Page(page).Size(size).Search(search).OrderBy(orderBy).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1ResourceQuotaGet(context.Background()).Page(page).Size(size).Search(search).OrderBy(orderBy).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1ResourceQuotaGet``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -5544,8 +5544,8 @@ func main() {
     orderBy := "orderBy_example" // string | Specifies the order by criteria. The syntax of this parameter is similar to the syntax of the _order by_ clause of an SQL statement, but using the names of the json attributes / column of the account. For example, in order to retrieve all accounts ordered by username:  ```sql username asc ```  Or in order to retrieve all accounts ordered by username _and_ first name:  ```sql username asc, firstName asc ```  If the parameter isn't provided, or if the value is empty, then no explicit ordering will be applied. (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1RoleBindingsGet(context.Background()).Page(page).Size(size).Search(search).OrderBy(orderBy).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1RoleBindingsGet(context.Background()).Page(page).Size(size).Search(search).OrderBy(orderBy).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1RoleBindingsGet``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -5611,8 +5611,8 @@ func main() {
     id := "id_example" // string | The id of record
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1RoleBindingsIdDelete(context.Background(), id).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1RoleBindingsIdDelete(context.Background(), id).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1RoleBindingsIdDelete``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -5677,8 +5677,8 @@ func main() {
     id := "id_example" // string | The id of record
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1RoleBindingsIdGet(context.Background(), id).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1RoleBindingsIdGet(context.Background(), id).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1RoleBindingsIdGet``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -5746,8 +5746,8 @@ func main() {
     roleBindingRequest := *openapiclient.NewRoleBindingRequest() // RoleBindingRequest | Updated role binding data
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1RoleBindingsIdPatch(context.Background(), id).RoleBindingRequest(roleBindingRequest).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1RoleBindingsIdPatch(context.Background(), id).RoleBindingRequest(roleBindingRequest).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1RoleBindingsIdPatch``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -5815,8 +5815,8 @@ func main() {
     roleBindingCreateRequest := *openapiclient.NewRoleBindingCreateRequest("RoleId_example", "Type_example") // RoleBindingCreateRequest | Role binding data
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1RoleBindingsPost(context.Background()).RoleBindingCreateRequest(roleBindingCreateRequest).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1RoleBindingsPost(context.Background()).RoleBindingCreateRequest(roleBindingCreateRequest).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1RoleBindingsPost``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -5881,8 +5881,8 @@ func main() {
     search := "search_example" // string | Specifies the search criteria. The syntax of this parameter is similar to the syntax of the _where_ clause of an SQL statement, using the names of the json attributes / column names of the account. For example, in order to retrieve all the accounts with a username starting with `my`:  ```sql username like 'my%' ```  The search criteria can also be applied on related resource. For example, in order to retrieve all the subscriptions labeled by `foo=bar`,  ```sql labels.key = 'foo' and labels.value = 'bar' ```  If the parameter isn't provided, or if the value is empty, then all the accounts that the user has permission to see will be returned. (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1RolesGet(context.Background()).Page(page).Size(size).Search(search).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1RolesGet(context.Background()).Page(page).Size(size).Search(search).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1RolesGet``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -5947,8 +5947,8 @@ func main() {
     id := "id_example" // string | The id of record
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1RolesIdGet(context.Background(), id).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1RolesIdGet(context.Background(), id).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1RolesIdGet``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -6015,8 +6015,8 @@ func main() {
     product := "product_example" // string | The product for self_entitlement. The supported products are [rosa].
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1SelfEntitlementProductPost(context.Background(), product).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1SelfEntitlementProductPost(context.Background(), product).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1SelfEntitlementProductPost``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -6083,8 +6083,8 @@ func main() {
     search := "search_example" // string | Specifies the search criteria. The syntax of this parameter is similar to the syntax of the _where_ clause of an SQL statement, using the names of the json attributes / column names of the account. For example, in order to retrieve all the accounts with a username starting with `my`:  ```sql username like 'my%' ```  The search criteria can also be applied on related resource. For example, in order to retrieve all the subscriptions labeled by `foo=bar`,  ```sql labels.key = 'foo' and labels.value = 'bar' ```  If the parameter isn't provided, or if the value is empty, then all the accounts that the user has permission to see will be returned. (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1SkuRulesGet(context.Background()).Search(search).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1SkuRulesGet(context.Background()).Search(search).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1SkuRulesGet``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -6147,8 +6147,8 @@ func main() {
     id := "id_example" // string | The id of record
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1SkuRulesIdDelete(context.Background(), id).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1SkuRulesIdDelete(context.Background(), id).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1SkuRulesIdDelete``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -6213,8 +6213,8 @@ func main() {
     id := "id_example" // string | The id of record
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1SkuRulesIdGet(context.Background(), id).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1SkuRulesIdGet(context.Background(), id).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1SkuRulesIdGet``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -6282,8 +6282,8 @@ func main() {
     skuRules := *openapiclient.NewSkuRules() // SkuRules | Updated sku rule data
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1SkuRulesIdPatch(context.Background(), id).SkuRules(skuRules).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1SkuRulesIdPatch(context.Background(), id).SkuRules(skuRules).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1SkuRulesIdPatch``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -6351,8 +6351,8 @@ func main() {
     skuRules := *openapiclient.NewSkuRules() // SkuRules | Sku rule data
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1SkuRulesPost(context.Background()).SkuRules(skuRules).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1SkuRulesPost(context.Background()).SkuRules(skuRules).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1SkuRulesPost``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -6415,8 +6415,8 @@ func main() {
     search := "search_example" // string | Specifies the search criteria. The syntax of this parameter is similar to the syntax of the _where_ clause of an SQL statement, using the names of the json attributes / column names of the account. For example, in order to retrieve all the accounts with a username starting with `my`:  ```sql username like 'my%' ```  The search criteria can also be applied on related resource. For example, in order to retrieve all the subscriptions labeled by `foo=bar`,  ```sql labels.key = 'foo' and labels.value = 'bar' ```  If the parameter isn't provided, or if the value is empty, then all the accounts that the user has permission to see will be returned. (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1SkusGet(context.Background()).Search(search).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1SkusGet(context.Background()).Search(search).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1SkusGet``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -6479,8 +6479,8 @@ func main() {
     id := "id_example" // string | The id of record
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1SkusIdGet(context.Background(), id).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1SkusIdGet(context.Background(), id).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1SkusIdGet``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -6555,8 +6555,8 @@ func main() {
     labels := "labels_example" // string | Specifies the criteria to filter the subscription resource based on their labels. A label is represented as a `key=value` pair,  ``` labels = \"foo=bar\" ```  and multiple labels are separated by comma,  ``` labels = \"foo=bar,fooz=barz\" ``` (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1SubscriptionsGet(context.Background()).Page(page).Size(size).Search(search).FetchAccounts(fetchAccounts).FetchLabels(fetchLabels).FetchCapabilities(fetchCapabilities).Fields(fields).OrderBy(orderBy).Labels(labels).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1SubscriptionsGet(context.Background()).Page(page).Size(size).Search(search).FetchAccounts(fetchAccounts).FetchLabels(fetchLabels).FetchCapabilities(fetchCapabilities).Fields(fields).OrderBy(orderBy).Labels(labels).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1SubscriptionsGet``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -6627,8 +6627,8 @@ func main() {
     id := "id_example" // string | The id of record
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1SubscriptionsIdDelete(context.Background(), id).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1SubscriptionsIdDelete(context.Background(), id).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1SubscriptionsIdDelete``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -6697,8 +6697,8 @@ func main() {
     fetchCpuAndSocket := true // bool | If true, fetches, from the clusters service, the total numbers of CPU's and sockets under an obligation, and includes in the output. Could slow request response time. (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1SubscriptionsIdGet(context.Background(), id).FetchAccounts(fetchAccounts).FetchLabels(fetchLabels).FetchCapabilities(fetchCapabilities).FetchCpuAndSocket(fetchCpuAndSocket).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1SubscriptionsIdGet(context.Background(), id).FetchAccounts(fetchAccounts).FetchLabels(fetchLabels).FetchCapabilities(fetchCapabilities).FetchCpuAndSocket(fetchCpuAndSocket).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1SubscriptionsIdGet``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -6773,8 +6773,8 @@ func main() {
     orderBy := "orderBy_example" // string | Specifies the order by criteria. The syntax of this parameter is similar to the syntax of the _order by_ clause of an SQL statement, but using the names of the json attributes / column of the account. For example, in order to retrieve all accounts ordered by username:  ```sql username asc ```  Or in order to retrieve all accounts ordered by username _and_ first name:  ```sql username asc, firstName asc ```  If the parameter isn't provided, or if the value is empty, then no explicit ordering will be applied. (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1SubscriptionsIdLabelsGet(context.Background(), id).Page(page).Size(size).Search(search).OrderBy(orderBy).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1SubscriptionsIdLabelsGet(context.Background(), id).Page(page).Size(size).Search(search).OrderBy(orderBy).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1SubscriptionsIdLabelsGet``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -6846,8 +6846,8 @@ func main() {
     key := "key_example" // string | The key of the label
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1SubscriptionsIdLabelsKeyDelete(context.Background(), id, key).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1SubscriptionsIdLabelsKeyDelete(context.Background(), id, key).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1SubscriptionsIdLabelsKeyDelete``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -6915,8 +6915,8 @@ func main() {
     key := "key_example" // string | The key of the label
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1SubscriptionsIdLabelsKeyGet(context.Background(), id, key).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1SubscriptionsIdLabelsKeyGet(context.Background(), id, key).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1SubscriptionsIdLabelsKeyGet``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -6987,8 +6987,8 @@ func main() {
     label := *openapiclient.NewLabel(false, "Key_example", "Value_example") // Label | Label data
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1SubscriptionsIdLabelsKeyPatch(context.Background(), id, key).Label(label).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1SubscriptionsIdLabelsKeyPatch(context.Background(), id, key).Label(label).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1SubscriptionsIdLabelsKeyPatch``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -7059,8 +7059,8 @@ func main() {
     label := *openapiclient.NewLabel(false, "Key_example", "Value_example") // Label | Label data
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1SubscriptionsIdLabelsPost(context.Background(), id).Label(label).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1SubscriptionsIdLabelsPost(context.Background(), id).Label(label).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1SubscriptionsIdLabelsPost``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -7131,8 +7131,8 @@ func main() {
     fields := "fields_example" // string | Supplies a comma-separated list of fields to be returned. Fields of sub-structures and of arrays use <structure>.<field> notation. <stucture>.* means all field of a structure Example: For each Subscription to get id, href, plan(id and kind) and labels (all fields)  ``` ocm get subscriptions --parameter fields=id,href,plan.id,plan.kind,labels.* --parameter fetchLabels=true ``` (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1SubscriptionsIdMetricsMetricNameGet(context.Background(), id, metricName).Search(search).Fields(fields).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1SubscriptionsIdMetricsMetricNameGet(context.Background(), id, metricName).Search(search).Fields(fields).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1SubscriptionsIdMetricsMetricNameGet``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -7204,8 +7204,8 @@ func main() {
     notificationRequest := *openapiclient.NewNotificationRequest("TemplateName_example") // NotificationRequest | The contents of the notification to send to the owner of a subscription in addition to the set of template parameters which are sent automatically ACCOUNT_USERNAME, FIRST_NAME, LAST_NAME, ORGANIZATION_NAME, ORGANIZATION_EXTERNAL_ID
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1SubscriptionsIdNotifyPost(context.Background(), id).NotificationRequest(notificationRequest).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1SubscriptionsIdNotifyPost(context.Background(), id).NotificationRequest(notificationRequest).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1SubscriptionsIdNotifyPost``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -7272,8 +7272,8 @@ func main() {
     subscriptionPatchRequest := *openapiclient.NewSubscriptionPatchRequest() // SubscriptionPatchRequest | Updated subscription data
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1SubscriptionsIdPatch(context.Background(), id).SubscriptionPatchRequest(subscriptionPatchRequest).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1SubscriptionsIdPatch(context.Background(), id).SubscriptionPatchRequest(subscriptionPatchRequest).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1SubscriptionsIdPatch``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -7345,8 +7345,8 @@ func main() {
     orderBy := "orderBy_example" // string | Specifies the order by criteria. The syntax of this parameter is similar to the syntax of the _order by_ clause of an SQL statement, but using the names of the json attributes / column of the account. For example, in order to retrieve all accounts ordered by username:  ```sql username asc ```  Or in order to retrieve all accounts ordered by username _and_ first name:  ```sql username asc, firstName asc ```  If the parameter isn't provided, or if the value is empty, then no explicit ordering will be applied. (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1SubscriptionsIdReservedResourcesGet(context.Background(), id).Page(page).Size(size).Search(search).OrderBy(orderBy).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1SubscriptionsIdReservedResourcesGet(context.Background(), id).Page(page).Size(size).Search(search).OrderBy(orderBy).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1SubscriptionsIdReservedResourcesGet``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -7419,8 +7419,8 @@ func main() {
     size := int32(56) // int32 | Maximum number of records to return (optional) (default to 100)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1SubscriptionsIdSupportCasesGet(context.Background(), id).Page(page).Size(size).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1SubscriptionsIdSupportCasesGet(context.Background(), id).Page(page).Size(size).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1SubscriptionsIdSupportCasesGet``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -7487,8 +7487,8 @@ func main() {
     subscriptionCreateRequest := *openapiclient.NewSubscriptionCreateRequest("ClusterUuid_example", "PlanId_example", "Status_example") // SubscriptionCreateRequest | Subscription Creation data
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1SubscriptionsPost(context.Background()).SubscriptionCreateRequest(subscriptionCreateRequest).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1SubscriptionsPost(context.Background()).SubscriptionCreateRequest(subscriptionCreateRequest).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1SubscriptionsPost``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -7552,8 +7552,8 @@ func main() {
     accountId := "accountId_example" // string | The id of account
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsAccountIdDelete(context.Background(), subId, accountId).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsAccountIdDelete(context.Background(), subId, accountId).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsAccountIdDelete``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -7625,8 +7625,8 @@ func main() {
     orderBy := "orderBy_example" // string | Specifies the order by criteria. The syntax of this parameter is similar to the syntax of the _order by_ clause of an SQL statement, but using the names of the json attributes / column of the account. For example, in order to retrieve all accounts ordered by username:  ```sql username asc ```  Or in order to retrieve all accounts ordered by username _and_ first name:  ```sql username asc, firstName asc ```  If the parameter isn't provided, or if the value is empty, then no explicit ordering will be applied. (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsGet(context.Background(), subId).Page(page).Size(size).Search(search).Fields(fields).OrderBy(orderBy).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsGet(context.Background(), subId).Page(page).Size(size).Search(search).Fields(fields).OrderBy(orderBy).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsGet``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -7699,8 +7699,8 @@ func main() {
     notificationContactCreateRequest := *openapiclient.NewNotificationContactCreateRequest() // NotificationContactCreateRequest | Add a notification contact by an account's username
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsPost(context.Background(), subId).NotificationContactCreateRequest(notificationContactCreateRequest).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsPost(context.Background(), subId).NotificationContactCreateRequest(notificationContactCreateRequest).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsPost``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -7769,8 +7769,8 @@ func main() {
     reservedResourceId := "reservedResourceId_example" // string | The id of reserved resource
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdDelete(context.Background(), subId, reservedResourceId).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdDelete(context.Background(), subId, reservedResourceId).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdDelete``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -7838,8 +7838,8 @@ func main() {
     reservedResourceId := "reservedResourceId_example" // string | The id of reserved resource
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdGet(context.Background(), subId, reservedResourceId).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdGet(context.Background(), subId, reservedResourceId).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdGet``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -7910,8 +7910,8 @@ func main() {
     reservedResourcePatchRequest := *openapiclient.NewReservedResourcePatchRequest() // ReservedResourcePatchRequest | Updated reserved resource data
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdPatch(context.Background(), subId, reservedResourceId).ReservedResourcePatchRequest(reservedResourcePatchRequest).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdPatch(context.Background(), subId, reservedResourceId).ReservedResourcePatchRequest(reservedResourcePatchRequest).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdPatch``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -7986,8 +7986,8 @@ func main() {
     fetchAccounts := true // bool | If true, includes the account reference information in the output. Could slow request response time. (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsGet(context.Background(), subId).Page(page).Size(size).Search(search).OrderBy(orderBy).FetchAccounts(fetchAccounts).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsGet(context.Background(), subId).Page(page).Size(size).Search(search).OrderBy(orderBy).FetchAccounts(fetchAccounts).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsGet``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -8060,8 +8060,8 @@ func main() {
     subId := "subId_example" // string | The id of subscription
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdDelete(context.Background(), id, subId).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdDelete(context.Background(), id, subId).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdDelete``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -8129,8 +8129,8 @@ func main() {
     subId := "subId_example" // string | The id of subscription
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdGet(context.Background(), id, subId).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdGet(context.Background(), id, subId).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdGet``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -8200,8 +8200,8 @@ func main() {
     subscriptionRoleBindingCreateRequest := *openapiclient.NewSubscriptionRoleBindingCreateRequest("AccountUsername_example", "RoleId_example") // SubscriptionRoleBindingCreateRequest | Subscription role binding data
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsPost(context.Background(), subId).SubscriptionRoleBindingCreateRequest(subscriptionRoleBindingCreateRequest).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsPost(context.Background(), subId).SubscriptionRoleBindingCreateRequest(subscriptionRoleBindingCreateRequest).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsPost``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -8269,8 +8269,8 @@ func main() {
     caseId := "caseId_example" // string | The id of a support case
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1SupportCasesCaseIdDelete(context.Background(), caseId).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1SupportCasesCaseIdDelete(context.Background(), caseId).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1SupportCasesCaseIdDelete``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -8335,8 +8335,8 @@ func main() {
     supportCasesRequest := *openapiclient.NewSupportCasesRequest("Description_example", "Severity_example", "Summary_example") // SupportCasesRequest | The contents of the support case to be created
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1SupportCasesPost(context.Background()).SupportCasesRequest(supportCasesRequest).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1SupportCasesPost(context.Background()).SupportCasesRequest(supportCasesRequest).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1SupportCasesPost``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -8399,8 +8399,8 @@ func main() {
     tokenAuthorizationRequest := *openapiclient.NewTokenAuthorizationRequest() // TokenAuthorizationRequest | Token authorization data
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAccountsMgmtV1TokenAuthorizationPost(context.Background()).TokenAuthorizationRequest(tokenAuthorizationRequest).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAccountsMgmtV1TokenAuthorizationPost(context.Background()).TokenAuthorizationRequest(tokenAuthorizationRequest).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAccountsMgmtV1TokenAuthorizationPost``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -8463,8 +8463,8 @@ func main() {
     accessReview := *openapiclient.NewAccessReview("AccountUsername_example", "Action_example", "ResourceType_example") // AccessReview | Access review data
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAuthorizationsV1AccessReviewPost(context.Background()).AccessReview(accessReview).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAuthorizationsV1AccessReviewPost(context.Background()).AccessReview(accessReview).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAuthorizationsV1AccessReviewPost``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -8527,8 +8527,8 @@ func main() {
     capabilityReviewRequest := *openapiclient.NewCapabilityReviewRequest("AccountUsername_example", "Capability_example", "Type_example") // CapabilityReviewRequest | Capability review data
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAuthorizationsV1CapabilityReviewPost(context.Background()).CapabilityReviewRequest(capabilityReviewRequest).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAuthorizationsV1CapabilityReviewPost(context.Background()).CapabilityReviewRequest(capabilityReviewRequest).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAuthorizationsV1CapabilityReviewPost``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -8591,8 +8591,8 @@ func main() {
     exportControlReviewRequest := *openapiclient.NewExportControlReviewRequest("AccountUsername_example") // ExportControlReviewRequest | Export control review data
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAuthorizationsV1ExportControlReviewPost(context.Background()).ExportControlReviewRequest(exportControlReviewRequest).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAuthorizationsV1ExportControlReviewPost(context.Background()).ExportControlReviewRequest(exportControlReviewRequest).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAuthorizationsV1ExportControlReviewPost``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -8655,8 +8655,8 @@ func main() {
     featureReview := *openapiclient.NewFeatureReview("Feature_example") // FeatureReview | Feature review data
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAuthorizationsV1FeatureReviewPost(context.Background()).FeatureReview(featureReview).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAuthorizationsV1FeatureReviewPost(context.Background()).FeatureReview(featureReview).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAuthorizationsV1FeatureReviewPost``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -8720,8 +8720,8 @@ func main() {
     reduceClusterList := true // bool | If true, When returning a list of cluster_ids/cluster_uuids/subscription_ids, if those are already included in one of the organizations provided in organization_ids, do not include it in the list. (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAuthorizationsV1ResourceReviewPost(context.Background()).ResourceReviewRequest(resourceReviewRequest).ReduceClusterList(reduceClusterList).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAuthorizationsV1ResourceReviewPost(context.Background()).ResourceReviewRequest(resourceReviewRequest).ReduceClusterList(reduceClusterList).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAuthorizationsV1ResourceReviewPost``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -8785,8 +8785,8 @@ func main() {
     selfAccessReview := *openapiclient.NewSelfAccessReview("Action_example", "ResourceType_example") // SelfAccessReview | Self access review data
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAuthorizationsV1SelfAccessReviewPost(context.Background()).SelfAccessReview(selfAccessReview).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAuthorizationsV1SelfAccessReviewPost(context.Background()).SelfAccessReview(selfAccessReview).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAuthorizationsV1SelfAccessReviewPost``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -8849,8 +8849,8 @@ func main() {
     selfFeatureReview := *openapiclient.NewSelfFeatureReview("Feature_example") // SelfFeatureReview | Self feature review data
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAuthorizationsV1SelfFeatureReviewPost(context.Background()).SelfFeatureReview(selfFeatureReview).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAuthorizationsV1SelfFeatureReviewPost(context.Background()).SelfFeatureReview(selfFeatureReview).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAuthorizationsV1SelfFeatureReviewPost``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -8914,8 +8914,8 @@ func main() {
     reduceClusterList := true // bool | If true, When returning a list of cluster_ids/cluster_uuids/subscription_ids, if those are already included in one of the organizations provided in organization_ids, do not include it in the list. (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAuthorizationsV1SelfResourceReviewPost(context.Background()).SelfResourceReviewRequest(selfResourceReviewRequest).ReduceClusterList(reduceClusterList).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAuthorizationsV1SelfResourceReviewPost(context.Background()).SelfResourceReviewRequest(selfResourceReviewRequest).ReduceClusterList(reduceClusterList).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAuthorizationsV1SelfResourceReviewPost``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -8979,8 +8979,8 @@ func main() {
     termsReview := *openapiclient.NewTermsReview("AccountUsername_example") // TermsReview | Data to check terms for
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.ApiAuthorizationsV1TermsReviewPost(context.Background()).TermsReview(termsReview).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.ApiAuthorizationsV1TermsReviewPost(context.Background()).TermsReview(termsReview).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.ApiAuthorizationsV1TermsReviewPost``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/docs/RegistryAddressValue.md b/app-services-sdk-go/accountmgmt/apiv1/client/docs/RegistryAddressValue.md
deleted file mode 100644
index fac0557c..00000000
--- a/app-services-sdk-go/accountmgmt/apiv1/client/docs/RegistryAddressValue.md
+++ /dev/null
@@ -1,82 +0,0 @@
-# RegistryAddressValue
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**Auth** | Pointer to **string** |  | [optional] 
-**Email** | Pointer to **string** |  | [optional] 
-
-## Methods
-
-### NewRegistryAddressValue
-
-`func NewRegistryAddressValue() *RegistryAddressValue`
-
-NewRegistryAddressValue instantiates a new RegistryAddressValue object
-This constructor will assign default values to properties that have it defined,
-and makes sure properties required by API are set, but the set of arguments
-will change when the set of required properties is changed
-
-### NewRegistryAddressValueWithDefaults
-
-`func NewRegistryAddressValueWithDefaults() *RegistryAddressValue`
-
-NewRegistryAddressValueWithDefaults instantiates a new RegistryAddressValue object
-This constructor will only assign default values to properties that have it defined,
-but it doesn't guarantee that properties required by API are set
-
-### GetAuth
-
-`func (o *RegistryAddressValue) GetAuth() string`
-
-GetAuth returns the Auth field if non-nil, zero value otherwise.
-
-### GetAuthOk
-
-`func (o *RegistryAddressValue) GetAuthOk() (*string, bool)`
-
-GetAuthOk returns a tuple with the Auth field if it's non-nil, zero value otherwise
-and a boolean to check if the value has been set.
-
-### SetAuth
-
-`func (o *RegistryAddressValue) SetAuth(v string)`
-
-SetAuth sets Auth field to given value.
-
-### HasAuth
-
-`func (o *RegistryAddressValue) HasAuth() bool`
-
-HasAuth returns a boolean if a field has been set.
-
-### GetEmail
-
-`func (o *RegistryAddressValue) GetEmail() string`
-
-GetEmail returns the Email field if non-nil, zero value otherwise.
-
-### GetEmailOk
-
-`func (o *RegistryAddressValue) GetEmailOk() (*string, bool)`
-
-GetEmailOk returns a tuple with the Email field if it's non-nil, zero value otherwise
-and a boolean to check if the value has been set.
-
-### SetEmail
-
-`func (o *RegistryAddressValue) SetEmail(v string)`
-
-SetEmail sets Email field to given value.
-
-### HasEmail
-
-`func (o *RegistryAddressValue) HasEmail() bool`
-
-HasEmail returns a boolean if a field has been set.
-
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/git_push.sh b/app-services-sdk-go/accountmgmt/apiv1/client/git_push.sh
index f53a75d4..ced3be2b 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/git_push.sh
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/git_push.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
 #
-# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl "minor update" "gitlab.com"
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update" "gitlab.com"
 
 git_user_id=$1
 git_repo_id=$2
@@ -38,14 +38,14 @@ git add .
 git commit -m "$release_note"
 
 # Sets the new remote
-git_remote=$(git remote)
+git_remote=`git remote`
 if [ "$git_remote" = "" ]; then # git remote not defined
 
     if [ "$GIT_TOKEN" = "" ]; then
         echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment."
         git remote add origin https://${git_host}/${git_user_id}/${git_repo_id}.git
     else
-        git remote add origin https://${git_user_id}:"${GIT_TOKEN}"@${git_host}/${git_user_id}/${git_repo_id}.git
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@${git_host}/${git_user_id}/${git_repo_id}.git
     fi
 
 fi
@@ -55,3 +55,4 @@ git pull origin master
 # Pushes (Forces) the changes in the local repository up to the remote repository
 echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git"
 git push origin master 2>&1 | grep -v 'To https'
+
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/go.mod b/app-services-sdk-go/accountmgmt/apiv1/client/go.mod
index ead32606..0bbad780 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/go.mod
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/go.mod
@@ -1,7 +1,5 @@
-module github.com/GIT_USER_ID/GIT_REPO_ID
+module github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go/accountmgmt/apiv1/client
 
 go 1.13
 
-require (
-	golang.org/x/oauth2 v0.0.0-20210323180902-22b0adad7558
-)
+require golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/go.sum b/app-services-sdk-go/accountmgmt/apiv1/client/go.sum
index 734252e6..ae0eabaa 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/go.sum
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/go.sum
@@ -1,13 +1,362 @@
+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
+cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
+cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
+cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
+cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc=
+cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
+cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To=
+cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4=
+cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M=
+cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc=
+cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk=
+cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs=
+cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc=
+cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY=
+cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
+cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
+cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
+cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=
+cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
+cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
+cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
+cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
+cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
+cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
+cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
+cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU=
+cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
+cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
+cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
+cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
+cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
+dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
+github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
+github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
+github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
+github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
+github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
+github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
+github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
+github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
+github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
+github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
+github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
+github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
+github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
+github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
+github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
+github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
+github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
+github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0=
+github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
+github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.1 h1:JFrFEBb2xKufg6XkJsJr+WbKb4FQlURi5RUcBveYu9k=
+github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
+github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
+github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
+github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
+github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
+github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
+github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
+github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
+github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
+github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
+github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
+go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
+go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
+go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
+go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
+golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek=
+golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY=
+golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
+golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
+golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
+golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
+golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
+golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
+golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
+golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
+golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
+golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
+golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
+golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
+golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
+golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
+golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e h1:bRhVy7zSSasaqNksaRZiA5EEI+Ei4I1nO5Jh72wfHlg=
+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 h1:SVwTIAaPC2U/AvvLNZ2a7OVsmBpC8L5BlwK1whH3hm0=
+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20200822124328-c89045814202 h1:VvcQYSHwXgi7W+TpUR6A9g6Up98WAHf3f/ulnJ62IyA=
+golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 h1:YUO/7uOKsKeq9UokNS62b8FYywz3ker1l1vDZRCRefw=
+golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99 h1:5vD4XjIc0X5+kHZjx4UecYdjA6mJo+XXNoaW0EjU5Os=
+golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508=
+golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
+golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
+golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
+golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
+golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
+golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
+golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
+google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
+google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
+google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
+google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
+google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
+google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
+google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
+google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
+google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM=
+google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc=
+google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
+google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
+google.golang.org/appengine v1.6.6 h1:lMO5rYAqUxkmaj76jAkRUvt5JZgFymx/+Q5Mzfivuhc=
+google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
+google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
+google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA=
+google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U=
+google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
+google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
+google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
+google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
+google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
+google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
+google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
+google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
+google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
+google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
+google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
+google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
+google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
+google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
+google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
+google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c=
+google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
+honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
+honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
+rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
+rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
+rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_access_review.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_access_review.go
index f11e5d25..f91b8695 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_access_review.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_access_review.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -58,8 +58,8 @@ func (o *AccessReview) GetAccountUsername() string {
 // GetAccountUsernameOk returns a tuple with the AccountUsername field value
 // and a boolean to check if the value has been set.
 func (o *AccessReview) GetAccountUsernameOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.AccountUsername, true
 }
@@ -82,8 +82,8 @@ func (o *AccessReview) GetAction() string {
 // GetActionOk returns a tuple with the Action field value
 // and a boolean to check if the value has been set.
 func (o *AccessReview) GetActionOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Action, true
 }
@@ -95,7 +95,7 @@ func (o *AccessReview) SetAction(v string) {
 
 // GetClusterId returns the ClusterId field value if set, zero value otherwise.
 func (o *AccessReview) GetClusterId() string {
-	if o == nil || isNil(o.ClusterId) {
+	if o == nil || o.ClusterId == nil {
 		var ret string
 		return ret
 	}
@@ -105,15 +105,15 @@ func (o *AccessReview) GetClusterId() string {
 // GetClusterIdOk returns a tuple with the ClusterId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AccessReview) GetClusterIdOk() (*string, bool) {
-	if o == nil || isNil(o.ClusterId) {
-    return nil, false
+	if o == nil || o.ClusterId == nil {
+		return nil, false
 	}
 	return o.ClusterId, true
 }
 
 // HasClusterId returns a boolean if a field has been set.
 func (o *AccessReview) HasClusterId() bool {
-	if o != nil && !isNil(o.ClusterId) {
+	if o != nil && o.ClusterId != nil {
 		return true
 	}
 
@@ -127,7 +127,7 @@ func (o *AccessReview) SetClusterId(v string) {
 
 // GetClusterUuid returns the ClusterUuid field value if set, zero value otherwise.
 func (o *AccessReview) GetClusterUuid() string {
-	if o == nil || isNil(o.ClusterUuid) {
+	if o == nil || o.ClusterUuid == nil {
 		var ret string
 		return ret
 	}
@@ -137,15 +137,15 @@ func (o *AccessReview) GetClusterUuid() string {
 // GetClusterUuidOk returns a tuple with the ClusterUuid field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AccessReview) GetClusterUuidOk() (*string, bool) {
-	if o == nil || isNil(o.ClusterUuid) {
-    return nil, false
+	if o == nil || o.ClusterUuid == nil {
+		return nil, false
 	}
 	return o.ClusterUuid, true
 }
 
 // HasClusterUuid returns a boolean if a field has been set.
 func (o *AccessReview) HasClusterUuid() bool {
-	if o != nil && !isNil(o.ClusterUuid) {
+	if o != nil && o.ClusterUuid != nil {
 		return true
 	}
 
@@ -159,7 +159,7 @@ func (o *AccessReview) SetClusterUuid(v string) {
 
 // GetOrganizationId returns the OrganizationId field value if set, zero value otherwise.
 func (o *AccessReview) GetOrganizationId() string {
-	if o == nil || isNil(o.OrganizationId) {
+	if o == nil || o.OrganizationId == nil {
 		var ret string
 		return ret
 	}
@@ -169,15 +169,15 @@ func (o *AccessReview) GetOrganizationId() string {
 // GetOrganizationIdOk returns a tuple with the OrganizationId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AccessReview) GetOrganizationIdOk() (*string, bool) {
-	if o == nil || isNil(o.OrganizationId) {
-    return nil, false
+	if o == nil || o.OrganizationId == nil {
+		return nil, false
 	}
 	return o.OrganizationId, true
 }
 
 // HasOrganizationId returns a boolean if a field has been set.
 func (o *AccessReview) HasOrganizationId() bool {
-	if o != nil && !isNil(o.OrganizationId) {
+	if o != nil && o.OrganizationId != nil {
 		return true
 	}
 
@@ -202,8 +202,8 @@ func (o *AccessReview) GetResourceType() string {
 // GetResourceTypeOk returns a tuple with the ResourceType field value
 // and a boolean to check if the value has been set.
 func (o *AccessReview) GetResourceTypeOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.ResourceType, true
 }
@@ -215,7 +215,7 @@ func (o *AccessReview) SetResourceType(v string) {
 
 // GetSubscriptionId returns the SubscriptionId field value if set, zero value otherwise.
 func (o *AccessReview) GetSubscriptionId() string {
-	if o == nil || isNil(o.SubscriptionId) {
+	if o == nil || o.SubscriptionId == nil {
 		var ret string
 		return ret
 	}
@@ -225,15 +225,15 @@ func (o *AccessReview) GetSubscriptionId() string {
 // GetSubscriptionIdOk returns a tuple with the SubscriptionId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AccessReview) GetSubscriptionIdOk() (*string, bool) {
-	if o == nil || isNil(o.SubscriptionId) {
-    return nil, false
+	if o == nil || o.SubscriptionId == nil {
+		return nil, false
 	}
 	return o.SubscriptionId, true
 }
 
 // HasSubscriptionId returns a boolean if a field has been set.
 func (o *AccessReview) HasSubscriptionId() bool {
-	if o != nil && !isNil(o.SubscriptionId) {
+	if o != nil && o.SubscriptionId != nil {
 		return true
 	}
 
@@ -253,19 +253,19 @@ func (o AccessReview) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["action"] = o.Action
 	}
-	if !isNil(o.ClusterId) {
+	if o.ClusterId != nil {
 		toSerialize["cluster_id"] = o.ClusterId
 	}
-	if !isNil(o.ClusterUuid) {
+	if o.ClusterUuid != nil {
 		toSerialize["cluster_uuid"] = o.ClusterUuid
 	}
-	if !isNil(o.OrganizationId) {
+	if o.OrganizationId != nil {
 		toSerialize["organization_id"] = o.OrganizationId
 	}
 	if true {
 		toSerialize["resource_type"] = o.ResourceType
 	}
-	if !isNil(o.SubscriptionId) {
+	if o.SubscriptionId != nil {
 		toSerialize["subscription_id"] = o.SubscriptionId
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_access_review_response.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_access_review_response.go
index e2c55194..16ee8654 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_access_review_response.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_access_review_response.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -46,7 +46,7 @@ func NewAccessReviewResponseWithDefaults() *AccessReviewResponse {
 
 // GetAccountId returns the AccountId field value if set, zero value otherwise.
 func (o *AccessReviewResponse) GetAccountId() string {
-	if o == nil || isNil(o.AccountId) {
+	if o == nil || o.AccountId == nil {
 		var ret string
 		return ret
 	}
@@ -56,15 +56,15 @@ func (o *AccessReviewResponse) GetAccountId() string {
 // GetAccountIdOk returns a tuple with the AccountId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AccessReviewResponse) GetAccountIdOk() (*string, bool) {
-	if o == nil || isNil(o.AccountId) {
-    return nil, false
+	if o == nil || o.AccountId == nil {
+		return nil, false
 	}
 	return o.AccountId, true
 }
 
 // HasAccountId returns a boolean if a field has been set.
 func (o *AccessReviewResponse) HasAccountId() bool {
-	if o != nil && !isNil(o.AccountId) {
+	if o != nil && o.AccountId != nil {
 		return true
 	}
 
@@ -78,7 +78,7 @@ func (o *AccessReviewResponse) SetAccountId(v string) {
 
 // GetAction returns the Action field value if set, zero value otherwise.
 func (o *AccessReviewResponse) GetAction() string {
-	if o == nil || isNil(o.Action) {
+	if o == nil || o.Action == nil {
 		var ret string
 		return ret
 	}
@@ -88,15 +88,15 @@ func (o *AccessReviewResponse) GetAction() string {
 // GetActionOk returns a tuple with the Action field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AccessReviewResponse) GetActionOk() (*string, bool) {
-	if o == nil || isNil(o.Action) {
-    return nil, false
+	if o == nil || o.Action == nil {
+		return nil, false
 	}
 	return o.Action, true
 }
 
 // HasAction returns a boolean if a field has been set.
 func (o *AccessReviewResponse) HasAction() bool {
-	if o != nil && !isNil(o.Action) {
+	if o != nil && o.Action != nil {
 		return true
 	}
 
@@ -121,8 +121,8 @@ func (o *AccessReviewResponse) GetAllowed() bool {
 // GetAllowedOk returns a tuple with the Allowed field value
 // and a boolean to check if the value has been set.
 func (o *AccessReviewResponse) GetAllowedOk() (*bool, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Allowed, true
 }
@@ -134,7 +134,7 @@ func (o *AccessReviewResponse) SetAllowed(v bool) {
 
 // GetClusterId returns the ClusterId field value if set, zero value otherwise.
 func (o *AccessReviewResponse) GetClusterId() string {
-	if o == nil || isNil(o.ClusterId) {
+	if o == nil || o.ClusterId == nil {
 		var ret string
 		return ret
 	}
@@ -144,15 +144,15 @@ func (o *AccessReviewResponse) GetClusterId() string {
 // GetClusterIdOk returns a tuple with the ClusterId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AccessReviewResponse) GetClusterIdOk() (*string, bool) {
-	if o == nil || isNil(o.ClusterId) {
-    return nil, false
+	if o == nil || o.ClusterId == nil {
+		return nil, false
 	}
 	return o.ClusterId, true
 }
 
 // HasClusterId returns a boolean if a field has been set.
 func (o *AccessReviewResponse) HasClusterId() bool {
-	if o != nil && !isNil(o.ClusterId) {
+	if o != nil && o.ClusterId != nil {
 		return true
 	}
 
@@ -166,7 +166,7 @@ func (o *AccessReviewResponse) SetClusterId(v string) {
 
 // GetClusterUuid returns the ClusterUuid field value if set, zero value otherwise.
 func (o *AccessReviewResponse) GetClusterUuid() string {
-	if o == nil || isNil(o.ClusterUuid) {
+	if o == nil || o.ClusterUuid == nil {
 		var ret string
 		return ret
 	}
@@ -176,15 +176,15 @@ func (o *AccessReviewResponse) GetClusterUuid() string {
 // GetClusterUuidOk returns a tuple with the ClusterUuid field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AccessReviewResponse) GetClusterUuidOk() (*string, bool) {
-	if o == nil || isNil(o.ClusterUuid) {
-    return nil, false
+	if o == nil || o.ClusterUuid == nil {
+		return nil, false
 	}
 	return o.ClusterUuid, true
 }
 
 // HasClusterUuid returns a boolean if a field has been set.
 func (o *AccessReviewResponse) HasClusterUuid() bool {
-	if o != nil && !isNil(o.ClusterUuid) {
+	if o != nil && o.ClusterUuid != nil {
 		return true
 	}
 
@@ -198,7 +198,7 @@ func (o *AccessReviewResponse) SetClusterUuid(v string) {
 
 // GetOrganizationId returns the OrganizationId field value if set, zero value otherwise.
 func (o *AccessReviewResponse) GetOrganizationId() string {
-	if o == nil || isNil(o.OrganizationId) {
+	if o == nil || o.OrganizationId == nil {
 		var ret string
 		return ret
 	}
@@ -208,15 +208,15 @@ func (o *AccessReviewResponse) GetOrganizationId() string {
 // GetOrganizationIdOk returns a tuple with the OrganizationId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AccessReviewResponse) GetOrganizationIdOk() (*string, bool) {
-	if o == nil || isNil(o.OrganizationId) {
-    return nil, false
+	if o == nil || o.OrganizationId == nil {
+		return nil, false
 	}
 	return o.OrganizationId, true
 }
 
 // HasOrganizationId returns a boolean if a field has been set.
 func (o *AccessReviewResponse) HasOrganizationId() bool {
-	if o != nil && !isNil(o.OrganizationId) {
+	if o != nil && o.OrganizationId != nil {
 		return true
 	}
 
@@ -230,7 +230,7 @@ func (o *AccessReviewResponse) SetOrganizationId(v string) {
 
 // GetResourceType returns the ResourceType field value if set, zero value otherwise.
 func (o *AccessReviewResponse) GetResourceType() string {
-	if o == nil || isNil(o.ResourceType) {
+	if o == nil || o.ResourceType == nil {
 		var ret string
 		return ret
 	}
@@ -240,15 +240,15 @@ func (o *AccessReviewResponse) GetResourceType() string {
 // GetResourceTypeOk returns a tuple with the ResourceType field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AccessReviewResponse) GetResourceTypeOk() (*string, bool) {
-	if o == nil || isNil(o.ResourceType) {
-    return nil, false
+	if o == nil || o.ResourceType == nil {
+		return nil, false
 	}
 	return o.ResourceType, true
 }
 
 // HasResourceType returns a boolean if a field has been set.
 func (o *AccessReviewResponse) HasResourceType() bool {
-	if o != nil && !isNil(o.ResourceType) {
+	if o != nil && o.ResourceType != nil {
 		return true
 	}
 
@@ -262,7 +262,7 @@ func (o *AccessReviewResponse) SetResourceType(v string) {
 
 // GetSubscriptionId returns the SubscriptionId field value if set, zero value otherwise.
 func (o *AccessReviewResponse) GetSubscriptionId() string {
-	if o == nil || isNil(o.SubscriptionId) {
+	if o == nil || o.SubscriptionId == nil {
 		var ret string
 		return ret
 	}
@@ -272,15 +272,15 @@ func (o *AccessReviewResponse) GetSubscriptionId() string {
 // GetSubscriptionIdOk returns a tuple with the SubscriptionId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AccessReviewResponse) GetSubscriptionIdOk() (*string, bool) {
-	if o == nil || isNil(o.SubscriptionId) {
-    return nil, false
+	if o == nil || o.SubscriptionId == nil {
+		return nil, false
 	}
 	return o.SubscriptionId, true
 }
 
 // HasSubscriptionId returns a boolean if a field has been set.
 func (o *AccessReviewResponse) HasSubscriptionId() bool {
-	if o != nil && !isNil(o.SubscriptionId) {
+	if o != nil && o.SubscriptionId != nil {
 		return true
 	}
 
@@ -294,28 +294,28 @@ func (o *AccessReviewResponse) SetSubscriptionId(v string) {
 
 func (o AccessReviewResponse) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.AccountId) {
+	if o.AccountId != nil {
 		toSerialize["account_id"] = o.AccountId
 	}
-	if !isNil(o.Action) {
+	if o.Action != nil {
 		toSerialize["action"] = o.Action
 	}
 	if true {
 		toSerialize["allowed"] = o.Allowed
 	}
-	if !isNil(o.ClusterId) {
+	if o.ClusterId != nil {
 		toSerialize["cluster_id"] = o.ClusterId
 	}
-	if !isNil(o.ClusterUuid) {
+	if o.ClusterUuid != nil {
 		toSerialize["cluster_uuid"] = o.ClusterUuid
 	}
-	if !isNil(o.OrganizationId) {
+	if o.OrganizationId != nil {
 		toSerialize["organization_id"] = o.OrganizationId
 	}
-	if !isNil(o.ResourceType) {
+	if o.ResourceType != nil {
 		toSerialize["resource_type"] = o.ResourceType
 	}
-	if !isNil(o.SubscriptionId) {
+	if o.SubscriptionId != nil {
 		toSerialize["subscription_id"] = o.SubscriptionId
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_access_token_cfg.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_access_token_cfg.go
index c6a10873..6bc7d9b4 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_access_token_cfg.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_access_token_cfg.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -16,14 +16,14 @@ import (
 
 // AccessTokenCfg struct for AccessTokenCfg
 type AccessTokenCfg struct {
-	Auths map[string]interface{} `json:"auths"`
+	Auths map[string]map[string]interface{} `json:"auths"`
 }
 
 // NewAccessTokenCfg instantiates a new AccessTokenCfg object
 // This constructor will assign default values to properties that have it defined,
 // and makes sure properties required by API are set, but the set of arguments
 // will change when the set of required properties is changed
-func NewAccessTokenCfg(auths map[string]interface{}) *AccessTokenCfg {
+func NewAccessTokenCfg(auths map[string]map[string]interface{}) *AccessTokenCfg {
 	this := AccessTokenCfg{}
 	this.Auths = auths
 	return &this
@@ -38,9 +38,9 @@ func NewAccessTokenCfgWithDefaults() *AccessTokenCfg {
 }
 
 // GetAuths returns the Auths field value
-func (o *AccessTokenCfg) GetAuths() map[string]interface{} {
+func (o *AccessTokenCfg) GetAuths() map[string]map[string]interface{} {
 	if o == nil {
-		var ret map[string]interface{}
+		var ret map[string]map[string]interface{}
 		return ret
 	}
 
@@ -49,15 +49,15 @@ func (o *AccessTokenCfg) GetAuths() map[string]interface{} {
 
 // GetAuthsOk returns a tuple with the Auths field value
 // and a boolean to check if the value has been set.
-func (o *AccessTokenCfg) GetAuthsOk() (map[string]interface{}, bool) {
-	if o == nil {
-    return map[string]interface{}{}, false
+func (o *AccessTokenCfg) GetAuthsOk() (*map[string]map[string]interface{}, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Auths, true
+	return &o.Auths, true
 }
 
 // SetAuths sets field value
-func (o *AccessTokenCfg) SetAuths(v map[string]interface{}) {
+func (o *AccessTokenCfg) SetAuths(v map[string]map[string]interface{}) {
 	o.Auths = v
 }
 
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_account.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_account.go
index 57bb380d..89da4c69 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_account.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_account.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -12,6 +12,7 @@ package accountmgmtclient
 
 import (
 	"encoding/json"
+	"time"
 )
 
 // Account struct for Account
@@ -22,11 +23,11 @@ type Account struct {
 	BanCode *string `json:"ban_code,omitempty"`
 	BanDescription *string `json:"ban_description,omitempty"`
 	Banned *bool `json:"banned,omitempty"`
-	Capabilities []Capability `json:"capabilities,omitempty"`
+	Capabilities *[]Capability `json:"capabilities,omitempty"`
 	CreatedAt *time.Time `json:"created_at,omitempty"`
 	Email *string `json:"email,omitempty"`
 	FirstName *string `json:"first_name,omitempty"`
-	Labels []Label `json:"labels,omitempty"`
+	Labels *[]Label `json:"labels,omitempty"`
 	LastName *string `json:"last_name,omitempty"`
 	Organization *Organization `json:"organization,omitempty"`
 	OrganizationId *string `json:"organization_id,omitempty"`
@@ -65,7 +66,7 @@ func NewAccountWithDefaults() *Account {
 
 // GetHref returns the Href field value if set, zero value otherwise.
 func (o *Account) GetHref() string {
-	if o == nil || isNil(o.Href) {
+	if o == nil || o.Href == nil {
 		var ret string
 		return ret
 	}
@@ -75,15 +76,15 @@ func (o *Account) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Account) GetHrefOk() (*string, bool) {
-	if o == nil || isNil(o.Href) {
-    return nil, false
+	if o == nil || o.Href == nil {
+		return nil, false
 	}
 	return o.Href, true
 }
 
 // HasHref returns a boolean if a field has been set.
 func (o *Account) HasHref() bool {
-	if o != nil && !isNil(o.Href) {
+	if o != nil && o.Href != nil {
 		return true
 	}
 
@@ -97,7 +98,7 @@ func (o *Account) SetHref(v string) {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *Account) GetId() string {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret string
 		return ret
 	}
@@ -107,15 +108,15 @@ func (o *Account) GetId() string {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Account) GetIdOk() (*string, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *Account) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -129,7 +130,7 @@ func (o *Account) SetId(v string) {
 
 // GetKind returns the Kind field value if set, zero value otherwise.
 func (o *Account) GetKind() string {
-	if o == nil || isNil(o.Kind) {
+	if o == nil || o.Kind == nil {
 		var ret string
 		return ret
 	}
@@ -139,15 +140,15 @@ func (o *Account) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Account) GetKindOk() (*string, bool) {
-	if o == nil || isNil(o.Kind) {
-    return nil, false
+	if o == nil || o.Kind == nil {
+		return nil, false
 	}
 	return o.Kind, true
 }
 
 // HasKind returns a boolean if a field has been set.
 func (o *Account) HasKind() bool {
-	if o != nil && !isNil(o.Kind) {
+	if o != nil && o.Kind != nil {
 		return true
 	}
 
@@ -161,7 +162,7 @@ func (o *Account) SetKind(v string) {
 
 // GetBanCode returns the BanCode field value if set, zero value otherwise.
 func (o *Account) GetBanCode() string {
-	if o == nil || isNil(o.BanCode) {
+	if o == nil || o.BanCode == nil {
 		var ret string
 		return ret
 	}
@@ -171,15 +172,15 @@ func (o *Account) GetBanCode() string {
 // GetBanCodeOk returns a tuple with the BanCode field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Account) GetBanCodeOk() (*string, bool) {
-	if o == nil || isNil(o.BanCode) {
-    return nil, false
+	if o == nil || o.BanCode == nil {
+		return nil, false
 	}
 	return o.BanCode, true
 }
 
 // HasBanCode returns a boolean if a field has been set.
 func (o *Account) HasBanCode() bool {
-	if o != nil && !isNil(o.BanCode) {
+	if o != nil && o.BanCode != nil {
 		return true
 	}
 
@@ -193,7 +194,7 @@ func (o *Account) SetBanCode(v string) {
 
 // GetBanDescription returns the BanDescription field value if set, zero value otherwise.
 func (o *Account) GetBanDescription() string {
-	if o == nil || isNil(o.BanDescription) {
+	if o == nil || o.BanDescription == nil {
 		var ret string
 		return ret
 	}
@@ -203,15 +204,15 @@ func (o *Account) GetBanDescription() string {
 // GetBanDescriptionOk returns a tuple with the BanDescription field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Account) GetBanDescriptionOk() (*string, bool) {
-	if o == nil || isNil(o.BanDescription) {
-    return nil, false
+	if o == nil || o.BanDescription == nil {
+		return nil, false
 	}
 	return o.BanDescription, true
 }
 
 // HasBanDescription returns a boolean if a field has been set.
 func (o *Account) HasBanDescription() bool {
-	if o != nil && !isNil(o.BanDescription) {
+	if o != nil && o.BanDescription != nil {
 		return true
 	}
 
@@ -225,7 +226,7 @@ func (o *Account) SetBanDescription(v string) {
 
 // GetBanned returns the Banned field value if set, zero value otherwise.
 func (o *Account) GetBanned() bool {
-	if o == nil || isNil(o.Banned) {
+	if o == nil || o.Banned == nil {
 		var ret bool
 		return ret
 	}
@@ -235,15 +236,15 @@ func (o *Account) GetBanned() bool {
 // GetBannedOk returns a tuple with the Banned field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Account) GetBannedOk() (*bool, bool) {
-	if o == nil || isNil(o.Banned) {
-    return nil, false
+	if o == nil || o.Banned == nil {
+		return nil, false
 	}
 	return o.Banned, true
 }
 
 // HasBanned returns a boolean if a field has been set.
 func (o *Account) HasBanned() bool {
-	if o != nil && !isNil(o.Banned) {
+	if o != nil && o.Banned != nil {
 		return true
 	}
 
@@ -257,25 +258,25 @@ func (o *Account) SetBanned(v bool) {
 
 // GetCapabilities returns the Capabilities field value if set, zero value otherwise.
 func (o *Account) GetCapabilities() []Capability {
-	if o == nil || isNil(o.Capabilities) {
+	if o == nil || o.Capabilities == nil {
 		var ret []Capability
 		return ret
 	}
-	return o.Capabilities
+	return *o.Capabilities
 }
 
 // GetCapabilitiesOk returns a tuple with the Capabilities field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *Account) GetCapabilitiesOk() ([]Capability, bool) {
-	if o == nil || isNil(o.Capabilities) {
-    return nil, false
+func (o *Account) GetCapabilitiesOk() (*[]Capability, bool) {
+	if o == nil || o.Capabilities == nil {
+		return nil, false
 	}
 	return o.Capabilities, true
 }
 
 // HasCapabilities returns a boolean if a field has been set.
 func (o *Account) HasCapabilities() bool {
-	if o != nil && !isNil(o.Capabilities) {
+	if o != nil && o.Capabilities != nil {
 		return true
 	}
 
@@ -284,12 +285,12 @@ func (o *Account) HasCapabilities() bool {
 
 // SetCapabilities gets a reference to the given []Capability and assigns it to the Capabilities field.
 func (o *Account) SetCapabilities(v []Capability) {
-	o.Capabilities = v
+	o.Capabilities = &v
 }
 
 // GetCreatedAt returns the CreatedAt field value if set, zero value otherwise.
 func (o *Account) GetCreatedAt() time.Time {
-	if o == nil || isNil(o.CreatedAt) {
+	if o == nil || o.CreatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -299,15 +300,15 @@ func (o *Account) GetCreatedAt() time.Time {
 // GetCreatedAtOk returns a tuple with the CreatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Account) GetCreatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.CreatedAt) {
-    return nil, false
+	if o == nil || o.CreatedAt == nil {
+		return nil, false
 	}
 	return o.CreatedAt, true
 }
 
 // HasCreatedAt returns a boolean if a field has been set.
 func (o *Account) HasCreatedAt() bool {
-	if o != nil && !isNil(o.CreatedAt) {
+	if o != nil && o.CreatedAt != nil {
 		return true
 	}
 
@@ -321,7 +322,7 @@ func (o *Account) SetCreatedAt(v time.Time) {
 
 // GetEmail returns the Email field value if set, zero value otherwise.
 func (o *Account) GetEmail() string {
-	if o == nil || isNil(o.Email) {
+	if o == nil || o.Email == nil {
 		var ret string
 		return ret
 	}
@@ -331,15 +332,15 @@ func (o *Account) GetEmail() string {
 // GetEmailOk returns a tuple with the Email field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Account) GetEmailOk() (*string, bool) {
-	if o == nil || isNil(o.Email) {
-    return nil, false
+	if o == nil || o.Email == nil {
+		return nil, false
 	}
 	return o.Email, true
 }
 
 // HasEmail returns a boolean if a field has been set.
 func (o *Account) HasEmail() bool {
-	if o != nil && !isNil(o.Email) {
+	if o != nil && o.Email != nil {
 		return true
 	}
 
@@ -353,7 +354,7 @@ func (o *Account) SetEmail(v string) {
 
 // GetFirstName returns the FirstName field value if set, zero value otherwise.
 func (o *Account) GetFirstName() string {
-	if o == nil || isNil(o.FirstName) {
+	if o == nil || o.FirstName == nil {
 		var ret string
 		return ret
 	}
@@ -363,15 +364,15 @@ func (o *Account) GetFirstName() string {
 // GetFirstNameOk returns a tuple with the FirstName field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Account) GetFirstNameOk() (*string, bool) {
-	if o == nil || isNil(o.FirstName) {
-    return nil, false
+	if o == nil || o.FirstName == nil {
+		return nil, false
 	}
 	return o.FirstName, true
 }
 
 // HasFirstName returns a boolean if a field has been set.
 func (o *Account) HasFirstName() bool {
-	if o != nil && !isNil(o.FirstName) {
+	if o != nil && o.FirstName != nil {
 		return true
 	}
 
@@ -385,25 +386,25 @@ func (o *Account) SetFirstName(v string) {
 
 // GetLabels returns the Labels field value if set, zero value otherwise.
 func (o *Account) GetLabels() []Label {
-	if o == nil || isNil(o.Labels) {
+	if o == nil || o.Labels == nil {
 		var ret []Label
 		return ret
 	}
-	return o.Labels
+	return *o.Labels
 }
 
 // GetLabelsOk returns a tuple with the Labels field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *Account) GetLabelsOk() ([]Label, bool) {
-	if o == nil || isNil(o.Labels) {
-    return nil, false
+func (o *Account) GetLabelsOk() (*[]Label, bool) {
+	if o == nil || o.Labels == nil {
+		return nil, false
 	}
 	return o.Labels, true
 }
 
 // HasLabels returns a boolean if a field has been set.
 func (o *Account) HasLabels() bool {
-	if o != nil && !isNil(o.Labels) {
+	if o != nil && o.Labels != nil {
 		return true
 	}
 
@@ -412,12 +413,12 @@ func (o *Account) HasLabels() bool {
 
 // SetLabels gets a reference to the given []Label and assigns it to the Labels field.
 func (o *Account) SetLabels(v []Label) {
-	o.Labels = v
+	o.Labels = &v
 }
 
 // GetLastName returns the LastName field value if set, zero value otherwise.
 func (o *Account) GetLastName() string {
-	if o == nil || isNil(o.LastName) {
+	if o == nil || o.LastName == nil {
 		var ret string
 		return ret
 	}
@@ -427,15 +428,15 @@ func (o *Account) GetLastName() string {
 // GetLastNameOk returns a tuple with the LastName field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Account) GetLastNameOk() (*string, bool) {
-	if o == nil || isNil(o.LastName) {
-    return nil, false
+	if o == nil || o.LastName == nil {
+		return nil, false
 	}
 	return o.LastName, true
 }
 
 // HasLastName returns a boolean if a field has been set.
 func (o *Account) HasLastName() bool {
-	if o != nil && !isNil(o.LastName) {
+	if o != nil && o.LastName != nil {
 		return true
 	}
 
@@ -449,7 +450,7 @@ func (o *Account) SetLastName(v string) {
 
 // GetOrganization returns the Organization field value if set, zero value otherwise.
 func (o *Account) GetOrganization() Organization {
-	if o == nil || isNil(o.Organization) {
+	if o == nil || o.Organization == nil {
 		var ret Organization
 		return ret
 	}
@@ -459,15 +460,15 @@ func (o *Account) GetOrganization() Organization {
 // GetOrganizationOk returns a tuple with the Organization field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Account) GetOrganizationOk() (*Organization, bool) {
-	if o == nil || isNil(o.Organization) {
-    return nil, false
+	if o == nil || o.Organization == nil {
+		return nil, false
 	}
 	return o.Organization, true
 }
 
 // HasOrganization returns a boolean if a field has been set.
 func (o *Account) HasOrganization() bool {
-	if o != nil && !isNil(o.Organization) {
+	if o != nil && o.Organization != nil {
 		return true
 	}
 
@@ -481,7 +482,7 @@ func (o *Account) SetOrganization(v Organization) {
 
 // GetOrganizationId returns the OrganizationId field value if set, zero value otherwise.
 func (o *Account) GetOrganizationId() string {
-	if o == nil || isNil(o.OrganizationId) {
+	if o == nil || o.OrganizationId == nil {
 		var ret string
 		return ret
 	}
@@ -491,15 +492,15 @@ func (o *Account) GetOrganizationId() string {
 // GetOrganizationIdOk returns a tuple with the OrganizationId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Account) GetOrganizationIdOk() (*string, bool) {
-	if o == nil || isNil(o.OrganizationId) {
-    return nil, false
+	if o == nil || o.OrganizationId == nil {
+		return nil, false
 	}
 	return o.OrganizationId, true
 }
 
 // HasOrganizationId returns a boolean if a field has been set.
 func (o *Account) HasOrganizationId() bool {
-	if o != nil && !isNil(o.OrganizationId) {
+	if o != nil && o.OrganizationId != nil {
 		return true
 	}
 
@@ -513,7 +514,7 @@ func (o *Account) SetOrganizationId(v string) {
 
 // GetRhitAccountId returns the RhitAccountId field value if set, zero value otherwise.
 func (o *Account) GetRhitAccountId() string {
-	if o == nil || isNil(o.RhitAccountId) {
+	if o == nil || o.RhitAccountId == nil {
 		var ret string
 		return ret
 	}
@@ -523,15 +524,15 @@ func (o *Account) GetRhitAccountId() string {
 // GetRhitAccountIdOk returns a tuple with the RhitAccountId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Account) GetRhitAccountIdOk() (*string, bool) {
-	if o == nil || isNil(o.RhitAccountId) {
-    return nil, false
+	if o == nil || o.RhitAccountId == nil {
+		return nil, false
 	}
 	return o.RhitAccountId, true
 }
 
 // HasRhitAccountId returns a boolean if a field has been set.
 func (o *Account) HasRhitAccountId() bool {
-	if o != nil && !isNil(o.RhitAccountId) {
+	if o != nil && o.RhitAccountId != nil {
 		return true
 	}
 
@@ -545,7 +546,7 @@ func (o *Account) SetRhitAccountId(v string) {
 
 // GetRhitWebUserId returns the RhitWebUserId field value if set, zero value otherwise.
 func (o *Account) GetRhitWebUserId() string {
-	if o == nil || isNil(o.RhitWebUserId) {
+	if o == nil || o.RhitWebUserId == nil {
 		var ret string
 		return ret
 	}
@@ -555,15 +556,15 @@ func (o *Account) GetRhitWebUserId() string {
 // GetRhitWebUserIdOk returns a tuple with the RhitWebUserId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Account) GetRhitWebUserIdOk() (*string, bool) {
-	if o == nil || isNil(o.RhitWebUserId) {
-    return nil, false
+	if o == nil || o.RhitWebUserId == nil {
+		return nil, false
 	}
 	return o.RhitWebUserId, true
 }
 
 // HasRhitWebUserId returns a boolean if a field has been set.
 func (o *Account) HasRhitWebUserId() bool {
-	if o != nil && !isNil(o.RhitWebUserId) {
+	if o != nil && o.RhitWebUserId != nil {
 		return true
 	}
 
@@ -577,7 +578,7 @@ func (o *Account) SetRhitWebUserId(v string) {
 
 // GetServiceAccount returns the ServiceAccount field value if set, zero value otherwise.
 func (o *Account) GetServiceAccount() bool {
-	if o == nil || isNil(o.ServiceAccount) {
+	if o == nil || o.ServiceAccount == nil {
 		var ret bool
 		return ret
 	}
@@ -587,15 +588,15 @@ func (o *Account) GetServiceAccount() bool {
 // GetServiceAccountOk returns a tuple with the ServiceAccount field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Account) GetServiceAccountOk() (*bool, bool) {
-	if o == nil || isNil(o.ServiceAccount) {
-    return nil, false
+	if o == nil || o.ServiceAccount == nil {
+		return nil, false
 	}
 	return o.ServiceAccount, true
 }
 
 // HasServiceAccount returns a boolean if a field has been set.
 func (o *Account) HasServiceAccount() bool {
-	if o != nil && !isNil(o.ServiceAccount) {
+	if o != nil && o.ServiceAccount != nil {
 		return true
 	}
 
@@ -609,7 +610,7 @@ func (o *Account) SetServiceAccount(v bool) {
 
 // GetUpdatedAt returns the UpdatedAt field value if set, zero value otherwise.
 func (o *Account) GetUpdatedAt() time.Time {
-	if o == nil || isNil(o.UpdatedAt) {
+	if o == nil || o.UpdatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -619,15 +620,15 @@ func (o *Account) GetUpdatedAt() time.Time {
 // GetUpdatedAtOk returns a tuple with the UpdatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Account) GetUpdatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.UpdatedAt) {
-    return nil, false
+	if o == nil || o.UpdatedAt == nil {
+		return nil, false
 	}
 	return o.UpdatedAt, true
 }
 
 // HasUpdatedAt returns a boolean if a field has been set.
 func (o *Account) HasUpdatedAt() bool {
-	if o != nil && !isNil(o.UpdatedAt) {
+	if o != nil && o.UpdatedAt != nil {
 		return true
 	}
 
@@ -652,8 +653,8 @@ func (o *Account) GetUsername() string {
 // GetUsernameOk returns a tuple with the Username field value
 // and a boolean to check if the value has been set.
 func (o *Account) GetUsernameOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Username, true
 }
@@ -665,58 +666,58 @@ func (o *Account) SetUsername(v string) {
 
 func (o Account) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Href) {
+	if o.Href != nil {
 		toSerialize["href"] = o.Href
 	}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.Kind) {
+	if o.Kind != nil {
 		toSerialize["kind"] = o.Kind
 	}
-	if !isNil(o.BanCode) {
+	if o.BanCode != nil {
 		toSerialize["ban_code"] = o.BanCode
 	}
-	if !isNil(o.BanDescription) {
+	if o.BanDescription != nil {
 		toSerialize["ban_description"] = o.BanDescription
 	}
-	if !isNil(o.Banned) {
+	if o.Banned != nil {
 		toSerialize["banned"] = o.Banned
 	}
-	if !isNil(o.Capabilities) {
+	if o.Capabilities != nil {
 		toSerialize["capabilities"] = o.Capabilities
 	}
-	if !isNil(o.CreatedAt) {
+	if o.CreatedAt != nil {
 		toSerialize["created_at"] = o.CreatedAt
 	}
-	if !isNil(o.Email) {
+	if o.Email != nil {
 		toSerialize["email"] = o.Email
 	}
-	if !isNil(o.FirstName) {
+	if o.FirstName != nil {
 		toSerialize["first_name"] = o.FirstName
 	}
-	if !isNil(o.Labels) {
+	if o.Labels != nil {
 		toSerialize["labels"] = o.Labels
 	}
-	if !isNil(o.LastName) {
+	if o.LastName != nil {
 		toSerialize["last_name"] = o.LastName
 	}
-	if !isNil(o.Organization) {
+	if o.Organization != nil {
 		toSerialize["organization"] = o.Organization
 	}
-	if !isNil(o.OrganizationId) {
+	if o.OrganizationId != nil {
 		toSerialize["organization_id"] = o.OrganizationId
 	}
-	if !isNil(o.RhitAccountId) {
+	if o.RhitAccountId != nil {
 		toSerialize["rhit_account_id"] = o.RhitAccountId
 	}
-	if !isNil(o.RhitWebUserId) {
+	if o.RhitWebUserId != nil {
 		toSerialize["rhit_web_user_id"] = o.RhitWebUserId
 	}
-	if !isNil(o.ServiceAccount) {
+	if o.ServiceAccount != nil {
 		toSerialize["service_account"] = o.ServiceAccount
 	}
-	if !isNil(o.UpdatedAt) {
+	if o.UpdatedAt != nil {
 		toSerialize["updated_at"] = o.UpdatedAt
 	}
 	if true {
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_account_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_account_all_of.go
index c163dc6c..d32845bd 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_account_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_account_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -20,11 +20,11 @@ type AccountAllOf struct {
 	BanCode *string `json:"ban_code,omitempty"`
 	BanDescription *string `json:"ban_description,omitempty"`
 	Banned *bool `json:"banned,omitempty"`
-	Capabilities []Capability `json:"capabilities,omitempty"`
+	Capabilities *[]Capability `json:"capabilities,omitempty"`
 	CreatedAt *time.Time `json:"created_at,omitempty"`
 	Email *string `json:"email,omitempty"`
 	FirstName *string `json:"first_name,omitempty"`
-	Labels []Label `json:"labels,omitempty"`
+	Labels *[]Label `json:"labels,omitempty"`
 	LastName *string `json:"last_name,omitempty"`
 	Organization *Organization `json:"organization,omitempty"`
 	OrganizationId *string `json:"organization_id,omitempty"`
@@ -63,7 +63,7 @@ func NewAccountAllOfWithDefaults() *AccountAllOf {
 
 // GetBanCode returns the BanCode field value if set, zero value otherwise.
 func (o *AccountAllOf) GetBanCode() string {
-	if o == nil || isNil(o.BanCode) {
+	if o == nil || o.BanCode == nil {
 		var ret string
 		return ret
 	}
@@ -73,15 +73,15 @@ func (o *AccountAllOf) GetBanCode() string {
 // GetBanCodeOk returns a tuple with the BanCode field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AccountAllOf) GetBanCodeOk() (*string, bool) {
-	if o == nil || isNil(o.BanCode) {
-    return nil, false
+	if o == nil || o.BanCode == nil {
+		return nil, false
 	}
 	return o.BanCode, true
 }
 
 // HasBanCode returns a boolean if a field has been set.
 func (o *AccountAllOf) HasBanCode() bool {
-	if o != nil && !isNil(o.BanCode) {
+	if o != nil && o.BanCode != nil {
 		return true
 	}
 
@@ -95,7 +95,7 @@ func (o *AccountAllOf) SetBanCode(v string) {
 
 // GetBanDescription returns the BanDescription field value if set, zero value otherwise.
 func (o *AccountAllOf) GetBanDescription() string {
-	if o == nil || isNil(o.BanDescription) {
+	if o == nil || o.BanDescription == nil {
 		var ret string
 		return ret
 	}
@@ -105,15 +105,15 @@ func (o *AccountAllOf) GetBanDescription() string {
 // GetBanDescriptionOk returns a tuple with the BanDescription field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AccountAllOf) GetBanDescriptionOk() (*string, bool) {
-	if o == nil || isNil(o.BanDescription) {
-    return nil, false
+	if o == nil || o.BanDescription == nil {
+		return nil, false
 	}
 	return o.BanDescription, true
 }
 
 // HasBanDescription returns a boolean if a field has been set.
 func (o *AccountAllOf) HasBanDescription() bool {
-	if o != nil && !isNil(o.BanDescription) {
+	if o != nil && o.BanDescription != nil {
 		return true
 	}
 
@@ -127,7 +127,7 @@ func (o *AccountAllOf) SetBanDescription(v string) {
 
 // GetBanned returns the Banned field value if set, zero value otherwise.
 func (o *AccountAllOf) GetBanned() bool {
-	if o == nil || isNil(o.Banned) {
+	if o == nil || o.Banned == nil {
 		var ret bool
 		return ret
 	}
@@ -137,15 +137,15 @@ func (o *AccountAllOf) GetBanned() bool {
 // GetBannedOk returns a tuple with the Banned field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AccountAllOf) GetBannedOk() (*bool, bool) {
-	if o == nil || isNil(o.Banned) {
-    return nil, false
+	if o == nil || o.Banned == nil {
+		return nil, false
 	}
 	return o.Banned, true
 }
 
 // HasBanned returns a boolean if a field has been set.
 func (o *AccountAllOf) HasBanned() bool {
-	if o != nil && !isNil(o.Banned) {
+	if o != nil && o.Banned != nil {
 		return true
 	}
 
@@ -159,25 +159,25 @@ func (o *AccountAllOf) SetBanned(v bool) {
 
 // GetCapabilities returns the Capabilities field value if set, zero value otherwise.
 func (o *AccountAllOf) GetCapabilities() []Capability {
-	if o == nil || isNil(o.Capabilities) {
+	if o == nil || o.Capabilities == nil {
 		var ret []Capability
 		return ret
 	}
-	return o.Capabilities
+	return *o.Capabilities
 }
 
 // GetCapabilitiesOk returns a tuple with the Capabilities field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *AccountAllOf) GetCapabilitiesOk() ([]Capability, bool) {
-	if o == nil || isNil(o.Capabilities) {
-    return nil, false
+func (o *AccountAllOf) GetCapabilitiesOk() (*[]Capability, bool) {
+	if o == nil || o.Capabilities == nil {
+		return nil, false
 	}
 	return o.Capabilities, true
 }
 
 // HasCapabilities returns a boolean if a field has been set.
 func (o *AccountAllOf) HasCapabilities() bool {
-	if o != nil && !isNil(o.Capabilities) {
+	if o != nil && o.Capabilities != nil {
 		return true
 	}
 
@@ -186,12 +186,12 @@ func (o *AccountAllOf) HasCapabilities() bool {
 
 // SetCapabilities gets a reference to the given []Capability and assigns it to the Capabilities field.
 func (o *AccountAllOf) SetCapabilities(v []Capability) {
-	o.Capabilities = v
+	o.Capabilities = &v
 }
 
 // GetCreatedAt returns the CreatedAt field value if set, zero value otherwise.
 func (o *AccountAllOf) GetCreatedAt() time.Time {
-	if o == nil || isNil(o.CreatedAt) {
+	if o == nil || o.CreatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -201,15 +201,15 @@ func (o *AccountAllOf) GetCreatedAt() time.Time {
 // GetCreatedAtOk returns a tuple with the CreatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AccountAllOf) GetCreatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.CreatedAt) {
-    return nil, false
+	if o == nil || o.CreatedAt == nil {
+		return nil, false
 	}
 	return o.CreatedAt, true
 }
 
 // HasCreatedAt returns a boolean if a field has been set.
 func (o *AccountAllOf) HasCreatedAt() bool {
-	if o != nil && !isNil(o.CreatedAt) {
+	if o != nil && o.CreatedAt != nil {
 		return true
 	}
 
@@ -223,7 +223,7 @@ func (o *AccountAllOf) SetCreatedAt(v time.Time) {
 
 // GetEmail returns the Email field value if set, zero value otherwise.
 func (o *AccountAllOf) GetEmail() string {
-	if o == nil || isNil(o.Email) {
+	if o == nil || o.Email == nil {
 		var ret string
 		return ret
 	}
@@ -233,15 +233,15 @@ func (o *AccountAllOf) GetEmail() string {
 // GetEmailOk returns a tuple with the Email field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AccountAllOf) GetEmailOk() (*string, bool) {
-	if o == nil || isNil(o.Email) {
-    return nil, false
+	if o == nil || o.Email == nil {
+		return nil, false
 	}
 	return o.Email, true
 }
 
 // HasEmail returns a boolean if a field has been set.
 func (o *AccountAllOf) HasEmail() bool {
-	if o != nil && !isNil(o.Email) {
+	if o != nil && o.Email != nil {
 		return true
 	}
 
@@ -255,7 +255,7 @@ func (o *AccountAllOf) SetEmail(v string) {
 
 // GetFirstName returns the FirstName field value if set, zero value otherwise.
 func (o *AccountAllOf) GetFirstName() string {
-	if o == nil || isNil(o.FirstName) {
+	if o == nil || o.FirstName == nil {
 		var ret string
 		return ret
 	}
@@ -265,15 +265,15 @@ func (o *AccountAllOf) GetFirstName() string {
 // GetFirstNameOk returns a tuple with the FirstName field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AccountAllOf) GetFirstNameOk() (*string, bool) {
-	if o == nil || isNil(o.FirstName) {
-    return nil, false
+	if o == nil || o.FirstName == nil {
+		return nil, false
 	}
 	return o.FirstName, true
 }
 
 // HasFirstName returns a boolean if a field has been set.
 func (o *AccountAllOf) HasFirstName() bool {
-	if o != nil && !isNil(o.FirstName) {
+	if o != nil && o.FirstName != nil {
 		return true
 	}
 
@@ -287,25 +287,25 @@ func (o *AccountAllOf) SetFirstName(v string) {
 
 // GetLabels returns the Labels field value if set, zero value otherwise.
 func (o *AccountAllOf) GetLabels() []Label {
-	if o == nil || isNil(o.Labels) {
+	if o == nil || o.Labels == nil {
 		var ret []Label
 		return ret
 	}
-	return o.Labels
+	return *o.Labels
 }
 
 // GetLabelsOk returns a tuple with the Labels field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *AccountAllOf) GetLabelsOk() ([]Label, bool) {
-	if o == nil || isNil(o.Labels) {
-    return nil, false
+func (o *AccountAllOf) GetLabelsOk() (*[]Label, bool) {
+	if o == nil || o.Labels == nil {
+		return nil, false
 	}
 	return o.Labels, true
 }
 
 // HasLabels returns a boolean if a field has been set.
 func (o *AccountAllOf) HasLabels() bool {
-	if o != nil && !isNil(o.Labels) {
+	if o != nil && o.Labels != nil {
 		return true
 	}
 
@@ -314,12 +314,12 @@ func (o *AccountAllOf) HasLabels() bool {
 
 // SetLabels gets a reference to the given []Label and assigns it to the Labels field.
 func (o *AccountAllOf) SetLabels(v []Label) {
-	o.Labels = v
+	o.Labels = &v
 }
 
 // GetLastName returns the LastName field value if set, zero value otherwise.
 func (o *AccountAllOf) GetLastName() string {
-	if o == nil || isNil(o.LastName) {
+	if o == nil || o.LastName == nil {
 		var ret string
 		return ret
 	}
@@ -329,15 +329,15 @@ func (o *AccountAllOf) GetLastName() string {
 // GetLastNameOk returns a tuple with the LastName field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AccountAllOf) GetLastNameOk() (*string, bool) {
-	if o == nil || isNil(o.LastName) {
-    return nil, false
+	if o == nil || o.LastName == nil {
+		return nil, false
 	}
 	return o.LastName, true
 }
 
 // HasLastName returns a boolean if a field has been set.
 func (o *AccountAllOf) HasLastName() bool {
-	if o != nil && !isNil(o.LastName) {
+	if o != nil && o.LastName != nil {
 		return true
 	}
 
@@ -351,7 +351,7 @@ func (o *AccountAllOf) SetLastName(v string) {
 
 // GetOrganization returns the Organization field value if set, zero value otherwise.
 func (o *AccountAllOf) GetOrganization() Organization {
-	if o == nil || isNil(o.Organization) {
+	if o == nil || o.Organization == nil {
 		var ret Organization
 		return ret
 	}
@@ -361,15 +361,15 @@ func (o *AccountAllOf) GetOrganization() Organization {
 // GetOrganizationOk returns a tuple with the Organization field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AccountAllOf) GetOrganizationOk() (*Organization, bool) {
-	if o == nil || isNil(o.Organization) {
-    return nil, false
+	if o == nil || o.Organization == nil {
+		return nil, false
 	}
 	return o.Organization, true
 }
 
 // HasOrganization returns a boolean if a field has been set.
 func (o *AccountAllOf) HasOrganization() bool {
-	if o != nil && !isNil(o.Organization) {
+	if o != nil && o.Organization != nil {
 		return true
 	}
 
@@ -383,7 +383,7 @@ func (o *AccountAllOf) SetOrganization(v Organization) {
 
 // GetOrganizationId returns the OrganizationId field value if set, zero value otherwise.
 func (o *AccountAllOf) GetOrganizationId() string {
-	if o == nil || isNil(o.OrganizationId) {
+	if o == nil || o.OrganizationId == nil {
 		var ret string
 		return ret
 	}
@@ -393,15 +393,15 @@ func (o *AccountAllOf) GetOrganizationId() string {
 // GetOrganizationIdOk returns a tuple with the OrganizationId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AccountAllOf) GetOrganizationIdOk() (*string, bool) {
-	if o == nil || isNil(o.OrganizationId) {
-    return nil, false
+	if o == nil || o.OrganizationId == nil {
+		return nil, false
 	}
 	return o.OrganizationId, true
 }
 
 // HasOrganizationId returns a boolean if a field has been set.
 func (o *AccountAllOf) HasOrganizationId() bool {
-	if o != nil && !isNil(o.OrganizationId) {
+	if o != nil && o.OrganizationId != nil {
 		return true
 	}
 
@@ -415,7 +415,7 @@ func (o *AccountAllOf) SetOrganizationId(v string) {
 
 // GetRhitAccountId returns the RhitAccountId field value if set, zero value otherwise.
 func (o *AccountAllOf) GetRhitAccountId() string {
-	if o == nil || isNil(o.RhitAccountId) {
+	if o == nil || o.RhitAccountId == nil {
 		var ret string
 		return ret
 	}
@@ -425,15 +425,15 @@ func (o *AccountAllOf) GetRhitAccountId() string {
 // GetRhitAccountIdOk returns a tuple with the RhitAccountId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AccountAllOf) GetRhitAccountIdOk() (*string, bool) {
-	if o == nil || isNil(o.RhitAccountId) {
-    return nil, false
+	if o == nil || o.RhitAccountId == nil {
+		return nil, false
 	}
 	return o.RhitAccountId, true
 }
 
 // HasRhitAccountId returns a boolean if a field has been set.
 func (o *AccountAllOf) HasRhitAccountId() bool {
-	if o != nil && !isNil(o.RhitAccountId) {
+	if o != nil && o.RhitAccountId != nil {
 		return true
 	}
 
@@ -447,7 +447,7 @@ func (o *AccountAllOf) SetRhitAccountId(v string) {
 
 // GetRhitWebUserId returns the RhitWebUserId field value if set, zero value otherwise.
 func (o *AccountAllOf) GetRhitWebUserId() string {
-	if o == nil || isNil(o.RhitWebUserId) {
+	if o == nil || o.RhitWebUserId == nil {
 		var ret string
 		return ret
 	}
@@ -457,15 +457,15 @@ func (o *AccountAllOf) GetRhitWebUserId() string {
 // GetRhitWebUserIdOk returns a tuple with the RhitWebUserId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AccountAllOf) GetRhitWebUserIdOk() (*string, bool) {
-	if o == nil || isNil(o.RhitWebUserId) {
-    return nil, false
+	if o == nil || o.RhitWebUserId == nil {
+		return nil, false
 	}
 	return o.RhitWebUserId, true
 }
 
 // HasRhitWebUserId returns a boolean if a field has been set.
 func (o *AccountAllOf) HasRhitWebUserId() bool {
-	if o != nil && !isNil(o.RhitWebUserId) {
+	if o != nil && o.RhitWebUserId != nil {
 		return true
 	}
 
@@ -479,7 +479,7 @@ func (o *AccountAllOf) SetRhitWebUserId(v string) {
 
 // GetServiceAccount returns the ServiceAccount field value if set, zero value otherwise.
 func (o *AccountAllOf) GetServiceAccount() bool {
-	if o == nil || isNil(o.ServiceAccount) {
+	if o == nil || o.ServiceAccount == nil {
 		var ret bool
 		return ret
 	}
@@ -489,15 +489,15 @@ func (o *AccountAllOf) GetServiceAccount() bool {
 // GetServiceAccountOk returns a tuple with the ServiceAccount field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AccountAllOf) GetServiceAccountOk() (*bool, bool) {
-	if o == nil || isNil(o.ServiceAccount) {
-    return nil, false
+	if o == nil || o.ServiceAccount == nil {
+		return nil, false
 	}
 	return o.ServiceAccount, true
 }
 
 // HasServiceAccount returns a boolean if a field has been set.
 func (o *AccountAllOf) HasServiceAccount() bool {
-	if o != nil && !isNil(o.ServiceAccount) {
+	if o != nil && o.ServiceAccount != nil {
 		return true
 	}
 
@@ -511,7 +511,7 @@ func (o *AccountAllOf) SetServiceAccount(v bool) {
 
 // GetUpdatedAt returns the UpdatedAt field value if set, zero value otherwise.
 func (o *AccountAllOf) GetUpdatedAt() time.Time {
-	if o == nil || isNil(o.UpdatedAt) {
+	if o == nil || o.UpdatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -521,15 +521,15 @@ func (o *AccountAllOf) GetUpdatedAt() time.Time {
 // GetUpdatedAtOk returns a tuple with the UpdatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AccountAllOf) GetUpdatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.UpdatedAt) {
-    return nil, false
+	if o == nil || o.UpdatedAt == nil {
+		return nil, false
 	}
 	return o.UpdatedAt, true
 }
 
 // HasUpdatedAt returns a boolean if a field has been set.
 func (o *AccountAllOf) HasUpdatedAt() bool {
-	if o != nil && !isNil(o.UpdatedAt) {
+	if o != nil && o.UpdatedAt != nil {
 		return true
 	}
 
@@ -554,8 +554,8 @@ func (o *AccountAllOf) GetUsername() string {
 // GetUsernameOk returns a tuple with the Username field value
 // and a boolean to check if the value has been set.
 func (o *AccountAllOf) GetUsernameOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Username, true
 }
@@ -567,49 +567,49 @@ func (o *AccountAllOf) SetUsername(v string) {
 
 func (o AccountAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.BanCode) {
+	if o.BanCode != nil {
 		toSerialize["ban_code"] = o.BanCode
 	}
-	if !isNil(o.BanDescription) {
+	if o.BanDescription != nil {
 		toSerialize["ban_description"] = o.BanDescription
 	}
-	if !isNil(o.Banned) {
+	if o.Banned != nil {
 		toSerialize["banned"] = o.Banned
 	}
-	if !isNil(o.Capabilities) {
+	if o.Capabilities != nil {
 		toSerialize["capabilities"] = o.Capabilities
 	}
-	if !isNil(o.CreatedAt) {
+	if o.CreatedAt != nil {
 		toSerialize["created_at"] = o.CreatedAt
 	}
-	if !isNil(o.Email) {
+	if o.Email != nil {
 		toSerialize["email"] = o.Email
 	}
-	if !isNil(o.FirstName) {
+	if o.FirstName != nil {
 		toSerialize["first_name"] = o.FirstName
 	}
-	if !isNil(o.Labels) {
+	if o.Labels != nil {
 		toSerialize["labels"] = o.Labels
 	}
-	if !isNil(o.LastName) {
+	if o.LastName != nil {
 		toSerialize["last_name"] = o.LastName
 	}
-	if !isNil(o.Organization) {
+	if o.Organization != nil {
 		toSerialize["organization"] = o.Organization
 	}
-	if !isNil(o.OrganizationId) {
+	if o.OrganizationId != nil {
 		toSerialize["organization_id"] = o.OrganizationId
 	}
-	if !isNil(o.RhitAccountId) {
+	if o.RhitAccountId != nil {
 		toSerialize["rhit_account_id"] = o.RhitAccountId
 	}
-	if !isNil(o.RhitWebUserId) {
+	if o.RhitWebUserId != nil {
 		toSerialize["rhit_web_user_id"] = o.RhitWebUserId
 	}
-	if !isNil(o.ServiceAccount) {
+	if o.ServiceAccount != nil {
 		toSerialize["service_account"] = o.ServiceAccount
 	}
-	if !isNil(o.UpdatedAt) {
+	if o.UpdatedAt != nil {
 		toSerialize["updated_at"] = o.UpdatedAt
 	}
 	if true {
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_account_group.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_account_group.go
index 21f0d17e..893b595c 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_account_group.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_account_group.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -12,6 +12,7 @@ package accountmgmtclient
 
 import (
 	"encoding/json"
+	"time"
 )
 
 // AccountGroup struct for AccountGroup
@@ -50,7 +51,7 @@ func NewAccountGroupWithDefaults() *AccountGroup {
 
 // GetHref returns the Href field value if set, zero value otherwise.
 func (o *AccountGroup) GetHref() string {
-	if o == nil || isNil(o.Href) {
+	if o == nil || o.Href == nil {
 		var ret string
 		return ret
 	}
@@ -60,15 +61,15 @@ func (o *AccountGroup) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AccountGroup) GetHrefOk() (*string, bool) {
-	if o == nil || isNil(o.Href) {
-    return nil, false
+	if o == nil || o.Href == nil {
+		return nil, false
 	}
 	return o.Href, true
 }
 
 // HasHref returns a boolean if a field has been set.
 func (o *AccountGroup) HasHref() bool {
-	if o != nil && !isNil(o.Href) {
+	if o != nil && o.Href != nil {
 		return true
 	}
 
@@ -82,7 +83,7 @@ func (o *AccountGroup) SetHref(v string) {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *AccountGroup) GetId() string {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret string
 		return ret
 	}
@@ -92,15 +93,15 @@ func (o *AccountGroup) GetId() string {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AccountGroup) GetIdOk() (*string, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *AccountGroup) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -114,7 +115,7 @@ func (o *AccountGroup) SetId(v string) {
 
 // GetKind returns the Kind field value if set, zero value otherwise.
 func (o *AccountGroup) GetKind() string {
-	if o == nil || isNil(o.Kind) {
+	if o == nil || o.Kind == nil {
 		var ret string
 		return ret
 	}
@@ -124,15 +125,15 @@ func (o *AccountGroup) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AccountGroup) GetKindOk() (*string, bool) {
-	if o == nil || isNil(o.Kind) {
-    return nil, false
+	if o == nil || o.Kind == nil {
+		return nil, false
 	}
 	return o.Kind, true
 }
 
 // HasKind returns a boolean if a field has been set.
 func (o *AccountGroup) HasKind() bool {
-	if o != nil && !isNil(o.Kind) {
+	if o != nil && o.Kind != nil {
 		return true
 	}
 
@@ -146,7 +147,7 @@ func (o *AccountGroup) SetKind(v string) {
 
 // GetCreatedAt returns the CreatedAt field value if set, zero value otherwise.
 func (o *AccountGroup) GetCreatedAt() time.Time {
-	if o == nil || isNil(o.CreatedAt) {
+	if o == nil || o.CreatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -156,15 +157,15 @@ func (o *AccountGroup) GetCreatedAt() time.Time {
 // GetCreatedAtOk returns a tuple with the CreatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AccountGroup) GetCreatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.CreatedAt) {
-    return nil, false
+	if o == nil || o.CreatedAt == nil {
+		return nil, false
 	}
 	return o.CreatedAt, true
 }
 
 // HasCreatedAt returns a boolean if a field has been set.
 func (o *AccountGroup) HasCreatedAt() bool {
-	if o != nil && !isNil(o.CreatedAt) {
+	if o != nil && o.CreatedAt != nil {
 		return true
 	}
 
@@ -189,8 +190,8 @@ func (o *AccountGroup) GetDescription() string {
 // GetDescriptionOk returns a tuple with the Description field value
 // and a boolean to check if the value has been set.
 func (o *AccountGroup) GetDescriptionOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Description, true
 }
@@ -213,8 +214,8 @@ func (o *AccountGroup) GetManagedBy() string {
 // GetManagedByOk returns a tuple with the ManagedBy field value
 // and a boolean to check if the value has been set.
 func (o *AccountGroup) GetManagedByOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.ManagedBy, true
 }
@@ -237,8 +238,8 @@ func (o *AccountGroup) GetName() string {
 // GetNameOk returns a tuple with the Name field value
 // and a boolean to check if the value has been set.
 func (o *AccountGroup) GetNameOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Name, true
 }
@@ -261,8 +262,8 @@ func (o *AccountGroup) GetOrganizationId() string {
 // GetOrganizationIdOk returns a tuple with the OrganizationId field value
 // and a boolean to check if the value has been set.
 func (o *AccountGroup) GetOrganizationIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.OrganizationId, true
 }
@@ -274,7 +275,7 @@ func (o *AccountGroup) SetOrganizationId(v string) {
 
 // GetUpdatedAt returns the UpdatedAt field value if set, zero value otherwise.
 func (o *AccountGroup) GetUpdatedAt() time.Time {
-	if o == nil || isNil(o.UpdatedAt) {
+	if o == nil || o.UpdatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -284,15 +285,15 @@ func (o *AccountGroup) GetUpdatedAt() time.Time {
 // GetUpdatedAtOk returns a tuple with the UpdatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AccountGroup) GetUpdatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.UpdatedAt) {
-    return nil, false
+	if o == nil || o.UpdatedAt == nil {
+		return nil, false
 	}
 	return o.UpdatedAt, true
 }
 
 // HasUpdatedAt returns a boolean if a field has been set.
 func (o *AccountGroup) HasUpdatedAt() bool {
-	if o != nil && !isNil(o.UpdatedAt) {
+	if o != nil && o.UpdatedAt != nil {
 		return true
 	}
 
@@ -306,16 +307,16 @@ func (o *AccountGroup) SetUpdatedAt(v time.Time) {
 
 func (o AccountGroup) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Href) {
+	if o.Href != nil {
 		toSerialize["href"] = o.Href
 	}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.Kind) {
+	if o.Kind != nil {
 		toSerialize["kind"] = o.Kind
 	}
-	if !isNil(o.CreatedAt) {
+	if o.CreatedAt != nil {
 		toSerialize["created_at"] = o.CreatedAt
 	}
 	if true {
@@ -330,7 +331,7 @@ func (o AccountGroup) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["organization_id"] = o.OrganizationId
 	}
-	if !isNil(o.UpdatedAt) {
+	if o.UpdatedAt != nil {
 		toSerialize["updated_at"] = o.UpdatedAt
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_account_group_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_account_group_all_of.go
index 19406ae5..010b1ebf 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_account_group_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_account_group_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -48,7 +48,7 @@ func NewAccountGroupAllOfWithDefaults() *AccountGroupAllOf {
 
 // GetCreatedAt returns the CreatedAt field value if set, zero value otherwise.
 func (o *AccountGroupAllOf) GetCreatedAt() time.Time {
-	if o == nil || isNil(o.CreatedAt) {
+	if o == nil || o.CreatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -58,15 +58,15 @@ func (o *AccountGroupAllOf) GetCreatedAt() time.Time {
 // GetCreatedAtOk returns a tuple with the CreatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AccountGroupAllOf) GetCreatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.CreatedAt) {
-    return nil, false
+	if o == nil || o.CreatedAt == nil {
+		return nil, false
 	}
 	return o.CreatedAt, true
 }
 
 // HasCreatedAt returns a boolean if a field has been set.
 func (o *AccountGroupAllOf) HasCreatedAt() bool {
-	if o != nil && !isNil(o.CreatedAt) {
+	if o != nil && o.CreatedAt != nil {
 		return true
 	}
 
@@ -91,8 +91,8 @@ func (o *AccountGroupAllOf) GetDescription() string {
 // GetDescriptionOk returns a tuple with the Description field value
 // and a boolean to check if the value has been set.
 func (o *AccountGroupAllOf) GetDescriptionOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Description, true
 }
@@ -115,8 +115,8 @@ func (o *AccountGroupAllOf) GetManagedBy() string {
 // GetManagedByOk returns a tuple with the ManagedBy field value
 // and a boolean to check if the value has been set.
 func (o *AccountGroupAllOf) GetManagedByOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.ManagedBy, true
 }
@@ -139,8 +139,8 @@ func (o *AccountGroupAllOf) GetName() string {
 // GetNameOk returns a tuple with the Name field value
 // and a boolean to check if the value has been set.
 func (o *AccountGroupAllOf) GetNameOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Name, true
 }
@@ -163,8 +163,8 @@ func (o *AccountGroupAllOf) GetOrganizationId() string {
 // GetOrganizationIdOk returns a tuple with the OrganizationId field value
 // and a boolean to check if the value has been set.
 func (o *AccountGroupAllOf) GetOrganizationIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.OrganizationId, true
 }
@@ -176,7 +176,7 @@ func (o *AccountGroupAllOf) SetOrganizationId(v string) {
 
 // GetUpdatedAt returns the UpdatedAt field value if set, zero value otherwise.
 func (o *AccountGroupAllOf) GetUpdatedAt() time.Time {
-	if o == nil || isNil(o.UpdatedAt) {
+	if o == nil || o.UpdatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -186,15 +186,15 @@ func (o *AccountGroupAllOf) GetUpdatedAt() time.Time {
 // GetUpdatedAtOk returns a tuple with the UpdatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AccountGroupAllOf) GetUpdatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.UpdatedAt) {
-    return nil, false
+	if o == nil || o.UpdatedAt == nil {
+		return nil, false
 	}
 	return o.UpdatedAt, true
 }
 
 // HasUpdatedAt returns a boolean if a field has been set.
 func (o *AccountGroupAllOf) HasUpdatedAt() bool {
-	if o != nil && !isNil(o.UpdatedAt) {
+	if o != nil && o.UpdatedAt != nil {
 		return true
 	}
 
@@ -208,7 +208,7 @@ func (o *AccountGroupAllOf) SetUpdatedAt(v time.Time) {
 
 func (o AccountGroupAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.CreatedAt) {
+	if o.CreatedAt != nil {
 		toSerialize["created_at"] = o.CreatedAt
 	}
 	if true {
@@ -223,7 +223,7 @@ func (o AccountGroupAllOf) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["organization_id"] = o.OrganizationId
 	}
-	if !isNil(o.UpdatedAt) {
+	if o.UpdatedAt != nil {
 		toSerialize["updated_at"] = o.UpdatedAt
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_account_group_assignment.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_account_group_assignment.go
index 235c989f..cc6b7805 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_account_group_assignment.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_account_group_assignment.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -12,6 +12,7 @@ package accountmgmtclient
 
 import (
 	"encoding/json"
+	"time"
 )
 
 // AccountGroupAssignment struct for AccountGroupAssignment
@@ -46,7 +47,7 @@ func NewAccountGroupAssignmentWithDefaults() *AccountGroupAssignment {
 
 // GetHref returns the Href field value if set, zero value otherwise.
 func (o *AccountGroupAssignment) GetHref() string {
-	if o == nil || isNil(o.Href) {
+	if o == nil || o.Href == nil {
 		var ret string
 		return ret
 	}
@@ -56,15 +57,15 @@ func (o *AccountGroupAssignment) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AccountGroupAssignment) GetHrefOk() (*string, bool) {
-	if o == nil || isNil(o.Href) {
-    return nil, false
+	if o == nil || o.Href == nil {
+		return nil, false
 	}
 	return o.Href, true
 }
 
 // HasHref returns a boolean if a field has been set.
 func (o *AccountGroupAssignment) HasHref() bool {
-	if o != nil && !isNil(o.Href) {
+	if o != nil && o.Href != nil {
 		return true
 	}
 
@@ -78,7 +79,7 @@ func (o *AccountGroupAssignment) SetHref(v string) {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *AccountGroupAssignment) GetId() string {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret string
 		return ret
 	}
@@ -88,15 +89,15 @@ func (o *AccountGroupAssignment) GetId() string {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AccountGroupAssignment) GetIdOk() (*string, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *AccountGroupAssignment) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -110,7 +111,7 @@ func (o *AccountGroupAssignment) SetId(v string) {
 
 // GetKind returns the Kind field value if set, zero value otherwise.
 func (o *AccountGroupAssignment) GetKind() string {
-	if o == nil || isNil(o.Kind) {
+	if o == nil || o.Kind == nil {
 		var ret string
 		return ret
 	}
@@ -120,15 +121,15 @@ func (o *AccountGroupAssignment) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AccountGroupAssignment) GetKindOk() (*string, bool) {
-	if o == nil || isNil(o.Kind) {
-    return nil, false
+	if o == nil || o.Kind == nil {
+		return nil, false
 	}
 	return o.Kind, true
 }
 
 // HasKind returns a boolean if a field has been set.
 func (o *AccountGroupAssignment) HasKind() bool {
-	if o != nil && !isNil(o.Kind) {
+	if o != nil && o.Kind != nil {
 		return true
 	}
 
@@ -153,8 +154,8 @@ func (o *AccountGroupAssignment) GetAccountGroupId() string {
 // GetAccountGroupIdOk returns a tuple with the AccountGroupId field value
 // and a boolean to check if the value has been set.
 func (o *AccountGroupAssignment) GetAccountGroupIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.AccountGroupId, true
 }
@@ -177,8 +178,8 @@ func (o *AccountGroupAssignment) GetAccountId() string {
 // GetAccountIdOk returns a tuple with the AccountId field value
 // and a boolean to check if the value has been set.
 func (o *AccountGroupAssignment) GetAccountIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.AccountId, true
 }
@@ -190,7 +191,7 @@ func (o *AccountGroupAssignment) SetAccountId(v string) {
 
 // GetCreatedAt returns the CreatedAt field value if set, zero value otherwise.
 func (o *AccountGroupAssignment) GetCreatedAt() time.Time {
-	if o == nil || isNil(o.CreatedAt) {
+	if o == nil || o.CreatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -200,15 +201,15 @@ func (o *AccountGroupAssignment) GetCreatedAt() time.Time {
 // GetCreatedAtOk returns a tuple with the CreatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AccountGroupAssignment) GetCreatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.CreatedAt) {
-    return nil, false
+	if o == nil || o.CreatedAt == nil {
+		return nil, false
 	}
 	return o.CreatedAt, true
 }
 
 // HasCreatedAt returns a boolean if a field has been set.
 func (o *AccountGroupAssignment) HasCreatedAt() bool {
-	if o != nil && !isNil(o.CreatedAt) {
+	if o != nil && o.CreatedAt != nil {
 		return true
 	}
 
@@ -222,7 +223,7 @@ func (o *AccountGroupAssignment) SetCreatedAt(v time.Time) {
 
 // GetUpdatedAt returns the UpdatedAt field value if set, zero value otherwise.
 func (o *AccountGroupAssignment) GetUpdatedAt() time.Time {
-	if o == nil || isNil(o.UpdatedAt) {
+	if o == nil || o.UpdatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -232,15 +233,15 @@ func (o *AccountGroupAssignment) GetUpdatedAt() time.Time {
 // GetUpdatedAtOk returns a tuple with the UpdatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AccountGroupAssignment) GetUpdatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.UpdatedAt) {
-    return nil, false
+	if o == nil || o.UpdatedAt == nil {
+		return nil, false
 	}
 	return o.UpdatedAt, true
 }
 
 // HasUpdatedAt returns a boolean if a field has been set.
 func (o *AccountGroupAssignment) HasUpdatedAt() bool {
-	if o != nil && !isNil(o.UpdatedAt) {
+	if o != nil && o.UpdatedAt != nil {
 		return true
 	}
 
@@ -254,13 +255,13 @@ func (o *AccountGroupAssignment) SetUpdatedAt(v time.Time) {
 
 func (o AccountGroupAssignment) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Href) {
+	if o.Href != nil {
 		toSerialize["href"] = o.Href
 	}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.Kind) {
+	if o.Kind != nil {
 		toSerialize["kind"] = o.Kind
 	}
 	if true {
@@ -269,10 +270,10 @@ func (o AccountGroupAssignment) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["account_id"] = o.AccountId
 	}
-	if !isNil(o.CreatedAt) {
+	if o.CreatedAt != nil {
 		toSerialize["created_at"] = o.CreatedAt
 	}
-	if !isNil(o.UpdatedAt) {
+	if o.UpdatedAt != nil {
 		toSerialize["updated_at"] = o.UpdatedAt
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_account_group_assignment_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_account_group_assignment_all_of.go
index 5045e267..dc3c2acd 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_account_group_assignment_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_account_group_assignment_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -55,8 +55,8 @@ func (o *AccountGroupAssignmentAllOf) GetAccountGroupId() string {
 // GetAccountGroupIdOk returns a tuple with the AccountGroupId field value
 // and a boolean to check if the value has been set.
 func (o *AccountGroupAssignmentAllOf) GetAccountGroupIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.AccountGroupId, true
 }
@@ -79,8 +79,8 @@ func (o *AccountGroupAssignmentAllOf) GetAccountId() string {
 // GetAccountIdOk returns a tuple with the AccountId field value
 // and a boolean to check if the value has been set.
 func (o *AccountGroupAssignmentAllOf) GetAccountIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.AccountId, true
 }
@@ -92,7 +92,7 @@ func (o *AccountGroupAssignmentAllOf) SetAccountId(v string) {
 
 // GetCreatedAt returns the CreatedAt field value if set, zero value otherwise.
 func (o *AccountGroupAssignmentAllOf) GetCreatedAt() time.Time {
-	if o == nil || isNil(o.CreatedAt) {
+	if o == nil || o.CreatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -102,15 +102,15 @@ func (o *AccountGroupAssignmentAllOf) GetCreatedAt() time.Time {
 // GetCreatedAtOk returns a tuple with the CreatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AccountGroupAssignmentAllOf) GetCreatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.CreatedAt) {
-    return nil, false
+	if o == nil || o.CreatedAt == nil {
+		return nil, false
 	}
 	return o.CreatedAt, true
 }
 
 // HasCreatedAt returns a boolean if a field has been set.
 func (o *AccountGroupAssignmentAllOf) HasCreatedAt() bool {
-	if o != nil && !isNil(o.CreatedAt) {
+	if o != nil && o.CreatedAt != nil {
 		return true
 	}
 
@@ -124,7 +124,7 @@ func (o *AccountGroupAssignmentAllOf) SetCreatedAt(v time.Time) {
 
 // GetUpdatedAt returns the UpdatedAt field value if set, zero value otherwise.
 func (o *AccountGroupAssignmentAllOf) GetUpdatedAt() time.Time {
-	if o == nil || isNil(o.UpdatedAt) {
+	if o == nil || o.UpdatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -134,15 +134,15 @@ func (o *AccountGroupAssignmentAllOf) GetUpdatedAt() time.Time {
 // GetUpdatedAtOk returns a tuple with the UpdatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AccountGroupAssignmentAllOf) GetUpdatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.UpdatedAt) {
-    return nil, false
+	if o == nil || o.UpdatedAt == nil {
+		return nil, false
 	}
 	return o.UpdatedAt, true
 }
 
 // HasUpdatedAt returns a boolean if a field has been set.
 func (o *AccountGroupAssignmentAllOf) HasUpdatedAt() bool {
-	if o != nil && !isNil(o.UpdatedAt) {
+	if o != nil && o.UpdatedAt != nil {
 		return true
 	}
 
@@ -162,10 +162,10 @@ func (o AccountGroupAssignmentAllOf) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["account_id"] = o.AccountId
 	}
-	if !isNil(o.CreatedAt) {
+	if o.CreatedAt != nil {
 		toSerialize["created_at"] = o.CreatedAt
 	}
-	if !isNil(o.UpdatedAt) {
+	if o.UpdatedAt != nil {
 		toSerialize["updated_at"] = o.UpdatedAt
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_account_group_assignment_list.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_account_group_assignment_list.go
index 0d5a1fdc..84eed306 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_account_group_assignment_list.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_account_group_assignment_list.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -58,8 +58,8 @@ func (o *AccountGroupAssignmentList) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *AccountGroupAssignmentList) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -82,8 +82,8 @@ func (o *AccountGroupAssignmentList) GetPage() int32 {
 // GetPageOk returns a tuple with the Page field value
 // and a boolean to check if the value has been set.
 func (o *AccountGroupAssignmentList) GetPageOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Page, true
 }
@@ -106,8 +106,8 @@ func (o *AccountGroupAssignmentList) GetSize() int32 {
 // GetSizeOk returns a tuple with the Size field value
 // and a boolean to check if the value has been set.
 func (o *AccountGroupAssignmentList) GetSizeOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Size, true
 }
@@ -130,8 +130,8 @@ func (o *AccountGroupAssignmentList) GetTotal() int32 {
 // GetTotalOk returns a tuple with the Total field value
 // and a boolean to check if the value has been set.
 func (o *AccountGroupAssignmentList) GetTotalOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Total, true
 }
@@ -153,11 +153,11 @@ func (o *AccountGroupAssignmentList) GetItems() []AccountGroupAssignment {
 
 // GetItemsOk returns a tuple with the Items field value
 // and a boolean to check if the value has been set.
-func (o *AccountGroupAssignmentList) GetItemsOk() ([]AccountGroupAssignment, bool) {
-	if o == nil {
-    return nil, false
+func (o *AccountGroupAssignmentList) GetItemsOk() (*[]AccountGroupAssignment, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Items, true
+	return &o.Items, true
 }
 
 // SetItems sets field value
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_account_group_assignment_list_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_account_group_assignment_list_all_of.go
index f53e5107..98031c89 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_account_group_assignment_list_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_account_group_assignment_list_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -16,7 +16,7 @@ import (
 
 // AccountGroupAssignmentListAllOf struct for AccountGroupAssignmentListAllOf
 type AccountGroupAssignmentListAllOf struct {
-	Items []AccountGroupAssignment `json:"items,omitempty"`
+	Items *[]AccountGroupAssignment `json:"items,omitempty"`
 }
 
 // NewAccountGroupAssignmentListAllOf instantiates a new AccountGroupAssignmentListAllOf object
@@ -38,25 +38,25 @@ func NewAccountGroupAssignmentListAllOfWithDefaults() *AccountGroupAssignmentLis
 
 // GetItems returns the Items field value if set, zero value otherwise.
 func (o *AccountGroupAssignmentListAllOf) GetItems() []AccountGroupAssignment {
-	if o == nil || isNil(o.Items) {
+	if o == nil || o.Items == nil {
 		var ret []AccountGroupAssignment
 		return ret
 	}
-	return o.Items
+	return *o.Items
 }
 
 // GetItemsOk returns a tuple with the Items field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *AccountGroupAssignmentListAllOf) GetItemsOk() ([]AccountGroupAssignment, bool) {
-	if o == nil || isNil(o.Items) {
-    return nil, false
+func (o *AccountGroupAssignmentListAllOf) GetItemsOk() (*[]AccountGroupAssignment, bool) {
+	if o == nil || o.Items == nil {
+		return nil, false
 	}
 	return o.Items, true
 }
 
 // HasItems returns a boolean if a field has been set.
 func (o *AccountGroupAssignmentListAllOf) HasItems() bool {
-	if o != nil && !isNil(o.Items) {
+	if o != nil && o.Items != nil {
 		return true
 	}
 
@@ -65,12 +65,12 @@ func (o *AccountGroupAssignmentListAllOf) HasItems() bool {
 
 // SetItems gets a reference to the given []AccountGroupAssignment and assigns it to the Items field.
 func (o *AccountGroupAssignmentListAllOf) SetItems(v []AccountGroupAssignment) {
-	o.Items = v
+	o.Items = &v
 }
 
 func (o AccountGroupAssignmentListAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Items) {
+	if o.Items != nil {
 		toSerialize["items"] = o.Items
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_account_group_list.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_account_group_list.go
index d2ef5196..1ddadb75 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_account_group_list.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_account_group_list.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -58,8 +58,8 @@ func (o *AccountGroupList) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *AccountGroupList) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -82,8 +82,8 @@ func (o *AccountGroupList) GetPage() int32 {
 // GetPageOk returns a tuple with the Page field value
 // and a boolean to check if the value has been set.
 func (o *AccountGroupList) GetPageOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Page, true
 }
@@ -106,8 +106,8 @@ func (o *AccountGroupList) GetSize() int32 {
 // GetSizeOk returns a tuple with the Size field value
 // and a boolean to check if the value has been set.
 func (o *AccountGroupList) GetSizeOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Size, true
 }
@@ -130,8 +130,8 @@ func (o *AccountGroupList) GetTotal() int32 {
 // GetTotalOk returns a tuple with the Total field value
 // and a boolean to check if the value has been set.
 func (o *AccountGroupList) GetTotalOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Total, true
 }
@@ -153,11 +153,11 @@ func (o *AccountGroupList) GetItems() []AccountGroup {
 
 // GetItemsOk returns a tuple with the Items field value
 // and a boolean to check if the value has been set.
-func (o *AccountGroupList) GetItemsOk() ([]AccountGroup, bool) {
-	if o == nil {
-    return nil, false
+func (o *AccountGroupList) GetItemsOk() (*[]AccountGroup, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Items, true
+	return &o.Items, true
 }
 
 // SetItems sets field value
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_account_group_list_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_account_group_list_all_of.go
index 3623bb3a..28e83d16 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_account_group_list_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_account_group_list_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -16,7 +16,7 @@ import (
 
 // AccountGroupListAllOf struct for AccountGroupListAllOf
 type AccountGroupListAllOf struct {
-	Items []AccountGroup `json:"items,omitempty"`
+	Items *[]AccountGroup `json:"items,omitempty"`
 }
 
 // NewAccountGroupListAllOf instantiates a new AccountGroupListAllOf object
@@ -38,25 +38,25 @@ func NewAccountGroupListAllOfWithDefaults() *AccountGroupListAllOf {
 
 // GetItems returns the Items field value if set, zero value otherwise.
 func (o *AccountGroupListAllOf) GetItems() []AccountGroup {
-	if o == nil || isNil(o.Items) {
+	if o == nil || o.Items == nil {
 		var ret []AccountGroup
 		return ret
 	}
-	return o.Items
+	return *o.Items
 }
 
 // GetItemsOk returns a tuple with the Items field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *AccountGroupListAllOf) GetItemsOk() ([]AccountGroup, bool) {
-	if o == nil || isNil(o.Items) {
-    return nil, false
+func (o *AccountGroupListAllOf) GetItemsOk() (*[]AccountGroup, bool) {
+	if o == nil || o.Items == nil {
+		return nil, false
 	}
 	return o.Items, true
 }
 
 // HasItems returns a boolean if a field has been set.
 func (o *AccountGroupListAllOf) HasItems() bool {
-	if o != nil && !isNil(o.Items) {
+	if o != nil && o.Items != nil {
 		return true
 	}
 
@@ -65,12 +65,12 @@ func (o *AccountGroupListAllOf) HasItems() bool {
 
 // SetItems gets a reference to the given []AccountGroup and assigns it to the Items field.
 func (o *AccountGroupListAllOf) SetItems(v []AccountGroup) {
-	o.Items = v
+	o.Items = &v
 }
 
 func (o AccountGroupListAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Items) {
+	if o.Items != nil {
 		toSerialize["items"] = o.Items
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_account_group_request.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_account_group_request.go
index acaadc0d..8d21eab7 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_account_group_request.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_account_group_request.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -44,7 +44,7 @@ func NewAccountGroupRequestWithDefaults() *AccountGroupRequest {
 
 // GetHref returns the Href field value if set, zero value otherwise.
 func (o *AccountGroupRequest) GetHref() string {
-	if o == nil || isNil(o.Href) {
+	if o == nil || o.Href == nil {
 		var ret string
 		return ret
 	}
@@ -54,15 +54,15 @@ func (o *AccountGroupRequest) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AccountGroupRequest) GetHrefOk() (*string, bool) {
-	if o == nil || isNil(o.Href) {
-    return nil, false
+	if o == nil || o.Href == nil {
+		return nil, false
 	}
 	return o.Href, true
 }
 
 // HasHref returns a boolean if a field has been set.
 func (o *AccountGroupRequest) HasHref() bool {
-	if o != nil && !isNil(o.Href) {
+	if o != nil && o.Href != nil {
 		return true
 	}
 
@@ -76,7 +76,7 @@ func (o *AccountGroupRequest) SetHref(v string) {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *AccountGroupRequest) GetId() string {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret string
 		return ret
 	}
@@ -86,15 +86,15 @@ func (o *AccountGroupRequest) GetId() string {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AccountGroupRequest) GetIdOk() (*string, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *AccountGroupRequest) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -108,7 +108,7 @@ func (o *AccountGroupRequest) SetId(v string) {
 
 // GetKind returns the Kind field value if set, zero value otherwise.
 func (o *AccountGroupRequest) GetKind() string {
-	if o == nil || isNil(o.Kind) {
+	if o == nil || o.Kind == nil {
 		var ret string
 		return ret
 	}
@@ -118,15 +118,15 @@ func (o *AccountGroupRequest) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AccountGroupRequest) GetKindOk() (*string, bool) {
-	if o == nil || isNil(o.Kind) {
-    return nil, false
+	if o == nil || o.Kind == nil {
+		return nil, false
 	}
 	return o.Kind, true
 }
 
 // HasKind returns a boolean if a field has been set.
 func (o *AccountGroupRequest) HasKind() bool {
-	if o != nil && !isNil(o.Kind) {
+	if o != nil && o.Kind != nil {
 		return true
 	}
 
@@ -151,8 +151,8 @@ func (o *AccountGroupRequest) GetDescription() string {
 // GetDescriptionOk returns a tuple with the Description field value
 // and a boolean to check if the value has been set.
 func (o *AccountGroupRequest) GetDescriptionOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Description, true
 }
@@ -175,8 +175,8 @@ func (o *AccountGroupRequest) GetName() string {
 // GetNameOk returns a tuple with the Name field value
 // and a boolean to check if the value has been set.
 func (o *AccountGroupRequest) GetNameOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Name, true
 }
@@ -188,13 +188,13 @@ func (o *AccountGroupRequest) SetName(v string) {
 
 func (o AccountGroupRequest) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Href) {
+	if o.Href != nil {
 		toSerialize["href"] = o.Href
 	}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.Kind) {
+	if o.Kind != nil {
 		toSerialize["kind"] = o.Kind
 	}
 	if true {
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_account_group_request_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_account_group_request_all_of.go
index b815c58b..faa5d393 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_account_group_request_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_account_group_request_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -52,8 +52,8 @@ func (o *AccountGroupRequestAllOf) GetDescription() string {
 // GetDescriptionOk returns a tuple with the Description field value
 // and a boolean to check if the value has been set.
 func (o *AccountGroupRequestAllOf) GetDescriptionOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Description, true
 }
@@ -76,8 +76,8 @@ func (o *AccountGroupRequestAllOf) GetName() string {
 // GetNameOk returns a tuple with the Name field value
 // and a boolean to check if the value has been set.
 func (o *AccountGroupRequestAllOf) GetNameOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Name, true
 }
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_account_list.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_account_list.go
index 93c30f06..b1d2d94d 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_account_list.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_account_list.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -58,8 +58,8 @@ func (o *AccountList) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *AccountList) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -82,8 +82,8 @@ func (o *AccountList) GetPage() int32 {
 // GetPageOk returns a tuple with the Page field value
 // and a boolean to check if the value has been set.
 func (o *AccountList) GetPageOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Page, true
 }
@@ -106,8 +106,8 @@ func (o *AccountList) GetSize() int32 {
 // GetSizeOk returns a tuple with the Size field value
 // and a boolean to check if the value has been set.
 func (o *AccountList) GetSizeOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Size, true
 }
@@ -130,8 +130,8 @@ func (o *AccountList) GetTotal() int32 {
 // GetTotalOk returns a tuple with the Total field value
 // and a boolean to check if the value has been set.
 func (o *AccountList) GetTotalOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Total, true
 }
@@ -153,11 +153,11 @@ func (o *AccountList) GetItems() []Account {
 
 // GetItemsOk returns a tuple with the Items field value
 // and a boolean to check if the value has been set.
-func (o *AccountList) GetItemsOk() ([]Account, bool) {
-	if o == nil {
-    return nil, false
+func (o *AccountList) GetItemsOk() (*[]Account, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Items, true
+	return &o.Items, true
 }
 
 // SetItems sets field value
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_account_list_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_account_list_all_of.go
index e81cfcac..63530312 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_account_list_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_account_list_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -16,7 +16,7 @@ import (
 
 // AccountListAllOf struct for AccountListAllOf
 type AccountListAllOf struct {
-	Items []Account `json:"items,omitempty"`
+	Items *[]Account `json:"items,omitempty"`
 }
 
 // NewAccountListAllOf instantiates a new AccountListAllOf object
@@ -38,25 +38,25 @@ func NewAccountListAllOfWithDefaults() *AccountListAllOf {
 
 // GetItems returns the Items field value if set, zero value otherwise.
 func (o *AccountListAllOf) GetItems() []Account {
-	if o == nil || isNil(o.Items) {
+	if o == nil || o.Items == nil {
 		var ret []Account
 		return ret
 	}
-	return o.Items
+	return *o.Items
 }
 
 // GetItemsOk returns a tuple with the Items field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *AccountListAllOf) GetItemsOk() ([]Account, bool) {
-	if o == nil || isNil(o.Items) {
-    return nil, false
+func (o *AccountListAllOf) GetItemsOk() (*[]Account, bool) {
+	if o == nil || o.Items == nil {
+		return nil, false
 	}
 	return o.Items, true
 }
 
 // HasItems returns a boolean if a field has been set.
 func (o *AccountListAllOf) HasItems() bool {
-	if o != nil && !isNil(o.Items) {
+	if o != nil && o.Items != nil {
 		return true
 	}
 
@@ -65,12 +65,12 @@ func (o *AccountListAllOf) HasItems() bool {
 
 // SetItems gets a reference to the given []Account and assigns it to the Items field.
 func (o *AccountListAllOf) SetItems(v []Account) {
-	o.Items = v
+	o.Items = &v
 }
 
 func (o AccountListAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Items) {
+	if o.Items != nil {
 		toSerialize["items"] = o.Items
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_account_patch_request.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_account_patch_request.go
index dcbdb8ca..d617226a 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_account_patch_request.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_account_patch_request.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -45,7 +45,7 @@ func NewAccountPatchRequestWithDefaults() *AccountPatchRequest {
 
 // GetBanCode returns the BanCode field value if set, zero value otherwise.
 func (o *AccountPatchRequest) GetBanCode() string {
-	if o == nil || isNil(o.BanCode) {
+	if o == nil || o.BanCode == nil {
 		var ret string
 		return ret
 	}
@@ -55,15 +55,15 @@ func (o *AccountPatchRequest) GetBanCode() string {
 // GetBanCodeOk returns a tuple with the BanCode field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AccountPatchRequest) GetBanCodeOk() (*string, bool) {
-	if o == nil || isNil(o.BanCode) {
-    return nil, false
+	if o == nil || o.BanCode == nil {
+		return nil, false
 	}
 	return o.BanCode, true
 }
 
 // HasBanCode returns a boolean if a field has been set.
 func (o *AccountPatchRequest) HasBanCode() bool {
-	if o != nil && !isNil(o.BanCode) {
+	if o != nil && o.BanCode != nil {
 		return true
 	}
 
@@ -77,7 +77,7 @@ func (o *AccountPatchRequest) SetBanCode(v string) {
 
 // GetBanDescription returns the BanDescription field value if set, zero value otherwise.
 func (o *AccountPatchRequest) GetBanDescription() string {
-	if o == nil || isNil(o.BanDescription) {
+	if o == nil || o.BanDescription == nil {
 		var ret string
 		return ret
 	}
@@ -87,15 +87,15 @@ func (o *AccountPatchRequest) GetBanDescription() string {
 // GetBanDescriptionOk returns a tuple with the BanDescription field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AccountPatchRequest) GetBanDescriptionOk() (*string, bool) {
-	if o == nil || isNil(o.BanDescription) {
-    return nil, false
+	if o == nil || o.BanDescription == nil {
+		return nil, false
 	}
 	return o.BanDescription, true
 }
 
 // HasBanDescription returns a boolean if a field has been set.
 func (o *AccountPatchRequest) HasBanDescription() bool {
-	if o != nil && !isNil(o.BanDescription) {
+	if o != nil && o.BanDescription != nil {
 		return true
 	}
 
@@ -109,7 +109,7 @@ func (o *AccountPatchRequest) SetBanDescription(v string) {
 
 // GetBanned returns the Banned field value if set, zero value otherwise.
 func (o *AccountPatchRequest) GetBanned() bool {
-	if o == nil || isNil(o.Banned) {
+	if o == nil || o.Banned == nil {
 		var ret bool
 		return ret
 	}
@@ -119,15 +119,15 @@ func (o *AccountPatchRequest) GetBanned() bool {
 // GetBannedOk returns a tuple with the Banned field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AccountPatchRequest) GetBannedOk() (*bool, bool) {
-	if o == nil || isNil(o.Banned) {
-    return nil, false
+	if o == nil || o.Banned == nil {
+		return nil, false
 	}
 	return o.Banned, true
 }
 
 // HasBanned returns a boolean if a field has been set.
 func (o *AccountPatchRequest) HasBanned() bool {
-	if o != nil && !isNil(o.Banned) {
+	if o != nil && o.Banned != nil {
 		return true
 	}
 
@@ -141,7 +141,7 @@ func (o *AccountPatchRequest) SetBanned(v bool) {
 
 // GetEmail returns the Email field value if set, zero value otherwise.
 func (o *AccountPatchRequest) GetEmail() string {
-	if o == nil || isNil(o.Email) {
+	if o == nil || o.Email == nil {
 		var ret string
 		return ret
 	}
@@ -151,15 +151,15 @@ func (o *AccountPatchRequest) GetEmail() string {
 // GetEmailOk returns a tuple with the Email field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AccountPatchRequest) GetEmailOk() (*string, bool) {
-	if o == nil || isNil(o.Email) {
-    return nil, false
+	if o == nil || o.Email == nil {
+		return nil, false
 	}
 	return o.Email, true
 }
 
 // HasEmail returns a boolean if a field has been set.
 func (o *AccountPatchRequest) HasEmail() bool {
-	if o != nil && !isNil(o.Email) {
+	if o != nil && o.Email != nil {
 		return true
 	}
 
@@ -173,7 +173,7 @@ func (o *AccountPatchRequest) SetEmail(v string) {
 
 // GetFirstName returns the FirstName field value if set, zero value otherwise.
 func (o *AccountPatchRequest) GetFirstName() string {
-	if o == nil || isNil(o.FirstName) {
+	if o == nil || o.FirstName == nil {
 		var ret string
 		return ret
 	}
@@ -183,15 +183,15 @@ func (o *AccountPatchRequest) GetFirstName() string {
 // GetFirstNameOk returns a tuple with the FirstName field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AccountPatchRequest) GetFirstNameOk() (*string, bool) {
-	if o == nil || isNil(o.FirstName) {
-    return nil, false
+	if o == nil || o.FirstName == nil {
+		return nil, false
 	}
 	return o.FirstName, true
 }
 
 // HasFirstName returns a boolean if a field has been set.
 func (o *AccountPatchRequest) HasFirstName() bool {
-	if o != nil && !isNil(o.FirstName) {
+	if o != nil && o.FirstName != nil {
 		return true
 	}
 
@@ -205,7 +205,7 @@ func (o *AccountPatchRequest) SetFirstName(v string) {
 
 // GetLastName returns the LastName field value if set, zero value otherwise.
 func (o *AccountPatchRequest) GetLastName() string {
-	if o == nil || isNil(o.LastName) {
+	if o == nil || o.LastName == nil {
 		var ret string
 		return ret
 	}
@@ -215,15 +215,15 @@ func (o *AccountPatchRequest) GetLastName() string {
 // GetLastNameOk returns a tuple with the LastName field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AccountPatchRequest) GetLastNameOk() (*string, bool) {
-	if o == nil || isNil(o.LastName) {
-    return nil, false
+	if o == nil || o.LastName == nil {
+		return nil, false
 	}
 	return o.LastName, true
 }
 
 // HasLastName returns a boolean if a field has been set.
 func (o *AccountPatchRequest) HasLastName() bool {
-	if o != nil && !isNil(o.LastName) {
+	if o != nil && o.LastName != nil {
 		return true
 	}
 
@@ -237,7 +237,7 @@ func (o *AccountPatchRequest) SetLastName(v string) {
 
 // GetOrganizationId returns the OrganizationId field value if set, zero value otherwise.
 func (o *AccountPatchRequest) GetOrganizationId() string {
-	if o == nil || isNil(o.OrganizationId) {
+	if o == nil || o.OrganizationId == nil {
 		var ret string
 		return ret
 	}
@@ -247,15 +247,15 @@ func (o *AccountPatchRequest) GetOrganizationId() string {
 // GetOrganizationIdOk returns a tuple with the OrganizationId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AccountPatchRequest) GetOrganizationIdOk() (*string, bool) {
-	if o == nil || isNil(o.OrganizationId) {
-    return nil, false
+	if o == nil || o.OrganizationId == nil {
+		return nil, false
 	}
 	return o.OrganizationId, true
 }
 
 // HasOrganizationId returns a boolean if a field has been set.
 func (o *AccountPatchRequest) HasOrganizationId() bool {
-	if o != nil && !isNil(o.OrganizationId) {
+	if o != nil && o.OrganizationId != nil {
 		return true
 	}
 
@@ -269,7 +269,7 @@ func (o *AccountPatchRequest) SetOrganizationId(v string) {
 
 // GetServiceAccount returns the ServiceAccount field value if set, zero value otherwise.
 func (o *AccountPatchRequest) GetServiceAccount() bool {
-	if o == nil || isNil(o.ServiceAccount) {
+	if o == nil || o.ServiceAccount == nil {
 		var ret bool
 		return ret
 	}
@@ -279,15 +279,15 @@ func (o *AccountPatchRequest) GetServiceAccount() bool {
 // GetServiceAccountOk returns a tuple with the ServiceAccount field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AccountPatchRequest) GetServiceAccountOk() (*bool, bool) {
-	if o == nil || isNil(o.ServiceAccount) {
-    return nil, false
+	if o == nil || o.ServiceAccount == nil {
+		return nil, false
 	}
 	return o.ServiceAccount, true
 }
 
 // HasServiceAccount returns a boolean if a field has been set.
 func (o *AccountPatchRequest) HasServiceAccount() bool {
-	if o != nil && !isNil(o.ServiceAccount) {
+	if o != nil && o.ServiceAccount != nil {
 		return true
 	}
 
@@ -301,28 +301,28 @@ func (o *AccountPatchRequest) SetServiceAccount(v bool) {
 
 func (o AccountPatchRequest) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.BanCode) {
+	if o.BanCode != nil {
 		toSerialize["ban_code"] = o.BanCode
 	}
-	if !isNil(o.BanDescription) {
+	if o.BanDescription != nil {
 		toSerialize["ban_description"] = o.BanDescription
 	}
-	if !isNil(o.Banned) {
+	if o.Banned != nil {
 		toSerialize["banned"] = o.Banned
 	}
-	if !isNil(o.Email) {
+	if o.Email != nil {
 		toSerialize["email"] = o.Email
 	}
-	if !isNil(o.FirstName) {
+	if o.FirstName != nil {
 		toSerialize["first_name"] = o.FirstName
 	}
-	if !isNil(o.LastName) {
+	if o.LastName != nil {
 		toSerialize["last_name"] = o.LastName
 	}
-	if !isNil(o.OrganizationId) {
+	if o.OrganizationId != nil {
 		toSerialize["organization_id"] = o.OrganizationId
 	}
-	if !isNil(o.ServiceAccount) {
+	if o.ServiceAccount != nil {
 		toSerialize["service_account"] = o.ServiceAccount
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_account_reference.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_account_reference.go
index 26c9d544..47b07a31 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_account_reference.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_account_reference.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -43,7 +43,7 @@ func NewAccountReferenceWithDefaults() *AccountReference {
 
 // GetHref returns the Href field value if set, zero value otherwise.
 func (o *AccountReference) GetHref() string {
-	if o == nil || isNil(o.Href) {
+	if o == nil || o.Href == nil {
 		var ret string
 		return ret
 	}
@@ -53,15 +53,15 @@ func (o *AccountReference) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AccountReference) GetHrefOk() (*string, bool) {
-	if o == nil || isNil(o.Href) {
-    return nil, false
+	if o == nil || o.Href == nil {
+		return nil, false
 	}
 	return o.Href, true
 }
 
 // HasHref returns a boolean if a field has been set.
 func (o *AccountReference) HasHref() bool {
-	if o != nil && !isNil(o.Href) {
+	if o != nil && o.Href != nil {
 		return true
 	}
 
@@ -75,7 +75,7 @@ func (o *AccountReference) SetHref(v string) {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *AccountReference) GetId() string {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret string
 		return ret
 	}
@@ -85,15 +85,15 @@ func (o *AccountReference) GetId() string {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AccountReference) GetIdOk() (*string, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *AccountReference) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -107,7 +107,7 @@ func (o *AccountReference) SetId(v string) {
 
 // GetKind returns the Kind field value if set, zero value otherwise.
 func (o *AccountReference) GetKind() string {
-	if o == nil || isNil(o.Kind) {
+	if o == nil || o.Kind == nil {
 		var ret string
 		return ret
 	}
@@ -117,15 +117,15 @@ func (o *AccountReference) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AccountReference) GetKindOk() (*string, bool) {
-	if o == nil || isNil(o.Kind) {
-    return nil, false
+	if o == nil || o.Kind == nil {
+		return nil, false
 	}
 	return o.Kind, true
 }
 
 // HasKind returns a boolean if a field has been set.
 func (o *AccountReference) HasKind() bool {
-	if o != nil && !isNil(o.Kind) {
+	if o != nil && o.Kind != nil {
 		return true
 	}
 
@@ -139,7 +139,7 @@ func (o *AccountReference) SetKind(v string) {
 
 // GetEmail returns the Email field value if set, zero value otherwise.
 func (o *AccountReference) GetEmail() string {
-	if o == nil || isNil(o.Email) {
+	if o == nil || o.Email == nil {
 		var ret string
 		return ret
 	}
@@ -149,15 +149,15 @@ func (o *AccountReference) GetEmail() string {
 // GetEmailOk returns a tuple with the Email field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AccountReference) GetEmailOk() (*string, bool) {
-	if o == nil || isNil(o.Email) {
-    return nil, false
+	if o == nil || o.Email == nil {
+		return nil, false
 	}
 	return o.Email, true
 }
 
 // HasEmail returns a boolean if a field has been set.
 func (o *AccountReference) HasEmail() bool {
-	if o != nil && !isNil(o.Email) {
+	if o != nil && o.Email != nil {
 		return true
 	}
 
@@ -171,7 +171,7 @@ func (o *AccountReference) SetEmail(v string) {
 
 // GetName returns the Name field value if set, zero value otherwise.
 func (o *AccountReference) GetName() string {
-	if o == nil || isNil(o.Name) {
+	if o == nil || o.Name == nil {
 		var ret string
 		return ret
 	}
@@ -181,15 +181,15 @@ func (o *AccountReference) GetName() string {
 // GetNameOk returns a tuple with the Name field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AccountReference) GetNameOk() (*string, bool) {
-	if o == nil || isNil(o.Name) {
-    return nil, false
+	if o == nil || o.Name == nil {
+		return nil, false
 	}
 	return o.Name, true
 }
 
 // HasName returns a boolean if a field has been set.
 func (o *AccountReference) HasName() bool {
-	if o != nil && !isNil(o.Name) {
+	if o != nil && o.Name != nil {
 		return true
 	}
 
@@ -203,7 +203,7 @@ func (o *AccountReference) SetName(v string) {
 
 // GetUsername returns the Username field value if set, zero value otherwise.
 func (o *AccountReference) GetUsername() string {
-	if o == nil || isNil(o.Username) {
+	if o == nil || o.Username == nil {
 		var ret string
 		return ret
 	}
@@ -213,15 +213,15 @@ func (o *AccountReference) GetUsername() string {
 // GetUsernameOk returns a tuple with the Username field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AccountReference) GetUsernameOk() (*string, bool) {
-	if o == nil || isNil(o.Username) {
-    return nil, false
+	if o == nil || o.Username == nil {
+		return nil, false
 	}
 	return o.Username, true
 }
 
 // HasUsername returns a boolean if a field has been set.
 func (o *AccountReference) HasUsername() bool {
-	if o != nil && !isNil(o.Username) {
+	if o != nil && o.Username != nil {
 		return true
 	}
 
@@ -235,22 +235,22 @@ func (o *AccountReference) SetUsername(v string) {
 
 func (o AccountReference) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Href) {
+	if o.Href != nil {
 		toSerialize["href"] = o.Href
 	}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.Kind) {
+	if o.Kind != nil {
 		toSerialize["kind"] = o.Kind
 	}
-	if !isNil(o.Email) {
+	if o.Email != nil {
 		toSerialize["email"] = o.Email
 	}
-	if !isNil(o.Name) {
+	if o.Name != nil {
 		toSerialize["name"] = o.Name
 	}
-	if !isNil(o.Username) {
+	if o.Username != nil {
 		toSerialize["username"] = o.Username
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_account_reference_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_account_reference_all_of.go
index c3b67e0c..a9f0388a 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_account_reference_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_account_reference_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -40,7 +40,7 @@ func NewAccountReferenceAllOfWithDefaults() *AccountReferenceAllOf {
 
 // GetEmail returns the Email field value if set, zero value otherwise.
 func (o *AccountReferenceAllOf) GetEmail() string {
-	if o == nil || isNil(o.Email) {
+	if o == nil || o.Email == nil {
 		var ret string
 		return ret
 	}
@@ -50,15 +50,15 @@ func (o *AccountReferenceAllOf) GetEmail() string {
 // GetEmailOk returns a tuple with the Email field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AccountReferenceAllOf) GetEmailOk() (*string, bool) {
-	if o == nil || isNil(o.Email) {
-    return nil, false
+	if o == nil || o.Email == nil {
+		return nil, false
 	}
 	return o.Email, true
 }
 
 // HasEmail returns a boolean if a field has been set.
 func (o *AccountReferenceAllOf) HasEmail() bool {
-	if o != nil && !isNil(o.Email) {
+	if o != nil && o.Email != nil {
 		return true
 	}
 
@@ -72,7 +72,7 @@ func (o *AccountReferenceAllOf) SetEmail(v string) {
 
 // GetName returns the Name field value if set, zero value otherwise.
 func (o *AccountReferenceAllOf) GetName() string {
-	if o == nil || isNil(o.Name) {
+	if o == nil || o.Name == nil {
 		var ret string
 		return ret
 	}
@@ -82,15 +82,15 @@ func (o *AccountReferenceAllOf) GetName() string {
 // GetNameOk returns a tuple with the Name field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AccountReferenceAllOf) GetNameOk() (*string, bool) {
-	if o == nil || isNil(o.Name) {
-    return nil, false
+	if o == nil || o.Name == nil {
+		return nil, false
 	}
 	return o.Name, true
 }
 
 // HasName returns a boolean if a field has been set.
 func (o *AccountReferenceAllOf) HasName() bool {
-	if o != nil && !isNil(o.Name) {
+	if o != nil && o.Name != nil {
 		return true
 	}
 
@@ -104,7 +104,7 @@ func (o *AccountReferenceAllOf) SetName(v string) {
 
 // GetUsername returns the Username field value if set, zero value otherwise.
 func (o *AccountReferenceAllOf) GetUsername() string {
-	if o == nil || isNil(o.Username) {
+	if o == nil || o.Username == nil {
 		var ret string
 		return ret
 	}
@@ -114,15 +114,15 @@ func (o *AccountReferenceAllOf) GetUsername() string {
 // GetUsernameOk returns a tuple with the Username field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AccountReferenceAllOf) GetUsernameOk() (*string, bool) {
-	if o == nil || isNil(o.Username) {
-    return nil, false
+	if o == nil || o.Username == nil {
+		return nil, false
 	}
 	return o.Username, true
 }
 
 // HasUsername returns a boolean if a field has been set.
 func (o *AccountReferenceAllOf) HasUsername() bool {
-	if o != nil && !isNil(o.Username) {
+	if o != nil && o.Username != nil {
 		return true
 	}
 
@@ -136,13 +136,13 @@ func (o *AccountReferenceAllOf) SetUsername(v string) {
 
 func (o AccountReferenceAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Email) {
+	if o.Email != nil {
 		toSerialize["email"] = o.Email
 	}
-	if !isNil(o.Name) {
+	if o.Name != nil {
 		toSerialize["name"] = o.Name
 	}
-	if !isNil(o.Username) {
+	if o.Username != nil {
 		toSerialize["username"] = o.Username
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_capability.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_capability.go
index 1ca16bd9..881c7495 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_capability.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_capability.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -46,7 +46,7 @@ func NewCapabilityWithDefaults() *Capability {
 
 // GetHref returns the Href field value if set, zero value otherwise.
 func (o *Capability) GetHref() string {
-	if o == nil || isNil(o.Href) {
+	if o == nil || o.Href == nil {
 		var ret string
 		return ret
 	}
@@ -56,15 +56,15 @@ func (o *Capability) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Capability) GetHrefOk() (*string, bool) {
-	if o == nil || isNil(o.Href) {
-    return nil, false
+	if o == nil || o.Href == nil {
+		return nil, false
 	}
 	return o.Href, true
 }
 
 // HasHref returns a boolean if a field has been set.
 func (o *Capability) HasHref() bool {
-	if o != nil && !isNil(o.Href) {
+	if o != nil && o.Href != nil {
 		return true
 	}
 
@@ -78,7 +78,7 @@ func (o *Capability) SetHref(v string) {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *Capability) GetId() string {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret string
 		return ret
 	}
@@ -88,15 +88,15 @@ func (o *Capability) GetId() string {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Capability) GetIdOk() (*string, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *Capability) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -110,7 +110,7 @@ func (o *Capability) SetId(v string) {
 
 // GetKind returns the Kind field value if set, zero value otherwise.
 func (o *Capability) GetKind() string {
-	if o == nil || isNil(o.Kind) {
+	if o == nil || o.Kind == nil {
 		var ret string
 		return ret
 	}
@@ -120,15 +120,15 @@ func (o *Capability) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Capability) GetKindOk() (*string, bool) {
-	if o == nil || isNil(o.Kind) {
-    return nil, false
+	if o == nil || o.Kind == nil {
+		return nil, false
 	}
 	return o.Kind, true
 }
 
 // HasKind returns a boolean if a field has been set.
 func (o *Capability) HasKind() bool {
-	if o != nil && !isNil(o.Kind) {
+	if o != nil && o.Kind != nil {
 		return true
 	}
 
@@ -153,8 +153,8 @@ func (o *Capability) GetInherited() bool {
 // GetInheritedOk returns a tuple with the Inherited field value
 // and a boolean to check if the value has been set.
 func (o *Capability) GetInheritedOk() (*bool, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Inherited, true
 }
@@ -177,8 +177,8 @@ func (o *Capability) GetName() string {
 // GetNameOk returns a tuple with the Name field value
 // and a boolean to check if the value has been set.
 func (o *Capability) GetNameOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Name, true
 }
@@ -201,8 +201,8 @@ func (o *Capability) GetValue() string {
 // GetValueOk returns a tuple with the Value field value
 // and a boolean to check if the value has been set.
 func (o *Capability) GetValueOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Value, true
 }
@@ -214,13 +214,13 @@ func (o *Capability) SetValue(v string) {
 
 func (o Capability) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Href) {
+	if o.Href != nil {
 		toSerialize["href"] = o.Href
 	}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.Kind) {
+	if o.Kind != nil {
 		toSerialize["kind"] = o.Kind
 	}
 	if true {
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_capability_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_capability_all_of.go
index 209d561f..3b960558 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_capability_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_capability_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -54,8 +54,8 @@ func (o *CapabilityAllOf) GetInherited() bool {
 // GetInheritedOk returns a tuple with the Inherited field value
 // and a boolean to check if the value has been set.
 func (o *CapabilityAllOf) GetInheritedOk() (*bool, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Inherited, true
 }
@@ -78,8 +78,8 @@ func (o *CapabilityAllOf) GetName() string {
 // GetNameOk returns a tuple with the Name field value
 // and a boolean to check if the value has been set.
 func (o *CapabilityAllOf) GetNameOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Name, true
 }
@@ -102,8 +102,8 @@ func (o *CapabilityAllOf) GetValue() string {
 // GetValueOk returns a tuple with the Value field value
 // and a boolean to check if the value has been set.
 func (o *CapabilityAllOf) GetValueOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Value, true
 }
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_capability_review.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_capability_review.go
index 079f0bcd..90c0bd48 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_capability_review.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_capability_review.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -50,8 +50,8 @@ func (o *CapabilityReview) GetResult() string {
 // GetResultOk returns a tuple with the Result field value
 // and a boolean to check if the value has been set.
 func (o *CapabilityReview) GetResultOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Result, true
 }
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_capability_review_request.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_capability_review_request.go
index 5c350949..a4234366 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_capability_review_request.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_capability_review_request.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -57,8 +57,8 @@ func (o *CapabilityReviewRequest) GetAccountUsername() string {
 // GetAccountUsernameOk returns a tuple with the AccountUsername field value
 // and a boolean to check if the value has been set.
 func (o *CapabilityReviewRequest) GetAccountUsernameOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.AccountUsername, true
 }
@@ -81,8 +81,8 @@ func (o *CapabilityReviewRequest) GetCapability() string {
 // GetCapabilityOk returns a tuple with the Capability field value
 // and a boolean to check if the value has been set.
 func (o *CapabilityReviewRequest) GetCapabilityOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Capability, true
 }
@@ -94,7 +94,7 @@ func (o *CapabilityReviewRequest) SetCapability(v string) {
 
 // GetClusterId returns the ClusterId field value if set, zero value otherwise.
 func (o *CapabilityReviewRequest) GetClusterId() string {
-	if o == nil || isNil(o.ClusterId) {
+	if o == nil || o.ClusterId == nil {
 		var ret string
 		return ret
 	}
@@ -104,15 +104,15 @@ func (o *CapabilityReviewRequest) GetClusterId() string {
 // GetClusterIdOk returns a tuple with the ClusterId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *CapabilityReviewRequest) GetClusterIdOk() (*string, bool) {
-	if o == nil || isNil(o.ClusterId) {
-    return nil, false
+	if o == nil || o.ClusterId == nil {
+		return nil, false
 	}
 	return o.ClusterId, true
 }
 
 // HasClusterId returns a boolean if a field has been set.
 func (o *CapabilityReviewRequest) HasClusterId() bool {
-	if o != nil && !isNil(o.ClusterId) {
+	if o != nil && o.ClusterId != nil {
 		return true
 	}
 
@@ -126,7 +126,7 @@ func (o *CapabilityReviewRequest) SetClusterId(v string) {
 
 // GetOrganizationId returns the OrganizationId field value if set, zero value otherwise.
 func (o *CapabilityReviewRequest) GetOrganizationId() string {
-	if o == nil || isNil(o.OrganizationId) {
+	if o == nil || o.OrganizationId == nil {
 		var ret string
 		return ret
 	}
@@ -136,15 +136,15 @@ func (o *CapabilityReviewRequest) GetOrganizationId() string {
 // GetOrganizationIdOk returns a tuple with the OrganizationId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *CapabilityReviewRequest) GetOrganizationIdOk() (*string, bool) {
-	if o == nil || isNil(o.OrganizationId) {
-    return nil, false
+	if o == nil || o.OrganizationId == nil {
+		return nil, false
 	}
 	return o.OrganizationId, true
 }
 
 // HasOrganizationId returns a boolean if a field has been set.
 func (o *CapabilityReviewRequest) HasOrganizationId() bool {
-	if o != nil && !isNil(o.OrganizationId) {
+	if o != nil && o.OrganizationId != nil {
 		return true
 	}
 
@@ -158,7 +158,7 @@ func (o *CapabilityReviewRequest) SetOrganizationId(v string) {
 
 // GetSubscriptionId returns the SubscriptionId field value if set, zero value otherwise.
 func (o *CapabilityReviewRequest) GetSubscriptionId() string {
-	if o == nil || isNil(o.SubscriptionId) {
+	if o == nil || o.SubscriptionId == nil {
 		var ret string
 		return ret
 	}
@@ -168,15 +168,15 @@ func (o *CapabilityReviewRequest) GetSubscriptionId() string {
 // GetSubscriptionIdOk returns a tuple with the SubscriptionId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *CapabilityReviewRequest) GetSubscriptionIdOk() (*string, bool) {
-	if o == nil || isNil(o.SubscriptionId) {
-    return nil, false
+	if o == nil || o.SubscriptionId == nil {
+		return nil, false
 	}
 	return o.SubscriptionId, true
 }
 
 // HasSubscriptionId returns a boolean if a field has been set.
 func (o *CapabilityReviewRequest) HasSubscriptionId() bool {
-	if o != nil && !isNil(o.SubscriptionId) {
+	if o != nil && o.SubscriptionId != nil {
 		return true
 	}
 
@@ -201,8 +201,8 @@ func (o *CapabilityReviewRequest) GetType() string {
 // GetTypeOk returns a tuple with the Type field value
 // and a boolean to check if the value has been set.
 func (o *CapabilityReviewRequest) GetTypeOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Type, true
 }
@@ -220,13 +220,13 @@ func (o CapabilityReviewRequest) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["capability"] = o.Capability
 	}
-	if !isNil(o.ClusterId) {
+	if o.ClusterId != nil {
 		toSerialize["cluster_id"] = o.ClusterId
 	}
-	if !isNil(o.OrganizationId) {
+	if o.OrganizationId != nil {
 		toSerialize["organization_id"] = o.OrganizationId
 	}
-	if !isNil(o.SubscriptionId) {
+	if o.SubscriptionId != nil {
 		toSerialize["subscription_id"] = o.SubscriptionId
 	}
 	if true {
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_certificate.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_certificate.go
index 162efb07..5ea1f3d6 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_certificate.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_certificate.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -60,8 +60,8 @@ func (o *Certificate) GetCert() string {
 // GetCertOk returns a tuple with the Cert field value
 // and a boolean to check if the value has been set.
 func (o *Certificate) GetCertOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Cert, true
 }
@@ -84,8 +84,8 @@ func (o *Certificate) GetId() string {
 // GetIdOk returns a tuple with the Id field value
 // and a boolean to check if the value has been set.
 func (o *Certificate) GetIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Id, true
 }
@@ -108,8 +108,8 @@ func (o *Certificate) GetKey() string {
 // GetKeyOk returns a tuple with the Key field value
 // and a boolean to check if the value has been set.
 func (o *Certificate) GetKeyOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Key, true
 }
@@ -132,8 +132,8 @@ func (o *Certificate) GetMetadata() map[string]string {
 // GetMetadataOk returns a tuple with the Metadata field value
 // and a boolean to check if the value has been set.
 func (o *Certificate) GetMetadataOk() (*map[string]string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Metadata, true
 }
@@ -156,8 +156,8 @@ func (o *Certificate) GetOrganizationId() string {
 // GetOrganizationIdOk returns a tuple with the OrganizationId field value
 // and a boolean to check if the value has been set.
 func (o *Certificate) GetOrganizationIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.OrganizationId, true
 }
@@ -180,8 +180,8 @@ func (o *Certificate) GetSerial() CertificateSerial {
 // GetSerialOk returns a tuple with the Serial field value
 // and a boolean to check if the value has been set.
 func (o *Certificate) GetSerialOk() (*CertificateSerial, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Serial, true
 }
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_certificate_serial.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_certificate_serial.go
index 35a5dc05..16bcb4ad 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_certificate_serial.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_certificate_serial.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -59,8 +59,8 @@ func (o *CertificateSerial) GetCreated() time.Time {
 // GetCreatedOk returns a tuple with the Created field value
 // and a boolean to check if the value has been set.
 func (o *CertificateSerial) GetCreatedOk() (*time.Time, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Created, true
 }
@@ -83,8 +83,8 @@ func (o *CertificateSerial) GetExpiration() time.Time {
 // GetExpirationOk returns a tuple with the Expiration field value
 // and a boolean to check if the value has been set.
 func (o *CertificateSerial) GetExpirationOk() (*time.Time, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Expiration, true
 }
@@ -107,8 +107,8 @@ func (o *CertificateSerial) GetId() int64 {
 // GetIdOk returns a tuple with the Id field value
 // and a boolean to check if the value has been set.
 func (o *CertificateSerial) GetIdOk() (*int64, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Id, true
 }
@@ -131,8 +131,8 @@ func (o *CertificateSerial) GetSerial() int64 {
 // GetSerialOk returns a tuple with the Serial field value
 // and a boolean to check if the value has been set.
 func (o *CertificateSerial) GetSerialOk() (*int64, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Serial, true
 }
@@ -155,8 +155,8 @@ func (o *CertificateSerial) GetUpdated() time.Time {
 // GetUpdatedOk returns a tuple with the Updated field value
 // and a boolean to check if the value has been set.
 func (o *CertificateSerial) GetUpdatedOk() (*time.Time, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Updated, true
 }
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_certificates_request.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_certificates_request.go
index 7475a35a..831c34d0 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_certificates_request.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_certificates_request.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -40,7 +40,7 @@ func NewCertificatesRequestWithDefaults() *CertificatesRequest {
 
 // GetArch returns the Arch field value if set, zero value otherwise.
 func (o *CertificatesRequest) GetArch() string {
-	if o == nil || isNil(o.Arch) {
+	if o == nil || o.Arch == nil {
 		var ret string
 		return ret
 	}
@@ -50,15 +50,15 @@ func (o *CertificatesRequest) GetArch() string {
 // GetArchOk returns a tuple with the Arch field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *CertificatesRequest) GetArchOk() (*string, bool) {
-	if o == nil || isNil(o.Arch) {
-    return nil, false
+	if o == nil || o.Arch == nil {
+		return nil, false
 	}
 	return o.Arch, true
 }
 
 // HasArch returns a boolean if a field has been set.
 func (o *CertificatesRequest) HasArch() bool {
-	if o != nil && !isNil(o.Arch) {
+	if o != nil && o.Arch != nil {
 		return true
 	}
 
@@ -83,8 +83,8 @@ func (o *CertificatesRequest) GetType() string {
 // GetTypeOk returns a tuple with the Type field value
 // and a boolean to check if the value has been set.
 func (o *CertificatesRequest) GetTypeOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Type, true
 }
@@ -96,7 +96,7 @@ func (o *CertificatesRequest) SetType(v string) {
 
 func (o CertificatesRequest) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Arch) {
+	if o.Arch != nil {
 		toSerialize["arch"] = o.Arch
 	}
 	if true {
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_cloud_account.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_cloud_account.go
index dd209ed8..0ec0bb31 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_cloud_account.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_cloud_account.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -39,7 +39,7 @@ func NewCloudAccountWithDefaults() *CloudAccount {
 
 // GetCloudAccountId returns the CloudAccountId field value if set, zero value otherwise.
 func (o *CloudAccount) GetCloudAccountId() string {
-	if o == nil || isNil(o.CloudAccountId) {
+	if o == nil || o.CloudAccountId == nil {
 		var ret string
 		return ret
 	}
@@ -49,15 +49,15 @@ func (o *CloudAccount) GetCloudAccountId() string {
 // GetCloudAccountIdOk returns a tuple with the CloudAccountId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *CloudAccount) GetCloudAccountIdOk() (*string, bool) {
-	if o == nil || isNil(o.CloudAccountId) {
-    return nil, false
+	if o == nil || o.CloudAccountId == nil {
+		return nil, false
 	}
 	return o.CloudAccountId, true
 }
 
 // HasCloudAccountId returns a boolean if a field has been set.
 func (o *CloudAccount) HasCloudAccountId() bool {
-	if o != nil && !isNil(o.CloudAccountId) {
+	if o != nil && o.CloudAccountId != nil {
 		return true
 	}
 
@@ -71,7 +71,7 @@ func (o *CloudAccount) SetCloudAccountId(v string) {
 
 // GetCloudProviderId returns the CloudProviderId field value if set, zero value otherwise.
 func (o *CloudAccount) GetCloudProviderId() string {
-	if o == nil || isNil(o.CloudProviderId) {
+	if o == nil || o.CloudProviderId == nil {
 		var ret string
 		return ret
 	}
@@ -81,15 +81,15 @@ func (o *CloudAccount) GetCloudProviderId() string {
 // GetCloudProviderIdOk returns a tuple with the CloudProviderId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *CloudAccount) GetCloudProviderIdOk() (*string, bool) {
-	if o == nil || isNil(o.CloudProviderId) {
-    return nil, false
+	if o == nil || o.CloudProviderId == nil {
+		return nil, false
 	}
 	return o.CloudProviderId, true
 }
 
 // HasCloudProviderId returns a boolean if a field has been set.
 func (o *CloudAccount) HasCloudProviderId() bool {
-	if o != nil && !isNil(o.CloudProviderId) {
+	if o != nil && o.CloudProviderId != nil {
 		return true
 	}
 
@@ -103,10 +103,10 @@ func (o *CloudAccount) SetCloudProviderId(v string) {
 
 func (o CloudAccount) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.CloudAccountId) {
+	if o.CloudAccountId != nil {
 		toSerialize["cloud_account_id"] = o.CloudAccountId
 	}
-	if !isNil(o.CloudProviderId) {
+	if o.CloudProviderId != nil {
 		toSerialize["cloud_provider_id"] = o.CloudProviderId
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_cloud_resource.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_cloud_resource.go
index 2a94cbc6..d76f3382 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_cloud_resource.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_cloud_resource.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -12,6 +12,7 @@ package accountmgmtclient
 
 import (
 	"encoding/json"
+	"time"
 )
 
 // CloudResource struct for CloudResource
@@ -57,7 +58,7 @@ func NewCloudResourceWithDefaults() *CloudResource {
 
 // GetHref returns the Href field value if set, zero value otherwise.
 func (o *CloudResource) GetHref() string {
-	if o == nil || isNil(o.Href) {
+	if o == nil || o.Href == nil {
 		var ret string
 		return ret
 	}
@@ -67,15 +68,15 @@ func (o *CloudResource) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *CloudResource) GetHrefOk() (*string, bool) {
-	if o == nil || isNil(o.Href) {
-    return nil, false
+	if o == nil || o.Href == nil {
+		return nil, false
 	}
 	return o.Href, true
 }
 
 // HasHref returns a boolean if a field has been set.
 func (o *CloudResource) HasHref() bool {
-	if o != nil && !isNil(o.Href) {
+	if o != nil && o.Href != nil {
 		return true
 	}
 
@@ -89,7 +90,7 @@ func (o *CloudResource) SetHref(v string) {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *CloudResource) GetId() string {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret string
 		return ret
 	}
@@ -99,15 +100,15 @@ func (o *CloudResource) GetId() string {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *CloudResource) GetIdOk() (*string, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *CloudResource) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -121,7 +122,7 @@ func (o *CloudResource) SetId(v string) {
 
 // GetKind returns the Kind field value if set, zero value otherwise.
 func (o *CloudResource) GetKind() string {
-	if o == nil || isNil(o.Kind) {
+	if o == nil || o.Kind == nil {
 		var ret string
 		return ret
 	}
@@ -131,15 +132,15 @@ func (o *CloudResource) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *CloudResource) GetKindOk() (*string, bool) {
-	if o == nil || isNil(o.Kind) {
-    return nil, false
+	if o == nil || o.Kind == nil {
+		return nil, false
 	}
 	return o.Kind, true
 }
 
 // HasKind returns a boolean if a field has been set.
 func (o *CloudResource) HasKind() bool {
-	if o != nil && !isNil(o.Kind) {
+	if o != nil && o.Kind != nil {
 		return true
 	}
 
@@ -153,7 +154,7 @@ func (o *CloudResource) SetKind(v string) {
 
 // GetActive returns the Active field value if set, zero value otherwise.
 func (o *CloudResource) GetActive() bool {
-	if o == nil || isNil(o.Active) {
+	if o == nil || o.Active == nil {
 		var ret bool
 		return ret
 	}
@@ -163,15 +164,15 @@ func (o *CloudResource) GetActive() bool {
 // GetActiveOk returns a tuple with the Active field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *CloudResource) GetActiveOk() (*bool, bool) {
-	if o == nil || isNil(o.Active) {
-    return nil, false
+	if o == nil || o.Active == nil {
+		return nil, false
 	}
 	return o.Active, true
 }
 
 // HasActive returns a boolean if a field has been set.
 func (o *CloudResource) HasActive() bool {
-	if o != nil && !isNil(o.Active) {
+	if o != nil && o.Active != nil {
 		return true
 	}
 
@@ -185,7 +186,7 @@ func (o *CloudResource) SetActive(v bool) {
 
 // GetCategory returns the Category field value if set, zero value otherwise.
 func (o *CloudResource) GetCategory() string {
-	if o == nil || isNil(o.Category) {
+	if o == nil || o.Category == nil {
 		var ret string
 		return ret
 	}
@@ -195,15 +196,15 @@ func (o *CloudResource) GetCategory() string {
 // GetCategoryOk returns a tuple with the Category field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *CloudResource) GetCategoryOk() (*string, bool) {
-	if o == nil || isNil(o.Category) {
-    return nil, false
+	if o == nil || o.Category == nil {
+		return nil, false
 	}
 	return o.Category, true
 }
 
 // HasCategory returns a boolean if a field has been set.
 func (o *CloudResource) HasCategory() bool {
-	if o != nil && !isNil(o.Category) {
+	if o != nil && o.Category != nil {
 		return true
 	}
 
@@ -217,7 +218,7 @@ func (o *CloudResource) SetCategory(v string) {
 
 // GetCategoryPretty returns the CategoryPretty field value if set, zero value otherwise.
 func (o *CloudResource) GetCategoryPretty() string {
-	if o == nil || isNil(o.CategoryPretty) {
+	if o == nil || o.CategoryPretty == nil {
 		var ret string
 		return ret
 	}
@@ -227,15 +228,15 @@ func (o *CloudResource) GetCategoryPretty() string {
 // GetCategoryPrettyOk returns a tuple with the CategoryPretty field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *CloudResource) GetCategoryPrettyOk() (*string, bool) {
-	if o == nil || isNil(o.CategoryPretty) {
-    return nil, false
+	if o == nil || o.CategoryPretty == nil {
+		return nil, false
 	}
 	return o.CategoryPretty, true
 }
 
 // HasCategoryPretty returns a boolean if a field has been set.
 func (o *CloudResource) HasCategoryPretty() bool {
-	if o != nil && !isNil(o.CategoryPretty) {
+	if o != nil && o.CategoryPretty != nil {
 		return true
 	}
 
@@ -249,7 +250,7 @@ func (o *CloudResource) SetCategoryPretty(v string) {
 
 // GetCloudProvider returns the CloudProvider field value if set, zero value otherwise.
 func (o *CloudResource) GetCloudProvider() string {
-	if o == nil || isNil(o.CloudProvider) {
+	if o == nil || o.CloudProvider == nil {
 		var ret string
 		return ret
 	}
@@ -259,15 +260,15 @@ func (o *CloudResource) GetCloudProvider() string {
 // GetCloudProviderOk returns a tuple with the CloudProvider field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *CloudResource) GetCloudProviderOk() (*string, bool) {
-	if o == nil || isNil(o.CloudProvider) {
-    return nil, false
+	if o == nil || o.CloudProvider == nil {
+		return nil, false
 	}
 	return o.CloudProvider, true
 }
 
 // HasCloudProvider returns a boolean if a field has been set.
 func (o *CloudResource) HasCloudProvider() bool {
-	if o != nil && !isNil(o.CloudProvider) {
+	if o != nil && o.CloudProvider != nil {
 		return true
 	}
 
@@ -281,7 +282,7 @@ func (o *CloudResource) SetCloudProvider(v string) {
 
 // GetCpuCores returns the CpuCores field value if set, zero value otherwise.
 func (o *CloudResource) GetCpuCores() int32 {
-	if o == nil || isNil(o.CpuCores) {
+	if o == nil || o.CpuCores == nil {
 		var ret int32
 		return ret
 	}
@@ -291,15 +292,15 @@ func (o *CloudResource) GetCpuCores() int32 {
 // GetCpuCoresOk returns a tuple with the CpuCores field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *CloudResource) GetCpuCoresOk() (*int32, bool) {
-	if o == nil || isNil(o.CpuCores) {
-    return nil, false
+	if o == nil || o.CpuCores == nil {
+		return nil, false
 	}
 	return o.CpuCores, true
 }
 
 // HasCpuCores returns a boolean if a field has been set.
 func (o *CloudResource) HasCpuCores() bool {
-	if o != nil && !isNil(o.CpuCores) {
+	if o != nil && o.CpuCores != nil {
 		return true
 	}
 
@@ -313,7 +314,7 @@ func (o *CloudResource) SetCpuCores(v int32) {
 
 // GetCreatedAt returns the CreatedAt field value if set, zero value otherwise.
 func (o *CloudResource) GetCreatedAt() time.Time {
-	if o == nil || isNil(o.CreatedAt) {
+	if o == nil || o.CreatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -323,15 +324,15 @@ func (o *CloudResource) GetCreatedAt() time.Time {
 // GetCreatedAtOk returns a tuple with the CreatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *CloudResource) GetCreatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.CreatedAt) {
-    return nil, false
+	if o == nil || o.CreatedAt == nil {
+		return nil, false
 	}
 	return o.CreatedAt, true
 }
 
 // HasCreatedAt returns a boolean if a field has been set.
 func (o *CloudResource) HasCreatedAt() bool {
-	if o != nil && !isNil(o.CreatedAt) {
+	if o != nil && o.CreatedAt != nil {
 		return true
 	}
 
@@ -345,7 +346,7 @@ func (o *CloudResource) SetCreatedAt(v time.Time) {
 
 // GetGenericName returns the GenericName field value if set, zero value otherwise.
 func (o *CloudResource) GetGenericName() string {
-	if o == nil || isNil(o.GenericName) {
+	if o == nil || o.GenericName == nil {
 		var ret string
 		return ret
 	}
@@ -355,15 +356,15 @@ func (o *CloudResource) GetGenericName() string {
 // GetGenericNameOk returns a tuple with the GenericName field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *CloudResource) GetGenericNameOk() (*string, bool) {
-	if o == nil || isNil(o.GenericName) {
-    return nil, false
+	if o == nil || o.GenericName == nil {
+		return nil, false
 	}
 	return o.GenericName, true
 }
 
 // HasGenericName returns a boolean if a field has been set.
 func (o *CloudResource) HasGenericName() bool {
-	if o != nil && !isNil(o.GenericName) {
+	if o != nil && o.GenericName != nil {
 		return true
 	}
 
@@ -377,7 +378,7 @@ func (o *CloudResource) SetGenericName(v string) {
 
 // GetMemory returns the Memory field value if set, zero value otherwise.
 func (o *CloudResource) GetMemory() int64 {
-	if o == nil || isNil(o.Memory) {
+	if o == nil || o.Memory == nil {
 		var ret int64
 		return ret
 	}
@@ -387,15 +388,15 @@ func (o *CloudResource) GetMemory() int64 {
 // GetMemoryOk returns a tuple with the Memory field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *CloudResource) GetMemoryOk() (*int64, bool) {
-	if o == nil || isNil(o.Memory) {
-    return nil, false
+	if o == nil || o.Memory == nil {
+		return nil, false
 	}
 	return o.Memory, true
 }
 
 // HasMemory returns a boolean if a field has been set.
 func (o *CloudResource) HasMemory() bool {
-	if o != nil && !isNil(o.Memory) {
+	if o != nil && o.Memory != nil {
 		return true
 	}
 
@@ -409,7 +410,7 @@ func (o *CloudResource) SetMemory(v int64) {
 
 // GetMemoryPretty returns the MemoryPretty field value if set, zero value otherwise.
 func (o *CloudResource) GetMemoryPretty() string {
-	if o == nil || isNil(o.MemoryPretty) {
+	if o == nil || o.MemoryPretty == nil {
 		var ret string
 		return ret
 	}
@@ -419,15 +420,15 @@ func (o *CloudResource) GetMemoryPretty() string {
 // GetMemoryPrettyOk returns a tuple with the MemoryPretty field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *CloudResource) GetMemoryPrettyOk() (*string, bool) {
-	if o == nil || isNil(o.MemoryPretty) {
-    return nil, false
+	if o == nil || o.MemoryPretty == nil {
+		return nil, false
 	}
 	return o.MemoryPretty, true
 }
 
 // HasMemoryPretty returns a boolean if a field has been set.
 func (o *CloudResource) HasMemoryPretty() bool {
-	if o != nil && !isNil(o.MemoryPretty) {
+	if o != nil && o.MemoryPretty != nil {
 		return true
 	}
 
@@ -441,7 +442,7 @@ func (o *CloudResource) SetMemoryPretty(v string) {
 
 // GetNamePretty returns the NamePretty field value if set, zero value otherwise.
 func (o *CloudResource) GetNamePretty() string {
-	if o == nil || isNil(o.NamePretty) {
+	if o == nil || o.NamePretty == nil {
 		var ret string
 		return ret
 	}
@@ -451,15 +452,15 @@ func (o *CloudResource) GetNamePretty() string {
 // GetNamePrettyOk returns a tuple with the NamePretty field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *CloudResource) GetNamePrettyOk() (*string, bool) {
-	if o == nil || isNil(o.NamePretty) {
-    return nil, false
+	if o == nil || o.NamePretty == nil {
+		return nil, false
 	}
 	return o.NamePretty, true
 }
 
 // HasNamePretty returns a boolean if a field has been set.
 func (o *CloudResource) HasNamePretty() bool {
-	if o != nil && !isNil(o.NamePretty) {
+	if o != nil && o.NamePretty != nil {
 		return true
 	}
 
@@ -473,7 +474,7 @@ func (o *CloudResource) SetNamePretty(v string) {
 
 // GetResourceType returns the ResourceType field value if set, zero value otherwise.
 func (o *CloudResource) GetResourceType() string {
-	if o == nil || isNil(o.ResourceType) {
+	if o == nil || o.ResourceType == nil {
 		var ret string
 		return ret
 	}
@@ -483,15 +484,15 @@ func (o *CloudResource) GetResourceType() string {
 // GetResourceTypeOk returns a tuple with the ResourceType field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *CloudResource) GetResourceTypeOk() (*string, bool) {
-	if o == nil || isNil(o.ResourceType) {
-    return nil, false
+	if o == nil || o.ResourceType == nil {
+		return nil, false
 	}
 	return o.ResourceType, true
 }
 
 // HasResourceType returns a boolean if a field has been set.
 func (o *CloudResource) HasResourceType() bool {
-	if o != nil && !isNil(o.ResourceType) {
+	if o != nil && o.ResourceType != nil {
 		return true
 	}
 
@@ -505,7 +506,7 @@ func (o *CloudResource) SetResourceType(v string) {
 
 // GetSizePretty returns the SizePretty field value if set, zero value otherwise.
 func (o *CloudResource) GetSizePretty() string {
-	if o == nil || isNil(o.SizePretty) {
+	if o == nil || o.SizePretty == nil {
 		var ret string
 		return ret
 	}
@@ -515,15 +516,15 @@ func (o *CloudResource) GetSizePretty() string {
 // GetSizePrettyOk returns a tuple with the SizePretty field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *CloudResource) GetSizePrettyOk() (*string, bool) {
-	if o == nil || isNil(o.SizePretty) {
-    return nil, false
+	if o == nil || o.SizePretty == nil {
+		return nil, false
 	}
 	return o.SizePretty, true
 }
 
 // HasSizePretty returns a boolean if a field has been set.
 func (o *CloudResource) HasSizePretty() bool {
-	if o != nil && !isNil(o.SizePretty) {
+	if o != nil && o.SizePretty != nil {
 		return true
 	}
 
@@ -537,7 +538,7 @@ func (o *CloudResource) SetSizePretty(v string) {
 
 // GetUpdatedAt returns the UpdatedAt field value if set, zero value otherwise.
 func (o *CloudResource) GetUpdatedAt() time.Time {
-	if o == nil || isNil(o.UpdatedAt) {
+	if o == nil || o.UpdatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -547,15 +548,15 @@ func (o *CloudResource) GetUpdatedAt() time.Time {
 // GetUpdatedAtOk returns a tuple with the UpdatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *CloudResource) GetUpdatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.UpdatedAt) {
-    return nil, false
+	if o == nil || o.UpdatedAt == nil {
+		return nil, false
 	}
 	return o.UpdatedAt, true
 }
 
 // HasUpdatedAt returns a boolean if a field has been set.
 func (o *CloudResource) HasUpdatedAt() bool {
-	if o != nil && !isNil(o.UpdatedAt) {
+	if o != nil && o.UpdatedAt != nil {
 		return true
 	}
 
@@ -569,52 +570,52 @@ func (o *CloudResource) SetUpdatedAt(v time.Time) {
 
 func (o CloudResource) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Href) {
+	if o.Href != nil {
 		toSerialize["href"] = o.Href
 	}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.Kind) {
+	if o.Kind != nil {
 		toSerialize["kind"] = o.Kind
 	}
-	if !isNil(o.Active) {
+	if o.Active != nil {
 		toSerialize["active"] = o.Active
 	}
-	if !isNil(o.Category) {
+	if o.Category != nil {
 		toSerialize["category"] = o.Category
 	}
-	if !isNil(o.CategoryPretty) {
+	if o.CategoryPretty != nil {
 		toSerialize["category_pretty"] = o.CategoryPretty
 	}
-	if !isNil(o.CloudProvider) {
+	if o.CloudProvider != nil {
 		toSerialize["cloud_provider"] = o.CloudProvider
 	}
-	if !isNil(o.CpuCores) {
+	if o.CpuCores != nil {
 		toSerialize["cpu_cores"] = o.CpuCores
 	}
-	if !isNil(o.CreatedAt) {
+	if o.CreatedAt != nil {
 		toSerialize["created_at"] = o.CreatedAt
 	}
-	if !isNil(o.GenericName) {
+	if o.GenericName != nil {
 		toSerialize["generic_name"] = o.GenericName
 	}
-	if !isNil(o.Memory) {
+	if o.Memory != nil {
 		toSerialize["memory"] = o.Memory
 	}
-	if !isNil(o.MemoryPretty) {
+	if o.MemoryPretty != nil {
 		toSerialize["memory_pretty"] = o.MemoryPretty
 	}
-	if !isNil(o.NamePretty) {
+	if o.NamePretty != nil {
 		toSerialize["name_pretty"] = o.NamePretty
 	}
-	if !isNil(o.ResourceType) {
+	if o.ResourceType != nil {
 		toSerialize["resource_type"] = o.ResourceType
 	}
-	if !isNil(o.SizePretty) {
+	if o.SizePretty != nil {
 		toSerialize["size_pretty"] = o.SizePretty
 	}
-	if !isNil(o.UpdatedAt) {
+	if o.UpdatedAt != nil {
 		toSerialize["updated_at"] = o.UpdatedAt
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_cloud_resource_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_cloud_resource_all_of.go
index fce18590..29aa1771 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_cloud_resource_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_cloud_resource_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -55,7 +55,7 @@ func NewCloudResourceAllOfWithDefaults() *CloudResourceAllOf {
 
 // GetActive returns the Active field value if set, zero value otherwise.
 func (o *CloudResourceAllOf) GetActive() bool {
-	if o == nil || isNil(o.Active) {
+	if o == nil || o.Active == nil {
 		var ret bool
 		return ret
 	}
@@ -65,15 +65,15 @@ func (o *CloudResourceAllOf) GetActive() bool {
 // GetActiveOk returns a tuple with the Active field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *CloudResourceAllOf) GetActiveOk() (*bool, bool) {
-	if o == nil || isNil(o.Active) {
-    return nil, false
+	if o == nil || o.Active == nil {
+		return nil, false
 	}
 	return o.Active, true
 }
 
 // HasActive returns a boolean if a field has been set.
 func (o *CloudResourceAllOf) HasActive() bool {
-	if o != nil && !isNil(o.Active) {
+	if o != nil && o.Active != nil {
 		return true
 	}
 
@@ -87,7 +87,7 @@ func (o *CloudResourceAllOf) SetActive(v bool) {
 
 // GetCategory returns the Category field value if set, zero value otherwise.
 func (o *CloudResourceAllOf) GetCategory() string {
-	if o == nil || isNil(o.Category) {
+	if o == nil || o.Category == nil {
 		var ret string
 		return ret
 	}
@@ -97,15 +97,15 @@ func (o *CloudResourceAllOf) GetCategory() string {
 // GetCategoryOk returns a tuple with the Category field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *CloudResourceAllOf) GetCategoryOk() (*string, bool) {
-	if o == nil || isNil(o.Category) {
-    return nil, false
+	if o == nil || o.Category == nil {
+		return nil, false
 	}
 	return o.Category, true
 }
 
 // HasCategory returns a boolean if a field has been set.
 func (o *CloudResourceAllOf) HasCategory() bool {
-	if o != nil && !isNil(o.Category) {
+	if o != nil && o.Category != nil {
 		return true
 	}
 
@@ -119,7 +119,7 @@ func (o *CloudResourceAllOf) SetCategory(v string) {
 
 // GetCategoryPretty returns the CategoryPretty field value if set, zero value otherwise.
 func (o *CloudResourceAllOf) GetCategoryPretty() string {
-	if o == nil || isNil(o.CategoryPretty) {
+	if o == nil || o.CategoryPretty == nil {
 		var ret string
 		return ret
 	}
@@ -129,15 +129,15 @@ func (o *CloudResourceAllOf) GetCategoryPretty() string {
 // GetCategoryPrettyOk returns a tuple with the CategoryPretty field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *CloudResourceAllOf) GetCategoryPrettyOk() (*string, bool) {
-	if o == nil || isNil(o.CategoryPretty) {
-    return nil, false
+	if o == nil || o.CategoryPretty == nil {
+		return nil, false
 	}
 	return o.CategoryPretty, true
 }
 
 // HasCategoryPretty returns a boolean if a field has been set.
 func (o *CloudResourceAllOf) HasCategoryPretty() bool {
-	if o != nil && !isNil(o.CategoryPretty) {
+	if o != nil && o.CategoryPretty != nil {
 		return true
 	}
 
@@ -151,7 +151,7 @@ func (o *CloudResourceAllOf) SetCategoryPretty(v string) {
 
 // GetCloudProvider returns the CloudProvider field value if set, zero value otherwise.
 func (o *CloudResourceAllOf) GetCloudProvider() string {
-	if o == nil || isNil(o.CloudProvider) {
+	if o == nil || o.CloudProvider == nil {
 		var ret string
 		return ret
 	}
@@ -161,15 +161,15 @@ func (o *CloudResourceAllOf) GetCloudProvider() string {
 // GetCloudProviderOk returns a tuple with the CloudProvider field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *CloudResourceAllOf) GetCloudProviderOk() (*string, bool) {
-	if o == nil || isNil(o.CloudProvider) {
-    return nil, false
+	if o == nil || o.CloudProvider == nil {
+		return nil, false
 	}
 	return o.CloudProvider, true
 }
 
 // HasCloudProvider returns a boolean if a field has been set.
 func (o *CloudResourceAllOf) HasCloudProvider() bool {
-	if o != nil && !isNil(o.CloudProvider) {
+	if o != nil && o.CloudProvider != nil {
 		return true
 	}
 
@@ -183,7 +183,7 @@ func (o *CloudResourceAllOf) SetCloudProvider(v string) {
 
 // GetCpuCores returns the CpuCores field value if set, zero value otherwise.
 func (o *CloudResourceAllOf) GetCpuCores() int32 {
-	if o == nil || isNil(o.CpuCores) {
+	if o == nil || o.CpuCores == nil {
 		var ret int32
 		return ret
 	}
@@ -193,15 +193,15 @@ func (o *CloudResourceAllOf) GetCpuCores() int32 {
 // GetCpuCoresOk returns a tuple with the CpuCores field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *CloudResourceAllOf) GetCpuCoresOk() (*int32, bool) {
-	if o == nil || isNil(o.CpuCores) {
-    return nil, false
+	if o == nil || o.CpuCores == nil {
+		return nil, false
 	}
 	return o.CpuCores, true
 }
 
 // HasCpuCores returns a boolean if a field has been set.
 func (o *CloudResourceAllOf) HasCpuCores() bool {
-	if o != nil && !isNil(o.CpuCores) {
+	if o != nil && o.CpuCores != nil {
 		return true
 	}
 
@@ -215,7 +215,7 @@ func (o *CloudResourceAllOf) SetCpuCores(v int32) {
 
 // GetCreatedAt returns the CreatedAt field value if set, zero value otherwise.
 func (o *CloudResourceAllOf) GetCreatedAt() time.Time {
-	if o == nil || isNil(o.CreatedAt) {
+	if o == nil || o.CreatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -225,15 +225,15 @@ func (o *CloudResourceAllOf) GetCreatedAt() time.Time {
 // GetCreatedAtOk returns a tuple with the CreatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *CloudResourceAllOf) GetCreatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.CreatedAt) {
-    return nil, false
+	if o == nil || o.CreatedAt == nil {
+		return nil, false
 	}
 	return o.CreatedAt, true
 }
 
 // HasCreatedAt returns a boolean if a field has been set.
 func (o *CloudResourceAllOf) HasCreatedAt() bool {
-	if o != nil && !isNil(o.CreatedAt) {
+	if o != nil && o.CreatedAt != nil {
 		return true
 	}
 
@@ -247,7 +247,7 @@ func (o *CloudResourceAllOf) SetCreatedAt(v time.Time) {
 
 // GetGenericName returns the GenericName field value if set, zero value otherwise.
 func (o *CloudResourceAllOf) GetGenericName() string {
-	if o == nil || isNil(o.GenericName) {
+	if o == nil || o.GenericName == nil {
 		var ret string
 		return ret
 	}
@@ -257,15 +257,15 @@ func (o *CloudResourceAllOf) GetGenericName() string {
 // GetGenericNameOk returns a tuple with the GenericName field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *CloudResourceAllOf) GetGenericNameOk() (*string, bool) {
-	if o == nil || isNil(o.GenericName) {
-    return nil, false
+	if o == nil || o.GenericName == nil {
+		return nil, false
 	}
 	return o.GenericName, true
 }
 
 // HasGenericName returns a boolean if a field has been set.
 func (o *CloudResourceAllOf) HasGenericName() bool {
-	if o != nil && !isNil(o.GenericName) {
+	if o != nil && o.GenericName != nil {
 		return true
 	}
 
@@ -279,7 +279,7 @@ func (o *CloudResourceAllOf) SetGenericName(v string) {
 
 // GetMemory returns the Memory field value if set, zero value otherwise.
 func (o *CloudResourceAllOf) GetMemory() int64 {
-	if o == nil || isNil(o.Memory) {
+	if o == nil || o.Memory == nil {
 		var ret int64
 		return ret
 	}
@@ -289,15 +289,15 @@ func (o *CloudResourceAllOf) GetMemory() int64 {
 // GetMemoryOk returns a tuple with the Memory field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *CloudResourceAllOf) GetMemoryOk() (*int64, bool) {
-	if o == nil || isNil(o.Memory) {
-    return nil, false
+	if o == nil || o.Memory == nil {
+		return nil, false
 	}
 	return o.Memory, true
 }
 
 // HasMemory returns a boolean if a field has been set.
 func (o *CloudResourceAllOf) HasMemory() bool {
-	if o != nil && !isNil(o.Memory) {
+	if o != nil && o.Memory != nil {
 		return true
 	}
 
@@ -311,7 +311,7 @@ func (o *CloudResourceAllOf) SetMemory(v int64) {
 
 // GetMemoryPretty returns the MemoryPretty field value if set, zero value otherwise.
 func (o *CloudResourceAllOf) GetMemoryPretty() string {
-	if o == nil || isNil(o.MemoryPretty) {
+	if o == nil || o.MemoryPretty == nil {
 		var ret string
 		return ret
 	}
@@ -321,15 +321,15 @@ func (o *CloudResourceAllOf) GetMemoryPretty() string {
 // GetMemoryPrettyOk returns a tuple with the MemoryPretty field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *CloudResourceAllOf) GetMemoryPrettyOk() (*string, bool) {
-	if o == nil || isNil(o.MemoryPretty) {
-    return nil, false
+	if o == nil || o.MemoryPretty == nil {
+		return nil, false
 	}
 	return o.MemoryPretty, true
 }
 
 // HasMemoryPretty returns a boolean if a field has been set.
 func (o *CloudResourceAllOf) HasMemoryPretty() bool {
-	if o != nil && !isNil(o.MemoryPretty) {
+	if o != nil && o.MemoryPretty != nil {
 		return true
 	}
 
@@ -343,7 +343,7 @@ func (o *CloudResourceAllOf) SetMemoryPretty(v string) {
 
 // GetNamePretty returns the NamePretty field value if set, zero value otherwise.
 func (o *CloudResourceAllOf) GetNamePretty() string {
-	if o == nil || isNil(o.NamePretty) {
+	if o == nil || o.NamePretty == nil {
 		var ret string
 		return ret
 	}
@@ -353,15 +353,15 @@ func (o *CloudResourceAllOf) GetNamePretty() string {
 // GetNamePrettyOk returns a tuple with the NamePretty field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *CloudResourceAllOf) GetNamePrettyOk() (*string, bool) {
-	if o == nil || isNil(o.NamePretty) {
-    return nil, false
+	if o == nil || o.NamePretty == nil {
+		return nil, false
 	}
 	return o.NamePretty, true
 }
 
 // HasNamePretty returns a boolean if a field has been set.
 func (o *CloudResourceAllOf) HasNamePretty() bool {
-	if o != nil && !isNil(o.NamePretty) {
+	if o != nil && o.NamePretty != nil {
 		return true
 	}
 
@@ -375,7 +375,7 @@ func (o *CloudResourceAllOf) SetNamePretty(v string) {
 
 // GetResourceType returns the ResourceType field value if set, zero value otherwise.
 func (o *CloudResourceAllOf) GetResourceType() string {
-	if o == nil || isNil(o.ResourceType) {
+	if o == nil || o.ResourceType == nil {
 		var ret string
 		return ret
 	}
@@ -385,15 +385,15 @@ func (o *CloudResourceAllOf) GetResourceType() string {
 // GetResourceTypeOk returns a tuple with the ResourceType field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *CloudResourceAllOf) GetResourceTypeOk() (*string, bool) {
-	if o == nil || isNil(o.ResourceType) {
-    return nil, false
+	if o == nil || o.ResourceType == nil {
+		return nil, false
 	}
 	return o.ResourceType, true
 }
 
 // HasResourceType returns a boolean if a field has been set.
 func (o *CloudResourceAllOf) HasResourceType() bool {
-	if o != nil && !isNil(o.ResourceType) {
+	if o != nil && o.ResourceType != nil {
 		return true
 	}
 
@@ -407,7 +407,7 @@ func (o *CloudResourceAllOf) SetResourceType(v string) {
 
 // GetSizePretty returns the SizePretty field value if set, zero value otherwise.
 func (o *CloudResourceAllOf) GetSizePretty() string {
-	if o == nil || isNil(o.SizePretty) {
+	if o == nil || o.SizePretty == nil {
 		var ret string
 		return ret
 	}
@@ -417,15 +417,15 @@ func (o *CloudResourceAllOf) GetSizePretty() string {
 // GetSizePrettyOk returns a tuple with the SizePretty field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *CloudResourceAllOf) GetSizePrettyOk() (*string, bool) {
-	if o == nil || isNil(o.SizePretty) {
-    return nil, false
+	if o == nil || o.SizePretty == nil {
+		return nil, false
 	}
 	return o.SizePretty, true
 }
 
 // HasSizePretty returns a boolean if a field has been set.
 func (o *CloudResourceAllOf) HasSizePretty() bool {
-	if o != nil && !isNil(o.SizePretty) {
+	if o != nil && o.SizePretty != nil {
 		return true
 	}
 
@@ -439,7 +439,7 @@ func (o *CloudResourceAllOf) SetSizePretty(v string) {
 
 // GetUpdatedAt returns the UpdatedAt field value if set, zero value otherwise.
 func (o *CloudResourceAllOf) GetUpdatedAt() time.Time {
-	if o == nil || isNil(o.UpdatedAt) {
+	if o == nil || o.UpdatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -449,15 +449,15 @@ func (o *CloudResourceAllOf) GetUpdatedAt() time.Time {
 // GetUpdatedAtOk returns a tuple with the UpdatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *CloudResourceAllOf) GetUpdatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.UpdatedAt) {
-    return nil, false
+	if o == nil || o.UpdatedAt == nil {
+		return nil, false
 	}
 	return o.UpdatedAt, true
 }
 
 // HasUpdatedAt returns a boolean if a field has been set.
 func (o *CloudResourceAllOf) HasUpdatedAt() bool {
-	if o != nil && !isNil(o.UpdatedAt) {
+	if o != nil && o.UpdatedAt != nil {
 		return true
 	}
 
@@ -471,43 +471,43 @@ func (o *CloudResourceAllOf) SetUpdatedAt(v time.Time) {
 
 func (o CloudResourceAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Active) {
+	if o.Active != nil {
 		toSerialize["active"] = o.Active
 	}
-	if !isNil(o.Category) {
+	if o.Category != nil {
 		toSerialize["category"] = o.Category
 	}
-	if !isNil(o.CategoryPretty) {
+	if o.CategoryPretty != nil {
 		toSerialize["category_pretty"] = o.CategoryPretty
 	}
-	if !isNil(o.CloudProvider) {
+	if o.CloudProvider != nil {
 		toSerialize["cloud_provider"] = o.CloudProvider
 	}
-	if !isNil(o.CpuCores) {
+	if o.CpuCores != nil {
 		toSerialize["cpu_cores"] = o.CpuCores
 	}
-	if !isNil(o.CreatedAt) {
+	if o.CreatedAt != nil {
 		toSerialize["created_at"] = o.CreatedAt
 	}
-	if !isNil(o.GenericName) {
+	if o.GenericName != nil {
 		toSerialize["generic_name"] = o.GenericName
 	}
-	if !isNil(o.Memory) {
+	if o.Memory != nil {
 		toSerialize["memory"] = o.Memory
 	}
-	if !isNil(o.MemoryPretty) {
+	if o.MemoryPretty != nil {
 		toSerialize["memory_pretty"] = o.MemoryPretty
 	}
-	if !isNil(o.NamePretty) {
+	if o.NamePretty != nil {
 		toSerialize["name_pretty"] = o.NamePretty
 	}
-	if !isNil(o.ResourceType) {
+	if o.ResourceType != nil {
 		toSerialize["resource_type"] = o.ResourceType
 	}
-	if !isNil(o.SizePretty) {
+	if o.SizePretty != nil {
 		toSerialize["size_pretty"] = o.SizePretty
 	}
-	if !isNil(o.UpdatedAt) {
+	if o.UpdatedAt != nil {
 		toSerialize["updated_at"] = o.UpdatedAt
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_cloud_resource_list.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_cloud_resource_list.go
index 50063d57..8e93e716 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_cloud_resource_list.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_cloud_resource_list.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -58,8 +58,8 @@ func (o *CloudResourceList) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *CloudResourceList) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -82,8 +82,8 @@ func (o *CloudResourceList) GetPage() int32 {
 // GetPageOk returns a tuple with the Page field value
 // and a boolean to check if the value has been set.
 func (o *CloudResourceList) GetPageOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Page, true
 }
@@ -106,8 +106,8 @@ func (o *CloudResourceList) GetSize() int32 {
 // GetSizeOk returns a tuple with the Size field value
 // and a boolean to check if the value has been set.
 func (o *CloudResourceList) GetSizeOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Size, true
 }
@@ -130,8 +130,8 @@ func (o *CloudResourceList) GetTotal() int32 {
 // GetTotalOk returns a tuple with the Total field value
 // and a boolean to check if the value has been set.
 func (o *CloudResourceList) GetTotalOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Total, true
 }
@@ -153,11 +153,11 @@ func (o *CloudResourceList) GetItems() []CloudResource {
 
 // GetItemsOk returns a tuple with the Items field value
 // and a boolean to check if the value has been set.
-func (o *CloudResourceList) GetItemsOk() ([]CloudResource, bool) {
-	if o == nil {
-    return nil, false
+func (o *CloudResourceList) GetItemsOk() (*[]CloudResource, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Items, true
+	return &o.Items, true
 }
 
 // SetItems sets field value
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_cloud_resource_list_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_cloud_resource_list_all_of.go
index 57bff9d5..7e4d0c36 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_cloud_resource_list_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_cloud_resource_list_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -16,7 +16,7 @@ import (
 
 // CloudResourceListAllOf struct for CloudResourceListAllOf
 type CloudResourceListAllOf struct {
-	Items []CloudResource `json:"items,omitempty"`
+	Items *[]CloudResource `json:"items,omitempty"`
 }
 
 // NewCloudResourceListAllOf instantiates a new CloudResourceListAllOf object
@@ -38,25 +38,25 @@ func NewCloudResourceListAllOfWithDefaults() *CloudResourceListAllOf {
 
 // GetItems returns the Items field value if set, zero value otherwise.
 func (o *CloudResourceListAllOf) GetItems() []CloudResource {
-	if o == nil || isNil(o.Items) {
+	if o == nil || o.Items == nil {
 		var ret []CloudResource
 		return ret
 	}
-	return o.Items
+	return *o.Items
 }
 
 // GetItemsOk returns a tuple with the Items field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *CloudResourceListAllOf) GetItemsOk() ([]CloudResource, bool) {
-	if o == nil || isNil(o.Items) {
-    return nil, false
+func (o *CloudResourceListAllOf) GetItemsOk() (*[]CloudResource, bool) {
+	if o == nil || o.Items == nil {
+		return nil, false
 	}
 	return o.Items, true
 }
 
 // HasItems returns a boolean if a field has been set.
 func (o *CloudResourceListAllOf) HasItems() bool {
-	if o != nil && !isNil(o.Items) {
+	if o != nil && o.Items != nil {
 		return true
 	}
 
@@ -65,12 +65,12 @@ func (o *CloudResourceListAllOf) HasItems() bool {
 
 // SetItems gets a reference to the given []CloudResource and assigns it to the Items field.
 func (o *CloudResourceListAllOf) SetItems(v []CloudResource) {
-	o.Items = v
+	o.Items = &v
 }
 
 func (o CloudResourceListAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Items) {
+	if o.Items != nil {
 		toSerialize["items"] = o.Items
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_cluster_authorization_request.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_cluster_authorization_request.go
index dbc10d12..051d9a32 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_cluster_authorization_request.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_cluster_authorization_request.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -30,7 +30,7 @@ type ClusterAuthorizationRequest struct {
 	ProductId *string `json:"product_id,omitempty"`
 	QuotaVersion *string `json:"quota_version,omitempty"`
 	Reserve *bool `json:"reserve,omitempty"`
-	Resources []ReservedResource `json:"resources,omitempty"`
+	Resources *[]ReservedResource `json:"resources,omitempty"`
 }
 
 // NewClusterAuthorizationRequest instantiates a new ClusterAuthorizationRequest object
@@ -69,8 +69,8 @@ func (o *ClusterAuthorizationRequest) GetAccountUsername() string {
 // GetAccountUsernameOk returns a tuple with the AccountUsername field value
 // and a boolean to check if the value has been set.
 func (o *ClusterAuthorizationRequest) GetAccountUsernameOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.AccountUsername, true
 }
@@ -82,7 +82,7 @@ func (o *ClusterAuthorizationRequest) SetAccountUsername(v string) {
 
 // GetAvailabilityZone returns the AvailabilityZone field value if set, zero value otherwise.
 func (o *ClusterAuthorizationRequest) GetAvailabilityZone() string {
-	if o == nil || isNil(o.AvailabilityZone) {
+	if o == nil || o.AvailabilityZone == nil {
 		var ret string
 		return ret
 	}
@@ -92,15 +92,15 @@ func (o *ClusterAuthorizationRequest) GetAvailabilityZone() string {
 // GetAvailabilityZoneOk returns a tuple with the AvailabilityZone field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ClusterAuthorizationRequest) GetAvailabilityZoneOk() (*string, bool) {
-	if o == nil || isNil(o.AvailabilityZone) {
-    return nil, false
+	if o == nil || o.AvailabilityZone == nil {
+		return nil, false
 	}
 	return o.AvailabilityZone, true
 }
 
 // HasAvailabilityZone returns a boolean if a field has been set.
 func (o *ClusterAuthorizationRequest) HasAvailabilityZone() bool {
-	if o != nil && !isNil(o.AvailabilityZone) {
+	if o != nil && o.AvailabilityZone != nil {
 		return true
 	}
 
@@ -114,7 +114,7 @@ func (o *ClusterAuthorizationRequest) SetAvailabilityZone(v string) {
 
 // GetByoc returns the Byoc field value if set, zero value otherwise.
 func (o *ClusterAuthorizationRequest) GetByoc() bool {
-	if o == nil || isNil(o.Byoc) {
+	if o == nil || o.Byoc == nil {
 		var ret bool
 		return ret
 	}
@@ -124,15 +124,15 @@ func (o *ClusterAuthorizationRequest) GetByoc() bool {
 // GetByocOk returns a tuple with the Byoc field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ClusterAuthorizationRequest) GetByocOk() (*bool, bool) {
-	if o == nil || isNil(o.Byoc) {
-    return nil, false
+	if o == nil || o.Byoc == nil {
+		return nil, false
 	}
 	return o.Byoc, true
 }
 
 // HasByoc returns a boolean if a field has been set.
 func (o *ClusterAuthorizationRequest) HasByoc() bool {
-	if o != nil && !isNil(o.Byoc) {
+	if o != nil && o.Byoc != nil {
 		return true
 	}
 
@@ -146,7 +146,7 @@ func (o *ClusterAuthorizationRequest) SetByoc(v bool) {
 
 // GetCloudAccountId returns the CloudAccountId field value if set, zero value otherwise.
 func (o *ClusterAuthorizationRequest) GetCloudAccountId() string {
-	if o == nil || isNil(o.CloudAccountId) {
+	if o == nil || o.CloudAccountId == nil {
 		var ret string
 		return ret
 	}
@@ -156,15 +156,15 @@ func (o *ClusterAuthorizationRequest) GetCloudAccountId() string {
 // GetCloudAccountIdOk returns a tuple with the CloudAccountId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ClusterAuthorizationRequest) GetCloudAccountIdOk() (*string, bool) {
-	if o == nil || isNil(o.CloudAccountId) {
-    return nil, false
+	if o == nil || o.CloudAccountId == nil {
+		return nil, false
 	}
 	return o.CloudAccountId, true
 }
 
 // HasCloudAccountId returns a boolean if a field has been set.
 func (o *ClusterAuthorizationRequest) HasCloudAccountId() bool {
-	if o != nil && !isNil(o.CloudAccountId) {
+	if o != nil && o.CloudAccountId != nil {
 		return true
 	}
 
@@ -178,7 +178,7 @@ func (o *ClusterAuthorizationRequest) SetCloudAccountId(v string) {
 
 // GetCloudProviderId returns the CloudProviderId field value if set, zero value otherwise.
 func (o *ClusterAuthorizationRequest) GetCloudProviderId() string {
-	if o == nil || isNil(o.CloudProviderId) {
+	if o == nil || o.CloudProviderId == nil {
 		var ret string
 		return ret
 	}
@@ -188,15 +188,15 @@ func (o *ClusterAuthorizationRequest) GetCloudProviderId() string {
 // GetCloudProviderIdOk returns a tuple with the CloudProviderId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ClusterAuthorizationRequest) GetCloudProviderIdOk() (*string, bool) {
-	if o == nil || isNil(o.CloudProviderId) {
-    return nil, false
+	if o == nil || o.CloudProviderId == nil {
+		return nil, false
 	}
 	return o.CloudProviderId, true
 }
 
 // HasCloudProviderId returns a boolean if a field has been set.
 func (o *ClusterAuthorizationRequest) HasCloudProviderId() bool {
-	if o != nil && !isNil(o.CloudProviderId) {
+	if o != nil && o.CloudProviderId != nil {
 		return true
 	}
 
@@ -221,8 +221,8 @@ func (o *ClusterAuthorizationRequest) GetClusterId() string {
 // GetClusterIdOk returns a tuple with the ClusterId field value
 // and a boolean to check if the value has been set.
 func (o *ClusterAuthorizationRequest) GetClusterIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.ClusterId, true
 }
@@ -234,7 +234,7 @@ func (o *ClusterAuthorizationRequest) SetClusterId(v string) {
 
 // GetDisconnected returns the Disconnected field value if set, zero value otherwise.
 func (o *ClusterAuthorizationRequest) GetDisconnected() bool {
-	if o == nil || isNil(o.Disconnected) {
+	if o == nil || o.Disconnected == nil {
 		var ret bool
 		return ret
 	}
@@ -244,15 +244,15 @@ func (o *ClusterAuthorizationRequest) GetDisconnected() bool {
 // GetDisconnectedOk returns a tuple with the Disconnected field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ClusterAuthorizationRequest) GetDisconnectedOk() (*bool, bool) {
-	if o == nil || isNil(o.Disconnected) {
-    return nil, false
+	if o == nil || o.Disconnected == nil {
+		return nil, false
 	}
 	return o.Disconnected, true
 }
 
 // HasDisconnected returns a boolean if a field has been set.
 func (o *ClusterAuthorizationRequest) HasDisconnected() bool {
-	if o != nil && !isNil(o.Disconnected) {
+	if o != nil && o.Disconnected != nil {
 		return true
 	}
 
@@ -266,7 +266,7 @@ func (o *ClusterAuthorizationRequest) SetDisconnected(v bool) {
 
 // GetDisplayName returns the DisplayName field value if set, zero value otherwise.
 func (o *ClusterAuthorizationRequest) GetDisplayName() string {
-	if o == nil || isNil(o.DisplayName) {
+	if o == nil || o.DisplayName == nil {
 		var ret string
 		return ret
 	}
@@ -276,15 +276,15 @@ func (o *ClusterAuthorizationRequest) GetDisplayName() string {
 // GetDisplayNameOk returns a tuple with the DisplayName field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ClusterAuthorizationRequest) GetDisplayNameOk() (*string, bool) {
-	if o == nil || isNil(o.DisplayName) {
-    return nil, false
+	if o == nil || o.DisplayName == nil {
+		return nil, false
 	}
 	return o.DisplayName, true
 }
 
 // HasDisplayName returns a boolean if a field has been set.
 func (o *ClusterAuthorizationRequest) HasDisplayName() bool {
-	if o != nil && !isNil(o.DisplayName) {
+	if o != nil && o.DisplayName != nil {
 		return true
 	}
 
@@ -298,7 +298,7 @@ func (o *ClusterAuthorizationRequest) SetDisplayName(v string) {
 
 // GetExternalClusterId returns the ExternalClusterId field value if set, zero value otherwise.
 func (o *ClusterAuthorizationRequest) GetExternalClusterId() string {
-	if o == nil || isNil(o.ExternalClusterId) {
+	if o == nil || o.ExternalClusterId == nil {
 		var ret string
 		return ret
 	}
@@ -308,15 +308,15 @@ func (o *ClusterAuthorizationRequest) GetExternalClusterId() string {
 // GetExternalClusterIdOk returns a tuple with the ExternalClusterId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ClusterAuthorizationRequest) GetExternalClusterIdOk() (*string, bool) {
-	if o == nil || isNil(o.ExternalClusterId) {
-    return nil, false
+	if o == nil || o.ExternalClusterId == nil {
+		return nil, false
 	}
 	return o.ExternalClusterId, true
 }
 
 // HasExternalClusterId returns a boolean if a field has been set.
 func (o *ClusterAuthorizationRequest) HasExternalClusterId() bool {
-	if o != nil && !isNil(o.ExternalClusterId) {
+	if o != nil && o.ExternalClusterId != nil {
 		return true
 	}
 
@@ -330,7 +330,7 @@ func (o *ClusterAuthorizationRequest) SetExternalClusterId(v string) {
 
 // GetManaged returns the Managed field value if set, zero value otherwise.
 func (o *ClusterAuthorizationRequest) GetManaged() bool {
-	if o == nil || isNil(o.Managed) {
+	if o == nil || o.Managed == nil {
 		var ret bool
 		return ret
 	}
@@ -340,15 +340,15 @@ func (o *ClusterAuthorizationRequest) GetManaged() bool {
 // GetManagedOk returns a tuple with the Managed field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ClusterAuthorizationRequest) GetManagedOk() (*bool, bool) {
-	if o == nil || isNil(o.Managed) {
-    return nil, false
+	if o == nil || o.Managed == nil {
+		return nil, false
 	}
 	return o.Managed, true
 }
 
 // HasManaged returns a boolean if a field has been set.
 func (o *ClusterAuthorizationRequest) HasManaged() bool {
-	if o != nil && !isNil(o.Managed) {
+	if o != nil && o.Managed != nil {
 		return true
 	}
 
@@ -362,7 +362,7 @@ func (o *ClusterAuthorizationRequest) SetManaged(v bool) {
 
 // GetProductCategory returns the ProductCategory field value if set, zero value otherwise.
 func (o *ClusterAuthorizationRequest) GetProductCategory() string {
-	if o == nil || isNil(o.ProductCategory) {
+	if o == nil || o.ProductCategory == nil {
 		var ret string
 		return ret
 	}
@@ -372,15 +372,15 @@ func (o *ClusterAuthorizationRequest) GetProductCategory() string {
 // GetProductCategoryOk returns a tuple with the ProductCategory field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ClusterAuthorizationRequest) GetProductCategoryOk() (*string, bool) {
-	if o == nil || isNil(o.ProductCategory) {
-    return nil, false
+	if o == nil || o.ProductCategory == nil {
+		return nil, false
 	}
 	return o.ProductCategory, true
 }
 
 // HasProductCategory returns a boolean if a field has been set.
 func (o *ClusterAuthorizationRequest) HasProductCategory() bool {
-	if o != nil && !isNil(o.ProductCategory) {
+	if o != nil && o.ProductCategory != nil {
 		return true
 	}
 
@@ -394,7 +394,7 @@ func (o *ClusterAuthorizationRequest) SetProductCategory(v string) {
 
 // GetProductId returns the ProductId field value if set, zero value otherwise.
 func (o *ClusterAuthorizationRequest) GetProductId() string {
-	if o == nil || isNil(o.ProductId) {
+	if o == nil || o.ProductId == nil {
 		var ret string
 		return ret
 	}
@@ -404,15 +404,15 @@ func (o *ClusterAuthorizationRequest) GetProductId() string {
 // GetProductIdOk returns a tuple with the ProductId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ClusterAuthorizationRequest) GetProductIdOk() (*string, bool) {
-	if o == nil || isNil(o.ProductId) {
-    return nil, false
+	if o == nil || o.ProductId == nil {
+		return nil, false
 	}
 	return o.ProductId, true
 }
 
 // HasProductId returns a boolean if a field has been set.
 func (o *ClusterAuthorizationRequest) HasProductId() bool {
-	if o != nil && !isNil(o.ProductId) {
+	if o != nil && o.ProductId != nil {
 		return true
 	}
 
@@ -426,7 +426,7 @@ func (o *ClusterAuthorizationRequest) SetProductId(v string) {
 
 // GetQuotaVersion returns the QuotaVersion field value if set, zero value otherwise.
 func (o *ClusterAuthorizationRequest) GetQuotaVersion() string {
-	if o == nil || isNil(o.QuotaVersion) {
+	if o == nil || o.QuotaVersion == nil {
 		var ret string
 		return ret
 	}
@@ -436,15 +436,15 @@ func (o *ClusterAuthorizationRequest) GetQuotaVersion() string {
 // GetQuotaVersionOk returns a tuple with the QuotaVersion field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ClusterAuthorizationRequest) GetQuotaVersionOk() (*string, bool) {
-	if o == nil || isNil(o.QuotaVersion) {
-    return nil, false
+	if o == nil || o.QuotaVersion == nil {
+		return nil, false
 	}
 	return o.QuotaVersion, true
 }
 
 // HasQuotaVersion returns a boolean if a field has been set.
 func (o *ClusterAuthorizationRequest) HasQuotaVersion() bool {
-	if o != nil && !isNil(o.QuotaVersion) {
+	if o != nil && o.QuotaVersion != nil {
 		return true
 	}
 
@@ -458,7 +458,7 @@ func (o *ClusterAuthorizationRequest) SetQuotaVersion(v string) {
 
 // GetReserve returns the Reserve field value if set, zero value otherwise.
 func (o *ClusterAuthorizationRequest) GetReserve() bool {
-	if o == nil || isNil(o.Reserve) {
+	if o == nil || o.Reserve == nil {
 		var ret bool
 		return ret
 	}
@@ -468,15 +468,15 @@ func (o *ClusterAuthorizationRequest) GetReserve() bool {
 // GetReserveOk returns a tuple with the Reserve field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ClusterAuthorizationRequest) GetReserveOk() (*bool, bool) {
-	if o == nil || isNil(o.Reserve) {
-    return nil, false
+	if o == nil || o.Reserve == nil {
+		return nil, false
 	}
 	return o.Reserve, true
 }
 
 // HasReserve returns a boolean if a field has been set.
 func (o *ClusterAuthorizationRequest) HasReserve() bool {
-	if o != nil && !isNil(o.Reserve) {
+	if o != nil && o.Reserve != nil {
 		return true
 	}
 
@@ -490,25 +490,25 @@ func (o *ClusterAuthorizationRequest) SetReserve(v bool) {
 
 // GetResources returns the Resources field value if set, zero value otherwise.
 func (o *ClusterAuthorizationRequest) GetResources() []ReservedResource {
-	if o == nil || isNil(o.Resources) {
+	if o == nil || o.Resources == nil {
 		var ret []ReservedResource
 		return ret
 	}
-	return o.Resources
+	return *o.Resources
 }
 
 // GetResourcesOk returns a tuple with the Resources field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *ClusterAuthorizationRequest) GetResourcesOk() ([]ReservedResource, bool) {
-	if o == nil || isNil(o.Resources) {
-    return nil, false
+func (o *ClusterAuthorizationRequest) GetResourcesOk() (*[]ReservedResource, bool) {
+	if o == nil || o.Resources == nil {
+		return nil, false
 	}
 	return o.Resources, true
 }
 
 // HasResources returns a boolean if a field has been set.
 func (o *ClusterAuthorizationRequest) HasResources() bool {
-	if o != nil && !isNil(o.Resources) {
+	if o != nil && o.Resources != nil {
 		return true
 	}
 
@@ -517,7 +517,7 @@ func (o *ClusterAuthorizationRequest) HasResources() bool {
 
 // SetResources gets a reference to the given []ReservedResource and assigns it to the Resources field.
 func (o *ClusterAuthorizationRequest) SetResources(v []ReservedResource) {
-	o.Resources = v
+	o.Resources = &v
 }
 
 func (o ClusterAuthorizationRequest) MarshalJSON() ([]byte, error) {
@@ -525,46 +525,46 @@ func (o ClusterAuthorizationRequest) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["account_username"] = o.AccountUsername
 	}
-	if !isNil(o.AvailabilityZone) {
+	if o.AvailabilityZone != nil {
 		toSerialize["availability_zone"] = o.AvailabilityZone
 	}
-	if !isNil(o.Byoc) {
+	if o.Byoc != nil {
 		toSerialize["byoc"] = o.Byoc
 	}
-	if !isNil(o.CloudAccountId) {
+	if o.CloudAccountId != nil {
 		toSerialize["cloud_account_id"] = o.CloudAccountId
 	}
-	if !isNil(o.CloudProviderId) {
+	if o.CloudProviderId != nil {
 		toSerialize["cloud_provider_id"] = o.CloudProviderId
 	}
 	if true {
 		toSerialize["cluster_id"] = o.ClusterId
 	}
-	if !isNil(o.Disconnected) {
+	if o.Disconnected != nil {
 		toSerialize["disconnected"] = o.Disconnected
 	}
-	if !isNil(o.DisplayName) {
+	if o.DisplayName != nil {
 		toSerialize["display_name"] = o.DisplayName
 	}
-	if !isNil(o.ExternalClusterId) {
+	if o.ExternalClusterId != nil {
 		toSerialize["external_cluster_id"] = o.ExternalClusterId
 	}
-	if !isNil(o.Managed) {
+	if o.Managed != nil {
 		toSerialize["managed"] = o.Managed
 	}
-	if !isNil(o.ProductCategory) {
+	if o.ProductCategory != nil {
 		toSerialize["product_category"] = o.ProductCategory
 	}
-	if !isNil(o.ProductId) {
+	if o.ProductId != nil {
 		toSerialize["product_id"] = o.ProductId
 	}
-	if !isNil(o.QuotaVersion) {
+	if o.QuotaVersion != nil {
 		toSerialize["quota_version"] = o.QuotaVersion
 	}
-	if !isNil(o.Reserve) {
+	if o.Reserve != nil {
 		toSerialize["reserve"] = o.Reserve
 	}
-	if !isNil(o.Resources) {
+	if o.Resources != nil {
 		toSerialize["resources"] = o.Resources
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_cluster_authorization_response.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_cluster_authorization_response.go
index ee996226..68e3da33 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_cluster_authorization_response.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_cluster_authorization_response.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -54,8 +54,8 @@ func (o *ClusterAuthorizationResponse) GetAllowed() bool {
 // GetAllowedOk returns a tuple with the Allowed field value
 // and a boolean to check if the value has been set.
 func (o *ClusterAuthorizationResponse) GetAllowedOk() (*bool, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Allowed, true
 }
@@ -77,11 +77,11 @@ func (o *ClusterAuthorizationResponse) GetExcessResources() []ExcessResource {
 
 // GetExcessResourcesOk returns a tuple with the ExcessResources field value
 // and a boolean to check if the value has been set.
-func (o *ClusterAuthorizationResponse) GetExcessResourcesOk() ([]ExcessResource, bool) {
-	if o == nil {
-    return nil, false
+func (o *ClusterAuthorizationResponse) GetExcessResourcesOk() (*[]ExcessResource, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.ExcessResources, true
+	return &o.ExcessResources, true
 }
 
 // SetExcessResources sets field value
@@ -91,7 +91,7 @@ func (o *ClusterAuthorizationResponse) SetExcessResources(v []ExcessResource) {
 
 // GetOrganizationId returns the OrganizationId field value if set, zero value otherwise.
 func (o *ClusterAuthorizationResponse) GetOrganizationId() string {
-	if o == nil || isNil(o.OrganizationId) {
+	if o == nil || o.OrganizationId == nil {
 		var ret string
 		return ret
 	}
@@ -101,15 +101,15 @@ func (o *ClusterAuthorizationResponse) GetOrganizationId() string {
 // GetOrganizationIdOk returns a tuple with the OrganizationId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ClusterAuthorizationResponse) GetOrganizationIdOk() (*string, bool) {
-	if o == nil || isNil(o.OrganizationId) {
-    return nil, false
+	if o == nil || o.OrganizationId == nil {
+		return nil, false
 	}
 	return o.OrganizationId, true
 }
 
 // HasOrganizationId returns a boolean if a field has been set.
 func (o *ClusterAuthorizationResponse) HasOrganizationId() bool {
-	if o != nil && !isNil(o.OrganizationId) {
+	if o != nil && o.OrganizationId != nil {
 		return true
 	}
 
@@ -123,7 +123,7 @@ func (o *ClusterAuthorizationResponse) SetOrganizationId(v string) {
 
 // GetSubscription returns the Subscription field value if set, zero value otherwise.
 func (o *ClusterAuthorizationResponse) GetSubscription() ObjectReference {
-	if o == nil || isNil(o.Subscription) {
+	if o == nil || o.Subscription == nil {
 		var ret ObjectReference
 		return ret
 	}
@@ -133,15 +133,15 @@ func (o *ClusterAuthorizationResponse) GetSubscription() ObjectReference {
 // GetSubscriptionOk returns a tuple with the Subscription field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ClusterAuthorizationResponse) GetSubscriptionOk() (*ObjectReference, bool) {
-	if o == nil || isNil(o.Subscription) {
-    return nil, false
+	if o == nil || o.Subscription == nil {
+		return nil, false
 	}
 	return o.Subscription, true
 }
 
 // HasSubscription returns a boolean if a field has been set.
 func (o *ClusterAuthorizationResponse) HasSubscription() bool {
-	if o != nil && !isNil(o.Subscription) {
+	if o != nil && o.Subscription != nil {
 		return true
 	}
 
@@ -161,10 +161,10 @@ func (o ClusterAuthorizationResponse) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["excess_resources"] = o.ExcessResources
 	}
-	if !isNil(o.OrganizationId) {
+	if o.OrganizationId != nil {
 		toSerialize["organization_id"] = o.OrganizationId
 	}
-	if !isNil(o.Subscription) {
+	if o.Subscription != nil {
 		toSerialize["subscription"] = o.Subscription
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_cluster_metrics_nodes.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_cluster_metrics_nodes.go
index 9061c002..32c50c33 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_cluster_metrics_nodes.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_cluster_metrics_nodes.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -41,7 +41,7 @@ func NewClusterMetricsNodesWithDefaults() *ClusterMetricsNodes {
 
 // GetCompute returns the Compute field value if set, zero value otherwise.
 func (o *ClusterMetricsNodes) GetCompute() float64 {
-	if o == nil || isNil(o.Compute) {
+	if o == nil || o.Compute == nil {
 		var ret float64
 		return ret
 	}
@@ -51,15 +51,15 @@ func (o *ClusterMetricsNodes) GetCompute() float64 {
 // GetComputeOk returns a tuple with the Compute field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ClusterMetricsNodes) GetComputeOk() (*float64, bool) {
-	if o == nil || isNil(o.Compute) {
-    return nil, false
+	if o == nil || o.Compute == nil {
+		return nil, false
 	}
 	return o.Compute, true
 }
 
 // HasCompute returns a boolean if a field has been set.
 func (o *ClusterMetricsNodes) HasCompute() bool {
-	if o != nil && !isNil(o.Compute) {
+	if o != nil && o.Compute != nil {
 		return true
 	}
 
@@ -73,7 +73,7 @@ func (o *ClusterMetricsNodes) SetCompute(v float64) {
 
 // GetInfra returns the Infra field value if set, zero value otherwise.
 func (o *ClusterMetricsNodes) GetInfra() float64 {
-	if o == nil || isNil(o.Infra) {
+	if o == nil || o.Infra == nil {
 		var ret float64
 		return ret
 	}
@@ -83,15 +83,15 @@ func (o *ClusterMetricsNodes) GetInfra() float64 {
 // GetInfraOk returns a tuple with the Infra field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ClusterMetricsNodes) GetInfraOk() (*float64, bool) {
-	if o == nil || isNil(o.Infra) {
-    return nil, false
+	if o == nil || o.Infra == nil {
+		return nil, false
 	}
 	return o.Infra, true
 }
 
 // HasInfra returns a boolean if a field has been set.
 func (o *ClusterMetricsNodes) HasInfra() bool {
-	if o != nil && !isNil(o.Infra) {
+	if o != nil && o.Infra != nil {
 		return true
 	}
 
@@ -105,7 +105,7 @@ func (o *ClusterMetricsNodes) SetInfra(v float64) {
 
 // GetMaster returns the Master field value if set, zero value otherwise.
 func (o *ClusterMetricsNodes) GetMaster() float64 {
-	if o == nil || isNil(o.Master) {
+	if o == nil || o.Master == nil {
 		var ret float64
 		return ret
 	}
@@ -115,15 +115,15 @@ func (o *ClusterMetricsNodes) GetMaster() float64 {
 // GetMasterOk returns a tuple with the Master field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ClusterMetricsNodes) GetMasterOk() (*float64, bool) {
-	if o == nil || isNil(o.Master) {
-    return nil, false
+	if o == nil || o.Master == nil {
+		return nil, false
 	}
 	return o.Master, true
 }
 
 // HasMaster returns a boolean if a field has been set.
 func (o *ClusterMetricsNodes) HasMaster() bool {
-	if o != nil && !isNil(o.Master) {
+	if o != nil && o.Master != nil {
 		return true
 	}
 
@@ -137,7 +137,7 @@ func (o *ClusterMetricsNodes) SetMaster(v float64) {
 
 // GetTotal returns the Total field value if set, zero value otherwise.
 func (o *ClusterMetricsNodes) GetTotal() float64 {
-	if o == nil || isNil(o.Total) {
+	if o == nil || o.Total == nil {
 		var ret float64
 		return ret
 	}
@@ -147,15 +147,15 @@ func (o *ClusterMetricsNodes) GetTotal() float64 {
 // GetTotalOk returns a tuple with the Total field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ClusterMetricsNodes) GetTotalOk() (*float64, bool) {
-	if o == nil || isNil(o.Total) {
-    return nil, false
+	if o == nil || o.Total == nil {
+		return nil, false
 	}
 	return o.Total, true
 }
 
 // HasTotal returns a boolean if a field has been set.
 func (o *ClusterMetricsNodes) HasTotal() bool {
-	if o != nil && !isNil(o.Total) {
+	if o != nil && o.Total != nil {
 		return true
 	}
 
@@ -169,16 +169,16 @@ func (o *ClusterMetricsNodes) SetTotal(v float64) {
 
 func (o ClusterMetricsNodes) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Compute) {
+	if o.Compute != nil {
 		toSerialize["compute"] = o.Compute
 	}
-	if !isNil(o.Infra) {
+	if o.Infra != nil {
 		toSerialize["infra"] = o.Infra
 	}
-	if !isNil(o.Master) {
+	if o.Master != nil {
 		toSerialize["master"] = o.Master
 	}
-	if !isNil(o.Total) {
+	if o.Total != nil {
 		toSerialize["total"] = o.Total
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_cluster_registration_request.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_cluster_registration_request.go
index bdcf95da..c9c7a1a9 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_cluster_registration_request.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_cluster_registration_request.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -39,7 +39,7 @@ func NewClusterRegistrationRequestWithDefaults() *ClusterRegistrationRequest {
 
 // GetAuthorizationToken returns the AuthorizationToken field value if set, zero value otherwise.
 func (o *ClusterRegistrationRequest) GetAuthorizationToken() string {
-	if o == nil || isNil(o.AuthorizationToken) {
+	if o == nil || o.AuthorizationToken == nil {
 		var ret string
 		return ret
 	}
@@ -49,15 +49,15 @@ func (o *ClusterRegistrationRequest) GetAuthorizationToken() string {
 // GetAuthorizationTokenOk returns a tuple with the AuthorizationToken field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ClusterRegistrationRequest) GetAuthorizationTokenOk() (*string, bool) {
-	if o == nil || isNil(o.AuthorizationToken) {
-    return nil, false
+	if o == nil || o.AuthorizationToken == nil {
+		return nil, false
 	}
 	return o.AuthorizationToken, true
 }
 
 // HasAuthorizationToken returns a boolean if a field has been set.
 func (o *ClusterRegistrationRequest) HasAuthorizationToken() bool {
-	if o != nil && !isNil(o.AuthorizationToken) {
+	if o != nil && o.AuthorizationToken != nil {
 		return true
 	}
 
@@ -71,7 +71,7 @@ func (o *ClusterRegistrationRequest) SetAuthorizationToken(v string) {
 
 // GetClusterId returns the ClusterId field value if set, zero value otherwise.
 func (o *ClusterRegistrationRequest) GetClusterId() string {
-	if o == nil || isNil(o.ClusterId) {
+	if o == nil || o.ClusterId == nil {
 		var ret string
 		return ret
 	}
@@ -81,15 +81,15 @@ func (o *ClusterRegistrationRequest) GetClusterId() string {
 // GetClusterIdOk returns a tuple with the ClusterId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ClusterRegistrationRequest) GetClusterIdOk() (*string, bool) {
-	if o == nil || isNil(o.ClusterId) {
-    return nil, false
+	if o == nil || o.ClusterId == nil {
+		return nil, false
 	}
 	return o.ClusterId, true
 }
 
 // HasClusterId returns a boolean if a field has been set.
 func (o *ClusterRegistrationRequest) HasClusterId() bool {
-	if o != nil && !isNil(o.ClusterId) {
+	if o != nil && o.ClusterId != nil {
 		return true
 	}
 
@@ -103,10 +103,10 @@ func (o *ClusterRegistrationRequest) SetClusterId(v string) {
 
 func (o ClusterRegistrationRequest) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.AuthorizationToken) {
+	if o.AuthorizationToken != nil {
 		toSerialize["authorization_token"] = o.AuthorizationToken
 	}
-	if !isNil(o.ClusterId) {
+	if o.ClusterId != nil {
 		toSerialize["cluster_id"] = o.ClusterId
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_cluster_registration_response.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_cluster_registration_response.go
index 90528906..9a3edf6b 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_cluster_registration_response.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_cluster_registration_response.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -42,7 +42,7 @@ func NewClusterRegistrationResponseWithDefaults() *ClusterRegistrationResponse {
 
 // GetAccountId returns the AccountId field value if set, zero value otherwise.
 func (o *ClusterRegistrationResponse) GetAccountId() string {
-	if o == nil || isNil(o.AccountId) {
+	if o == nil || o.AccountId == nil {
 		var ret string
 		return ret
 	}
@@ -52,15 +52,15 @@ func (o *ClusterRegistrationResponse) GetAccountId() string {
 // GetAccountIdOk returns a tuple with the AccountId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ClusterRegistrationResponse) GetAccountIdOk() (*string, bool) {
-	if o == nil || isNil(o.AccountId) {
-    return nil, false
+	if o == nil || o.AccountId == nil {
+		return nil, false
 	}
 	return o.AccountId, true
 }
 
 // HasAccountId returns a boolean if a field has been set.
 func (o *ClusterRegistrationResponse) HasAccountId() bool {
-	if o != nil && !isNil(o.AccountId) {
+	if o != nil && o.AccountId != nil {
 		return true
 	}
 
@@ -74,7 +74,7 @@ func (o *ClusterRegistrationResponse) SetAccountId(v string) {
 
 // GetAuthorizationToken returns the AuthorizationToken field value if set, zero value otherwise.
 func (o *ClusterRegistrationResponse) GetAuthorizationToken() string {
-	if o == nil || isNil(o.AuthorizationToken) {
+	if o == nil || o.AuthorizationToken == nil {
 		var ret string
 		return ret
 	}
@@ -84,15 +84,15 @@ func (o *ClusterRegistrationResponse) GetAuthorizationToken() string {
 // GetAuthorizationTokenOk returns a tuple with the AuthorizationToken field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ClusterRegistrationResponse) GetAuthorizationTokenOk() (*string, bool) {
-	if o == nil || isNil(o.AuthorizationToken) {
-    return nil, false
+	if o == nil || o.AuthorizationToken == nil {
+		return nil, false
 	}
 	return o.AuthorizationToken, true
 }
 
 // HasAuthorizationToken returns a boolean if a field has been set.
 func (o *ClusterRegistrationResponse) HasAuthorizationToken() bool {
-	if o != nil && !isNil(o.AuthorizationToken) {
+	if o != nil && o.AuthorizationToken != nil {
 		return true
 	}
 
@@ -106,7 +106,7 @@ func (o *ClusterRegistrationResponse) SetAuthorizationToken(v string) {
 
 // GetClusterId returns the ClusterId field value if set, zero value otherwise.
 func (o *ClusterRegistrationResponse) GetClusterId() string {
-	if o == nil || isNil(o.ClusterId) {
+	if o == nil || o.ClusterId == nil {
 		var ret string
 		return ret
 	}
@@ -116,15 +116,15 @@ func (o *ClusterRegistrationResponse) GetClusterId() string {
 // GetClusterIdOk returns a tuple with the ClusterId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ClusterRegistrationResponse) GetClusterIdOk() (*string, bool) {
-	if o == nil || isNil(o.ClusterId) {
-    return nil, false
+	if o == nil || o.ClusterId == nil {
+		return nil, false
 	}
 	return o.ClusterId, true
 }
 
 // HasClusterId returns a boolean if a field has been set.
 func (o *ClusterRegistrationResponse) HasClusterId() bool {
-	if o != nil && !isNil(o.ClusterId) {
+	if o != nil && o.ClusterId != nil {
 		return true
 	}
 
@@ -138,7 +138,7 @@ func (o *ClusterRegistrationResponse) SetClusterId(v string) {
 
 // GetExpiresAt returns the ExpiresAt field value if set, zero value otherwise.
 func (o *ClusterRegistrationResponse) GetExpiresAt() string {
-	if o == nil || isNil(o.ExpiresAt) {
+	if o == nil || o.ExpiresAt == nil {
 		var ret string
 		return ret
 	}
@@ -148,15 +148,15 @@ func (o *ClusterRegistrationResponse) GetExpiresAt() string {
 // GetExpiresAtOk returns a tuple with the ExpiresAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ClusterRegistrationResponse) GetExpiresAtOk() (*string, bool) {
-	if o == nil || isNil(o.ExpiresAt) {
-    return nil, false
+	if o == nil || o.ExpiresAt == nil {
+		return nil, false
 	}
 	return o.ExpiresAt, true
 }
 
 // HasExpiresAt returns a boolean if a field has been set.
 func (o *ClusterRegistrationResponse) HasExpiresAt() bool {
-	if o != nil && !isNil(o.ExpiresAt) {
+	if o != nil && o.ExpiresAt != nil {
 		return true
 	}
 
@@ -170,16 +170,16 @@ func (o *ClusterRegistrationResponse) SetExpiresAt(v string) {
 
 func (o ClusterRegistrationResponse) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.AccountId) {
+	if o.AccountId != nil {
 		toSerialize["account_id"] = o.AccountId
 	}
-	if !isNil(o.AuthorizationToken) {
+	if o.AuthorizationToken != nil {
 		toSerialize["authorization_token"] = o.AuthorizationToken
 	}
-	if !isNil(o.ClusterId) {
+	if o.ClusterId != nil {
 		toSerialize["cluster_id"] = o.ClusterId
 	}
-	if !isNil(o.ExpiresAt) {
+	if o.ExpiresAt != nil {
 		toSerialize["expires_at"] = o.ExpiresAt
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_cluster_resource.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_cluster_resource.go
index 084797a0..dcbb1329 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_cluster_resource.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_cluster_resource.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -55,8 +55,8 @@ func (o *ClusterResource) GetTotal() ClusterResourceTotal {
 // GetTotalOk returns a tuple with the Total field value
 // and a boolean to check if the value has been set.
 func (o *ClusterResource) GetTotalOk() (*ClusterResourceTotal, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Total, true
 }
@@ -79,8 +79,8 @@ func (o *ClusterResource) GetUpdatedTimestamp() time.Time {
 // GetUpdatedTimestampOk returns a tuple with the UpdatedTimestamp field value
 // and a boolean to check if the value has been set.
 func (o *ClusterResource) GetUpdatedTimestampOk() (*time.Time, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.UpdatedTimestamp, true
 }
@@ -103,8 +103,8 @@ func (o *ClusterResource) GetUsed() ClusterResourceTotal {
 // GetUsedOk returns a tuple with the Used field value
 // and a boolean to check if the value has been set.
 func (o *ClusterResource) GetUsedOk() (*ClusterResourceTotal, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Used, true
 }
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_cluster_resource_total.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_cluster_resource_total.go
index a96fb6d1..e5b478b1 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_cluster_resource_total.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_cluster_resource_total.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -52,8 +52,8 @@ func (o *ClusterResourceTotal) GetUnit() string {
 // GetUnitOk returns a tuple with the Unit field value
 // and a boolean to check if the value has been set.
 func (o *ClusterResourceTotal) GetUnitOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Unit, true
 }
@@ -76,8 +76,8 @@ func (o *ClusterResourceTotal) GetValue() float64 {
 // GetValueOk returns a tuple with the Value field value
 // and a boolean to check if the value has been set.
 func (o *ClusterResourceTotal) GetValueOk() (*float64, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Value, true
 }
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_cluster_transfer.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_cluster_transfer.go
index a4fb3199..ed720ef6 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_cluster_transfer.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_cluster_transfer.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -12,6 +12,7 @@ package accountmgmtclient
 
 import (
 	"encoding/json"
+	"time"
 )
 
 // ClusterTransfer struct for ClusterTransfer
@@ -48,7 +49,7 @@ func NewClusterTransferWithDefaults() *ClusterTransfer {
 
 // GetHref returns the Href field value if set, zero value otherwise.
 func (o *ClusterTransfer) GetHref() string {
-	if o == nil || isNil(o.Href) {
+	if o == nil || o.Href == nil {
 		var ret string
 		return ret
 	}
@@ -58,15 +59,15 @@ func (o *ClusterTransfer) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ClusterTransfer) GetHrefOk() (*string, bool) {
-	if o == nil || isNil(o.Href) {
-    return nil, false
+	if o == nil || o.Href == nil {
+		return nil, false
 	}
 	return o.Href, true
 }
 
 // HasHref returns a boolean if a field has been set.
 func (o *ClusterTransfer) HasHref() bool {
-	if o != nil && !isNil(o.Href) {
+	if o != nil && o.Href != nil {
 		return true
 	}
 
@@ -80,7 +81,7 @@ func (o *ClusterTransfer) SetHref(v string) {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *ClusterTransfer) GetId() string {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret string
 		return ret
 	}
@@ -90,15 +91,15 @@ func (o *ClusterTransfer) GetId() string {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ClusterTransfer) GetIdOk() (*string, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *ClusterTransfer) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -112,7 +113,7 @@ func (o *ClusterTransfer) SetId(v string) {
 
 // GetKind returns the Kind field value if set, zero value otherwise.
 func (o *ClusterTransfer) GetKind() string {
-	if o == nil || isNil(o.Kind) {
+	if o == nil || o.Kind == nil {
 		var ret string
 		return ret
 	}
@@ -122,15 +123,15 @@ func (o *ClusterTransfer) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ClusterTransfer) GetKindOk() (*string, bool) {
-	if o == nil || isNil(o.Kind) {
-    return nil, false
+	if o == nil || o.Kind == nil {
+		return nil, false
 	}
 	return o.Kind, true
 }
 
 // HasKind returns a boolean if a field has been set.
 func (o *ClusterTransfer) HasKind() bool {
-	if o != nil && !isNil(o.Kind) {
+	if o != nil && o.Kind != nil {
 		return true
 	}
 
@@ -144,7 +145,7 @@ func (o *ClusterTransfer) SetKind(v string) {
 
 // GetClusterUuid returns the ClusterUuid field value if set, zero value otherwise.
 func (o *ClusterTransfer) GetClusterUuid() string {
-	if o == nil || isNil(o.ClusterUuid) {
+	if o == nil || o.ClusterUuid == nil {
 		var ret string
 		return ret
 	}
@@ -154,15 +155,15 @@ func (o *ClusterTransfer) GetClusterUuid() string {
 // GetClusterUuidOk returns a tuple with the ClusterUuid field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ClusterTransfer) GetClusterUuidOk() (*string, bool) {
-	if o == nil || isNil(o.ClusterUuid) {
-    return nil, false
+	if o == nil || o.ClusterUuid == nil {
+		return nil, false
 	}
 	return o.ClusterUuid, true
 }
 
 // HasClusterUuid returns a boolean if a field has been set.
 func (o *ClusterTransfer) HasClusterUuid() bool {
-	if o != nil && !isNil(o.ClusterUuid) {
+	if o != nil && o.ClusterUuid != nil {
 		return true
 	}
 
@@ -176,7 +177,7 @@ func (o *ClusterTransfer) SetClusterUuid(v string) {
 
 // GetCreatedAt returns the CreatedAt field value if set, zero value otherwise.
 func (o *ClusterTransfer) GetCreatedAt() time.Time {
-	if o == nil || isNil(o.CreatedAt) {
+	if o == nil || o.CreatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -186,15 +187,15 @@ func (o *ClusterTransfer) GetCreatedAt() time.Time {
 // GetCreatedAtOk returns a tuple with the CreatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ClusterTransfer) GetCreatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.CreatedAt) {
-    return nil, false
+	if o == nil || o.CreatedAt == nil {
+		return nil, false
 	}
 	return o.CreatedAt, true
 }
 
 // HasCreatedAt returns a boolean if a field has been set.
 func (o *ClusterTransfer) HasCreatedAt() bool {
-	if o != nil && !isNil(o.CreatedAt) {
+	if o != nil && o.CreatedAt != nil {
 		return true
 	}
 
@@ -208,7 +209,7 @@ func (o *ClusterTransfer) SetCreatedAt(v time.Time) {
 
 // GetExpirationDate returns the ExpirationDate field value if set, zero value otherwise.
 func (o *ClusterTransfer) GetExpirationDate() time.Time {
-	if o == nil || isNil(o.ExpirationDate) {
+	if o == nil || o.ExpirationDate == nil {
 		var ret time.Time
 		return ret
 	}
@@ -218,15 +219,15 @@ func (o *ClusterTransfer) GetExpirationDate() time.Time {
 // GetExpirationDateOk returns a tuple with the ExpirationDate field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ClusterTransfer) GetExpirationDateOk() (*time.Time, bool) {
-	if o == nil || isNil(o.ExpirationDate) {
-    return nil, false
+	if o == nil || o.ExpirationDate == nil {
+		return nil, false
 	}
 	return o.ExpirationDate, true
 }
 
 // HasExpirationDate returns a boolean if a field has been set.
 func (o *ClusterTransfer) HasExpirationDate() bool {
-	if o != nil && !isNil(o.ExpirationDate) {
+	if o != nil && o.ExpirationDate != nil {
 		return true
 	}
 
@@ -240,7 +241,7 @@ func (o *ClusterTransfer) SetExpirationDate(v time.Time) {
 
 // GetOwner returns the Owner field value if set, zero value otherwise.
 func (o *ClusterTransfer) GetOwner() string {
-	if o == nil || isNil(o.Owner) {
+	if o == nil || o.Owner == nil {
 		var ret string
 		return ret
 	}
@@ -250,15 +251,15 @@ func (o *ClusterTransfer) GetOwner() string {
 // GetOwnerOk returns a tuple with the Owner field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ClusterTransfer) GetOwnerOk() (*string, bool) {
-	if o == nil || isNil(o.Owner) {
-    return nil, false
+	if o == nil || o.Owner == nil {
+		return nil, false
 	}
 	return o.Owner, true
 }
 
 // HasOwner returns a boolean if a field has been set.
 func (o *ClusterTransfer) HasOwner() bool {
-	if o != nil && !isNil(o.Owner) {
+	if o != nil && o.Owner != nil {
 		return true
 	}
 
@@ -272,7 +273,7 @@ func (o *ClusterTransfer) SetOwner(v string) {
 
 // GetRecipient returns the Recipient field value if set, zero value otherwise.
 func (o *ClusterTransfer) GetRecipient() string {
-	if o == nil || isNil(o.Recipient) {
+	if o == nil || o.Recipient == nil {
 		var ret string
 		return ret
 	}
@@ -282,15 +283,15 @@ func (o *ClusterTransfer) GetRecipient() string {
 // GetRecipientOk returns a tuple with the Recipient field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ClusterTransfer) GetRecipientOk() (*string, bool) {
-	if o == nil || isNil(o.Recipient) {
-    return nil, false
+	if o == nil || o.Recipient == nil {
+		return nil, false
 	}
 	return o.Recipient, true
 }
 
 // HasRecipient returns a boolean if a field has been set.
 func (o *ClusterTransfer) HasRecipient() bool {
-	if o != nil && !isNil(o.Recipient) {
+	if o != nil && o.Recipient != nil {
 		return true
 	}
 
@@ -304,7 +305,7 @@ func (o *ClusterTransfer) SetRecipient(v string) {
 
 // GetSecret returns the Secret field value if set, zero value otherwise.
 func (o *ClusterTransfer) GetSecret() string {
-	if o == nil || isNil(o.Secret) {
+	if o == nil || o.Secret == nil {
 		var ret string
 		return ret
 	}
@@ -314,15 +315,15 @@ func (o *ClusterTransfer) GetSecret() string {
 // GetSecretOk returns a tuple with the Secret field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ClusterTransfer) GetSecretOk() (*string, bool) {
-	if o == nil || isNil(o.Secret) {
-    return nil, false
+	if o == nil || o.Secret == nil {
+		return nil, false
 	}
 	return o.Secret, true
 }
 
 // HasSecret returns a boolean if a field has been set.
 func (o *ClusterTransfer) HasSecret() bool {
-	if o != nil && !isNil(o.Secret) {
+	if o != nil && o.Secret != nil {
 		return true
 	}
 
@@ -336,7 +337,7 @@ func (o *ClusterTransfer) SetSecret(v string) {
 
 // GetStatus returns the Status field value if set, zero value otherwise.
 func (o *ClusterTransfer) GetStatus() string {
-	if o == nil || isNil(o.Status) {
+	if o == nil || o.Status == nil {
 		var ret string
 		return ret
 	}
@@ -346,15 +347,15 @@ func (o *ClusterTransfer) GetStatus() string {
 // GetStatusOk returns a tuple with the Status field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ClusterTransfer) GetStatusOk() (*string, bool) {
-	if o == nil || isNil(o.Status) {
-    return nil, false
+	if o == nil || o.Status == nil {
+		return nil, false
 	}
 	return o.Status, true
 }
 
 // HasStatus returns a boolean if a field has been set.
 func (o *ClusterTransfer) HasStatus() bool {
-	if o != nil && !isNil(o.Status) {
+	if o != nil && o.Status != nil {
 		return true
 	}
 
@@ -368,7 +369,7 @@ func (o *ClusterTransfer) SetStatus(v string) {
 
 // GetUpdatedAt returns the UpdatedAt field value if set, zero value otherwise.
 func (o *ClusterTransfer) GetUpdatedAt() time.Time {
-	if o == nil || isNil(o.UpdatedAt) {
+	if o == nil || o.UpdatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -378,15 +379,15 @@ func (o *ClusterTransfer) GetUpdatedAt() time.Time {
 // GetUpdatedAtOk returns a tuple with the UpdatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ClusterTransfer) GetUpdatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.UpdatedAt) {
-    return nil, false
+	if o == nil || o.UpdatedAt == nil {
+		return nil, false
 	}
 	return o.UpdatedAt, true
 }
 
 // HasUpdatedAt returns a boolean if a field has been set.
 func (o *ClusterTransfer) HasUpdatedAt() bool {
-	if o != nil && !isNil(o.UpdatedAt) {
+	if o != nil && o.UpdatedAt != nil {
 		return true
 	}
 
@@ -400,37 +401,37 @@ func (o *ClusterTransfer) SetUpdatedAt(v time.Time) {
 
 func (o ClusterTransfer) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Href) {
+	if o.Href != nil {
 		toSerialize["href"] = o.Href
 	}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.Kind) {
+	if o.Kind != nil {
 		toSerialize["kind"] = o.Kind
 	}
-	if !isNil(o.ClusterUuid) {
+	if o.ClusterUuid != nil {
 		toSerialize["cluster_uuid"] = o.ClusterUuid
 	}
-	if !isNil(o.CreatedAt) {
+	if o.CreatedAt != nil {
 		toSerialize["created_at"] = o.CreatedAt
 	}
-	if !isNil(o.ExpirationDate) {
+	if o.ExpirationDate != nil {
 		toSerialize["expiration_date"] = o.ExpirationDate
 	}
-	if !isNil(o.Owner) {
+	if o.Owner != nil {
 		toSerialize["owner"] = o.Owner
 	}
-	if !isNil(o.Recipient) {
+	if o.Recipient != nil {
 		toSerialize["recipient"] = o.Recipient
 	}
-	if !isNil(o.Secret) {
+	if o.Secret != nil {
 		toSerialize["secret"] = o.Secret
 	}
-	if !isNil(o.Status) {
+	if o.Status != nil {
 		toSerialize["status"] = o.Status
 	}
-	if !isNil(o.UpdatedAt) {
+	if o.UpdatedAt != nil {
 		toSerialize["updated_at"] = o.UpdatedAt
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_cluster_transfer_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_cluster_transfer_all_of.go
index 93a96fff..ce3e06e9 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_cluster_transfer_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_cluster_transfer_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -46,7 +46,7 @@ func NewClusterTransferAllOfWithDefaults() *ClusterTransferAllOf {
 
 // GetClusterUuid returns the ClusterUuid field value if set, zero value otherwise.
 func (o *ClusterTransferAllOf) GetClusterUuid() string {
-	if o == nil || isNil(o.ClusterUuid) {
+	if o == nil || o.ClusterUuid == nil {
 		var ret string
 		return ret
 	}
@@ -56,15 +56,15 @@ func (o *ClusterTransferAllOf) GetClusterUuid() string {
 // GetClusterUuidOk returns a tuple with the ClusterUuid field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ClusterTransferAllOf) GetClusterUuidOk() (*string, bool) {
-	if o == nil || isNil(o.ClusterUuid) {
-    return nil, false
+	if o == nil || o.ClusterUuid == nil {
+		return nil, false
 	}
 	return o.ClusterUuid, true
 }
 
 // HasClusterUuid returns a boolean if a field has been set.
 func (o *ClusterTransferAllOf) HasClusterUuid() bool {
-	if o != nil && !isNil(o.ClusterUuid) {
+	if o != nil && o.ClusterUuid != nil {
 		return true
 	}
 
@@ -78,7 +78,7 @@ func (o *ClusterTransferAllOf) SetClusterUuid(v string) {
 
 // GetCreatedAt returns the CreatedAt field value if set, zero value otherwise.
 func (o *ClusterTransferAllOf) GetCreatedAt() time.Time {
-	if o == nil || isNil(o.CreatedAt) {
+	if o == nil || o.CreatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -88,15 +88,15 @@ func (o *ClusterTransferAllOf) GetCreatedAt() time.Time {
 // GetCreatedAtOk returns a tuple with the CreatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ClusterTransferAllOf) GetCreatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.CreatedAt) {
-    return nil, false
+	if o == nil || o.CreatedAt == nil {
+		return nil, false
 	}
 	return o.CreatedAt, true
 }
 
 // HasCreatedAt returns a boolean if a field has been set.
 func (o *ClusterTransferAllOf) HasCreatedAt() bool {
-	if o != nil && !isNil(o.CreatedAt) {
+	if o != nil && o.CreatedAt != nil {
 		return true
 	}
 
@@ -110,7 +110,7 @@ func (o *ClusterTransferAllOf) SetCreatedAt(v time.Time) {
 
 // GetExpirationDate returns the ExpirationDate field value if set, zero value otherwise.
 func (o *ClusterTransferAllOf) GetExpirationDate() time.Time {
-	if o == nil || isNil(o.ExpirationDate) {
+	if o == nil || o.ExpirationDate == nil {
 		var ret time.Time
 		return ret
 	}
@@ -120,15 +120,15 @@ func (o *ClusterTransferAllOf) GetExpirationDate() time.Time {
 // GetExpirationDateOk returns a tuple with the ExpirationDate field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ClusterTransferAllOf) GetExpirationDateOk() (*time.Time, bool) {
-	if o == nil || isNil(o.ExpirationDate) {
-    return nil, false
+	if o == nil || o.ExpirationDate == nil {
+		return nil, false
 	}
 	return o.ExpirationDate, true
 }
 
 // HasExpirationDate returns a boolean if a field has been set.
 func (o *ClusterTransferAllOf) HasExpirationDate() bool {
-	if o != nil && !isNil(o.ExpirationDate) {
+	if o != nil && o.ExpirationDate != nil {
 		return true
 	}
 
@@ -142,7 +142,7 @@ func (o *ClusterTransferAllOf) SetExpirationDate(v time.Time) {
 
 // GetOwner returns the Owner field value if set, zero value otherwise.
 func (o *ClusterTransferAllOf) GetOwner() string {
-	if o == nil || isNil(o.Owner) {
+	if o == nil || o.Owner == nil {
 		var ret string
 		return ret
 	}
@@ -152,15 +152,15 @@ func (o *ClusterTransferAllOf) GetOwner() string {
 // GetOwnerOk returns a tuple with the Owner field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ClusterTransferAllOf) GetOwnerOk() (*string, bool) {
-	if o == nil || isNil(o.Owner) {
-    return nil, false
+	if o == nil || o.Owner == nil {
+		return nil, false
 	}
 	return o.Owner, true
 }
 
 // HasOwner returns a boolean if a field has been set.
 func (o *ClusterTransferAllOf) HasOwner() bool {
-	if o != nil && !isNil(o.Owner) {
+	if o != nil && o.Owner != nil {
 		return true
 	}
 
@@ -174,7 +174,7 @@ func (o *ClusterTransferAllOf) SetOwner(v string) {
 
 // GetRecipient returns the Recipient field value if set, zero value otherwise.
 func (o *ClusterTransferAllOf) GetRecipient() string {
-	if o == nil || isNil(o.Recipient) {
+	if o == nil || o.Recipient == nil {
 		var ret string
 		return ret
 	}
@@ -184,15 +184,15 @@ func (o *ClusterTransferAllOf) GetRecipient() string {
 // GetRecipientOk returns a tuple with the Recipient field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ClusterTransferAllOf) GetRecipientOk() (*string, bool) {
-	if o == nil || isNil(o.Recipient) {
-    return nil, false
+	if o == nil || o.Recipient == nil {
+		return nil, false
 	}
 	return o.Recipient, true
 }
 
 // HasRecipient returns a boolean if a field has been set.
 func (o *ClusterTransferAllOf) HasRecipient() bool {
-	if o != nil && !isNil(o.Recipient) {
+	if o != nil && o.Recipient != nil {
 		return true
 	}
 
@@ -206,7 +206,7 @@ func (o *ClusterTransferAllOf) SetRecipient(v string) {
 
 // GetSecret returns the Secret field value if set, zero value otherwise.
 func (o *ClusterTransferAllOf) GetSecret() string {
-	if o == nil || isNil(o.Secret) {
+	if o == nil || o.Secret == nil {
 		var ret string
 		return ret
 	}
@@ -216,15 +216,15 @@ func (o *ClusterTransferAllOf) GetSecret() string {
 // GetSecretOk returns a tuple with the Secret field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ClusterTransferAllOf) GetSecretOk() (*string, bool) {
-	if o == nil || isNil(o.Secret) {
-    return nil, false
+	if o == nil || o.Secret == nil {
+		return nil, false
 	}
 	return o.Secret, true
 }
 
 // HasSecret returns a boolean if a field has been set.
 func (o *ClusterTransferAllOf) HasSecret() bool {
-	if o != nil && !isNil(o.Secret) {
+	if o != nil && o.Secret != nil {
 		return true
 	}
 
@@ -238,7 +238,7 @@ func (o *ClusterTransferAllOf) SetSecret(v string) {
 
 // GetStatus returns the Status field value if set, zero value otherwise.
 func (o *ClusterTransferAllOf) GetStatus() string {
-	if o == nil || isNil(o.Status) {
+	if o == nil || o.Status == nil {
 		var ret string
 		return ret
 	}
@@ -248,15 +248,15 @@ func (o *ClusterTransferAllOf) GetStatus() string {
 // GetStatusOk returns a tuple with the Status field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ClusterTransferAllOf) GetStatusOk() (*string, bool) {
-	if o == nil || isNil(o.Status) {
-    return nil, false
+	if o == nil || o.Status == nil {
+		return nil, false
 	}
 	return o.Status, true
 }
 
 // HasStatus returns a boolean if a field has been set.
 func (o *ClusterTransferAllOf) HasStatus() bool {
-	if o != nil && !isNil(o.Status) {
+	if o != nil && o.Status != nil {
 		return true
 	}
 
@@ -270,7 +270,7 @@ func (o *ClusterTransferAllOf) SetStatus(v string) {
 
 // GetUpdatedAt returns the UpdatedAt field value if set, zero value otherwise.
 func (o *ClusterTransferAllOf) GetUpdatedAt() time.Time {
-	if o == nil || isNil(o.UpdatedAt) {
+	if o == nil || o.UpdatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -280,15 +280,15 @@ func (o *ClusterTransferAllOf) GetUpdatedAt() time.Time {
 // GetUpdatedAtOk returns a tuple with the UpdatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ClusterTransferAllOf) GetUpdatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.UpdatedAt) {
-    return nil, false
+	if o == nil || o.UpdatedAt == nil {
+		return nil, false
 	}
 	return o.UpdatedAt, true
 }
 
 // HasUpdatedAt returns a boolean if a field has been set.
 func (o *ClusterTransferAllOf) HasUpdatedAt() bool {
-	if o != nil && !isNil(o.UpdatedAt) {
+	if o != nil && o.UpdatedAt != nil {
 		return true
 	}
 
@@ -302,28 +302,28 @@ func (o *ClusterTransferAllOf) SetUpdatedAt(v time.Time) {
 
 func (o ClusterTransferAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.ClusterUuid) {
+	if o.ClusterUuid != nil {
 		toSerialize["cluster_uuid"] = o.ClusterUuid
 	}
-	if !isNil(o.CreatedAt) {
+	if o.CreatedAt != nil {
 		toSerialize["created_at"] = o.CreatedAt
 	}
-	if !isNil(o.ExpirationDate) {
+	if o.ExpirationDate != nil {
 		toSerialize["expiration_date"] = o.ExpirationDate
 	}
-	if !isNil(o.Owner) {
+	if o.Owner != nil {
 		toSerialize["owner"] = o.Owner
 	}
-	if !isNil(o.Recipient) {
+	if o.Recipient != nil {
 		toSerialize["recipient"] = o.Recipient
 	}
-	if !isNil(o.Secret) {
+	if o.Secret != nil {
 		toSerialize["secret"] = o.Secret
 	}
-	if !isNil(o.Status) {
+	if o.Status != nil {
 		toSerialize["status"] = o.Status
 	}
-	if !isNil(o.UpdatedAt) {
+	if o.UpdatedAt != nil {
 		toSerialize["updated_at"] = o.UpdatedAt
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_cluster_transfer_list.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_cluster_transfer_list.go
index aabcb853..9999bb59 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_cluster_transfer_list.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_cluster_transfer_list.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -58,8 +58,8 @@ func (o *ClusterTransferList) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *ClusterTransferList) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -82,8 +82,8 @@ func (o *ClusterTransferList) GetPage() int32 {
 // GetPageOk returns a tuple with the Page field value
 // and a boolean to check if the value has been set.
 func (o *ClusterTransferList) GetPageOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Page, true
 }
@@ -106,8 +106,8 @@ func (o *ClusterTransferList) GetSize() int32 {
 // GetSizeOk returns a tuple with the Size field value
 // and a boolean to check if the value has been set.
 func (o *ClusterTransferList) GetSizeOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Size, true
 }
@@ -130,8 +130,8 @@ func (o *ClusterTransferList) GetTotal() int32 {
 // GetTotalOk returns a tuple with the Total field value
 // and a boolean to check if the value has been set.
 func (o *ClusterTransferList) GetTotalOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Total, true
 }
@@ -153,11 +153,11 @@ func (o *ClusterTransferList) GetItems() []ClusterTransfer {
 
 // GetItemsOk returns a tuple with the Items field value
 // and a boolean to check if the value has been set.
-func (o *ClusterTransferList) GetItemsOk() ([]ClusterTransfer, bool) {
-	if o == nil {
-    return nil, false
+func (o *ClusterTransferList) GetItemsOk() (*[]ClusterTransfer, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Items, true
+	return &o.Items, true
 }
 
 // SetItems sets field value
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_cluster_transfer_list_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_cluster_transfer_list_all_of.go
index 31b3e438..78b00426 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_cluster_transfer_list_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_cluster_transfer_list_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -16,7 +16,7 @@ import (
 
 // ClusterTransferListAllOf struct for ClusterTransferListAllOf
 type ClusterTransferListAllOf struct {
-	Items []ClusterTransfer `json:"items,omitempty"`
+	Items *[]ClusterTransfer `json:"items,omitempty"`
 }
 
 // NewClusterTransferListAllOf instantiates a new ClusterTransferListAllOf object
@@ -38,25 +38,25 @@ func NewClusterTransferListAllOfWithDefaults() *ClusterTransferListAllOf {
 
 // GetItems returns the Items field value if set, zero value otherwise.
 func (o *ClusterTransferListAllOf) GetItems() []ClusterTransfer {
-	if o == nil || isNil(o.Items) {
+	if o == nil || o.Items == nil {
 		var ret []ClusterTransfer
 		return ret
 	}
-	return o.Items
+	return *o.Items
 }
 
 // GetItemsOk returns a tuple with the Items field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *ClusterTransferListAllOf) GetItemsOk() ([]ClusterTransfer, bool) {
-	if o == nil || isNil(o.Items) {
-    return nil, false
+func (o *ClusterTransferListAllOf) GetItemsOk() (*[]ClusterTransfer, bool) {
+	if o == nil || o.Items == nil {
+		return nil, false
 	}
 	return o.Items, true
 }
 
 // HasItems returns a boolean if a field has been set.
 func (o *ClusterTransferListAllOf) HasItems() bool {
-	if o != nil && !isNil(o.Items) {
+	if o != nil && o.Items != nil {
 		return true
 	}
 
@@ -65,12 +65,12 @@ func (o *ClusterTransferListAllOf) HasItems() bool {
 
 // SetItems gets a reference to the given []ClusterTransfer and assigns it to the Items field.
 func (o *ClusterTransferListAllOf) SetItems(v []ClusterTransfer) {
-	o.Items = v
+	o.Items = &v
 }
 
 func (o ClusterTransferListAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Items) {
+	if o.Items != nil {
 		toSerialize["items"] = o.Items
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_cluster_transfer_patch_request.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_cluster_transfer_patch_request.go
index 39e077a1..40363e03 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_cluster_transfer_patch_request.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_cluster_transfer_patch_request.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -38,7 +38,7 @@ func NewClusterTransferPatchRequestWithDefaults() *ClusterTransferPatchRequest {
 
 // GetStatus returns the Status field value if set, zero value otherwise.
 func (o *ClusterTransferPatchRequest) GetStatus() string {
-	if o == nil || isNil(o.Status) {
+	if o == nil || o.Status == nil {
 		var ret string
 		return ret
 	}
@@ -48,15 +48,15 @@ func (o *ClusterTransferPatchRequest) GetStatus() string {
 // GetStatusOk returns a tuple with the Status field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ClusterTransferPatchRequest) GetStatusOk() (*string, bool) {
-	if o == nil || isNil(o.Status) {
-    return nil, false
+	if o == nil || o.Status == nil {
+		return nil, false
 	}
 	return o.Status, true
 }
 
 // HasStatus returns a boolean if a field has been set.
 func (o *ClusterTransferPatchRequest) HasStatus() bool {
-	if o != nil && !isNil(o.Status) {
+	if o != nil && o.Status != nil {
 		return true
 	}
 
@@ -70,7 +70,7 @@ func (o *ClusterTransferPatchRequest) SetStatus(v string) {
 
 func (o ClusterTransferPatchRequest) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Status) {
+	if o.Status != nil {
 		toSerialize["status"] = o.Status
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_cluster_transfer_request.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_cluster_transfer_request.go
index 12be7adf..f48702cf 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_cluster_transfer_request.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_cluster_transfer_request.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -40,7 +40,7 @@ func NewClusterTransferRequestWithDefaults() *ClusterTransferRequest {
 
 // GetClusterUuid returns the ClusterUuid field value if set, zero value otherwise.
 func (o *ClusterTransferRequest) GetClusterUuid() string {
-	if o == nil || isNil(o.ClusterUuid) {
+	if o == nil || o.ClusterUuid == nil {
 		var ret string
 		return ret
 	}
@@ -50,15 +50,15 @@ func (o *ClusterTransferRequest) GetClusterUuid() string {
 // GetClusterUuidOk returns a tuple with the ClusterUuid field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ClusterTransferRequest) GetClusterUuidOk() (*string, bool) {
-	if o == nil || isNil(o.ClusterUuid) {
-    return nil, false
+	if o == nil || o.ClusterUuid == nil {
+		return nil, false
 	}
 	return o.ClusterUuid, true
 }
 
 // HasClusterUuid returns a boolean if a field has been set.
 func (o *ClusterTransferRequest) HasClusterUuid() bool {
-	if o != nil && !isNil(o.ClusterUuid) {
+	if o != nil && o.ClusterUuid != nil {
 		return true
 	}
 
@@ -72,7 +72,7 @@ func (o *ClusterTransferRequest) SetClusterUuid(v string) {
 
 // GetOwner returns the Owner field value if set, zero value otherwise.
 func (o *ClusterTransferRequest) GetOwner() string {
-	if o == nil || isNil(o.Owner) {
+	if o == nil || o.Owner == nil {
 		var ret string
 		return ret
 	}
@@ -82,15 +82,15 @@ func (o *ClusterTransferRequest) GetOwner() string {
 // GetOwnerOk returns a tuple with the Owner field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ClusterTransferRequest) GetOwnerOk() (*string, bool) {
-	if o == nil || isNil(o.Owner) {
-    return nil, false
+	if o == nil || o.Owner == nil {
+		return nil, false
 	}
 	return o.Owner, true
 }
 
 // HasOwner returns a boolean if a field has been set.
 func (o *ClusterTransferRequest) HasOwner() bool {
-	if o != nil && !isNil(o.Owner) {
+	if o != nil && o.Owner != nil {
 		return true
 	}
 
@@ -104,7 +104,7 @@ func (o *ClusterTransferRequest) SetOwner(v string) {
 
 // GetRecipient returns the Recipient field value if set, zero value otherwise.
 func (o *ClusterTransferRequest) GetRecipient() string {
-	if o == nil || isNil(o.Recipient) {
+	if o == nil || o.Recipient == nil {
 		var ret string
 		return ret
 	}
@@ -114,15 +114,15 @@ func (o *ClusterTransferRequest) GetRecipient() string {
 // GetRecipientOk returns a tuple with the Recipient field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ClusterTransferRequest) GetRecipientOk() (*string, bool) {
-	if o == nil || isNil(o.Recipient) {
-    return nil, false
+	if o == nil || o.Recipient == nil {
+		return nil, false
 	}
 	return o.Recipient, true
 }
 
 // HasRecipient returns a boolean if a field has been set.
 func (o *ClusterTransferRequest) HasRecipient() bool {
-	if o != nil && !isNil(o.Recipient) {
+	if o != nil && o.Recipient != nil {
 		return true
 	}
 
@@ -136,13 +136,13 @@ func (o *ClusterTransferRequest) SetRecipient(v string) {
 
 func (o ClusterTransferRequest) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.ClusterUuid) {
+	if o.ClusterUuid != nil {
 		toSerialize["cluster_uuid"] = o.ClusterUuid
 	}
-	if !isNil(o.Owner) {
+	if o.Owner != nil {
 		toSerialize["owner"] = o.Owner
 	}
-	if !isNil(o.Recipient) {
+	if o.Recipient != nil {
 		toSerialize["recipient"] = o.Recipient
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_cluster_upgrade.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_cluster_upgrade.go
index 9db9a765..fe36c823 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_cluster_upgrade.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_cluster_upgrade.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -42,7 +42,7 @@ func NewClusterUpgradeWithDefaults() *ClusterUpgrade {
 
 // GetAvailable returns the Available field value if set, zero value otherwise.
 func (o *ClusterUpgrade) GetAvailable() bool {
-	if o == nil || isNil(o.Available) {
+	if o == nil || o.Available == nil {
 		var ret bool
 		return ret
 	}
@@ -52,15 +52,15 @@ func (o *ClusterUpgrade) GetAvailable() bool {
 // GetAvailableOk returns a tuple with the Available field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ClusterUpgrade) GetAvailableOk() (*bool, bool) {
-	if o == nil || isNil(o.Available) {
-    return nil, false
+	if o == nil || o.Available == nil {
+		return nil, false
 	}
 	return o.Available, true
 }
 
 // HasAvailable returns a boolean if a field has been set.
 func (o *ClusterUpgrade) HasAvailable() bool {
-	if o != nil && !isNil(o.Available) {
+	if o != nil && o.Available != nil {
 		return true
 	}
 
@@ -74,7 +74,7 @@ func (o *ClusterUpgrade) SetAvailable(v bool) {
 
 // GetState returns the State field value if set, zero value otherwise.
 func (o *ClusterUpgrade) GetState() string {
-	if o == nil || isNil(o.State) {
+	if o == nil || o.State == nil {
 		var ret string
 		return ret
 	}
@@ -84,15 +84,15 @@ func (o *ClusterUpgrade) GetState() string {
 // GetStateOk returns a tuple with the State field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ClusterUpgrade) GetStateOk() (*string, bool) {
-	if o == nil || isNil(o.State) {
-    return nil, false
+	if o == nil || o.State == nil {
+		return nil, false
 	}
 	return o.State, true
 }
 
 // HasState returns a boolean if a field has been set.
 func (o *ClusterUpgrade) HasState() bool {
-	if o != nil && !isNil(o.State) {
+	if o != nil && o.State != nil {
 		return true
 	}
 
@@ -106,7 +106,7 @@ func (o *ClusterUpgrade) SetState(v string) {
 
 // GetUpdatedTimestamp returns the UpdatedTimestamp field value if set, zero value otherwise.
 func (o *ClusterUpgrade) GetUpdatedTimestamp() time.Time {
-	if o == nil || isNil(o.UpdatedTimestamp) {
+	if o == nil || o.UpdatedTimestamp == nil {
 		var ret time.Time
 		return ret
 	}
@@ -116,15 +116,15 @@ func (o *ClusterUpgrade) GetUpdatedTimestamp() time.Time {
 // GetUpdatedTimestampOk returns a tuple with the UpdatedTimestamp field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ClusterUpgrade) GetUpdatedTimestampOk() (*time.Time, bool) {
-	if o == nil || isNil(o.UpdatedTimestamp) {
-    return nil, false
+	if o == nil || o.UpdatedTimestamp == nil {
+		return nil, false
 	}
 	return o.UpdatedTimestamp, true
 }
 
 // HasUpdatedTimestamp returns a boolean if a field has been set.
 func (o *ClusterUpgrade) HasUpdatedTimestamp() bool {
-	if o != nil && !isNil(o.UpdatedTimestamp) {
+	if o != nil && o.UpdatedTimestamp != nil {
 		return true
 	}
 
@@ -138,7 +138,7 @@ func (o *ClusterUpgrade) SetUpdatedTimestamp(v time.Time) {
 
 // GetVersion returns the Version field value if set, zero value otherwise.
 func (o *ClusterUpgrade) GetVersion() string {
-	if o == nil || isNil(o.Version) {
+	if o == nil || o.Version == nil {
 		var ret string
 		return ret
 	}
@@ -148,15 +148,15 @@ func (o *ClusterUpgrade) GetVersion() string {
 // GetVersionOk returns a tuple with the Version field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ClusterUpgrade) GetVersionOk() (*string, bool) {
-	if o == nil || isNil(o.Version) {
-    return nil, false
+	if o == nil || o.Version == nil {
+		return nil, false
 	}
 	return o.Version, true
 }
 
 // HasVersion returns a boolean if a field has been set.
 func (o *ClusterUpgrade) HasVersion() bool {
-	if o != nil && !isNil(o.Version) {
+	if o != nil && o.Version != nil {
 		return true
 	}
 
@@ -170,16 +170,16 @@ func (o *ClusterUpgrade) SetVersion(v string) {
 
 func (o ClusterUpgrade) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Available) {
+	if o.Available != nil {
 		toSerialize["available"] = o.Available
 	}
-	if !isNil(o.State) {
+	if o.State != nil {
 		toSerialize["state"] = o.State
 	}
-	if !isNil(o.UpdatedTimestamp) {
+	if o.UpdatedTimestamp != nil {
 		toSerialize["updated_timestamp"] = o.UpdatedTimestamp
 	}
-	if !isNil(o.Version) {
+	if o.Version != nil {
 		toSerialize["version"] = o.Version
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_consumed_quota.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_consumed_quota.go
index 308bb7a0..52370f5d 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_consumed_quota.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_consumed_quota.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -52,7 +52,7 @@ func NewConsumedQuotaWithDefaults() *ConsumedQuota {
 
 // GetHref returns the Href field value if set, zero value otherwise.
 func (o *ConsumedQuota) GetHref() string {
-	if o == nil || isNil(o.Href) {
+	if o == nil || o.Href == nil {
 		var ret string
 		return ret
 	}
@@ -62,15 +62,15 @@ func (o *ConsumedQuota) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConsumedQuota) GetHrefOk() (*string, bool) {
-	if o == nil || isNil(o.Href) {
-    return nil, false
+	if o == nil || o.Href == nil {
+		return nil, false
 	}
 	return o.Href, true
 }
 
 // HasHref returns a boolean if a field has been set.
 func (o *ConsumedQuota) HasHref() bool {
-	if o != nil && !isNil(o.Href) {
+	if o != nil && o.Href != nil {
 		return true
 	}
 
@@ -84,7 +84,7 @@ func (o *ConsumedQuota) SetHref(v string) {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *ConsumedQuota) GetId() string {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret string
 		return ret
 	}
@@ -94,15 +94,15 @@ func (o *ConsumedQuota) GetId() string {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConsumedQuota) GetIdOk() (*string, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *ConsumedQuota) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -116,7 +116,7 @@ func (o *ConsumedQuota) SetId(v string) {
 
 // GetKind returns the Kind field value if set, zero value otherwise.
 func (o *ConsumedQuota) GetKind() string {
-	if o == nil || isNil(o.Kind) {
+	if o == nil || o.Kind == nil {
 		var ret string
 		return ret
 	}
@@ -126,15 +126,15 @@ func (o *ConsumedQuota) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConsumedQuota) GetKindOk() (*string, bool) {
-	if o == nil || isNil(o.Kind) {
-    return nil, false
+	if o == nil || o.Kind == nil {
+		return nil, false
 	}
 	return o.Kind, true
 }
 
 // HasKind returns a boolean if a field has been set.
 func (o *ConsumedQuota) HasKind() bool {
-	if o != nil && !isNil(o.Kind) {
+	if o != nil && o.Kind != nil {
 		return true
 	}
 
@@ -148,7 +148,7 @@ func (o *ConsumedQuota) SetKind(v string) {
 
 // GetAvailabilityZoneType returns the AvailabilityZoneType field value if set, zero value otherwise.
 func (o *ConsumedQuota) GetAvailabilityZoneType() string {
-	if o == nil || isNil(o.AvailabilityZoneType) {
+	if o == nil || o.AvailabilityZoneType == nil {
 		var ret string
 		return ret
 	}
@@ -158,15 +158,15 @@ func (o *ConsumedQuota) GetAvailabilityZoneType() string {
 // GetAvailabilityZoneTypeOk returns a tuple with the AvailabilityZoneType field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConsumedQuota) GetAvailabilityZoneTypeOk() (*string, bool) {
-	if o == nil || isNil(o.AvailabilityZoneType) {
-    return nil, false
+	if o == nil || o.AvailabilityZoneType == nil {
+		return nil, false
 	}
 	return o.AvailabilityZoneType, true
 }
 
 // HasAvailabilityZoneType returns a boolean if a field has been set.
 func (o *ConsumedQuota) HasAvailabilityZoneType() bool {
-	if o != nil && !isNil(o.AvailabilityZoneType) {
+	if o != nil && o.AvailabilityZoneType != nil {
 		return true
 	}
 
@@ -180,7 +180,7 @@ func (o *ConsumedQuota) SetAvailabilityZoneType(v string) {
 
 // GetBillingModel returns the BillingModel field value if set, zero value otherwise.
 func (o *ConsumedQuota) GetBillingModel() string {
-	if o == nil || isNil(o.BillingModel) {
+	if o == nil || o.BillingModel == nil {
 		var ret string
 		return ret
 	}
@@ -190,15 +190,15 @@ func (o *ConsumedQuota) GetBillingModel() string {
 // GetBillingModelOk returns a tuple with the BillingModel field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConsumedQuota) GetBillingModelOk() (*string, bool) {
-	if o == nil || isNil(o.BillingModel) {
-    return nil, false
+	if o == nil || o.BillingModel == nil {
+		return nil, false
 	}
 	return o.BillingModel, true
 }
 
 // HasBillingModel returns a boolean if a field has been set.
 func (o *ConsumedQuota) HasBillingModel() bool {
-	if o != nil && !isNil(o.BillingModel) {
+	if o != nil && o.BillingModel != nil {
 		return true
 	}
 
@@ -223,8 +223,8 @@ func (o *ConsumedQuota) GetByoc() bool {
 // GetByocOk returns a tuple with the Byoc field value
 // and a boolean to check if the value has been set.
 func (o *ConsumedQuota) GetByocOk() (*bool, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Byoc, true
 }
@@ -236,7 +236,7 @@ func (o *ConsumedQuota) SetByoc(v bool) {
 
 // GetCloudProviderId returns the CloudProviderId field value if set, zero value otherwise.
 func (o *ConsumedQuota) GetCloudProviderId() string {
-	if o == nil || isNil(o.CloudProviderId) {
+	if o == nil || o.CloudProviderId == nil {
 		var ret string
 		return ret
 	}
@@ -246,15 +246,15 @@ func (o *ConsumedQuota) GetCloudProviderId() string {
 // GetCloudProviderIdOk returns a tuple with the CloudProviderId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConsumedQuota) GetCloudProviderIdOk() (*string, bool) {
-	if o == nil || isNil(o.CloudProviderId) {
-    return nil, false
+	if o == nil || o.CloudProviderId == nil {
+		return nil, false
 	}
 	return o.CloudProviderId, true
 }
 
 // HasCloudProviderId returns a boolean if a field has been set.
 func (o *ConsumedQuota) HasCloudProviderId() bool {
-	if o != nil && !isNil(o.CloudProviderId) {
+	if o != nil && o.CloudProviderId != nil {
 		return true
 	}
 
@@ -279,8 +279,8 @@ func (o *ConsumedQuota) GetCount() int32 {
 // GetCountOk returns a tuple with the Count field value
 // and a boolean to check if the value has been set.
 func (o *ConsumedQuota) GetCountOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Count, true
 }
@@ -292,7 +292,7 @@ func (o *ConsumedQuota) SetCount(v int32) {
 
 // GetOrganizationId returns the OrganizationId field value if set, zero value otherwise.
 func (o *ConsumedQuota) GetOrganizationId() string {
-	if o == nil || isNil(o.OrganizationId) {
+	if o == nil || o.OrganizationId == nil {
 		var ret string
 		return ret
 	}
@@ -302,15 +302,15 @@ func (o *ConsumedQuota) GetOrganizationId() string {
 // GetOrganizationIdOk returns a tuple with the OrganizationId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConsumedQuota) GetOrganizationIdOk() (*string, bool) {
-	if o == nil || isNil(o.OrganizationId) {
-    return nil, false
+	if o == nil || o.OrganizationId == nil {
+		return nil, false
 	}
 	return o.OrganizationId, true
 }
 
 // HasOrganizationId returns a boolean if a field has been set.
 func (o *ConsumedQuota) HasOrganizationId() bool {
-	if o != nil && !isNil(o.OrganizationId) {
+	if o != nil && o.OrganizationId != nil {
 		return true
 	}
 
@@ -324,7 +324,7 @@ func (o *ConsumedQuota) SetOrganizationId(v string) {
 
 // GetPlanId returns the PlanId field value if set, zero value otherwise.
 func (o *ConsumedQuota) GetPlanId() string {
-	if o == nil || isNil(o.PlanId) {
+	if o == nil || o.PlanId == nil {
 		var ret string
 		return ret
 	}
@@ -334,15 +334,15 @@ func (o *ConsumedQuota) GetPlanId() string {
 // GetPlanIdOk returns a tuple with the PlanId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConsumedQuota) GetPlanIdOk() (*string, bool) {
-	if o == nil || isNil(o.PlanId) {
-    return nil, false
+	if o == nil || o.PlanId == nil {
+		return nil, false
 	}
 	return o.PlanId, true
 }
 
 // HasPlanId returns a boolean if a field has been set.
 func (o *ConsumedQuota) HasPlanId() bool {
-	if o != nil && !isNil(o.PlanId) {
+	if o != nil && o.PlanId != nil {
 		return true
 	}
 
@@ -356,7 +356,7 @@ func (o *ConsumedQuota) SetPlanId(v string) {
 
 // GetResourceName returns the ResourceName field value if set, zero value otherwise.
 func (o *ConsumedQuota) GetResourceName() string {
-	if o == nil || isNil(o.ResourceName) {
+	if o == nil || o.ResourceName == nil {
 		var ret string
 		return ret
 	}
@@ -366,15 +366,15 @@ func (o *ConsumedQuota) GetResourceName() string {
 // GetResourceNameOk returns a tuple with the ResourceName field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConsumedQuota) GetResourceNameOk() (*string, bool) {
-	if o == nil || isNil(o.ResourceName) {
-    return nil, false
+	if o == nil || o.ResourceName == nil {
+		return nil, false
 	}
 	return o.ResourceName, true
 }
 
 // HasResourceName returns a boolean if a field has been set.
 func (o *ConsumedQuota) HasResourceName() bool {
-	if o != nil && !isNil(o.ResourceName) {
+	if o != nil && o.ResourceName != nil {
 		return true
 	}
 
@@ -388,7 +388,7 @@ func (o *ConsumedQuota) SetResourceName(v string) {
 
 // GetResourceType returns the ResourceType field value if set, zero value otherwise.
 func (o *ConsumedQuota) GetResourceType() string {
-	if o == nil || isNil(o.ResourceType) {
+	if o == nil || o.ResourceType == nil {
 		var ret string
 		return ret
 	}
@@ -398,15 +398,15 @@ func (o *ConsumedQuota) GetResourceType() string {
 // GetResourceTypeOk returns a tuple with the ResourceType field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConsumedQuota) GetResourceTypeOk() (*string, bool) {
-	if o == nil || isNil(o.ResourceType) {
-    return nil, false
+	if o == nil || o.ResourceType == nil {
+		return nil, false
 	}
 	return o.ResourceType, true
 }
 
 // HasResourceType returns a boolean if a field has been set.
 func (o *ConsumedQuota) HasResourceType() bool {
-	if o != nil && !isNil(o.ResourceType) {
+	if o != nil && o.ResourceType != nil {
 		return true
 	}
 
@@ -420,7 +420,7 @@ func (o *ConsumedQuota) SetResourceType(v string) {
 
 // GetVersion returns the Version field value if set, zero value otherwise.
 func (o *ConsumedQuota) GetVersion() string {
-	if o == nil || isNil(o.Version) {
+	if o == nil || o.Version == nil {
 		var ret string
 		return ret
 	}
@@ -430,15 +430,15 @@ func (o *ConsumedQuota) GetVersion() string {
 // GetVersionOk returns a tuple with the Version field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConsumedQuota) GetVersionOk() (*string, bool) {
-	if o == nil || isNil(o.Version) {
-    return nil, false
+	if o == nil || o.Version == nil {
+		return nil, false
 	}
 	return o.Version, true
 }
 
 // HasVersion returns a boolean if a field has been set.
 func (o *ConsumedQuota) HasVersion() bool {
-	if o != nil && !isNil(o.Version) {
+	if o != nil && o.Version != nil {
 		return true
 	}
 
@@ -452,43 +452,43 @@ func (o *ConsumedQuota) SetVersion(v string) {
 
 func (o ConsumedQuota) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Href) {
+	if o.Href != nil {
 		toSerialize["href"] = o.Href
 	}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.Kind) {
+	if o.Kind != nil {
 		toSerialize["kind"] = o.Kind
 	}
-	if !isNil(o.AvailabilityZoneType) {
+	if o.AvailabilityZoneType != nil {
 		toSerialize["availability_zone_type"] = o.AvailabilityZoneType
 	}
-	if !isNil(o.BillingModel) {
+	if o.BillingModel != nil {
 		toSerialize["billing_model"] = o.BillingModel
 	}
 	if true {
 		toSerialize["byoc"] = o.Byoc
 	}
-	if !isNil(o.CloudProviderId) {
+	if o.CloudProviderId != nil {
 		toSerialize["cloud_provider_id"] = o.CloudProviderId
 	}
 	if true {
 		toSerialize["count"] = o.Count
 	}
-	if !isNil(o.OrganizationId) {
+	if o.OrganizationId != nil {
 		toSerialize["organization_id"] = o.OrganizationId
 	}
-	if !isNil(o.PlanId) {
+	if o.PlanId != nil {
 		toSerialize["plan_id"] = o.PlanId
 	}
-	if !isNil(o.ResourceName) {
+	if o.ResourceName != nil {
 		toSerialize["resource_name"] = o.ResourceName
 	}
-	if !isNil(o.ResourceType) {
+	if o.ResourceType != nil {
 		toSerialize["resource_type"] = o.ResourceType
 	}
-	if !isNil(o.Version) {
+	if o.Version != nil {
 		toSerialize["version"] = o.Version
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_consumed_quota_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_consumed_quota_all_of.go
index 2d922c41..b639ef09 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_consumed_quota_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_consumed_quota_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -49,7 +49,7 @@ func NewConsumedQuotaAllOfWithDefaults() *ConsumedQuotaAllOf {
 
 // GetAvailabilityZoneType returns the AvailabilityZoneType field value if set, zero value otherwise.
 func (o *ConsumedQuotaAllOf) GetAvailabilityZoneType() string {
-	if o == nil || isNil(o.AvailabilityZoneType) {
+	if o == nil || o.AvailabilityZoneType == nil {
 		var ret string
 		return ret
 	}
@@ -59,15 +59,15 @@ func (o *ConsumedQuotaAllOf) GetAvailabilityZoneType() string {
 // GetAvailabilityZoneTypeOk returns a tuple with the AvailabilityZoneType field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConsumedQuotaAllOf) GetAvailabilityZoneTypeOk() (*string, bool) {
-	if o == nil || isNil(o.AvailabilityZoneType) {
-    return nil, false
+	if o == nil || o.AvailabilityZoneType == nil {
+		return nil, false
 	}
 	return o.AvailabilityZoneType, true
 }
 
 // HasAvailabilityZoneType returns a boolean if a field has been set.
 func (o *ConsumedQuotaAllOf) HasAvailabilityZoneType() bool {
-	if o != nil && !isNil(o.AvailabilityZoneType) {
+	if o != nil && o.AvailabilityZoneType != nil {
 		return true
 	}
 
@@ -81,7 +81,7 @@ func (o *ConsumedQuotaAllOf) SetAvailabilityZoneType(v string) {
 
 // GetBillingModel returns the BillingModel field value if set, zero value otherwise.
 func (o *ConsumedQuotaAllOf) GetBillingModel() string {
-	if o == nil || isNil(o.BillingModel) {
+	if o == nil || o.BillingModel == nil {
 		var ret string
 		return ret
 	}
@@ -91,15 +91,15 @@ func (o *ConsumedQuotaAllOf) GetBillingModel() string {
 // GetBillingModelOk returns a tuple with the BillingModel field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConsumedQuotaAllOf) GetBillingModelOk() (*string, bool) {
-	if o == nil || isNil(o.BillingModel) {
-    return nil, false
+	if o == nil || o.BillingModel == nil {
+		return nil, false
 	}
 	return o.BillingModel, true
 }
 
 // HasBillingModel returns a boolean if a field has been set.
 func (o *ConsumedQuotaAllOf) HasBillingModel() bool {
-	if o != nil && !isNil(o.BillingModel) {
+	if o != nil && o.BillingModel != nil {
 		return true
 	}
 
@@ -124,8 +124,8 @@ func (o *ConsumedQuotaAllOf) GetByoc() bool {
 // GetByocOk returns a tuple with the Byoc field value
 // and a boolean to check if the value has been set.
 func (o *ConsumedQuotaAllOf) GetByocOk() (*bool, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Byoc, true
 }
@@ -137,7 +137,7 @@ func (o *ConsumedQuotaAllOf) SetByoc(v bool) {
 
 // GetCloudProviderId returns the CloudProviderId field value if set, zero value otherwise.
 func (o *ConsumedQuotaAllOf) GetCloudProviderId() string {
-	if o == nil || isNil(o.CloudProviderId) {
+	if o == nil || o.CloudProviderId == nil {
 		var ret string
 		return ret
 	}
@@ -147,15 +147,15 @@ func (o *ConsumedQuotaAllOf) GetCloudProviderId() string {
 // GetCloudProviderIdOk returns a tuple with the CloudProviderId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConsumedQuotaAllOf) GetCloudProviderIdOk() (*string, bool) {
-	if o == nil || isNil(o.CloudProviderId) {
-    return nil, false
+	if o == nil || o.CloudProviderId == nil {
+		return nil, false
 	}
 	return o.CloudProviderId, true
 }
 
 // HasCloudProviderId returns a boolean if a field has been set.
 func (o *ConsumedQuotaAllOf) HasCloudProviderId() bool {
-	if o != nil && !isNil(o.CloudProviderId) {
+	if o != nil && o.CloudProviderId != nil {
 		return true
 	}
 
@@ -180,8 +180,8 @@ func (o *ConsumedQuotaAllOf) GetCount() int32 {
 // GetCountOk returns a tuple with the Count field value
 // and a boolean to check if the value has been set.
 func (o *ConsumedQuotaAllOf) GetCountOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Count, true
 }
@@ -193,7 +193,7 @@ func (o *ConsumedQuotaAllOf) SetCount(v int32) {
 
 // GetOrganizationId returns the OrganizationId field value if set, zero value otherwise.
 func (o *ConsumedQuotaAllOf) GetOrganizationId() string {
-	if o == nil || isNil(o.OrganizationId) {
+	if o == nil || o.OrganizationId == nil {
 		var ret string
 		return ret
 	}
@@ -203,15 +203,15 @@ func (o *ConsumedQuotaAllOf) GetOrganizationId() string {
 // GetOrganizationIdOk returns a tuple with the OrganizationId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConsumedQuotaAllOf) GetOrganizationIdOk() (*string, bool) {
-	if o == nil || isNil(o.OrganizationId) {
-    return nil, false
+	if o == nil || o.OrganizationId == nil {
+		return nil, false
 	}
 	return o.OrganizationId, true
 }
 
 // HasOrganizationId returns a boolean if a field has been set.
 func (o *ConsumedQuotaAllOf) HasOrganizationId() bool {
-	if o != nil && !isNil(o.OrganizationId) {
+	if o != nil && o.OrganizationId != nil {
 		return true
 	}
 
@@ -225,7 +225,7 @@ func (o *ConsumedQuotaAllOf) SetOrganizationId(v string) {
 
 // GetPlanId returns the PlanId field value if set, zero value otherwise.
 func (o *ConsumedQuotaAllOf) GetPlanId() string {
-	if o == nil || isNil(o.PlanId) {
+	if o == nil || o.PlanId == nil {
 		var ret string
 		return ret
 	}
@@ -235,15 +235,15 @@ func (o *ConsumedQuotaAllOf) GetPlanId() string {
 // GetPlanIdOk returns a tuple with the PlanId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConsumedQuotaAllOf) GetPlanIdOk() (*string, bool) {
-	if o == nil || isNil(o.PlanId) {
-    return nil, false
+	if o == nil || o.PlanId == nil {
+		return nil, false
 	}
 	return o.PlanId, true
 }
 
 // HasPlanId returns a boolean if a field has been set.
 func (o *ConsumedQuotaAllOf) HasPlanId() bool {
-	if o != nil && !isNil(o.PlanId) {
+	if o != nil && o.PlanId != nil {
 		return true
 	}
 
@@ -257,7 +257,7 @@ func (o *ConsumedQuotaAllOf) SetPlanId(v string) {
 
 // GetResourceName returns the ResourceName field value if set, zero value otherwise.
 func (o *ConsumedQuotaAllOf) GetResourceName() string {
-	if o == nil || isNil(o.ResourceName) {
+	if o == nil || o.ResourceName == nil {
 		var ret string
 		return ret
 	}
@@ -267,15 +267,15 @@ func (o *ConsumedQuotaAllOf) GetResourceName() string {
 // GetResourceNameOk returns a tuple with the ResourceName field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConsumedQuotaAllOf) GetResourceNameOk() (*string, bool) {
-	if o == nil || isNil(o.ResourceName) {
-    return nil, false
+	if o == nil || o.ResourceName == nil {
+		return nil, false
 	}
 	return o.ResourceName, true
 }
 
 // HasResourceName returns a boolean if a field has been set.
 func (o *ConsumedQuotaAllOf) HasResourceName() bool {
-	if o != nil && !isNil(o.ResourceName) {
+	if o != nil && o.ResourceName != nil {
 		return true
 	}
 
@@ -289,7 +289,7 @@ func (o *ConsumedQuotaAllOf) SetResourceName(v string) {
 
 // GetResourceType returns the ResourceType field value if set, zero value otherwise.
 func (o *ConsumedQuotaAllOf) GetResourceType() string {
-	if o == nil || isNil(o.ResourceType) {
+	if o == nil || o.ResourceType == nil {
 		var ret string
 		return ret
 	}
@@ -299,15 +299,15 @@ func (o *ConsumedQuotaAllOf) GetResourceType() string {
 // GetResourceTypeOk returns a tuple with the ResourceType field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConsumedQuotaAllOf) GetResourceTypeOk() (*string, bool) {
-	if o == nil || isNil(o.ResourceType) {
-    return nil, false
+	if o == nil || o.ResourceType == nil {
+		return nil, false
 	}
 	return o.ResourceType, true
 }
 
 // HasResourceType returns a boolean if a field has been set.
 func (o *ConsumedQuotaAllOf) HasResourceType() bool {
-	if o != nil && !isNil(o.ResourceType) {
+	if o != nil && o.ResourceType != nil {
 		return true
 	}
 
@@ -321,7 +321,7 @@ func (o *ConsumedQuotaAllOf) SetResourceType(v string) {
 
 // GetVersion returns the Version field value if set, zero value otherwise.
 func (o *ConsumedQuotaAllOf) GetVersion() string {
-	if o == nil || isNil(o.Version) {
+	if o == nil || o.Version == nil {
 		var ret string
 		return ret
 	}
@@ -331,15 +331,15 @@ func (o *ConsumedQuotaAllOf) GetVersion() string {
 // GetVersionOk returns a tuple with the Version field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConsumedQuotaAllOf) GetVersionOk() (*string, bool) {
-	if o == nil || isNil(o.Version) {
-    return nil, false
+	if o == nil || o.Version == nil {
+		return nil, false
 	}
 	return o.Version, true
 }
 
 // HasVersion returns a boolean if a field has been set.
 func (o *ConsumedQuotaAllOf) HasVersion() bool {
-	if o != nil && !isNil(o.Version) {
+	if o != nil && o.Version != nil {
 		return true
 	}
 
@@ -353,34 +353,34 @@ func (o *ConsumedQuotaAllOf) SetVersion(v string) {
 
 func (o ConsumedQuotaAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.AvailabilityZoneType) {
+	if o.AvailabilityZoneType != nil {
 		toSerialize["availability_zone_type"] = o.AvailabilityZoneType
 	}
-	if !isNil(o.BillingModel) {
+	if o.BillingModel != nil {
 		toSerialize["billing_model"] = o.BillingModel
 	}
 	if true {
 		toSerialize["byoc"] = o.Byoc
 	}
-	if !isNil(o.CloudProviderId) {
+	if o.CloudProviderId != nil {
 		toSerialize["cloud_provider_id"] = o.CloudProviderId
 	}
 	if true {
 		toSerialize["count"] = o.Count
 	}
-	if !isNil(o.OrganizationId) {
+	if o.OrganizationId != nil {
 		toSerialize["organization_id"] = o.OrganizationId
 	}
-	if !isNil(o.PlanId) {
+	if o.PlanId != nil {
 		toSerialize["plan_id"] = o.PlanId
 	}
-	if !isNil(o.ResourceName) {
+	if o.ResourceName != nil {
 		toSerialize["resource_name"] = o.ResourceName
 	}
-	if !isNil(o.ResourceType) {
+	if o.ResourceType != nil {
 		toSerialize["resource_type"] = o.ResourceType
 	}
-	if !isNil(o.Version) {
+	if o.Version != nil {
 		toSerialize["version"] = o.Version
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_consumed_quota_list.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_consumed_quota_list.go
index 37e2e7ca..1c5e5538 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_consumed_quota_list.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_consumed_quota_list.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -58,8 +58,8 @@ func (o *ConsumedQuotaList) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *ConsumedQuotaList) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -82,8 +82,8 @@ func (o *ConsumedQuotaList) GetPage() int32 {
 // GetPageOk returns a tuple with the Page field value
 // and a boolean to check if the value has been set.
 func (o *ConsumedQuotaList) GetPageOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Page, true
 }
@@ -106,8 +106,8 @@ func (o *ConsumedQuotaList) GetSize() int32 {
 // GetSizeOk returns a tuple with the Size field value
 // and a boolean to check if the value has been set.
 func (o *ConsumedQuotaList) GetSizeOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Size, true
 }
@@ -130,8 +130,8 @@ func (o *ConsumedQuotaList) GetTotal() int32 {
 // GetTotalOk returns a tuple with the Total field value
 // and a boolean to check if the value has been set.
 func (o *ConsumedQuotaList) GetTotalOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Total, true
 }
@@ -153,11 +153,11 @@ func (o *ConsumedQuotaList) GetItems() []ConsumedQuota {
 
 // GetItemsOk returns a tuple with the Items field value
 // and a boolean to check if the value has been set.
-func (o *ConsumedQuotaList) GetItemsOk() ([]ConsumedQuota, bool) {
-	if o == nil {
-    return nil, false
+func (o *ConsumedQuotaList) GetItemsOk() (*[]ConsumedQuota, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Items, true
+	return &o.Items, true
 }
 
 // SetItems sets field value
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_consumed_quota_list_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_consumed_quota_list_all_of.go
index c26095ac..0f58da62 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_consumed_quota_list_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_consumed_quota_list_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -16,7 +16,7 @@ import (
 
 // ConsumedQuotaListAllOf struct for ConsumedQuotaListAllOf
 type ConsumedQuotaListAllOf struct {
-	Items []ConsumedQuota `json:"items,omitempty"`
+	Items *[]ConsumedQuota `json:"items,omitempty"`
 }
 
 // NewConsumedQuotaListAllOf instantiates a new ConsumedQuotaListAllOf object
@@ -38,25 +38,25 @@ func NewConsumedQuotaListAllOfWithDefaults() *ConsumedQuotaListAllOf {
 
 // GetItems returns the Items field value if set, zero value otherwise.
 func (o *ConsumedQuotaListAllOf) GetItems() []ConsumedQuota {
-	if o == nil || isNil(o.Items) {
+	if o == nil || o.Items == nil {
 		var ret []ConsumedQuota
 		return ret
 	}
-	return o.Items
+	return *o.Items
 }
 
 // GetItemsOk returns a tuple with the Items field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *ConsumedQuotaListAllOf) GetItemsOk() ([]ConsumedQuota, bool) {
-	if o == nil || isNil(o.Items) {
-    return nil, false
+func (o *ConsumedQuotaListAllOf) GetItemsOk() (*[]ConsumedQuota, bool) {
+	if o == nil || o.Items == nil {
+		return nil, false
 	}
 	return o.Items, true
 }
 
 // HasItems returns a boolean if a field has been set.
 func (o *ConsumedQuotaListAllOf) HasItems() bool {
-	if o != nil && !isNil(o.Items) {
+	if o != nil && o.Items != nil {
 		return true
 	}
 
@@ -65,12 +65,12 @@ func (o *ConsumedQuotaListAllOf) HasItems() bool {
 
 // SetItems gets a reference to the given []ConsumedQuota and assigns it to the Items field.
 func (o *ConsumedQuotaListAllOf) SetItems(v []ConsumedQuota) {
-	o.Items = v
+	o.Items = &v
 }
 
 func (o ConsumedQuotaListAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Items) {
+	if o.Items != nil {
 		toSerialize["items"] = o.Items
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_deleted_subscription.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_deleted_subscription.go
index cd191e71..0862c520 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_deleted_subscription.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_deleted_subscription.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -12,6 +12,7 @@ package accountmgmtclient
 
 import (
 	"encoding/json"
+	"time"
 )
 
 // DeletedSubscription struct for DeletedSubscription
@@ -78,7 +79,7 @@ func NewDeletedSubscriptionWithDefaults() *DeletedSubscription {
 
 // GetHref returns the Href field value if set, zero value otherwise.
 func (o *DeletedSubscription) GetHref() string {
-	if o == nil || isNil(o.Href) {
+	if o == nil || o.Href == nil {
 		var ret string
 		return ret
 	}
@@ -88,15 +89,15 @@ func (o *DeletedSubscription) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *DeletedSubscription) GetHrefOk() (*string, bool) {
-	if o == nil || isNil(o.Href) {
-    return nil, false
+	if o == nil || o.Href == nil {
+		return nil, false
 	}
 	return o.Href, true
 }
 
 // HasHref returns a boolean if a field has been set.
 func (o *DeletedSubscription) HasHref() bool {
-	if o != nil && !isNil(o.Href) {
+	if o != nil && o.Href != nil {
 		return true
 	}
 
@@ -110,7 +111,7 @@ func (o *DeletedSubscription) SetHref(v string) {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *DeletedSubscription) GetId() string {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret string
 		return ret
 	}
@@ -120,15 +121,15 @@ func (o *DeletedSubscription) GetId() string {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *DeletedSubscription) GetIdOk() (*string, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *DeletedSubscription) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -142,7 +143,7 @@ func (o *DeletedSubscription) SetId(v string) {
 
 // GetKind returns the Kind field value if set, zero value otherwise.
 func (o *DeletedSubscription) GetKind() string {
-	if o == nil || isNil(o.Kind) {
+	if o == nil || o.Kind == nil {
 		var ret string
 		return ret
 	}
@@ -152,15 +153,15 @@ func (o *DeletedSubscription) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *DeletedSubscription) GetKindOk() (*string, bool) {
-	if o == nil || isNil(o.Kind) {
-    return nil, false
+	if o == nil || o.Kind == nil {
+		return nil, false
 	}
 	return o.Kind, true
 }
 
 // HasKind returns a boolean if a field has been set.
 func (o *DeletedSubscription) HasKind() bool {
-	if o != nil && !isNil(o.Kind) {
+	if o != nil && o.Kind != nil {
 		return true
 	}
 
@@ -174,7 +175,7 @@ func (o *DeletedSubscription) SetKind(v string) {
 
 // GetBillingExpirationDate returns the BillingExpirationDate field value if set, zero value otherwise.
 func (o *DeletedSubscription) GetBillingExpirationDate() time.Time {
-	if o == nil || isNil(o.BillingExpirationDate) {
+	if o == nil || o.BillingExpirationDate == nil {
 		var ret time.Time
 		return ret
 	}
@@ -184,15 +185,15 @@ func (o *DeletedSubscription) GetBillingExpirationDate() time.Time {
 // GetBillingExpirationDateOk returns a tuple with the BillingExpirationDate field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *DeletedSubscription) GetBillingExpirationDateOk() (*time.Time, bool) {
-	if o == nil || isNil(o.BillingExpirationDate) {
-    return nil, false
+	if o == nil || o.BillingExpirationDate == nil {
+		return nil, false
 	}
 	return o.BillingExpirationDate, true
 }
 
 // HasBillingExpirationDate returns a boolean if a field has been set.
 func (o *DeletedSubscription) HasBillingExpirationDate() bool {
-	if o != nil && !isNil(o.BillingExpirationDate) {
+	if o != nil && o.BillingExpirationDate != nil {
 		return true
 	}
 
@@ -206,7 +207,7 @@ func (o *DeletedSubscription) SetBillingExpirationDate(v time.Time) {
 
 // GetBillingMarketplaceAccount returns the BillingMarketplaceAccount field value if set, zero value otherwise.
 func (o *DeletedSubscription) GetBillingMarketplaceAccount() string {
-	if o == nil || isNil(o.BillingMarketplaceAccount) {
+	if o == nil || o.BillingMarketplaceAccount == nil {
 		var ret string
 		return ret
 	}
@@ -216,15 +217,15 @@ func (o *DeletedSubscription) GetBillingMarketplaceAccount() string {
 // GetBillingMarketplaceAccountOk returns a tuple with the BillingMarketplaceAccount field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *DeletedSubscription) GetBillingMarketplaceAccountOk() (*string, bool) {
-	if o == nil || isNil(o.BillingMarketplaceAccount) {
-    return nil, false
+	if o == nil || o.BillingMarketplaceAccount == nil {
+		return nil, false
 	}
 	return o.BillingMarketplaceAccount, true
 }
 
 // HasBillingMarketplaceAccount returns a boolean if a field has been set.
 func (o *DeletedSubscription) HasBillingMarketplaceAccount() bool {
-	if o != nil && !isNil(o.BillingMarketplaceAccount) {
+	if o != nil && o.BillingMarketplaceAccount != nil {
 		return true
 	}
 
@@ -238,7 +239,7 @@ func (o *DeletedSubscription) SetBillingMarketplaceAccount(v string) {
 
 // GetCloudAccountId returns the CloudAccountId field value if set, zero value otherwise.
 func (o *DeletedSubscription) GetCloudAccountId() string {
-	if o == nil || isNil(o.CloudAccountId) {
+	if o == nil || o.CloudAccountId == nil {
 		var ret string
 		return ret
 	}
@@ -248,15 +249,15 @@ func (o *DeletedSubscription) GetCloudAccountId() string {
 // GetCloudAccountIdOk returns a tuple with the CloudAccountId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *DeletedSubscription) GetCloudAccountIdOk() (*string, bool) {
-	if o == nil || isNil(o.CloudAccountId) {
-    return nil, false
+	if o == nil || o.CloudAccountId == nil {
+		return nil, false
 	}
 	return o.CloudAccountId, true
 }
 
 // HasCloudAccountId returns a boolean if a field has been set.
 func (o *DeletedSubscription) HasCloudAccountId() bool {
-	if o != nil && !isNil(o.CloudAccountId) {
+	if o != nil && o.CloudAccountId != nil {
 		return true
 	}
 
@@ -270,7 +271,7 @@ func (o *DeletedSubscription) SetCloudAccountId(v string) {
 
 // GetCloudProviderId returns the CloudProviderId field value if set, zero value otherwise.
 func (o *DeletedSubscription) GetCloudProviderId() string {
-	if o == nil || isNil(o.CloudProviderId) {
+	if o == nil || o.CloudProviderId == nil {
 		var ret string
 		return ret
 	}
@@ -280,15 +281,15 @@ func (o *DeletedSubscription) GetCloudProviderId() string {
 // GetCloudProviderIdOk returns a tuple with the CloudProviderId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *DeletedSubscription) GetCloudProviderIdOk() (*string, bool) {
-	if o == nil || isNil(o.CloudProviderId) {
-    return nil, false
+	if o == nil || o.CloudProviderId == nil {
+		return nil, false
 	}
 	return o.CloudProviderId, true
 }
 
 // HasCloudProviderId returns a boolean if a field has been set.
 func (o *DeletedSubscription) HasCloudProviderId() bool {
-	if o != nil && !isNil(o.CloudProviderId) {
+	if o != nil && o.CloudProviderId != nil {
 		return true
 	}
 
@@ -302,7 +303,7 @@ func (o *DeletedSubscription) SetCloudProviderId(v string) {
 
 // GetClusterBillingModel returns the ClusterBillingModel field value if set, zero value otherwise.
 func (o *DeletedSubscription) GetClusterBillingModel() string {
-	if o == nil || isNil(o.ClusterBillingModel) {
+	if o == nil || o.ClusterBillingModel == nil {
 		var ret string
 		return ret
 	}
@@ -312,15 +313,15 @@ func (o *DeletedSubscription) GetClusterBillingModel() string {
 // GetClusterBillingModelOk returns a tuple with the ClusterBillingModel field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *DeletedSubscription) GetClusterBillingModelOk() (*string, bool) {
-	if o == nil || isNil(o.ClusterBillingModel) {
-    return nil, false
+	if o == nil || o.ClusterBillingModel == nil {
+		return nil, false
 	}
 	return o.ClusterBillingModel, true
 }
 
 // HasClusterBillingModel returns a boolean if a field has been set.
 func (o *DeletedSubscription) HasClusterBillingModel() bool {
-	if o != nil && !isNil(o.ClusterBillingModel) {
+	if o != nil && o.ClusterBillingModel != nil {
 		return true
 	}
 
@@ -334,7 +335,7 @@ func (o *DeletedSubscription) SetClusterBillingModel(v string) {
 
 // GetClusterId returns the ClusterId field value if set, zero value otherwise.
 func (o *DeletedSubscription) GetClusterId() string {
-	if o == nil || isNil(o.ClusterId) {
+	if o == nil || o.ClusterId == nil {
 		var ret string
 		return ret
 	}
@@ -344,15 +345,15 @@ func (o *DeletedSubscription) GetClusterId() string {
 // GetClusterIdOk returns a tuple with the ClusterId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *DeletedSubscription) GetClusterIdOk() (*string, bool) {
-	if o == nil || isNil(o.ClusterId) {
-    return nil, false
+	if o == nil || o.ClusterId == nil {
+		return nil, false
 	}
 	return o.ClusterId, true
 }
 
 // HasClusterId returns a boolean if a field has been set.
 func (o *DeletedSubscription) HasClusterId() bool {
-	if o != nil && !isNil(o.ClusterId) {
+	if o != nil && o.ClusterId != nil {
 		return true
 	}
 
@@ -366,7 +367,7 @@ func (o *DeletedSubscription) SetClusterId(v string) {
 
 // GetConsoleUrl returns the ConsoleUrl field value if set, zero value otherwise.
 func (o *DeletedSubscription) GetConsoleUrl() string {
-	if o == nil || isNil(o.ConsoleUrl) {
+	if o == nil || o.ConsoleUrl == nil {
 		var ret string
 		return ret
 	}
@@ -376,15 +377,15 @@ func (o *DeletedSubscription) GetConsoleUrl() string {
 // GetConsoleUrlOk returns a tuple with the ConsoleUrl field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *DeletedSubscription) GetConsoleUrlOk() (*string, bool) {
-	if o == nil || isNil(o.ConsoleUrl) {
-    return nil, false
+	if o == nil || o.ConsoleUrl == nil {
+		return nil, false
 	}
 	return o.ConsoleUrl, true
 }
 
 // HasConsoleUrl returns a boolean if a field has been set.
 func (o *DeletedSubscription) HasConsoleUrl() bool {
-	if o != nil && !isNil(o.ConsoleUrl) {
+	if o != nil && o.ConsoleUrl != nil {
 		return true
 	}
 
@@ -398,7 +399,7 @@ func (o *DeletedSubscription) SetConsoleUrl(v string) {
 
 // GetConsumerUuid returns the ConsumerUuid field value if set, zero value otherwise.
 func (o *DeletedSubscription) GetConsumerUuid() string {
-	if o == nil || isNil(o.ConsumerUuid) {
+	if o == nil || o.ConsumerUuid == nil {
 		var ret string
 		return ret
 	}
@@ -408,15 +409,15 @@ func (o *DeletedSubscription) GetConsumerUuid() string {
 // GetConsumerUuidOk returns a tuple with the ConsumerUuid field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *DeletedSubscription) GetConsumerUuidOk() (*string, bool) {
-	if o == nil || isNil(o.ConsumerUuid) {
-    return nil, false
+	if o == nil || o.ConsumerUuid == nil {
+		return nil, false
 	}
 	return o.ConsumerUuid, true
 }
 
 // HasConsumerUuid returns a boolean if a field has been set.
 func (o *DeletedSubscription) HasConsumerUuid() bool {
-	if o != nil && !isNil(o.ConsumerUuid) {
+	if o != nil && o.ConsumerUuid != nil {
 		return true
 	}
 
@@ -430,7 +431,7 @@ func (o *DeletedSubscription) SetConsumerUuid(v string) {
 
 // GetCpuTotal returns the CpuTotal field value if set, zero value otherwise.
 func (o *DeletedSubscription) GetCpuTotal() int32 {
-	if o == nil || isNil(o.CpuTotal) {
+	if o == nil || o.CpuTotal == nil {
 		var ret int32
 		return ret
 	}
@@ -440,15 +441,15 @@ func (o *DeletedSubscription) GetCpuTotal() int32 {
 // GetCpuTotalOk returns a tuple with the CpuTotal field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *DeletedSubscription) GetCpuTotalOk() (*int32, bool) {
-	if o == nil || isNil(o.CpuTotal) {
-    return nil, false
+	if o == nil || o.CpuTotal == nil {
+		return nil, false
 	}
 	return o.CpuTotal, true
 }
 
 // HasCpuTotal returns a boolean if a field has been set.
 func (o *DeletedSubscription) HasCpuTotal() bool {
-	if o != nil && !isNil(o.CpuTotal) {
+	if o != nil && o.CpuTotal != nil {
 		return true
 	}
 
@@ -462,7 +463,7 @@ func (o *DeletedSubscription) SetCpuTotal(v int32) {
 
 // GetCreatorId returns the CreatorId field value if set, zero value otherwise.
 func (o *DeletedSubscription) GetCreatorId() string {
-	if o == nil || isNil(o.CreatorId) {
+	if o == nil || o.CreatorId == nil {
 		var ret string
 		return ret
 	}
@@ -472,15 +473,15 @@ func (o *DeletedSubscription) GetCreatorId() string {
 // GetCreatorIdOk returns a tuple with the CreatorId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *DeletedSubscription) GetCreatorIdOk() (*string, bool) {
-	if o == nil || isNil(o.CreatorId) {
-    return nil, false
+	if o == nil || o.CreatorId == nil {
+		return nil, false
 	}
 	return o.CreatorId, true
 }
 
 // HasCreatorId returns a boolean if a field has been set.
 func (o *DeletedSubscription) HasCreatorId() bool {
-	if o != nil && !isNil(o.CreatorId) {
+	if o != nil && o.CreatorId != nil {
 		return true
 	}
 
@@ -494,7 +495,7 @@ func (o *DeletedSubscription) SetCreatorId(v string) {
 
 // GetDisplayName returns the DisplayName field value if set, zero value otherwise.
 func (o *DeletedSubscription) GetDisplayName() string {
-	if o == nil || isNil(o.DisplayName) {
+	if o == nil || o.DisplayName == nil {
 		var ret string
 		return ret
 	}
@@ -504,15 +505,15 @@ func (o *DeletedSubscription) GetDisplayName() string {
 // GetDisplayNameOk returns a tuple with the DisplayName field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *DeletedSubscription) GetDisplayNameOk() (*string, bool) {
-	if o == nil || isNil(o.DisplayName) {
-    return nil, false
+	if o == nil || o.DisplayName == nil {
+		return nil, false
 	}
 	return o.DisplayName, true
 }
 
 // HasDisplayName returns a boolean if a field has been set.
 func (o *DeletedSubscription) HasDisplayName() bool {
-	if o != nil && !isNil(o.DisplayName) {
+	if o != nil && o.DisplayName != nil {
 		return true
 	}
 
@@ -526,7 +527,7 @@ func (o *DeletedSubscription) SetDisplayName(v string) {
 
 // GetExternalClusterId returns the ExternalClusterId field value if set, zero value otherwise.
 func (o *DeletedSubscription) GetExternalClusterId() string {
-	if o == nil || isNil(o.ExternalClusterId) {
+	if o == nil || o.ExternalClusterId == nil {
 		var ret string
 		return ret
 	}
@@ -536,15 +537,15 @@ func (o *DeletedSubscription) GetExternalClusterId() string {
 // GetExternalClusterIdOk returns a tuple with the ExternalClusterId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *DeletedSubscription) GetExternalClusterIdOk() (*string, bool) {
-	if o == nil || isNil(o.ExternalClusterId) {
-    return nil, false
+	if o == nil || o.ExternalClusterId == nil {
+		return nil, false
 	}
 	return o.ExternalClusterId, true
 }
 
 // HasExternalClusterId returns a boolean if a field has been set.
 func (o *DeletedSubscription) HasExternalClusterId() bool {
-	if o != nil && !isNil(o.ExternalClusterId) {
+	if o != nil && o.ExternalClusterId != nil {
 		return true
 	}
 
@@ -558,7 +559,7 @@ func (o *DeletedSubscription) SetExternalClusterId(v string) {
 
 // GetLastReconcileDate returns the LastReconcileDate field value if set, zero value otherwise.
 func (o *DeletedSubscription) GetLastReconcileDate() time.Time {
-	if o == nil || isNil(o.LastReconcileDate) {
+	if o == nil || o.LastReconcileDate == nil {
 		var ret time.Time
 		return ret
 	}
@@ -568,15 +569,15 @@ func (o *DeletedSubscription) GetLastReconcileDate() time.Time {
 // GetLastReconcileDateOk returns a tuple with the LastReconcileDate field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *DeletedSubscription) GetLastReconcileDateOk() (*time.Time, bool) {
-	if o == nil || isNil(o.LastReconcileDate) {
-    return nil, false
+	if o == nil || o.LastReconcileDate == nil {
+		return nil, false
 	}
 	return o.LastReconcileDate, true
 }
 
 // HasLastReconcileDate returns a boolean if a field has been set.
 func (o *DeletedSubscription) HasLastReconcileDate() bool {
-	if o != nil && !isNil(o.LastReconcileDate) {
+	if o != nil && o.LastReconcileDate != nil {
 		return true
 	}
 
@@ -590,7 +591,7 @@ func (o *DeletedSubscription) SetLastReconcileDate(v time.Time) {
 
 // GetLastReleasedAt returns the LastReleasedAt field value if set, zero value otherwise.
 func (o *DeletedSubscription) GetLastReleasedAt() time.Time {
-	if o == nil || isNil(o.LastReleasedAt) {
+	if o == nil || o.LastReleasedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -600,15 +601,15 @@ func (o *DeletedSubscription) GetLastReleasedAt() time.Time {
 // GetLastReleasedAtOk returns a tuple with the LastReleasedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *DeletedSubscription) GetLastReleasedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.LastReleasedAt) {
-    return nil, false
+	if o == nil || o.LastReleasedAt == nil {
+		return nil, false
 	}
 	return o.LastReleasedAt, true
 }
 
 // HasLastReleasedAt returns a boolean if a field has been set.
 func (o *DeletedSubscription) HasLastReleasedAt() bool {
-	if o != nil && !isNil(o.LastReleasedAt) {
+	if o != nil && o.LastReleasedAt != nil {
 		return true
 	}
 
@@ -622,7 +623,7 @@ func (o *DeletedSubscription) SetLastReleasedAt(v time.Time) {
 
 // GetLastTelemetryDate returns the LastTelemetryDate field value if set, zero value otherwise.
 func (o *DeletedSubscription) GetLastTelemetryDate() time.Time {
-	if o == nil || isNil(o.LastTelemetryDate) {
+	if o == nil || o.LastTelemetryDate == nil {
 		var ret time.Time
 		return ret
 	}
@@ -632,15 +633,15 @@ func (o *DeletedSubscription) GetLastTelemetryDate() time.Time {
 // GetLastTelemetryDateOk returns a tuple with the LastTelemetryDate field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *DeletedSubscription) GetLastTelemetryDateOk() (*time.Time, bool) {
-	if o == nil || isNil(o.LastTelemetryDate) {
-    return nil, false
+	if o == nil || o.LastTelemetryDate == nil {
+		return nil, false
 	}
 	return o.LastTelemetryDate, true
 }
 
 // HasLastTelemetryDate returns a boolean if a field has been set.
 func (o *DeletedSubscription) HasLastTelemetryDate() bool {
-	if o != nil && !isNil(o.LastTelemetryDate) {
+	if o != nil && o.LastTelemetryDate != nil {
 		return true
 	}
 
@@ -665,8 +666,8 @@ func (o *DeletedSubscription) GetManaged() bool {
 // GetManagedOk returns a tuple with the Managed field value
 // and a boolean to check if the value has been set.
 func (o *DeletedSubscription) GetManagedOk() (*bool, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Managed, true
 }
@@ -678,7 +679,7 @@ func (o *DeletedSubscription) SetManaged(v bool) {
 
 // GetOrganizationId returns the OrganizationId field value if set, zero value otherwise.
 func (o *DeletedSubscription) GetOrganizationId() string {
-	if o == nil || isNil(o.OrganizationId) {
+	if o == nil || o.OrganizationId == nil {
 		var ret string
 		return ret
 	}
@@ -688,15 +689,15 @@ func (o *DeletedSubscription) GetOrganizationId() string {
 // GetOrganizationIdOk returns a tuple with the OrganizationId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *DeletedSubscription) GetOrganizationIdOk() (*string, bool) {
-	if o == nil || isNil(o.OrganizationId) {
-    return nil, false
+	if o == nil || o.OrganizationId == nil {
+		return nil, false
 	}
 	return o.OrganizationId, true
 }
 
 // HasOrganizationId returns a boolean if a field has been set.
 func (o *DeletedSubscription) HasOrganizationId() bool {
-	if o != nil && !isNil(o.OrganizationId) {
+	if o != nil && o.OrganizationId != nil {
 		return true
 	}
 
@@ -710,7 +711,7 @@ func (o *DeletedSubscription) SetOrganizationId(v string) {
 
 // GetPlanId returns the PlanId field value if set, zero value otherwise.
 func (o *DeletedSubscription) GetPlanId() string {
-	if o == nil || isNil(o.PlanId) {
+	if o == nil || o.PlanId == nil {
 		var ret string
 		return ret
 	}
@@ -720,15 +721,15 @@ func (o *DeletedSubscription) GetPlanId() string {
 // GetPlanIdOk returns a tuple with the PlanId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *DeletedSubscription) GetPlanIdOk() (*string, bool) {
-	if o == nil || isNil(o.PlanId) {
-    return nil, false
+	if o == nil || o.PlanId == nil {
+		return nil, false
 	}
 	return o.PlanId, true
 }
 
 // HasPlanId returns a boolean if a field has been set.
 func (o *DeletedSubscription) HasPlanId() bool {
-	if o != nil && !isNil(o.PlanId) {
+	if o != nil && o.PlanId != nil {
 		return true
 	}
 
@@ -742,7 +743,7 @@ func (o *DeletedSubscription) SetPlanId(v string) {
 
 // GetProductBundle returns the ProductBundle field value if set, zero value otherwise.
 func (o *DeletedSubscription) GetProductBundle() string {
-	if o == nil || isNil(o.ProductBundle) {
+	if o == nil || o.ProductBundle == nil {
 		var ret string
 		return ret
 	}
@@ -752,15 +753,15 @@ func (o *DeletedSubscription) GetProductBundle() string {
 // GetProductBundleOk returns a tuple with the ProductBundle field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *DeletedSubscription) GetProductBundleOk() (*string, bool) {
-	if o == nil || isNil(o.ProductBundle) {
-    return nil, false
+	if o == nil || o.ProductBundle == nil {
+		return nil, false
 	}
 	return o.ProductBundle, true
 }
 
 // HasProductBundle returns a boolean if a field has been set.
 func (o *DeletedSubscription) HasProductBundle() bool {
-	if o != nil && !isNil(o.ProductBundle) {
+	if o != nil && o.ProductBundle != nil {
 		return true
 	}
 
@@ -774,7 +775,7 @@ func (o *DeletedSubscription) SetProductBundle(v string) {
 
 // GetProvenance returns the Provenance field value if set, zero value otherwise.
 func (o *DeletedSubscription) GetProvenance() string {
-	if o == nil || isNil(o.Provenance) {
+	if o == nil || o.Provenance == nil {
 		var ret string
 		return ret
 	}
@@ -784,15 +785,15 @@ func (o *DeletedSubscription) GetProvenance() string {
 // GetProvenanceOk returns a tuple with the Provenance field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *DeletedSubscription) GetProvenanceOk() (*string, bool) {
-	if o == nil || isNil(o.Provenance) {
-    return nil, false
+	if o == nil || o.Provenance == nil {
+		return nil, false
 	}
 	return o.Provenance, true
 }
 
 // HasProvenance returns a boolean if a field has been set.
 func (o *DeletedSubscription) HasProvenance() bool {
-	if o != nil && !isNil(o.Provenance) {
+	if o != nil && o.Provenance != nil {
 		return true
 	}
 
@@ -806,7 +807,7 @@ func (o *DeletedSubscription) SetProvenance(v string) {
 
 // GetRegionId returns the RegionId field value if set, zero value otherwise.
 func (o *DeletedSubscription) GetRegionId() string {
-	if o == nil || isNil(o.RegionId) {
+	if o == nil || o.RegionId == nil {
 		var ret string
 		return ret
 	}
@@ -816,15 +817,15 @@ func (o *DeletedSubscription) GetRegionId() string {
 // GetRegionIdOk returns a tuple with the RegionId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *DeletedSubscription) GetRegionIdOk() (*string, bool) {
-	if o == nil || isNil(o.RegionId) {
-    return nil, false
+	if o == nil || o.RegionId == nil {
+		return nil, false
 	}
 	return o.RegionId, true
 }
 
 // HasRegionId returns a boolean if a field has been set.
 func (o *DeletedSubscription) HasRegionId() bool {
-	if o != nil && !isNil(o.RegionId) {
+	if o != nil && o.RegionId != nil {
 		return true
 	}
 
@@ -838,7 +839,7 @@ func (o *DeletedSubscription) SetRegionId(v string) {
 
 // GetReleased returns the Released field value if set, zero value otherwise.
 func (o *DeletedSubscription) GetReleased() bool {
-	if o == nil || isNil(o.Released) {
+	if o == nil || o.Released == nil {
 		var ret bool
 		return ret
 	}
@@ -848,15 +849,15 @@ func (o *DeletedSubscription) GetReleased() bool {
 // GetReleasedOk returns a tuple with the Released field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *DeletedSubscription) GetReleasedOk() (*bool, bool) {
-	if o == nil || isNil(o.Released) {
-    return nil, false
+	if o == nil || o.Released == nil {
+		return nil, false
 	}
 	return o.Released, true
 }
 
 // HasReleased returns a boolean if a field has been set.
 func (o *DeletedSubscription) HasReleased() bool {
-	if o != nil && !isNil(o.Released) {
+	if o != nil && o.Released != nil {
 		return true
 	}
 
@@ -870,7 +871,7 @@ func (o *DeletedSubscription) SetReleased(v bool) {
 
 // GetServiceLevel returns the ServiceLevel field value if set, zero value otherwise.
 func (o *DeletedSubscription) GetServiceLevel() string {
-	if o == nil || isNil(o.ServiceLevel) {
+	if o == nil || o.ServiceLevel == nil {
 		var ret string
 		return ret
 	}
@@ -880,15 +881,15 @@ func (o *DeletedSubscription) GetServiceLevel() string {
 // GetServiceLevelOk returns a tuple with the ServiceLevel field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *DeletedSubscription) GetServiceLevelOk() (*string, bool) {
-	if o == nil || isNil(o.ServiceLevel) {
-    return nil, false
+	if o == nil || o.ServiceLevel == nil {
+		return nil, false
 	}
 	return o.ServiceLevel, true
 }
 
 // HasServiceLevel returns a boolean if a field has been set.
 func (o *DeletedSubscription) HasServiceLevel() bool {
-	if o != nil && !isNil(o.ServiceLevel) {
+	if o != nil && o.ServiceLevel != nil {
 		return true
 	}
 
@@ -902,7 +903,7 @@ func (o *DeletedSubscription) SetServiceLevel(v string) {
 
 // GetSocketTotal returns the SocketTotal field value if set, zero value otherwise.
 func (o *DeletedSubscription) GetSocketTotal() int32 {
-	if o == nil || isNil(o.SocketTotal) {
+	if o == nil || o.SocketTotal == nil {
 		var ret int32
 		return ret
 	}
@@ -912,15 +913,15 @@ func (o *DeletedSubscription) GetSocketTotal() int32 {
 // GetSocketTotalOk returns a tuple with the SocketTotal field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *DeletedSubscription) GetSocketTotalOk() (*int32, bool) {
-	if o == nil || isNil(o.SocketTotal) {
-    return nil, false
+	if o == nil || o.SocketTotal == nil {
+		return nil, false
 	}
 	return o.SocketTotal, true
 }
 
 // HasSocketTotal returns a boolean if a field has been set.
 func (o *DeletedSubscription) HasSocketTotal() bool {
-	if o != nil && !isNil(o.SocketTotal) {
+	if o != nil && o.SocketTotal != nil {
 		return true
 	}
 
@@ -934,7 +935,7 @@ func (o *DeletedSubscription) SetSocketTotal(v int32) {
 
 // GetStatus returns the Status field value if set, zero value otherwise.
 func (o *DeletedSubscription) GetStatus() string {
-	if o == nil || isNil(o.Status) {
+	if o == nil || o.Status == nil {
 		var ret string
 		return ret
 	}
@@ -944,15 +945,15 @@ func (o *DeletedSubscription) GetStatus() string {
 // GetStatusOk returns a tuple with the Status field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *DeletedSubscription) GetStatusOk() (*string, bool) {
-	if o == nil || isNil(o.Status) {
-    return nil, false
+	if o == nil || o.Status == nil {
+		return nil, false
 	}
 	return o.Status, true
 }
 
 // HasStatus returns a boolean if a field has been set.
 func (o *DeletedSubscription) HasStatus() bool {
-	if o != nil && !isNil(o.Status) {
+	if o != nil && o.Status != nil {
 		return true
 	}
 
@@ -966,7 +967,7 @@ func (o *DeletedSubscription) SetStatus(v string) {
 
 // GetSupportLevel returns the SupportLevel field value if set, zero value otherwise.
 func (o *DeletedSubscription) GetSupportLevel() string {
-	if o == nil || isNil(o.SupportLevel) {
+	if o == nil || o.SupportLevel == nil {
 		var ret string
 		return ret
 	}
@@ -976,15 +977,15 @@ func (o *DeletedSubscription) GetSupportLevel() string {
 // GetSupportLevelOk returns a tuple with the SupportLevel field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *DeletedSubscription) GetSupportLevelOk() (*string, bool) {
-	if o == nil || isNil(o.SupportLevel) {
-    return nil, false
+	if o == nil || o.SupportLevel == nil {
+		return nil, false
 	}
 	return o.SupportLevel, true
 }
 
 // HasSupportLevel returns a boolean if a field has been set.
 func (o *DeletedSubscription) HasSupportLevel() bool {
-	if o != nil && !isNil(o.SupportLevel) {
+	if o != nil && o.SupportLevel != nil {
 		return true
 	}
 
@@ -998,7 +999,7 @@ func (o *DeletedSubscription) SetSupportLevel(v string) {
 
 // GetSystemUnits returns the SystemUnits field value if set, zero value otherwise.
 func (o *DeletedSubscription) GetSystemUnits() string {
-	if o == nil || isNil(o.SystemUnits) {
+	if o == nil || o.SystemUnits == nil {
 		var ret string
 		return ret
 	}
@@ -1008,15 +1009,15 @@ func (o *DeletedSubscription) GetSystemUnits() string {
 // GetSystemUnitsOk returns a tuple with the SystemUnits field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *DeletedSubscription) GetSystemUnitsOk() (*string, bool) {
-	if o == nil || isNil(o.SystemUnits) {
-    return nil, false
+	if o == nil || o.SystemUnits == nil {
+		return nil, false
 	}
 	return o.SystemUnits, true
 }
 
 // HasSystemUnits returns a boolean if a field has been set.
 func (o *DeletedSubscription) HasSystemUnits() bool {
-	if o != nil && !isNil(o.SystemUnits) {
+	if o != nil && o.SystemUnits != nil {
 		return true
 	}
 
@@ -1030,7 +1031,7 @@ func (o *DeletedSubscription) SetSystemUnits(v string) {
 
 // GetTrialEndDate returns the TrialEndDate field value if set, zero value otherwise.
 func (o *DeletedSubscription) GetTrialEndDate() time.Time {
-	if o == nil || isNil(o.TrialEndDate) {
+	if o == nil || o.TrialEndDate == nil {
 		var ret time.Time
 		return ret
 	}
@@ -1040,15 +1041,15 @@ func (o *DeletedSubscription) GetTrialEndDate() time.Time {
 // GetTrialEndDateOk returns a tuple with the TrialEndDate field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *DeletedSubscription) GetTrialEndDateOk() (*time.Time, bool) {
-	if o == nil || isNil(o.TrialEndDate) {
-    return nil, false
+	if o == nil || o.TrialEndDate == nil {
+		return nil, false
 	}
 	return o.TrialEndDate, true
 }
 
 // HasTrialEndDate returns a boolean if a field has been set.
 func (o *DeletedSubscription) HasTrialEndDate() bool {
-	if o != nil && !isNil(o.TrialEndDate) {
+	if o != nil && o.TrialEndDate != nil {
 		return true
 	}
 
@@ -1062,7 +1063,7 @@ func (o *DeletedSubscription) SetTrialEndDate(v time.Time) {
 
 // GetUsage returns the Usage field value if set, zero value otherwise.
 func (o *DeletedSubscription) GetUsage() string {
-	if o == nil || isNil(o.Usage) {
+	if o == nil || o.Usage == nil {
 		var ret string
 		return ret
 	}
@@ -1072,15 +1073,15 @@ func (o *DeletedSubscription) GetUsage() string {
 // GetUsageOk returns a tuple with the Usage field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *DeletedSubscription) GetUsageOk() (*string, bool) {
-	if o == nil || isNil(o.Usage) {
-    return nil, false
+	if o == nil || o.Usage == nil {
+		return nil, false
 	}
 	return o.Usage, true
 }
 
 // HasUsage returns a boolean if a field has been set.
 func (o *DeletedSubscription) HasUsage() bool {
-	if o != nil && !isNil(o.Usage) {
+	if o != nil && o.Usage != nil {
 		return true
 	}
 
@@ -1094,7 +1095,7 @@ func (o *DeletedSubscription) SetUsage(v string) {
 
 // GetCreatedAt returns the CreatedAt field value if set, zero value otherwise.
 func (o *DeletedSubscription) GetCreatedAt() time.Time {
-	if o == nil || isNil(o.CreatedAt) {
+	if o == nil || o.CreatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -1104,15 +1105,15 @@ func (o *DeletedSubscription) GetCreatedAt() time.Time {
 // GetCreatedAtOk returns a tuple with the CreatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *DeletedSubscription) GetCreatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.CreatedAt) {
-    return nil, false
+	if o == nil || o.CreatedAt == nil {
+		return nil, false
 	}
 	return o.CreatedAt, true
 }
 
 // HasCreatedAt returns a boolean if a field has been set.
 func (o *DeletedSubscription) HasCreatedAt() bool {
-	if o != nil && !isNil(o.CreatedAt) {
+	if o != nil && o.CreatedAt != nil {
 		return true
 	}
 
@@ -1126,7 +1127,7 @@ func (o *DeletedSubscription) SetCreatedAt(v time.Time) {
 
 // GetMetrics returns the Metrics field value if set, zero value otherwise.
 func (o *DeletedSubscription) GetMetrics() string {
-	if o == nil || isNil(o.Metrics) {
+	if o == nil || o.Metrics == nil {
 		var ret string
 		return ret
 	}
@@ -1136,15 +1137,15 @@ func (o *DeletedSubscription) GetMetrics() string {
 // GetMetricsOk returns a tuple with the Metrics field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *DeletedSubscription) GetMetricsOk() (*string, bool) {
-	if o == nil || isNil(o.Metrics) {
-    return nil, false
+	if o == nil || o.Metrics == nil {
+		return nil, false
 	}
 	return o.Metrics, true
 }
 
 // HasMetrics returns a boolean if a field has been set.
 func (o *DeletedSubscription) HasMetrics() bool {
-	if o != nil && !isNil(o.Metrics) {
+	if o != nil && o.Metrics != nil {
 		return true
 	}
 
@@ -1158,7 +1159,7 @@ func (o *DeletedSubscription) SetMetrics(v string) {
 
 // GetQueryTimestamp returns the QueryTimestamp field value if set, zero value otherwise.
 func (o *DeletedSubscription) GetQueryTimestamp() time.Time {
-	if o == nil || isNil(o.QueryTimestamp) {
+	if o == nil || o.QueryTimestamp == nil {
 		var ret time.Time
 		return ret
 	}
@@ -1168,15 +1169,15 @@ func (o *DeletedSubscription) GetQueryTimestamp() time.Time {
 // GetQueryTimestampOk returns a tuple with the QueryTimestamp field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *DeletedSubscription) GetQueryTimestampOk() (*time.Time, bool) {
-	if o == nil || isNil(o.QueryTimestamp) {
-    return nil, false
+	if o == nil || o.QueryTimestamp == nil {
+		return nil, false
 	}
 	return o.QueryTimestamp, true
 }
 
 // HasQueryTimestamp returns a boolean if a field has been set.
 func (o *DeletedSubscription) HasQueryTimestamp() bool {
-	if o != nil && !isNil(o.QueryTimestamp) {
+	if o != nil && o.QueryTimestamp != nil {
 		return true
 	}
 
@@ -1190,109 +1191,109 @@ func (o *DeletedSubscription) SetQueryTimestamp(v time.Time) {
 
 func (o DeletedSubscription) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Href) {
+	if o.Href != nil {
 		toSerialize["href"] = o.Href
 	}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.Kind) {
+	if o.Kind != nil {
 		toSerialize["kind"] = o.Kind
 	}
-	if !isNil(o.BillingExpirationDate) {
+	if o.BillingExpirationDate != nil {
 		toSerialize["billing_expiration_date"] = o.BillingExpirationDate
 	}
-	if !isNil(o.BillingMarketplaceAccount) {
+	if o.BillingMarketplaceAccount != nil {
 		toSerialize["billing_marketplace_account"] = o.BillingMarketplaceAccount
 	}
-	if !isNil(o.CloudAccountId) {
+	if o.CloudAccountId != nil {
 		toSerialize["cloud_account_id"] = o.CloudAccountId
 	}
-	if !isNil(o.CloudProviderId) {
+	if o.CloudProviderId != nil {
 		toSerialize["cloud_provider_id"] = o.CloudProviderId
 	}
-	if !isNil(o.ClusterBillingModel) {
+	if o.ClusterBillingModel != nil {
 		toSerialize["cluster_billing_model"] = o.ClusterBillingModel
 	}
-	if !isNil(o.ClusterId) {
+	if o.ClusterId != nil {
 		toSerialize["cluster_id"] = o.ClusterId
 	}
-	if !isNil(o.ConsoleUrl) {
+	if o.ConsoleUrl != nil {
 		toSerialize["console_url"] = o.ConsoleUrl
 	}
-	if !isNil(o.ConsumerUuid) {
+	if o.ConsumerUuid != nil {
 		toSerialize["consumer_uuid"] = o.ConsumerUuid
 	}
-	if !isNil(o.CpuTotal) {
+	if o.CpuTotal != nil {
 		toSerialize["cpu_total"] = o.CpuTotal
 	}
-	if !isNil(o.CreatorId) {
+	if o.CreatorId != nil {
 		toSerialize["creator_id"] = o.CreatorId
 	}
-	if !isNil(o.DisplayName) {
+	if o.DisplayName != nil {
 		toSerialize["display_name"] = o.DisplayName
 	}
-	if !isNil(o.ExternalClusterId) {
+	if o.ExternalClusterId != nil {
 		toSerialize["external_cluster_id"] = o.ExternalClusterId
 	}
-	if !isNil(o.LastReconcileDate) {
+	if o.LastReconcileDate != nil {
 		toSerialize["last_reconcile_date"] = o.LastReconcileDate
 	}
-	if !isNil(o.LastReleasedAt) {
+	if o.LastReleasedAt != nil {
 		toSerialize["last_released_at"] = o.LastReleasedAt
 	}
-	if !isNil(o.LastTelemetryDate) {
+	if o.LastTelemetryDate != nil {
 		toSerialize["last_telemetry_date"] = o.LastTelemetryDate
 	}
 	if true {
 		toSerialize["managed"] = o.Managed
 	}
-	if !isNil(o.OrganizationId) {
+	if o.OrganizationId != nil {
 		toSerialize["organization_id"] = o.OrganizationId
 	}
-	if !isNil(o.PlanId) {
+	if o.PlanId != nil {
 		toSerialize["plan_id"] = o.PlanId
 	}
-	if !isNil(o.ProductBundle) {
+	if o.ProductBundle != nil {
 		toSerialize["product_bundle"] = o.ProductBundle
 	}
-	if !isNil(o.Provenance) {
+	if o.Provenance != nil {
 		toSerialize["provenance"] = o.Provenance
 	}
-	if !isNil(o.RegionId) {
+	if o.RegionId != nil {
 		toSerialize["region_id"] = o.RegionId
 	}
-	if !isNil(o.Released) {
+	if o.Released != nil {
 		toSerialize["released"] = o.Released
 	}
-	if !isNil(o.ServiceLevel) {
+	if o.ServiceLevel != nil {
 		toSerialize["service_level"] = o.ServiceLevel
 	}
-	if !isNil(o.SocketTotal) {
+	if o.SocketTotal != nil {
 		toSerialize["socket_total"] = o.SocketTotal
 	}
-	if !isNil(o.Status) {
+	if o.Status != nil {
 		toSerialize["status"] = o.Status
 	}
-	if !isNil(o.SupportLevel) {
+	if o.SupportLevel != nil {
 		toSerialize["support_level"] = o.SupportLevel
 	}
-	if !isNil(o.SystemUnits) {
+	if o.SystemUnits != nil {
 		toSerialize["system_units"] = o.SystemUnits
 	}
-	if !isNil(o.TrialEndDate) {
+	if o.TrialEndDate != nil {
 		toSerialize["trial_end_date"] = o.TrialEndDate
 	}
-	if !isNil(o.Usage) {
+	if o.Usage != nil {
 		toSerialize["usage"] = o.Usage
 	}
-	if !isNil(o.CreatedAt) {
+	if o.CreatedAt != nil {
 		toSerialize["created_at"] = o.CreatedAt
 	}
-	if !isNil(o.Metrics) {
+	if o.Metrics != nil {
 		toSerialize["metrics"] = o.Metrics
 	}
-	if !isNil(o.QueryTimestamp) {
+	if o.QueryTimestamp != nil {
 		toSerialize["query_timestamp"] = o.QueryTimestamp
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_deleted_subscription_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_deleted_subscription_all_of.go
index e60a87c0..f6705968 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_deleted_subscription_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_deleted_subscription_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -42,7 +42,7 @@ func NewDeletedSubscriptionAllOfWithDefaults() *DeletedSubscriptionAllOf {
 
 // GetCreatedAt returns the CreatedAt field value if set, zero value otherwise.
 func (o *DeletedSubscriptionAllOf) GetCreatedAt() time.Time {
-	if o == nil || isNil(o.CreatedAt) {
+	if o == nil || o.CreatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -52,15 +52,15 @@ func (o *DeletedSubscriptionAllOf) GetCreatedAt() time.Time {
 // GetCreatedAtOk returns a tuple with the CreatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *DeletedSubscriptionAllOf) GetCreatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.CreatedAt) {
-    return nil, false
+	if o == nil || o.CreatedAt == nil {
+		return nil, false
 	}
 	return o.CreatedAt, true
 }
 
 // HasCreatedAt returns a boolean if a field has been set.
 func (o *DeletedSubscriptionAllOf) HasCreatedAt() bool {
-	if o != nil && !isNil(o.CreatedAt) {
+	if o != nil && o.CreatedAt != nil {
 		return true
 	}
 
@@ -74,7 +74,7 @@ func (o *DeletedSubscriptionAllOf) SetCreatedAt(v time.Time) {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *DeletedSubscriptionAllOf) GetId() string {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret string
 		return ret
 	}
@@ -84,15 +84,15 @@ func (o *DeletedSubscriptionAllOf) GetId() string {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *DeletedSubscriptionAllOf) GetIdOk() (*string, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *DeletedSubscriptionAllOf) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -106,7 +106,7 @@ func (o *DeletedSubscriptionAllOf) SetId(v string) {
 
 // GetMetrics returns the Metrics field value if set, zero value otherwise.
 func (o *DeletedSubscriptionAllOf) GetMetrics() string {
-	if o == nil || isNil(o.Metrics) {
+	if o == nil || o.Metrics == nil {
 		var ret string
 		return ret
 	}
@@ -116,15 +116,15 @@ func (o *DeletedSubscriptionAllOf) GetMetrics() string {
 // GetMetricsOk returns a tuple with the Metrics field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *DeletedSubscriptionAllOf) GetMetricsOk() (*string, bool) {
-	if o == nil || isNil(o.Metrics) {
-    return nil, false
+	if o == nil || o.Metrics == nil {
+		return nil, false
 	}
 	return o.Metrics, true
 }
 
 // HasMetrics returns a boolean if a field has been set.
 func (o *DeletedSubscriptionAllOf) HasMetrics() bool {
-	if o != nil && !isNil(o.Metrics) {
+	if o != nil && o.Metrics != nil {
 		return true
 	}
 
@@ -138,7 +138,7 @@ func (o *DeletedSubscriptionAllOf) SetMetrics(v string) {
 
 // GetQueryTimestamp returns the QueryTimestamp field value if set, zero value otherwise.
 func (o *DeletedSubscriptionAllOf) GetQueryTimestamp() time.Time {
-	if o == nil || isNil(o.QueryTimestamp) {
+	if o == nil || o.QueryTimestamp == nil {
 		var ret time.Time
 		return ret
 	}
@@ -148,15 +148,15 @@ func (o *DeletedSubscriptionAllOf) GetQueryTimestamp() time.Time {
 // GetQueryTimestampOk returns a tuple with the QueryTimestamp field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *DeletedSubscriptionAllOf) GetQueryTimestampOk() (*time.Time, bool) {
-	if o == nil || isNil(o.QueryTimestamp) {
-    return nil, false
+	if o == nil || o.QueryTimestamp == nil {
+		return nil, false
 	}
 	return o.QueryTimestamp, true
 }
 
 // HasQueryTimestamp returns a boolean if a field has been set.
 func (o *DeletedSubscriptionAllOf) HasQueryTimestamp() bool {
-	if o != nil && !isNil(o.QueryTimestamp) {
+	if o != nil && o.QueryTimestamp != nil {
 		return true
 	}
 
@@ -170,16 +170,16 @@ func (o *DeletedSubscriptionAllOf) SetQueryTimestamp(v time.Time) {
 
 func (o DeletedSubscriptionAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.CreatedAt) {
+	if o.CreatedAt != nil {
 		toSerialize["created_at"] = o.CreatedAt
 	}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.Metrics) {
+	if o.Metrics != nil {
 		toSerialize["metrics"] = o.Metrics
 	}
-	if !isNil(o.QueryTimestamp) {
+	if o.QueryTimestamp != nil {
 		toSerialize["query_timestamp"] = o.QueryTimestamp
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_deleted_subscription_list.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_deleted_subscription_list.go
index 78aa6e42..79f7767e 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_deleted_subscription_list.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_deleted_subscription_list.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -58,8 +58,8 @@ func (o *DeletedSubscriptionList) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *DeletedSubscriptionList) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -82,8 +82,8 @@ func (o *DeletedSubscriptionList) GetPage() int32 {
 // GetPageOk returns a tuple with the Page field value
 // and a boolean to check if the value has been set.
 func (o *DeletedSubscriptionList) GetPageOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Page, true
 }
@@ -106,8 +106,8 @@ func (o *DeletedSubscriptionList) GetSize() int32 {
 // GetSizeOk returns a tuple with the Size field value
 // and a boolean to check if the value has been set.
 func (o *DeletedSubscriptionList) GetSizeOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Size, true
 }
@@ -130,8 +130,8 @@ func (o *DeletedSubscriptionList) GetTotal() int32 {
 // GetTotalOk returns a tuple with the Total field value
 // and a boolean to check if the value has been set.
 func (o *DeletedSubscriptionList) GetTotalOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Total, true
 }
@@ -153,11 +153,11 @@ func (o *DeletedSubscriptionList) GetItems() []DeletedSubscription {
 
 // GetItemsOk returns a tuple with the Items field value
 // and a boolean to check if the value has been set.
-func (o *DeletedSubscriptionList) GetItemsOk() ([]DeletedSubscription, bool) {
-	if o == nil {
-    return nil, false
+func (o *DeletedSubscriptionList) GetItemsOk() (*[]DeletedSubscription, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Items, true
+	return &o.Items, true
 }
 
 // SetItems sets field value
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_deleted_subscription_list_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_deleted_subscription_list_all_of.go
index ba531aa2..de59825b 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_deleted_subscription_list_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_deleted_subscription_list_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -16,7 +16,7 @@ import (
 
 // DeletedSubscriptionListAllOf struct for DeletedSubscriptionListAllOf
 type DeletedSubscriptionListAllOf struct {
-	Items []DeletedSubscription `json:"items,omitempty"`
+	Items *[]DeletedSubscription `json:"items,omitempty"`
 }
 
 // NewDeletedSubscriptionListAllOf instantiates a new DeletedSubscriptionListAllOf object
@@ -38,25 +38,25 @@ func NewDeletedSubscriptionListAllOfWithDefaults() *DeletedSubscriptionListAllOf
 
 // GetItems returns the Items field value if set, zero value otherwise.
 func (o *DeletedSubscriptionListAllOf) GetItems() []DeletedSubscription {
-	if o == nil || isNil(o.Items) {
+	if o == nil || o.Items == nil {
 		var ret []DeletedSubscription
 		return ret
 	}
-	return o.Items
+	return *o.Items
 }
 
 // GetItemsOk returns a tuple with the Items field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *DeletedSubscriptionListAllOf) GetItemsOk() ([]DeletedSubscription, bool) {
-	if o == nil || isNil(o.Items) {
-    return nil, false
+func (o *DeletedSubscriptionListAllOf) GetItemsOk() (*[]DeletedSubscription, bool) {
+	if o == nil || o.Items == nil {
+		return nil, false
 	}
 	return o.Items, true
 }
 
 // HasItems returns a boolean if a field has been set.
 func (o *DeletedSubscriptionListAllOf) HasItems() bool {
-	if o != nil && !isNil(o.Items) {
+	if o != nil && o.Items != nil {
 		return true
 	}
 
@@ -65,12 +65,12 @@ func (o *DeletedSubscriptionListAllOf) HasItems() bool {
 
 // SetItems gets a reference to the given []DeletedSubscription and assigns it to the Items field.
 func (o *DeletedSubscriptionListAllOf) SetItems(v []DeletedSubscription) {
-	o.Items = v
+	o.Items = &v
 }
 
 func (o DeletedSubscriptionListAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Items) {
+	if o.Items != nil {
 		toSerialize["items"] = o.Items
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_ephemeral_resource_quota.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_ephemeral_resource_quota.go
index 8ce8c479..95725624 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_ephemeral_resource_quota.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_ephemeral_resource_quota.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -43,7 +43,7 @@ func NewEphemeralResourceQuotaWithDefaults() *EphemeralResourceQuota {
 
 // GetAvailabilityZoneType returns the AvailabilityZoneType field value if set, zero value otherwise.
 func (o *EphemeralResourceQuota) GetAvailabilityZoneType() string {
-	if o == nil || isNil(o.AvailabilityZoneType) {
+	if o == nil || o.AvailabilityZoneType == nil {
 		var ret string
 		return ret
 	}
@@ -53,15 +53,15 @@ func (o *EphemeralResourceQuota) GetAvailabilityZoneType() string {
 // GetAvailabilityZoneTypeOk returns a tuple with the AvailabilityZoneType field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *EphemeralResourceQuota) GetAvailabilityZoneTypeOk() (*string, bool) {
-	if o == nil || isNil(o.AvailabilityZoneType) {
-    return nil, false
+	if o == nil || o.AvailabilityZoneType == nil {
+		return nil, false
 	}
 	return o.AvailabilityZoneType, true
 }
 
 // HasAvailabilityZoneType returns a boolean if a field has been set.
 func (o *EphemeralResourceQuota) HasAvailabilityZoneType() bool {
-	if o != nil && !isNil(o.AvailabilityZoneType) {
+	if o != nil && o.AvailabilityZoneType != nil {
 		return true
 	}
 
@@ -75,7 +75,7 @@ func (o *EphemeralResourceQuota) SetAvailabilityZoneType(v string) {
 
 // GetByoc returns the Byoc field value if set, zero value otherwise.
 func (o *EphemeralResourceQuota) GetByoc() bool {
-	if o == nil || isNil(o.Byoc) {
+	if o == nil || o.Byoc == nil {
 		var ret bool
 		return ret
 	}
@@ -85,15 +85,15 @@ func (o *EphemeralResourceQuota) GetByoc() bool {
 // GetByocOk returns a tuple with the Byoc field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *EphemeralResourceQuota) GetByocOk() (*bool, bool) {
-	if o == nil || isNil(o.Byoc) {
-    return nil, false
+	if o == nil || o.Byoc == nil {
+		return nil, false
 	}
 	return o.Byoc, true
 }
 
 // HasByoc returns a boolean if a field has been set.
 func (o *EphemeralResourceQuota) HasByoc() bool {
-	if o != nil && !isNil(o.Byoc) {
+	if o != nil && o.Byoc != nil {
 		return true
 	}
 
@@ -107,7 +107,7 @@ func (o *EphemeralResourceQuota) SetByoc(v bool) {
 
 // GetResourceName returns the ResourceName field value if set, zero value otherwise.
 func (o *EphemeralResourceQuota) GetResourceName() string {
-	if o == nil || isNil(o.ResourceName) {
+	if o == nil || o.ResourceName == nil {
 		var ret string
 		return ret
 	}
@@ -117,15 +117,15 @@ func (o *EphemeralResourceQuota) GetResourceName() string {
 // GetResourceNameOk returns a tuple with the ResourceName field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *EphemeralResourceQuota) GetResourceNameOk() (*string, bool) {
-	if o == nil || isNil(o.ResourceName) {
-    return nil, false
+	if o == nil || o.ResourceName == nil {
+		return nil, false
 	}
 	return o.ResourceName, true
 }
 
 // HasResourceName returns a boolean if a field has been set.
 func (o *EphemeralResourceQuota) HasResourceName() bool {
-	if o != nil && !isNil(o.ResourceName) {
+	if o != nil && o.ResourceName != nil {
 		return true
 	}
 
@@ -139,7 +139,7 @@ func (o *EphemeralResourceQuota) SetResourceName(v string) {
 
 // GetResourceType returns the ResourceType field value if set, zero value otherwise.
 func (o *EphemeralResourceQuota) GetResourceType() string {
-	if o == nil || isNil(o.ResourceType) {
+	if o == nil || o.ResourceType == nil {
 		var ret string
 		return ret
 	}
@@ -149,15 +149,15 @@ func (o *EphemeralResourceQuota) GetResourceType() string {
 // GetResourceTypeOk returns a tuple with the ResourceType field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *EphemeralResourceQuota) GetResourceTypeOk() (*string, bool) {
-	if o == nil || isNil(o.ResourceType) {
-    return nil, false
+	if o == nil || o.ResourceType == nil {
+		return nil, false
 	}
 	return o.ResourceType, true
 }
 
 // HasResourceType returns a boolean if a field has been set.
 func (o *EphemeralResourceQuota) HasResourceType() bool {
-	if o != nil && !isNil(o.ResourceType) {
+	if o != nil && o.ResourceType != nil {
 		return true
 	}
 
@@ -171,7 +171,7 @@ func (o *EphemeralResourceQuota) SetResourceType(v string) {
 
 // GetSku returns the Sku field value if set, zero value otherwise.
 func (o *EphemeralResourceQuota) GetSku() string {
-	if o == nil || isNil(o.Sku) {
+	if o == nil || o.Sku == nil {
 		var ret string
 		return ret
 	}
@@ -181,15 +181,15 @@ func (o *EphemeralResourceQuota) GetSku() string {
 // GetSkuOk returns a tuple with the Sku field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *EphemeralResourceQuota) GetSkuOk() (*string, bool) {
-	if o == nil || isNil(o.Sku) {
-    return nil, false
+	if o == nil || o.Sku == nil {
+		return nil, false
 	}
 	return o.Sku, true
 }
 
 // HasSku returns a boolean if a field has been set.
 func (o *EphemeralResourceQuota) HasSku() bool {
-	if o != nil && !isNil(o.Sku) {
+	if o != nil && o.Sku != nil {
 		return true
 	}
 
@@ -203,7 +203,7 @@ func (o *EphemeralResourceQuota) SetSku(v string) {
 
 // GetSkuCount returns the SkuCount field value if set, zero value otherwise.
 func (o *EphemeralResourceQuota) GetSkuCount() int32 {
-	if o == nil || isNil(o.SkuCount) {
+	if o == nil || o.SkuCount == nil {
 		var ret int32
 		return ret
 	}
@@ -213,15 +213,15 @@ func (o *EphemeralResourceQuota) GetSkuCount() int32 {
 // GetSkuCountOk returns a tuple with the SkuCount field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *EphemeralResourceQuota) GetSkuCountOk() (*int32, bool) {
-	if o == nil || isNil(o.SkuCount) {
-    return nil, false
+	if o == nil || o.SkuCount == nil {
+		return nil, false
 	}
 	return o.SkuCount, true
 }
 
 // HasSkuCount returns a boolean if a field has been set.
 func (o *EphemeralResourceQuota) HasSkuCount() bool {
-	if o != nil && !isNil(o.SkuCount) {
+	if o != nil && o.SkuCount != nil {
 		return true
 	}
 
@@ -235,22 +235,22 @@ func (o *EphemeralResourceQuota) SetSkuCount(v int32) {
 
 func (o EphemeralResourceQuota) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.AvailabilityZoneType) {
+	if o.AvailabilityZoneType != nil {
 		toSerialize["availability_zone_type"] = o.AvailabilityZoneType
 	}
-	if !isNil(o.Byoc) {
+	if o.Byoc != nil {
 		toSerialize["byoc"] = o.Byoc
 	}
-	if !isNil(o.ResourceName) {
+	if o.ResourceName != nil {
 		toSerialize["resource_name"] = o.ResourceName
 	}
-	if !isNil(o.ResourceType) {
+	if o.ResourceType != nil {
 		toSerialize["resource_type"] = o.ResourceType
 	}
-	if !isNil(o.Sku) {
+	if o.Sku != nil {
 		toSerialize["sku"] = o.Sku
 	}
-	if !isNil(o.SkuCount) {
+	if o.SkuCount != nil {
 		toSerialize["sku_count"] = o.SkuCount
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_error.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_error.go
index f26a82c9..f641c9ef 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_error.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_error.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -43,7 +43,7 @@ func NewErrorWithDefaults() *Error {
 
 // GetHref returns the Href field value if set, zero value otherwise.
 func (o *Error) GetHref() string {
-	if o == nil || isNil(o.Href) {
+	if o == nil || o.Href == nil {
 		var ret string
 		return ret
 	}
@@ -53,15 +53,15 @@ func (o *Error) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Error) GetHrefOk() (*string, bool) {
-	if o == nil || isNil(o.Href) {
-    return nil, false
+	if o == nil || o.Href == nil {
+		return nil, false
 	}
 	return o.Href, true
 }
 
 // HasHref returns a boolean if a field has been set.
 func (o *Error) HasHref() bool {
-	if o != nil && !isNil(o.Href) {
+	if o != nil && o.Href != nil {
 		return true
 	}
 
@@ -75,7 +75,7 @@ func (o *Error) SetHref(v string) {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *Error) GetId() string {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret string
 		return ret
 	}
@@ -85,15 +85,15 @@ func (o *Error) GetId() string {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Error) GetIdOk() (*string, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *Error) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -107,7 +107,7 @@ func (o *Error) SetId(v string) {
 
 // GetKind returns the Kind field value if set, zero value otherwise.
 func (o *Error) GetKind() string {
-	if o == nil || isNil(o.Kind) {
+	if o == nil || o.Kind == nil {
 		var ret string
 		return ret
 	}
@@ -117,15 +117,15 @@ func (o *Error) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Error) GetKindOk() (*string, bool) {
-	if o == nil || isNil(o.Kind) {
-    return nil, false
+	if o == nil || o.Kind == nil {
+		return nil, false
 	}
 	return o.Kind, true
 }
 
 // HasKind returns a boolean if a field has been set.
 func (o *Error) HasKind() bool {
-	if o != nil && !isNil(o.Kind) {
+	if o != nil && o.Kind != nil {
 		return true
 	}
 
@@ -139,7 +139,7 @@ func (o *Error) SetKind(v string) {
 
 // GetCode returns the Code field value if set, zero value otherwise.
 func (o *Error) GetCode() string {
-	if o == nil || isNil(o.Code) {
+	if o == nil || o.Code == nil {
 		var ret string
 		return ret
 	}
@@ -149,15 +149,15 @@ func (o *Error) GetCode() string {
 // GetCodeOk returns a tuple with the Code field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Error) GetCodeOk() (*string, bool) {
-	if o == nil || isNil(o.Code) {
-    return nil, false
+	if o == nil || o.Code == nil {
+		return nil, false
 	}
 	return o.Code, true
 }
 
 // HasCode returns a boolean if a field has been set.
 func (o *Error) HasCode() bool {
-	if o != nil && !isNil(o.Code) {
+	if o != nil && o.Code != nil {
 		return true
 	}
 
@@ -171,7 +171,7 @@ func (o *Error) SetCode(v string) {
 
 // GetOperationId returns the OperationId field value if set, zero value otherwise.
 func (o *Error) GetOperationId() string {
-	if o == nil || isNil(o.OperationId) {
+	if o == nil || o.OperationId == nil {
 		var ret string
 		return ret
 	}
@@ -181,15 +181,15 @@ func (o *Error) GetOperationId() string {
 // GetOperationIdOk returns a tuple with the OperationId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Error) GetOperationIdOk() (*string, bool) {
-	if o == nil || isNil(o.OperationId) {
-    return nil, false
+	if o == nil || o.OperationId == nil {
+		return nil, false
 	}
 	return o.OperationId, true
 }
 
 // HasOperationId returns a boolean if a field has been set.
 func (o *Error) HasOperationId() bool {
-	if o != nil && !isNil(o.OperationId) {
+	if o != nil && o.OperationId != nil {
 		return true
 	}
 
@@ -203,7 +203,7 @@ func (o *Error) SetOperationId(v string) {
 
 // GetReason returns the Reason field value if set, zero value otherwise.
 func (o *Error) GetReason() string {
-	if o == nil || isNil(o.Reason) {
+	if o == nil || o.Reason == nil {
 		var ret string
 		return ret
 	}
@@ -213,15 +213,15 @@ func (o *Error) GetReason() string {
 // GetReasonOk returns a tuple with the Reason field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Error) GetReasonOk() (*string, bool) {
-	if o == nil || isNil(o.Reason) {
-    return nil, false
+	if o == nil || o.Reason == nil {
+		return nil, false
 	}
 	return o.Reason, true
 }
 
 // HasReason returns a boolean if a field has been set.
 func (o *Error) HasReason() bool {
-	if o != nil && !isNil(o.Reason) {
+	if o != nil && o.Reason != nil {
 		return true
 	}
 
@@ -235,22 +235,22 @@ func (o *Error) SetReason(v string) {
 
 func (o Error) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Href) {
+	if o.Href != nil {
 		toSerialize["href"] = o.Href
 	}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.Kind) {
+	if o.Kind != nil {
 		toSerialize["kind"] = o.Kind
 	}
-	if !isNil(o.Code) {
+	if o.Code != nil {
 		toSerialize["code"] = o.Code
 	}
-	if !isNil(o.OperationId) {
+	if o.OperationId != nil {
 		toSerialize["operation_id"] = o.OperationId
 	}
-	if !isNil(o.Reason) {
+	if o.Reason != nil {
 		toSerialize["reason"] = o.Reason
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_error_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_error_all_of.go
index 2300887b..d5b0b6f3 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_error_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_error_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -40,7 +40,7 @@ func NewErrorAllOfWithDefaults() *ErrorAllOf {
 
 // GetCode returns the Code field value if set, zero value otherwise.
 func (o *ErrorAllOf) GetCode() string {
-	if o == nil || isNil(o.Code) {
+	if o == nil || o.Code == nil {
 		var ret string
 		return ret
 	}
@@ -50,15 +50,15 @@ func (o *ErrorAllOf) GetCode() string {
 // GetCodeOk returns a tuple with the Code field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ErrorAllOf) GetCodeOk() (*string, bool) {
-	if o == nil || isNil(o.Code) {
-    return nil, false
+	if o == nil || o.Code == nil {
+		return nil, false
 	}
 	return o.Code, true
 }
 
 // HasCode returns a boolean if a field has been set.
 func (o *ErrorAllOf) HasCode() bool {
-	if o != nil && !isNil(o.Code) {
+	if o != nil && o.Code != nil {
 		return true
 	}
 
@@ -72,7 +72,7 @@ func (o *ErrorAllOf) SetCode(v string) {
 
 // GetOperationId returns the OperationId field value if set, zero value otherwise.
 func (o *ErrorAllOf) GetOperationId() string {
-	if o == nil || isNil(o.OperationId) {
+	if o == nil || o.OperationId == nil {
 		var ret string
 		return ret
 	}
@@ -82,15 +82,15 @@ func (o *ErrorAllOf) GetOperationId() string {
 // GetOperationIdOk returns a tuple with the OperationId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ErrorAllOf) GetOperationIdOk() (*string, bool) {
-	if o == nil || isNil(o.OperationId) {
-    return nil, false
+	if o == nil || o.OperationId == nil {
+		return nil, false
 	}
 	return o.OperationId, true
 }
 
 // HasOperationId returns a boolean if a field has been set.
 func (o *ErrorAllOf) HasOperationId() bool {
-	if o != nil && !isNil(o.OperationId) {
+	if o != nil && o.OperationId != nil {
 		return true
 	}
 
@@ -104,7 +104,7 @@ func (o *ErrorAllOf) SetOperationId(v string) {
 
 // GetReason returns the Reason field value if set, zero value otherwise.
 func (o *ErrorAllOf) GetReason() string {
-	if o == nil || isNil(o.Reason) {
+	if o == nil || o.Reason == nil {
 		var ret string
 		return ret
 	}
@@ -114,15 +114,15 @@ func (o *ErrorAllOf) GetReason() string {
 // GetReasonOk returns a tuple with the Reason field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ErrorAllOf) GetReasonOk() (*string, bool) {
-	if o == nil || isNil(o.Reason) {
-    return nil, false
+	if o == nil || o.Reason == nil {
+		return nil, false
 	}
 	return o.Reason, true
 }
 
 // HasReason returns a boolean if a field has been set.
 func (o *ErrorAllOf) HasReason() bool {
-	if o != nil && !isNil(o.Reason) {
+	if o != nil && o.Reason != nil {
 		return true
 	}
 
@@ -136,13 +136,13 @@ func (o *ErrorAllOf) SetReason(v string) {
 
 func (o ErrorAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Code) {
+	if o.Code != nil {
 		toSerialize["code"] = o.Code
 	}
-	if !isNil(o.OperationId) {
+	if o.OperationId != nil {
 		toSerialize["operation_id"] = o.OperationId
 	}
-	if !isNil(o.Reason) {
+	if o.Reason != nil {
 		toSerialize["reason"] = o.Reason
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_error_list.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_error_list.go
index dc1d3ee0..ad6b7222 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_error_list.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_error_list.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -58,8 +58,8 @@ func (o *ErrorList) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *ErrorList) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -82,8 +82,8 @@ func (o *ErrorList) GetPage() int32 {
 // GetPageOk returns a tuple with the Page field value
 // and a boolean to check if the value has been set.
 func (o *ErrorList) GetPageOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Page, true
 }
@@ -106,8 +106,8 @@ func (o *ErrorList) GetSize() int32 {
 // GetSizeOk returns a tuple with the Size field value
 // and a boolean to check if the value has been set.
 func (o *ErrorList) GetSizeOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Size, true
 }
@@ -130,8 +130,8 @@ func (o *ErrorList) GetTotal() int32 {
 // GetTotalOk returns a tuple with the Total field value
 // and a boolean to check if the value has been set.
 func (o *ErrorList) GetTotalOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Total, true
 }
@@ -153,11 +153,11 @@ func (o *ErrorList) GetItems() []Error {
 
 // GetItemsOk returns a tuple with the Items field value
 // and a boolean to check if the value has been set.
-func (o *ErrorList) GetItemsOk() ([]Error, bool) {
-	if o == nil {
-    return nil, false
+func (o *ErrorList) GetItemsOk() (*[]Error, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Items, true
+	return &o.Items, true
 }
 
 // SetItems sets field value
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_error_list_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_error_list_all_of.go
index b7cf6258..1e4d964e 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_error_list_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_error_list_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -16,7 +16,7 @@ import (
 
 // ErrorListAllOf struct for ErrorListAllOf
 type ErrorListAllOf struct {
-	Items []Error `json:"items,omitempty"`
+	Items *[]Error `json:"items,omitempty"`
 }
 
 // NewErrorListAllOf instantiates a new ErrorListAllOf object
@@ -38,25 +38,25 @@ func NewErrorListAllOfWithDefaults() *ErrorListAllOf {
 
 // GetItems returns the Items field value if set, zero value otherwise.
 func (o *ErrorListAllOf) GetItems() []Error {
-	if o == nil || isNil(o.Items) {
+	if o == nil || o.Items == nil {
 		var ret []Error
 		return ret
 	}
-	return o.Items
+	return *o.Items
 }
 
 // GetItemsOk returns a tuple with the Items field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *ErrorListAllOf) GetItemsOk() ([]Error, bool) {
-	if o == nil || isNil(o.Items) {
-    return nil, false
+func (o *ErrorListAllOf) GetItemsOk() (*[]Error, bool) {
+	if o == nil || o.Items == nil {
+		return nil, false
 	}
 	return o.Items, true
 }
 
 // HasItems returns a boolean if a field has been set.
 func (o *ErrorListAllOf) HasItems() bool {
-	if o != nil && !isNil(o.Items) {
+	if o != nil && o.Items != nil {
 		return true
 	}
 
@@ -65,12 +65,12 @@ func (o *ErrorListAllOf) HasItems() bool {
 
 // SetItems gets a reference to the given []Error and assigns it to the Items field.
 func (o *ErrorListAllOf) SetItems(v []Error) {
-	o.Items = v
+	o.Items = &v
 }
 
 func (o ErrorListAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Items) {
+	if o.Items != nil {
 		toSerialize["items"] = o.Items
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_excess_resource.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_excess_resource.go
index cf0108c6..810e765c 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_excess_resource.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_excess_resource.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -47,7 +47,7 @@ func NewExcessResourceWithDefaults() *ExcessResource {
 
 // GetHref returns the Href field value if set, zero value otherwise.
 func (o *ExcessResource) GetHref() string {
-	if o == nil || isNil(o.Href) {
+	if o == nil || o.Href == nil {
 		var ret string
 		return ret
 	}
@@ -57,15 +57,15 @@ func (o *ExcessResource) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ExcessResource) GetHrefOk() (*string, bool) {
-	if o == nil || isNil(o.Href) {
-    return nil, false
+	if o == nil || o.Href == nil {
+		return nil, false
 	}
 	return o.Href, true
 }
 
 // HasHref returns a boolean if a field has been set.
 func (o *ExcessResource) HasHref() bool {
-	if o != nil && !isNil(o.Href) {
+	if o != nil && o.Href != nil {
 		return true
 	}
 
@@ -79,7 +79,7 @@ func (o *ExcessResource) SetHref(v string) {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *ExcessResource) GetId() string {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret string
 		return ret
 	}
@@ -89,15 +89,15 @@ func (o *ExcessResource) GetId() string {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ExcessResource) GetIdOk() (*string, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *ExcessResource) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -111,7 +111,7 @@ func (o *ExcessResource) SetId(v string) {
 
 // GetKind returns the Kind field value if set, zero value otherwise.
 func (o *ExcessResource) GetKind() string {
-	if o == nil || isNil(o.Kind) {
+	if o == nil || o.Kind == nil {
 		var ret string
 		return ret
 	}
@@ -121,15 +121,15 @@ func (o *ExcessResource) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ExcessResource) GetKindOk() (*string, bool) {
-	if o == nil || isNil(o.Kind) {
-    return nil, false
+	if o == nil || o.Kind == nil {
+		return nil, false
 	}
 	return o.Kind, true
 }
 
 // HasKind returns a boolean if a field has been set.
 func (o *ExcessResource) HasKind() bool {
-	if o != nil && !isNil(o.Kind) {
+	if o != nil && o.Kind != nil {
 		return true
 	}
 
@@ -143,7 +143,7 @@ func (o *ExcessResource) SetKind(v string) {
 
 // GetAvailabilityZoneType returns the AvailabilityZoneType field value if set, zero value otherwise.
 func (o *ExcessResource) GetAvailabilityZoneType() string {
-	if o == nil || isNil(o.AvailabilityZoneType) {
+	if o == nil || o.AvailabilityZoneType == nil {
 		var ret string
 		return ret
 	}
@@ -153,15 +153,15 @@ func (o *ExcessResource) GetAvailabilityZoneType() string {
 // GetAvailabilityZoneTypeOk returns a tuple with the AvailabilityZoneType field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ExcessResource) GetAvailabilityZoneTypeOk() (*string, bool) {
-	if o == nil || isNil(o.AvailabilityZoneType) {
-    return nil, false
+	if o == nil || o.AvailabilityZoneType == nil {
+		return nil, false
 	}
 	return o.AvailabilityZoneType, true
 }
 
 // HasAvailabilityZoneType returns a boolean if a field has been set.
 func (o *ExcessResource) HasAvailabilityZoneType() bool {
-	if o != nil && !isNil(o.AvailabilityZoneType) {
+	if o != nil && o.AvailabilityZoneType != nil {
 		return true
 	}
 
@@ -175,7 +175,7 @@ func (o *ExcessResource) SetAvailabilityZoneType(v string) {
 
 // GetBillingModel returns the BillingModel field value if set, zero value otherwise.
 func (o *ExcessResource) GetBillingModel() string {
-	if o == nil || isNil(o.BillingModel) {
+	if o == nil || o.BillingModel == nil {
 		var ret string
 		return ret
 	}
@@ -185,15 +185,15 @@ func (o *ExcessResource) GetBillingModel() string {
 // GetBillingModelOk returns a tuple with the BillingModel field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ExcessResource) GetBillingModelOk() (*string, bool) {
-	if o == nil || isNil(o.BillingModel) {
-    return nil, false
+	if o == nil || o.BillingModel == nil {
+		return nil, false
 	}
 	return o.BillingModel, true
 }
 
 // HasBillingModel returns a boolean if a field has been set.
 func (o *ExcessResource) HasBillingModel() bool {
-	if o != nil && !isNil(o.BillingModel) {
+	if o != nil && o.BillingModel != nil {
 		return true
 	}
 
@@ -218,8 +218,8 @@ func (o *ExcessResource) GetByoc() bool {
 // GetByocOk returns a tuple with the Byoc field value
 // and a boolean to check if the value has been set.
 func (o *ExcessResource) GetByocOk() (*bool, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Byoc, true
 }
@@ -231,7 +231,7 @@ func (o *ExcessResource) SetByoc(v bool) {
 
 // GetCount returns the Count field value if set, zero value otherwise.
 func (o *ExcessResource) GetCount() int32 {
-	if o == nil || isNil(o.Count) {
+	if o == nil || o.Count == nil {
 		var ret int32
 		return ret
 	}
@@ -241,15 +241,15 @@ func (o *ExcessResource) GetCount() int32 {
 // GetCountOk returns a tuple with the Count field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ExcessResource) GetCountOk() (*int32, bool) {
-	if o == nil || isNil(o.Count) {
-    return nil, false
+	if o == nil || o.Count == nil {
+		return nil, false
 	}
 	return o.Count, true
 }
 
 // HasCount returns a boolean if a field has been set.
 func (o *ExcessResource) HasCount() bool {
-	if o != nil && !isNil(o.Count) {
+	if o != nil && o.Count != nil {
 		return true
 	}
 
@@ -263,7 +263,7 @@ func (o *ExcessResource) SetCount(v int32) {
 
 // GetResourceName returns the ResourceName field value if set, zero value otherwise.
 func (o *ExcessResource) GetResourceName() string {
-	if o == nil || isNil(o.ResourceName) {
+	if o == nil || o.ResourceName == nil {
 		var ret string
 		return ret
 	}
@@ -273,15 +273,15 @@ func (o *ExcessResource) GetResourceName() string {
 // GetResourceNameOk returns a tuple with the ResourceName field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ExcessResource) GetResourceNameOk() (*string, bool) {
-	if o == nil || isNil(o.ResourceName) {
-    return nil, false
+	if o == nil || o.ResourceName == nil {
+		return nil, false
 	}
 	return o.ResourceName, true
 }
 
 // HasResourceName returns a boolean if a field has been set.
 func (o *ExcessResource) HasResourceName() bool {
-	if o != nil && !isNil(o.ResourceName) {
+	if o != nil && o.ResourceName != nil {
 		return true
 	}
 
@@ -295,7 +295,7 @@ func (o *ExcessResource) SetResourceName(v string) {
 
 // GetResourceType returns the ResourceType field value if set, zero value otherwise.
 func (o *ExcessResource) GetResourceType() string {
-	if o == nil || isNil(o.ResourceType) {
+	if o == nil || o.ResourceType == nil {
 		var ret string
 		return ret
 	}
@@ -305,15 +305,15 @@ func (o *ExcessResource) GetResourceType() string {
 // GetResourceTypeOk returns a tuple with the ResourceType field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ExcessResource) GetResourceTypeOk() (*string, bool) {
-	if o == nil || isNil(o.ResourceType) {
-    return nil, false
+	if o == nil || o.ResourceType == nil {
+		return nil, false
 	}
 	return o.ResourceType, true
 }
 
 // HasResourceType returns a boolean if a field has been set.
 func (o *ExcessResource) HasResourceType() bool {
-	if o != nil && !isNil(o.ResourceType) {
+	if o != nil && o.ResourceType != nil {
 		return true
 	}
 
@@ -327,31 +327,31 @@ func (o *ExcessResource) SetResourceType(v string) {
 
 func (o ExcessResource) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Href) {
+	if o.Href != nil {
 		toSerialize["href"] = o.Href
 	}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.Kind) {
+	if o.Kind != nil {
 		toSerialize["kind"] = o.Kind
 	}
-	if !isNil(o.AvailabilityZoneType) {
+	if o.AvailabilityZoneType != nil {
 		toSerialize["availability_zone_type"] = o.AvailabilityZoneType
 	}
-	if !isNil(o.BillingModel) {
+	if o.BillingModel != nil {
 		toSerialize["billing_model"] = o.BillingModel
 	}
 	if true {
 		toSerialize["byoc"] = o.Byoc
 	}
-	if !isNil(o.Count) {
+	if o.Count != nil {
 		toSerialize["count"] = o.Count
 	}
-	if !isNil(o.ResourceName) {
+	if o.ResourceName != nil {
 		toSerialize["resource_name"] = o.ResourceName
 	}
-	if !isNil(o.ResourceType) {
+	if o.ResourceType != nil {
 		toSerialize["resource_type"] = o.ResourceType
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_excess_resource_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_excess_resource_all_of.go
index 29a7a90b..f8a2805e 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_excess_resource_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_excess_resource_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -44,7 +44,7 @@ func NewExcessResourceAllOfWithDefaults() *ExcessResourceAllOf {
 
 // GetAvailabilityZoneType returns the AvailabilityZoneType field value if set, zero value otherwise.
 func (o *ExcessResourceAllOf) GetAvailabilityZoneType() string {
-	if o == nil || isNil(o.AvailabilityZoneType) {
+	if o == nil || o.AvailabilityZoneType == nil {
 		var ret string
 		return ret
 	}
@@ -54,15 +54,15 @@ func (o *ExcessResourceAllOf) GetAvailabilityZoneType() string {
 // GetAvailabilityZoneTypeOk returns a tuple with the AvailabilityZoneType field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ExcessResourceAllOf) GetAvailabilityZoneTypeOk() (*string, bool) {
-	if o == nil || isNil(o.AvailabilityZoneType) {
-    return nil, false
+	if o == nil || o.AvailabilityZoneType == nil {
+		return nil, false
 	}
 	return o.AvailabilityZoneType, true
 }
 
 // HasAvailabilityZoneType returns a boolean if a field has been set.
 func (o *ExcessResourceAllOf) HasAvailabilityZoneType() bool {
-	if o != nil && !isNil(o.AvailabilityZoneType) {
+	if o != nil && o.AvailabilityZoneType != nil {
 		return true
 	}
 
@@ -76,7 +76,7 @@ func (o *ExcessResourceAllOf) SetAvailabilityZoneType(v string) {
 
 // GetBillingModel returns the BillingModel field value if set, zero value otherwise.
 func (o *ExcessResourceAllOf) GetBillingModel() string {
-	if o == nil || isNil(o.BillingModel) {
+	if o == nil || o.BillingModel == nil {
 		var ret string
 		return ret
 	}
@@ -86,15 +86,15 @@ func (o *ExcessResourceAllOf) GetBillingModel() string {
 // GetBillingModelOk returns a tuple with the BillingModel field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ExcessResourceAllOf) GetBillingModelOk() (*string, bool) {
-	if o == nil || isNil(o.BillingModel) {
-    return nil, false
+	if o == nil || o.BillingModel == nil {
+		return nil, false
 	}
 	return o.BillingModel, true
 }
 
 // HasBillingModel returns a boolean if a field has been set.
 func (o *ExcessResourceAllOf) HasBillingModel() bool {
-	if o != nil && !isNil(o.BillingModel) {
+	if o != nil && o.BillingModel != nil {
 		return true
 	}
 
@@ -119,8 +119,8 @@ func (o *ExcessResourceAllOf) GetByoc() bool {
 // GetByocOk returns a tuple with the Byoc field value
 // and a boolean to check if the value has been set.
 func (o *ExcessResourceAllOf) GetByocOk() (*bool, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Byoc, true
 }
@@ -132,7 +132,7 @@ func (o *ExcessResourceAllOf) SetByoc(v bool) {
 
 // GetCount returns the Count field value if set, zero value otherwise.
 func (o *ExcessResourceAllOf) GetCount() int32 {
-	if o == nil || isNil(o.Count) {
+	if o == nil || o.Count == nil {
 		var ret int32
 		return ret
 	}
@@ -142,15 +142,15 @@ func (o *ExcessResourceAllOf) GetCount() int32 {
 // GetCountOk returns a tuple with the Count field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ExcessResourceAllOf) GetCountOk() (*int32, bool) {
-	if o == nil || isNil(o.Count) {
-    return nil, false
+	if o == nil || o.Count == nil {
+		return nil, false
 	}
 	return o.Count, true
 }
 
 // HasCount returns a boolean if a field has been set.
 func (o *ExcessResourceAllOf) HasCount() bool {
-	if o != nil && !isNil(o.Count) {
+	if o != nil && o.Count != nil {
 		return true
 	}
 
@@ -164,7 +164,7 @@ func (o *ExcessResourceAllOf) SetCount(v int32) {
 
 // GetResourceName returns the ResourceName field value if set, zero value otherwise.
 func (o *ExcessResourceAllOf) GetResourceName() string {
-	if o == nil || isNil(o.ResourceName) {
+	if o == nil || o.ResourceName == nil {
 		var ret string
 		return ret
 	}
@@ -174,15 +174,15 @@ func (o *ExcessResourceAllOf) GetResourceName() string {
 // GetResourceNameOk returns a tuple with the ResourceName field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ExcessResourceAllOf) GetResourceNameOk() (*string, bool) {
-	if o == nil || isNil(o.ResourceName) {
-    return nil, false
+	if o == nil || o.ResourceName == nil {
+		return nil, false
 	}
 	return o.ResourceName, true
 }
 
 // HasResourceName returns a boolean if a field has been set.
 func (o *ExcessResourceAllOf) HasResourceName() bool {
-	if o != nil && !isNil(o.ResourceName) {
+	if o != nil && o.ResourceName != nil {
 		return true
 	}
 
@@ -196,7 +196,7 @@ func (o *ExcessResourceAllOf) SetResourceName(v string) {
 
 // GetResourceType returns the ResourceType field value if set, zero value otherwise.
 func (o *ExcessResourceAllOf) GetResourceType() string {
-	if o == nil || isNil(o.ResourceType) {
+	if o == nil || o.ResourceType == nil {
 		var ret string
 		return ret
 	}
@@ -206,15 +206,15 @@ func (o *ExcessResourceAllOf) GetResourceType() string {
 // GetResourceTypeOk returns a tuple with the ResourceType field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ExcessResourceAllOf) GetResourceTypeOk() (*string, bool) {
-	if o == nil || isNil(o.ResourceType) {
-    return nil, false
+	if o == nil || o.ResourceType == nil {
+		return nil, false
 	}
 	return o.ResourceType, true
 }
 
 // HasResourceType returns a boolean if a field has been set.
 func (o *ExcessResourceAllOf) HasResourceType() bool {
-	if o != nil && !isNil(o.ResourceType) {
+	if o != nil && o.ResourceType != nil {
 		return true
 	}
 
@@ -228,22 +228,22 @@ func (o *ExcessResourceAllOf) SetResourceType(v string) {
 
 func (o ExcessResourceAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.AvailabilityZoneType) {
+	if o.AvailabilityZoneType != nil {
 		toSerialize["availability_zone_type"] = o.AvailabilityZoneType
 	}
-	if !isNil(o.BillingModel) {
+	if o.BillingModel != nil {
 		toSerialize["billing_model"] = o.BillingModel
 	}
 	if true {
 		toSerialize["byoc"] = o.Byoc
 	}
-	if !isNil(o.Count) {
+	if o.Count != nil {
 		toSerialize["count"] = o.Count
 	}
-	if !isNil(o.ResourceName) {
+	if o.ResourceName != nil {
 		toSerialize["resource_name"] = o.ResourceName
 	}
-	if !isNil(o.ResourceType) {
+	if o.ResourceType != nil {
 		toSerialize["resource_type"] = o.ResourceType
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_export_control_review.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_export_control_review.go
index 7a22455c..d6f90e5f 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_export_control_review.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_export_control_review.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -50,8 +50,8 @@ func (o *ExportControlReview) GetRestricted() bool {
 // GetRestrictedOk returns a tuple with the Restricted field value
 // and a boolean to check if the value has been set.
 func (o *ExportControlReview) GetRestrictedOk() (*bool, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Restricted, true
 }
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_export_control_review_request.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_export_control_review_request.go
index 308a6a75..8b71e99c 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_export_control_review_request.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_export_control_review_request.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -51,8 +51,8 @@ func (o *ExportControlReviewRequest) GetAccountUsername() string {
 // GetAccountUsernameOk returns a tuple with the AccountUsername field value
 // and a boolean to check if the value has been set.
 func (o *ExportControlReviewRequest) GetAccountUsernameOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.AccountUsername, true
 }
@@ -64,7 +64,7 @@ func (o *ExportControlReviewRequest) SetAccountUsername(v string) {
 
 // GetIgnoreCache returns the IgnoreCache field value if set, zero value otherwise.
 func (o *ExportControlReviewRequest) GetIgnoreCache() bool {
-	if o == nil || isNil(o.IgnoreCache) {
+	if o == nil || o.IgnoreCache == nil {
 		var ret bool
 		return ret
 	}
@@ -74,15 +74,15 @@ func (o *ExportControlReviewRequest) GetIgnoreCache() bool {
 // GetIgnoreCacheOk returns a tuple with the IgnoreCache field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ExportControlReviewRequest) GetIgnoreCacheOk() (*bool, bool) {
-	if o == nil || isNil(o.IgnoreCache) {
-    return nil, false
+	if o == nil || o.IgnoreCache == nil {
+		return nil, false
 	}
 	return o.IgnoreCache, true
 }
 
 // HasIgnoreCache returns a boolean if a field has been set.
 func (o *ExportControlReviewRequest) HasIgnoreCache() bool {
-	if o != nil && !isNil(o.IgnoreCache) {
+	if o != nil && o.IgnoreCache != nil {
 		return true
 	}
 
@@ -99,7 +99,7 @@ func (o ExportControlReviewRequest) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["account_username"] = o.AccountUsername
 	}
-	if !isNil(o.IgnoreCache) {
+	if o.IgnoreCache != nil {
 		toSerialize["ignore_cache"] = o.IgnoreCache
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_feature_review.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_feature_review.go
index 0e8f73f4..f88c381d 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_feature_review.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_feature_review.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -41,7 +41,7 @@ func NewFeatureReviewWithDefaults() *FeatureReview {
 
 // GetAccountUsername returns the AccountUsername field value if set, zero value otherwise.
 func (o *FeatureReview) GetAccountUsername() string {
-	if o == nil || isNil(o.AccountUsername) {
+	if o == nil || o.AccountUsername == nil {
 		var ret string
 		return ret
 	}
@@ -51,15 +51,15 @@ func (o *FeatureReview) GetAccountUsername() string {
 // GetAccountUsernameOk returns a tuple with the AccountUsername field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *FeatureReview) GetAccountUsernameOk() (*string, bool) {
-	if o == nil || isNil(o.AccountUsername) {
-    return nil, false
+	if o == nil || o.AccountUsername == nil {
+		return nil, false
 	}
 	return o.AccountUsername, true
 }
 
 // HasAccountUsername returns a boolean if a field has been set.
 func (o *FeatureReview) HasAccountUsername() bool {
-	if o != nil && !isNil(o.AccountUsername) {
+	if o != nil && o.AccountUsername != nil {
 		return true
 	}
 
@@ -84,8 +84,8 @@ func (o *FeatureReview) GetFeature() string {
 // GetFeatureOk returns a tuple with the Feature field value
 // and a boolean to check if the value has been set.
 func (o *FeatureReview) GetFeatureOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Feature, true
 }
@@ -97,7 +97,7 @@ func (o *FeatureReview) SetFeature(v string) {
 
 // GetOrganizationId returns the OrganizationId field value if set, zero value otherwise.
 func (o *FeatureReview) GetOrganizationId() string {
-	if o == nil || isNil(o.OrganizationId) {
+	if o == nil || o.OrganizationId == nil {
 		var ret string
 		return ret
 	}
@@ -107,15 +107,15 @@ func (o *FeatureReview) GetOrganizationId() string {
 // GetOrganizationIdOk returns a tuple with the OrganizationId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *FeatureReview) GetOrganizationIdOk() (*string, bool) {
-	if o == nil || isNil(o.OrganizationId) {
-    return nil, false
+	if o == nil || o.OrganizationId == nil {
+		return nil, false
 	}
 	return o.OrganizationId, true
 }
 
 // HasOrganizationId returns a boolean if a field has been set.
 func (o *FeatureReview) HasOrganizationId() bool {
-	if o != nil && !isNil(o.OrganizationId) {
+	if o != nil && o.OrganizationId != nil {
 		return true
 	}
 
@@ -129,13 +129,13 @@ func (o *FeatureReview) SetOrganizationId(v string) {
 
 func (o FeatureReview) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.AccountUsername) {
+	if o.AccountUsername != nil {
 		toSerialize["account_username"] = o.AccountUsername
 	}
 	if true {
 		toSerialize["feature"] = o.Feature
 	}
-	if !isNil(o.OrganizationId) {
+	if o.OrganizationId != nil {
 		toSerialize["organization_id"] = o.OrganizationId
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_feature_review_response.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_feature_review_response.go
index d0c068e0..a53afbde 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_feature_review_response.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_feature_review_response.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -54,8 +54,8 @@ func (o *FeatureReviewResponse) GetEnabled() bool {
 // GetEnabledOk returns a tuple with the Enabled field value
 // and a boolean to check if the value has been set.
 func (o *FeatureReviewResponse) GetEnabledOk() (*bool, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Enabled, true
 }
@@ -78,8 +78,8 @@ func (o *FeatureReviewResponse) GetFeatureId() string {
 // GetFeatureIdOk returns a tuple with the FeatureId field value
 // and a boolean to check if the value has been set.
 func (o *FeatureReviewResponse) GetFeatureIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.FeatureId, true
 }
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_feature_toggle.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_feature_toggle.go
index 7f943bfa..4843e0e7 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_feature_toggle.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_feature_toggle.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -44,7 +44,7 @@ func NewFeatureToggleWithDefaults() *FeatureToggle {
 
 // GetHref returns the Href field value if set, zero value otherwise.
 func (o *FeatureToggle) GetHref() string {
-	if o == nil || isNil(o.Href) {
+	if o == nil || o.Href == nil {
 		var ret string
 		return ret
 	}
@@ -54,15 +54,15 @@ func (o *FeatureToggle) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *FeatureToggle) GetHrefOk() (*string, bool) {
-	if o == nil || isNil(o.Href) {
-    return nil, false
+	if o == nil || o.Href == nil {
+		return nil, false
 	}
 	return o.Href, true
 }
 
 // HasHref returns a boolean if a field has been set.
 func (o *FeatureToggle) HasHref() bool {
-	if o != nil && !isNil(o.Href) {
+	if o != nil && o.Href != nil {
 		return true
 	}
 
@@ -76,7 +76,7 @@ func (o *FeatureToggle) SetHref(v string) {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *FeatureToggle) GetId() string {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret string
 		return ret
 	}
@@ -86,15 +86,15 @@ func (o *FeatureToggle) GetId() string {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *FeatureToggle) GetIdOk() (*string, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *FeatureToggle) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -108,7 +108,7 @@ func (o *FeatureToggle) SetId(v string) {
 
 // GetKind returns the Kind field value if set, zero value otherwise.
 func (o *FeatureToggle) GetKind() string {
-	if o == nil || isNil(o.Kind) {
+	if o == nil || o.Kind == nil {
 		var ret string
 		return ret
 	}
@@ -118,15 +118,15 @@ func (o *FeatureToggle) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *FeatureToggle) GetKindOk() (*string, bool) {
-	if o == nil || isNil(o.Kind) {
-    return nil, false
+	if o == nil || o.Kind == nil {
+		return nil, false
 	}
 	return o.Kind, true
 }
 
 // HasKind returns a boolean if a field has been set.
 func (o *FeatureToggle) HasKind() bool {
-	if o != nil && !isNil(o.Kind) {
+	if o != nil && o.Kind != nil {
 		return true
 	}
 
@@ -151,8 +151,8 @@ func (o *FeatureToggle) GetEnabled() bool {
 // GetEnabledOk returns a tuple with the Enabled field value
 // and a boolean to check if the value has been set.
 func (o *FeatureToggle) GetEnabledOk() (*bool, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Enabled, true
 }
@@ -164,13 +164,13 @@ func (o *FeatureToggle) SetEnabled(v bool) {
 
 func (o FeatureToggle) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Href) {
+	if o.Href != nil {
 		toSerialize["href"] = o.Href
 	}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.Kind) {
+	if o.Kind != nil {
 		toSerialize["kind"] = o.Kind
 	}
 	if true {
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_feature_toggle_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_feature_toggle_all_of.go
index 0af1fa57..40acfabc 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_feature_toggle_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_feature_toggle_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -52,8 +52,8 @@ func (o *FeatureToggleAllOf) GetEnabled() bool {
 // GetEnabledOk returns a tuple with the Enabled field value
 // and a boolean to check if the value has been set.
 func (o *FeatureToggleAllOf) GetEnabledOk() (*bool, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Enabled, true
 }
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_feature_toggle_query_request.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_feature_toggle_query_request.go
index 67e5a3d7..fcc3a675 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_feature_toggle_query_request.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_feature_toggle_query_request.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -50,8 +50,8 @@ func (o *FeatureToggleQueryRequest) GetOrganizationId() string {
 // GetOrganizationIdOk returns a tuple with the OrganizationId field value
 // and a boolean to check if the value has been set.
 func (o *FeatureToggleQueryRequest) GetOrganizationIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.OrganizationId, true
 }
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_feature_toggle_query_request_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_feature_toggle_query_request_all_of.go
index 733caa93..e54b4645 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_feature_toggle_query_request_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_feature_toggle_query_request_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -50,8 +50,8 @@ func (o *FeatureToggleQueryRequestAllOf) GetOrganizationId() string {
 // GetOrganizationIdOk returns a tuple with the OrganizationId field value
 // and a boolean to check if the value has been set.
 func (o *FeatureToggleQueryRequestAllOf) GetOrganizationIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.OrganizationId, true
 }
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_label.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_label.go
index 1a65c785..a603a227 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_label.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_label.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -12,6 +12,7 @@ package accountmgmtclient
 
 import (
 	"encoding/json"
+	"time"
 )
 
 // Label struct for Label
@@ -52,7 +53,7 @@ func NewLabelWithDefaults() *Label {
 
 // GetHref returns the Href field value if set, zero value otherwise.
 func (o *Label) GetHref() string {
-	if o == nil || isNil(o.Href) {
+	if o == nil || o.Href == nil {
 		var ret string
 		return ret
 	}
@@ -62,15 +63,15 @@ func (o *Label) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Label) GetHrefOk() (*string, bool) {
-	if o == nil || isNil(o.Href) {
-    return nil, false
+	if o == nil || o.Href == nil {
+		return nil, false
 	}
 	return o.Href, true
 }
 
 // HasHref returns a boolean if a field has been set.
 func (o *Label) HasHref() bool {
-	if o != nil && !isNil(o.Href) {
+	if o != nil && o.Href != nil {
 		return true
 	}
 
@@ -84,7 +85,7 @@ func (o *Label) SetHref(v string) {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *Label) GetId() string {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret string
 		return ret
 	}
@@ -94,15 +95,15 @@ func (o *Label) GetId() string {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Label) GetIdOk() (*string, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *Label) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -116,7 +117,7 @@ func (o *Label) SetId(v string) {
 
 // GetKind returns the Kind field value if set, zero value otherwise.
 func (o *Label) GetKind() string {
-	if o == nil || isNil(o.Kind) {
+	if o == nil || o.Kind == nil {
 		var ret string
 		return ret
 	}
@@ -126,15 +127,15 @@ func (o *Label) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Label) GetKindOk() (*string, bool) {
-	if o == nil || isNil(o.Kind) {
-    return nil, false
+	if o == nil || o.Kind == nil {
+		return nil, false
 	}
 	return o.Kind, true
 }
 
 // HasKind returns a boolean if a field has been set.
 func (o *Label) HasKind() bool {
-	if o != nil && !isNil(o.Kind) {
+	if o != nil && o.Kind != nil {
 		return true
 	}
 
@@ -148,7 +149,7 @@ func (o *Label) SetKind(v string) {
 
 // GetAccountId returns the AccountId field value if set, zero value otherwise.
 func (o *Label) GetAccountId() string {
-	if o == nil || isNil(o.AccountId) {
+	if o == nil || o.AccountId == nil {
 		var ret string
 		return ret
 	}
@@ -158,15 +159,15 @@ func (o *Label) GetAccountId() string {
 // GetAccountIdOk returns a tuple with the AccountId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Label) GetAccountIdOk() (*string, bool) {
-	if o == nil || isNil(o.AccountId) {
-    return nil, false
+	if o == nil || o.AccountId == nil {
+		return nil, false
 	}
 	return o.AccountId, true
 }
 
 // HasAccountId returns a boolean if a field has been set.
 func (o *Label) HasAccountId() bool {
-	if o != nil && !isNil(o.AccountId) {
+	if o != nil && o.AccountId != nil {
 		return true
 	}
 
@@ -180,7 +181,7 @@ func (o *Label) SetAccountId(v string) {
 
 // GetCreatedAt returns the CreatedAt field value if set, zero value otherwise.
 func (o *Label) GetCreatedAt() time.Time {
-	if o == nil || isNil(o.CreatedAt) {
+	if o == nil || o.CreatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -190,15 +191,15 @@ func (o *Label) GetCreatedAt() time.Time {
 // GetCreatedAtOk returns a tuple with the CreatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Label) GetCreatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.CreatedAt) {
-    return nil, false
+	if o == nil || o.CreatedAt == nil {
+		return nil, false
 	}
 	return o.CreatedAt, true
 }
 
 // HasCreatedAt returns a boolean if a field has been set.
 func (o *Label) HasCreatedAt() bool {
-	if o != nil && !isNil(o.CreatedAt) {
+	if o != nil && o.CreatedAt != nil {
 		return true
 	}
 
@@ -223,8 +224,8 @@ func (o *Label) GetInternal() bool {
 // GetInternalOk returns a tuple with the Internal field value
 // and a boolean to check if the value has been set.
 func (o *Label) GetInternalOk() (*bool, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Internal, true
 }
@@ -247,8 +248,8 @@ func (o *Label) GetKey() string {
 // GetKeyOk returns a tuple with the Key field value
 // and a boolean to check if the value has been set.
 func (o *Label) GetKeyOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Key, true
 }
@@ -260,7 +261,7 @@ func (o *Label) SetKey(v string) {
 
 // GetOrganizationId returns the OrganizationId field value if set, zero value otherwise.
 func (o *Label) GetOrganizationId() string {
-	if o == nil || isNil(o.OrganizationId) {
+	if o == nil || o.OrganizationId == nil {
 		var ret string
 		return ret
 	}
@@ -270,15 +271,15 @@ func (o *Label) GetOrganizationId() string {
 // GetOrganizationIdOk returns a tuple with the OrganizationId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Label) GetOrganizationIdOk() (*string, bool) {
-	if o == nil || isNil(o.OrganizationId) {
-    return nil, false
+	if o == nil || o.OrganizationId == nil {
+		return nil, false
 	}
 	return o.OrganizationId, true
 }
 
 // HasOrganizationId returns a boolean if a field has been set.
 func (o *Label) HasOrganizationId() bool {
-	if o != nil && !isNil(o.OrganizationId) {
+	if o != nil && o.OrganizationId != nil {
 		return true
 	}
 
@@ -292,7 +293,7 @@ func (o *Label) SetOrganizationId(v string) {
 
 // GetSubscriptionId returns the SubscriptionId field value if set, zero value otherwise.
 func (o *Label) GetSubscriptionId() string {
-	if o == nil || isNil(o.SubscriptionId) {
+	if o == nil || o.SubscriptionId == nil {
 		var ret string
 		return ret
 	}
@@ -302,15 +303,15 @@ func (o *Label) GetSubscriptionId() string {
 // GetSubscriptionIdOk returns a tuple with the SubscriptionId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Label) GetSubscriptionIdOk() (*string, bool) {
-	if o == nil || isNil(o.SubscriptionId) {
-    return nil, false
+	if o == nil || o.SubscriptionId == nil {
+		return nil, false
 	}
 	return o.SubscriptionId, true
 }
 
 // HasSubscriptionId returns a boolean if a field has been set.
 func (o *Label) HasSubscriptionId() bool {
-	if o != nil && !isNil(o.SubscriptionId) {
+	if o != nil && o.SubscriptionId != nil {
 		return true
 	}
 
@@ -324,7 +325,7 @@ func (o *Label) SetSubscriptionId(v string) {
 
 // GetType returns the Type field value if set, zero value otherwise.
 func (o *Label) GetType() string {
-	if o == nil || isNil(o.Type) {
+	if o == nil || o.Type == nil {
 		var ret string
 		return ret
 	}
@@ -334,15 +335,15 @@ func (o *Label) GetType() string {
 // GetTypeOk returns a tuple with the Type field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Label) GetTypeOk() (*string, bool) {
-	if o == nil || isNil(o.Type) {
-    return nil, false
+	if o == nil || o.Type == nil {
+		return nil, false
 	}
 	return o.Type, true
 }
 
 // HasType returns a boolean if a field has been set.
 func (o *Label) HasType() bool {
-	if o != nil && !isNil(o.Type) {
+	if o != nil && o.Type != nil {
 		return true
 	}
 
@@ -356,7 +357,7 @@ func (o *Label) SetType(v string) {
 
 // GetUpdatedAt returns the UpdatedAt field value if set, zero value otherwise.
 func (o *Label) GetUpdatedAt() time.Time {
-	if o == nil || isNil(o.UpdatedAt) {
+	if o == nil || o.UpdatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -366,15 +367,15 @@ func (o *Label) GetUpdatedAt() time.Time {
 // GetUpdatedAtOk returns a tuple with the UpdatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Label) GetUpdatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.UpdatedAt) {
-    return nil, false
+	if o == nil || o.UpdatedAt == nil {
+		return nil, false
 	}
 	return o.UpdatedAt, true
 }
 
 // HasUpdatedAt returns a boolean if a field has been set.
 func (o *Label) HasUpdatedAt() bool {
-	if o != nil && !isNil(o.UpdatedAt) {
+	if o != nil && o.UpdatedAt != nil {
 		return true
 	}
 
@@ -399,8 +400,8 @@ func (o *Label) GetValue() string {
 // GetValueOk returns a tuple with the Value field value
 // and a boolean to check if the value has been set.
 func (o *Label) GetValueOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Value, true
 }
@@ -412,19 +413,19 @@ func (o *Label) SetValue(v string) {
 
 func (o Label) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Href) {
+	if o.Href != nil {
 		toSerialize["href"] = o.Href
 	}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.Kind) {
+	if o.Kind != nil {
 		toSerialize["kind"] = o.Kind
 	}
-	if !isNil(o.AccountId) {
+	if o.AccountId != nil {
 		toSerialize["account_id"] = o.AccountId
 	}
-	if !isNil(o.CreatedAt) {
+	if o.CreatedAt != nil {
 		toSerialize["created_at"] = o.CreatedAt
 	}
 	if true {
@@ -433,16 +434,16 @@ func (o Label) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["key"] = o.Key
 	}
-	if !isNil(o.OrganizationId) {
+	if o.OrganizationId != nil {
 		toSerialize["organization_id"] = o.OrganizationId
 	}
-	if !isNil(o.SubscriptionId) {
+	if o.SubscriptionId != nil {
 		toSerialize["subscription_id"] = o.SubscriptionId
 	}
-	if !isNil(o.Type) {
+	if o.Type != nil {
 		toSerialize["type"] = o.Type
 	}
-	if !isNil(o.UpdatedAt) {
+	if o.UpdatedAt != nil {
 		toSerialize["updated_at"] = o.UpdatedAt
 	}
 	if true {
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_label_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_label_all_of.go
index b441434a..ada339c5 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_label_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_label_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -50,7 +50,7 @@ func NewLabelAllOfWithDefaults() *LabelAllOf {
 
 // GetAccountId returns the AccountId field value if set, zero value otherwise.
 func (o *LabelAllOf) GetAccountId() string {
-	if o == nil || isNil(o.AccountId) {
+	if o == nil || o.AccountId == nil {
 		var ret string
 		return ret
 	}
@@ -60,15 +60,15 @@ func (o *LabelAllOf) GetAccountId() string {
 // GetAccountIdOk returns a tuple with the AccountId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *LabelAllOf) GetAccountIdOk() (*string, bool) {
-	if o == nil || isNil(o.AccountId) {
-    return nil, false
+	if o == nil || o.AccountId == nil {
+		return nil, false
 	}
 	return o.AccountId, true
 }
 
 // HasAccountId returns a boolean if a field has been set.
 func (o *LabelAllOf) HasAccountId() bool {
-	if o != nil && !isNil(o.AccountId) {
+	if o != nil && o.AccountId != nil {
 		return true
 	}
 
@@ -82,7 +82,7 @@ func (o *LabelAllOf) SetAccountId(v string) {
 
 // GetCreatedAt returns the CreatedAt field value if set, zero value otherwise.
 func (o *LabelAllOf) GetCreatedAt() time.Time {
-	if o == nil || isNil(o.CreatedAt) {
+	if o == nil || o.CreatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -92,15 +92,15 @@ func (o *LabelAllOf) GetCreatedAt() time.Time {
 // GetCreatedAtOk returns a tuple with the CreatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *LabelAllOf) GetCreatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.CreatedAt) {
-    return nil, false
+	if o == nil || o.CreatedAt == nil {
+		return nil, false
 	}
 	return o.CreatedAt, true
 }
 
 // HasCreatedAt returns a boolean if a field has been set.
 func (o *LabelAllOf) HasCreatedAt() bool {
-	if o != nil && !isNil(o.CreatedAt) {
+	if o != nil && o.CreatedAt != nil {
 		return true
 	}
 
@@ -125,8 +125,8 @@ func (o *LabelAllOf) GetInternal() bool {
 // GetInternalOk returns a tuple with the Internal field value
 // and a boolean to check if the value has been set.
 func (o *LabelAllOf) GetInternalOk() (*bool, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Internal, true
 }
@@ -149,8 +149,8 @@ func (o *LabelAllOf) GetKey() string {
 // GetKeyOk returns a tuple with the Key field value
 // and a boolean to check if the value has been set.
 func (o *LabelAllOf) GetKeyOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Key, true
 }
@@ -162,7 +162,7 @@ func (o *LabelAllOf) SetKey(v string) {
 
 // GetOrganizationId returns the OrganizationId field value if set, zero value otherwise.
 func (o *LabelAllOf) GetOrganizationId() string {
-	if o == nil || isNil(o.OrganizationId) {
+	if o == nil || o.OrganizationId == nil {
 		var ret string
 		return ret
 	}
@@ -172,15 +172,15 @@ func (o *LabelAllOf) GetOrganizationId() string {
 // GetOrganizationIdOk returns a tuple with the OrganizationId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *LabelAllOf) GetOrganizationIdOk() (*string, bool) {
-	if o == nil || isNil(o.OrganizationId) {
-    return nil, false
+	if o == nil || o.OrganizationId == nil {
+		return nil, false
 	}
 	return o.OrganizationId, true
 }
 
 // HasOrganizationId returns a boolean if a field has been set.
 func (o *LabelAllOf) HasOrganizationId() bool {
-	if o != nil && !isNil(o.OrganizationId) {
+	if o != nil && o.OrganizationId != nil {
 		return true
 	}
 
@@ -194,7 +194,7 @@ func (o *LabelAllOf) SetOrganizationId(v string) {
 
 // GetSubscriptionId returns the SubscriptionId field value if set, zero value otherwise.
 func (o *LabelAllOf) GetSubscriptionId() string {
-	if o == nil || isNil(o.SubscriptionId) {
+	if o == nil || o.SubscriptionId == nil {
 		var ret string
 		return ret
 	}
@@ -204,15 +204,15 @@ func (o *LabelAllOf) GetSubscriptionId() string {
 // GetSubscriptionIdOk returns a tuple with the SubscriptionId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *LabelAllOf) GetSubscriptionIdOk() (*string, bool) {
-	if o == nil || isNil(o.SubscriptionId) {
-    return nil, false
+	if o == nil || o.SubscriptionId == nil {
+		return nil, false
 	}
 	return o.SubscriptionId, true
 }
 
 // HasSubscriptionId returns a boolean if a field has been set.
 func (o *LabelAllOf) HasSubscriptionId() bool {
-	if o != nil && !isNil(o.SubscriptionId) {
+	if o != nil && o.SubscriptionId != nil {
 		return true
 	}
 
@@ -226,7 +226,7 @@ func (o *LabelAllOf) SetSubscriptionId(v string) {
 
 // GetType returns the Type field value if set, zero value otherwise.
 func (o *LabelAllOf) GetType() string {
-	if o == nil || isNil(o.Type) {
+	if o == nil || o.Type == nil {
 		var ret string
 		return ret
 	}
@@ -236,15 +236,15 @@ func (o *LabelAllOf) GetType() string {
 // GetTypeOk returns a tuple with the Type field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *LabelAllOf) GetTypeOk() (*string, bool) {
-	if o == nil || isNil(o.Type) {
-    return nil, false
+	if o == nil || o.Type == nil {
+		return nil, false
 	}
 	return o.Type, true
 }
 
 // HasType returns a boolean if a field has been set.
 func (o *LabelAllOf) HasType() bool {
-	if o != nil && !isNil(o.Type) {
+	if o != nil && o.Type != nil {
 		return true
 	}
 
@@ -258,7 +258,7 @@ func (o *LabelAllOf) SetType(v string) {
 
 // GetUpdatedAt returns the UpdatedAt field value if set, zero value otherwise.
 func (o *LabelAllOf) GetUpdatedAt() time.Time {
-	if o == nil || isNil(o.UpdatedAt) {
+	if o == nil || o.UpdatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -268,15 +268,15 @@ func (o *LabelAllOf) GetUpdatedAt() time.Time {
 // GetUpdatedAtOk returns a tuple with the UpdatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *LabelAllOf) GetUpdatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.UpdatedAt) {
-    return nil, false
+	if o == nil || o.UpdatedAt == nil {
+		return nil, false
 	}
 	return o.UpdatedAt, true
 }
 
 // HasUpdatedAt returns a boolean if a field has been set.
 func (o *LabelAllOf) HasUpdatedAt() bool {
-	if o != nil && !isNil(o.UpdatedAt) {
+	if o != nil && o.UpdatedAt != nil {
 		return true
 	}
 
@@ -301,8 +301,8 @@ func (o *LabelAllOf) GetValue() string {
 // GetValueOk returns a tuple with the Value field value
 // and a boolean to check if the value has been set.
 func (o *LabelAllOf) GetValueOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Value, true
 }
@@ -314,10 +314,10 @@ func (o *LabelAllOf) SetValue(v string) {
 
 func (o LabelAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.AccountId) {
+	if o.AccountId != nil {
 		toSerialize["account_id"] = o.AccountId
 	}
-	if !isNil(o.CreatedAt) {
+	if o.CreatedAt != nil {
 		toSerialize["created_at"] = o.CreatedAt
 	}
 	if true {
@@ -326,16 +326,16 @@ func (o LabelAllOf) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["key"] = o.Key
 	}
-	if !isNil(o.OrganizationId) {
+	if o.OrganizationId != nil {
 		toSerialize["organization_id"] = o.OrganizationId
 	}
-	if !isNil(o.SubscriptionId) {
+	if o.SubscriptionId != nil {
 		toSerialize["subscription_id"] = o.SubscriptionId
 	}
-	if !isNil(o.Type) {
+	if o.Type != nil {
 		toSerialize["type"] = o.Type
 	}
-	if !isNil(o.UpdatedAt) {
+	if o.UpdatedAt != nil {
 		toSerialize["updated_at"] = o.UpdatedAt
 	}
 	if true {
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_label_list.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_label_list.go
index 2c6ff4e1..0b4f799a 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_label_list.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_label_list.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -58,8 +58,8 @@ func (o *LabelList) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *LabelList) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -82,8 +82,8 @@ func (o *LabelList) GetPage() int32 {
 // GetPageOk returns a tuple with the Page field value
 // and a boolean to check if the value has been set.
 func (o *LabelList) GetPageOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Page, true
 }
@@ -106,8 +106,8 @@ func (o *LabelList) GetSize() int32 {
 // GetSizeOk returns a tuple with the Size field value
 // and a boolean to check if the value has been set.
 func (o *LabelList) GetSizeOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Size, true
 }
@@ -130,8 +130,8 @@ func (o *LabelList) GetTotal() int32 {
 // GetTotalOk returns a tuple with the Total field value
 // and a boolean to check if the value has been set.
 func (o *LabelList) GetTotalOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Total, true
 }
@@ -153,11 +153,11 @@ func (o *LabelList) GetItems() []Label {
 
 // GetItemsOk returns a tuple with the Items field value
 // and a boolean to check if the value has been set.
-func (o *LabelList) GetItemsOk() ([]Label, bool) {
-	if o == nil {
-    return nil, false
+func (o *LabelList) GetItemsOk() (*[]Label, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Items, true
+	return &o.Items, true
 }
 
 // SetItems sets field value
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_label_list_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_label_list_all_of.go
index e755b338..bdc47523 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_label_list_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_label_list_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -16,7 +16,7 @@ import (
 
 // LabelListAllOf struct for LabelListAllOf
 type LabelListAllOf struct {
-	Items []Label `json:"items,omitempty"`
+	Items *[]Label `json:"items,omitempty"`
 }
 
 // NewLabelListAllOf instantiates a new LabelListAllOf object
@@ -38,25 +38,25 @@ func NewLabelListAllOfWithDefaults() *LabelListAllOf {
 
 // GetItems returns the Items field value if set, zero value otherwise.
 func (o *LabelListAllOf) GetItems() []Label {
-	if o == nil || isNil(o.Items) {
+	if o == nil || o.Items == nil {
 		var ret []Label
 		return ret
 	}
-	return o.Items
+	return *o.Items
 }
 
 // GetItemsOk returns a tuple with the Items field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *LabelListAllOf) GetItemsOk() ([]Label, bool) {
-	if o == nil || isNil(o.Items) {
-    return nil, false
+func (o *LabelListAllOf) GetItemsOk() (*[]Label, bool) {
+	if o == nil || o.Items == nil {
+		return nil, false
 	}
 	return o.Items, true
 }
 
 // HasItems returns a boolean if a field has been set.
 func (o *LabelListAllOf) HasItems() bool {
-	if o != nil && !isNil(o.Items) {
+	if o != nil && o.Items != nil {
 		return true
 	}
 
@@ -65,12 +65,12 @@ func (o *LabelListAllOf) HasItems() bool {
 
 // SetItems gets a reference to the given []Label and assigns it to the Items field.
 func (o *LabelListAllOf) SetItems(v []Label) {
-	o.Items = v
+	o.Items = &v
 }
 
 func (o LabelListAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Items) {
+	if o.Items != nil {
 		toSerialize["items"] = o.Items
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_landing_page_ctl_item.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_landing_page_ctl_item.go
index 78ac9119..129c02be 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_landing_page_ctl_item.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_landing_page_ctl_item.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -38,7 +38,7 @@ func NewLandingPageCTLItemWithDefaults() *LandingPageCTLItem {
 
 // GetShape returns the Shape field value if set, zero value otherwise.
 func (o *LandingPageCTLItem) GetShape() LandingPageCTLItemShape {
-	if o == nil || isNil(o.Shape) {
+	if o == nil || o.Shape == nil {
 		var ret LandingPageCTLItemShape
 		return ret
 	}
@@ -48,15 +48,15 @@ func (o *LandingPageCTLItem) GetShape() LandingPageCTLItemShape {
 // GetShapeOk returns a tuple with the Shape field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *LandingPageCTLItem) GetShapeOk() (*LandingPageCTLItemShape, bool) {
-	if o == nil || isNil(o.Shape) {
-    return nil, false
+	if o == nil || o.Shape == nil {
+		return nil, false
 	}
 	return o.Shape, true
 }
 
 // HasShape returns a boolean if a field has been set.
 func (o *LandingPageCTLItem) HasShape() bool {
-	if o != nil && !isNil(o.Shape) {
+	if o != nil && o.Shape != nil {
 		return true
 	}
 
@@ -70,7 +70,7 @@ func (o *LandingPageCTLItem) SetShape(v LandingPageCTLItemShape) {
 
 func (o LandingPageCTLItem) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Shape) {
+	if o.Shape != nil {
 		toSerialize["shape"] = o.Shape
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_landing_page_ctl_item_shape.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_landing_page_ctl_item_shape.go
index d6ecca6a..c3964133 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_landing_page_ctl_item_shape.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_landing_page_ctl_item_shape.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -40,7 +40,7 @@ func NewLandingPageCTLItemShapeWithDefaults() *LandingPageCTLItemShape {
 
 // GetDescription returns the Description field value if set, zero value otherwise.
 func (o *LandingPageCTLItemShape) GetDescription() string {
-	if o == nil || isNil(o.Description) {
+	if o == nil || o.Description == nil {
 		var ret string
 		return ret
 	}
@@ -50,15 +50,15 @@ func (o *LandingPageCTLItemShape) GetDescription() string {
 // GetDescriptionOk returns a tuple with the Description field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *LandingPageCTLItemShape) GetDescriptionOk() (*string, bool) {
-	if o == nil || isNil(o.Description) {
-    return nil, false
+	if o == nil || o.Description == nil {
+		return nil, false
 	}
 	return o.Description, true
 }
 
 // HasDescription returns a boolean if a field has been set.
 func (o *LandingPageCTLItemShape) HasDescription() bool {
-	if o != nil && !isNil(o.Description) {
+	if o != nil && o.Description != nil {
 		return true
 	}
 
@@ -72,7 +72,7 @@ func (o *LandingPageCTLItemShape) SetDescription(v string) {
 
 // GetLink returns the Link field value if set, zero value otherwise.
 func (o *LandingPageCTLItemShape) GetLink() LandingPageLinkShape {
-	if o == nil || isNil(o.Link) {
+	if o == nil || o.Link == nil {
 		var ret LandingPageLinkShape
 		return ret
 	}
@@ -82,15 +82,15 @@ func (o *LandingPageCTLItemShape) GetLink() LandingPageLinkShape {
 // GetLinkOk returns a tuple with the Link field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *LandingPageCTLItemShape) GetLinkOk() (*LandingPageLinkShape, bool) {
-	if o == nil || isNil(o.Link) {
-    return nil, false
+	if o == nil || o.Link == nil {
+		return nil, false
 	}
 	return o.Link, true
 }
 
 // HasLink returns a boolean if a field has been set.
 func (o *LandingPageCTLItemShape) HasLink() bool {
-	if o != nil && !isNil(o.Link) {
+	if o != nil && o.Link != nil {
 		return true
 	}
 
@@ -104,7 +104,7 @@ func (o *LandingPageCTLItemShape) SetLink(v LandingPageLinkShape) {
 
 // GetTitle returns the Title field value if set, zero value otherwise.
 func (o *LandingPageCTLItemShape) GetTitle() string {
-	if o == nil || isNil(o.Title) {
+	if o == nil || o.Title == nil {
 		var ret string
 		return ret
 	}
@@ -114,15 +114,15 @@ func (o *LandingPageCTLItemShape) GetTitle() string {
 // GetTitleOk returns a tuple with the Title field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *LandingPageCTLItemShape) GetTitleOk() (*string, bool) {
-	if o == nil || isNil(o.Title) {
-    return nil, false
+	if o == nil || o.Title == nil {
+		return nil, false
 	}
 	return o.Title, true
 }
 
 // HasTitle returns a boolean if a field has been set.
 func (o *LandingPageCTLItemShape) HasTitle() bool {
-	if o != nil && !isNil(o.Title) {
+	if o != nil && o.Title != nil {
 		return true
 	}
 
@@ -136,13 +136,13 @@ func (o *LandingPageCTLItemShape) SetTitle(v string) {
 
 func (o LandingPageCTLItemShape) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Description) {
+	if o.Description != nil {
 		toSerialize["description"] = o.Description
 	}
-	if !isNil(o.Link) {
+	if o.Link != nil {
 		toSerialize["link"] = o.Link
 	}
-	if !isNil(o.Title) {
+	if o.Title != nil {
 		toSerialize["title"] = o.Title
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_landing_page_estate_item.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_landing_page_estate_item.go
index 13a99b86..c682db06 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_landing_page_estate_item.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_landing_page_estate_item.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -40,7 +40,7 @@ func NewLandingPageEstateItemWithDefaults() *LandingPageEstateItem {
 
 // GetCount returns the Count field value if set, zero value otherwise.
 func (o *LandingPageEstateItem) GetCount() int64 {
-	if o == nil || isNil(o.Count) {
+	if o == nil || o.Count == nil {
 		var ret int64
 		return ret
 	}
@@ -50,15 +50,15 @@ func (o *LandingPageEstateItem) GetCount() int64 {
 // GetCountOk returns a tuple with the Count field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *LandingPageEstateItem) GetCountOk() (*int64, bool) {
-	if o == nil || isNil(o.Count) {
-    return nil, false
+	if o == nil || o.Count == nil {
+		return nil, false
 	}
 	return o.Count, true
 }
 
 // HasCount returns a boolean if a field has been set.
 func (o *LandingPageEstateItem) HasCount() bool {
-	if o != nil && !isNil(o.Count) {
+	if o != nil && o.Count != nil {
 		return true
 	}
 
@@ -72,7 +72,7 @@ func (o *LandingPageEstateItem) SetCount(v int64) {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *LandingPageEstateItem) GetId() string {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret string
 		return ret
 	}
@@ -82,15 +82,15 @@ func (o *LandingPageEstateItem) GetId() string {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *LandingPageEstateItem) GetIdOk() (*string, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *LandingPageEstateItem) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -104,7 +104,7 @@ func (o *LandingPageEstateItem) SetId(v string) {
 
 // GetShape returns the Shape field value if set, zero value otherwise.
 func (o *LandingPageEstateItem) GetShape() LandingPageLinkShape {
-	if o == nil || isNil(o.Shape) {
+	if o == nil || o.Shape == nil {
 		var ret LandingPageLinkShape
 		return ret
 	}
@@ -114,15 +114,15 @@ func (o *LandingPageEstateItem) GetShape() LandingPageLinkShape {
 // GetShapeOk returns a tuple with the Shape field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *LandingPageEstateItem) GetShapeOk() (*LandingPageLinkShape, bool) {
-	if o == nil || isNil(o.Shape) {
-    return nil, false
+	if o == nil || o.Shape == nil {
+		return nil, false
 	}
 	return o.Shape, true
 }
 
 // HasShape returns a boolean if a field has been set.
 func (o *LandingPageEstateItem) HasShape() bool {
-	if o != nil && !isNil(o.Shape) {
+	if o != nil && o.Shape != nil {
 		return true
 	}
 
@@ -136,13 +136,13 @@ func (o *LandingPageEstateItem) SetShape(v LandingPageLinkShape) {
 
 func (o LandingPageEstateItem) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Count) {
+	if o.Count != nil {
 		toSerialize["count"] = o.Count
 	}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.Shape) {
+	if o.Shape != nil {
 		toSerialize["shape"] = o.Shape
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_landing_page_link_shape.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_landing_page_link_shape.go
index d582342d..2742255f 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_landing_page_link_shape.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_landing_page_link_shape.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -39,7 +39,7 @@ func NewLandingPageLinkShapeWithDefaults() *LandingPageLinkShape {
 
 // GetHref returns the Href field value if set, zero value otherwise.
 func (o *LandingPageLinkShape) GetHref() string {
-	if o == nil || isNil(o.Href) {
+	if o == nil || o.Href == nil {
 		var ret string
 		return ret
 	}
@@ -49,15 +49,15 @@ func (o *LandingPageLinkShape) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *LandingPageLinkShape) GetHrefOk() (*string, bool) {
-	if o == nil || isNil(o.Href) {
-    return nil, false
+	if o == nil || o.Href == nil {
+		return nil, false
 	}
 	return o.Href, true
 }
 
 // HasHref returns a boolean if a field has been set.
 func (o *LandingPageLinkShape) HasHref() bool {
-	if o != nil && !isNil(o.Href) {
+	if o != nil && o.Href != nil {
 		return true
 	}
 
@@ -71,7 +71,7 @@ func (o *LandingPageLinkShape) SetHref(v string) {
 
 // GetTitle returns the Title field value if set, zero value otherwise.
 func (o *LandingPageLinkShape) GetTitle() string {
-	if o == nil || isNil(o.Title) {
+	if o == nil || o.Title == nil {
 		var ret string
 		return ret
 	}
@@ -81,15 +81,15 @@ func (o *LandingPageLinkShape) GetTitle() string {
 // GetTitleOk returns a tuple with the Title field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *LandingPageLinkShape) GetTitleOk() (*string, bool) {
-	if o == nil || isNil(o.Title) {
-    return nil, false
+	if o == nil || o.Title == nil {
+		return nil, false
 	}
 	return o.Title, true
 }
 
 // HasTitle returns a boolean if a field has been set.
 func (o *LandingPageLinkShape) HasTitle() bool {
-	if o != nil && !isNil(o.Title) {
+	if o != nil && o.Title != nil {
 		return true
 	}
 
@@ -103,10 +103,10 @@ func (o *LandingPageLinkShape) SetTitle(v string) {
 
 func (o LandingPageLinkShape) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Href) {
+	if o.Href != nil {
 		toSerialize["href"] = o.Href
 	}
-	if !isNil(o.Title) {
+	if o.Title != nil {
 		toSerialize["title"] = o.Title
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_list.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_list.go
index 018ded05..a8172d50 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_list.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_list.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -56,8 +56,8 @@ func (o *List) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *List) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -80,8 +80,8 @@ func (o *List) GetPage() int32 {
 // GetPageOk returns a tuple with the Page field value
 // and a boolean to check if the value has been set.
 func (o *List) GetPageOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Page, true
 }
@@ -104,8 +104,8 @@ func (o *List) GetSize() int32 {
 // GetSizeOk returns a tuple with the Size field value
 // and a boolean to check if the value has been set.
 func (o *List) GetSizeOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Size, true
 }
@@ -128,8 +128,8 @@ func (o *List) GetTotal() int32 {
 // GetTotalOk returns a tuple with the Total field value
 // and a boolean to check if the value has been set.
 func (o *List) GetTotalOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Total, true
 }
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_metric.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_metric.go
index e81a6ea1..6d648e02 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_metric.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_metric.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -12,6 +12,7 @@ package accountmgmtclient
 
 import (
 	"encoding/json"
+	"time"
 )
 
 // Metric struct for Metric
@@ -44,7 +45,7 @@ func NewMetricWithDefaults() *Metric {
 
 // GetHref returns the Href field value if set, zero value otherwise.
 func (o *Metric) GetHref() string {
-	if o == nil || isNil(o.Href) {
+	if o == nil || o.Href == nil {
 		var ret string
 		return ret
 	}
@@ -54,15 +55,15 @@ func (o *Metric) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Metric) GetHrefOk() (*string, bool) {
-	if o == nil || isNil(o.Href) {
-    return nil, false
+	if o == nil || o.Href == nil {
+		return nil, false
 	}
 	return o.Href, true
 }
 
 // HasHref returns a boolean if a field has been set.
 func (o *Metric) HasHref() bool {
-	if o != nil && !isNil(o.Href) {
+	if o != nil && o.Href != nil {
 		return true
 	}
 
@@ -76,7 +77,7 @@ func (o *Metric) SetHref(v string) {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *Metric) GetId() string {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret string
 		return ret
 	}
@@ -86,15 +87,15 @@ func (o *Metric) GetId() string {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Metric) GetIdOk() (*string, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *Metric) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -108,7 +109,7 @@ func (o *Metric) SetId(v string) {
 
 // GetKind returns the Kind field value if set, zero value otherwise.
 func (o *Metric) GetKind() string {
-	if o == nil || isNil(o.Kind) {
+	if o == nil || o.Kind == nil {
 		var ret string
 		return ret
 	}
@@ -118,15 +119,15 @@ func (o *Metric) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Metric) GetKindOk() (*string, bool) {
-	if o == nil || isNil(o.Kind) {
-    return nil, false
+	if o == nil || o.Kind == nil {
+		return nil, false
 	}
 	return o.Kind, true
 }
 
 // HasKind returns a boolean if a field has been set.
 func (o *Metric) HasKind() bool {
-	if o != nil && !isNil(o.Kind) {
+	if o != nil && o.Kind != nil {
 		return true
 	}
 
@@ -140,7 +141,7 @@ func (o *Metric) SetKind(v string) {
 
 // GetExternalId returns the ExternalId field value if set, zero value otherwise.
 func (o *Metric) GetExternalId() string {
-	if o == nil || isNil(o.ExternalId) {
+	if o == nil || o.ExternalId == nil {
 		var ret string
 		return ret
 	}
@@ -150,15 +151,15 @@ func (o *Metric) GetExternalId() string {
 // GetExternalIdOk returns a tuple with the ExternalId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Metric) GetExternalIdOk() (*string, bool) {
-	if o == nil || isNil(o.ExternalId) {
-    return nil, false
+	if o == nil || o.ExternalId == nil {
+		return nil, false
 	}
 	return o.ExternalId, true
 }
 
 // HasExternalId returns a boolean if a field has been set.
 func (o *Metric) HasExternalId() bool {
-	if o != nil && !isNil(o.ExternalId) {
+	if o != nil && o.ExternalId != nil {
 		return true
 	}
 
@@ -172,7 +173,7 @@ func (o *Metric) SetExternalId(v string) {
 
 // GetHealthState returns the HealthState field value if set, zero value otherwise.
 func (o *Metric) GetHealthState() string {
-	if o == nil || isNil(o.HealthState) {
+	if o == nil || o.HealthState == nil {
 		var ret string
 		return ret
 	}
@@ -182,15 +183,15 @@ func (o *Metric) GetHealthState() string {
 // GetHealthStateOk returns a tuple with the HealthState field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Metric) GetHealthStateOk() (*string, bool) {
-	if o == nil || isNil(o.HealthState) {
-    return nil, false
+	if o == nil || o.HealthState == nil {
+		return nil, false
 	}
 	return o.HealthState, true
 }
 
 // HasHealthState returns a boolean if a field has been set.
 func (o *Metric) HasHealthState() bool {
-	if o != nil && !isNil(o.HealthState) {
+	if o != nil && o.HealthState != nil {
 		return true
 	}
 
@@ -204,7 +205,7 @@ func (o *Metric) SetHealthState(v string) {
 
 // GetMetrics returns the Metrics field value if set, zero value otherwise.
 func (o *Metric) GetMetrics() string {
-	if o == nil || isNil(o.Metrics) {
+	if o == nil || o.Metrics == nil {
 		var ret string
 		return ret
 	}
@@ -214,15 +215,15 @@ func (o *Metric) GetMetrics() string {
 // GetMetricsOk returns a tuple with the Metrics field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Metric) GetMetricsOk() (*string, bool) {
-	if o == nil || isNil(o.Metrics) {
-    return nil, false
+	if o == nil || o.Metrics == nil {
+		return nil, false
 	}
 	return o.Metrics, true
 }
 
 // HasMetrics returns a boolean if a field has been set.
 func (o *Metric) HasMetrics() bool {
-	if o != nil && !isNil(o.Metrics) {
+	if o != nil && o.Metrics != nil {
 		return true
 	}
 
@@ -236,7 +237,7 @@ func (o *Metric) SetMetrics(v string) {
 
 // GetQueryTimestamp returns the QueryTimestamp field value if set, zero value otherwise.
 func (o *Metric) GetQueryTimestamp() time.Time {
-	if o == nil || isNil(o.QueryTimestamp) {
+	if o == nil || o.QueryTimestamp == nil {
 		var ret time.Time
 		return ret
 	}
@@ -246,15 +247,15 @@ func (o *Metric) GetQueryTimestamp() time.Time {
 // GetQueryTimestampOk returns a tuple with the QueryTimestamp field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Metric) GetQueryTimestampOk() (*time.Time, bool) {
-	if o == nil || isNil(o.QueryTimestamp) {
-    return nil, false
+	if o == nil || o.QueryTimestamp == nil {
+		return nil, false
 	}
 	return o.QueryTimestamp, true
 }
 
 // HasQueryTimestamp returns a boolean if a field has been set.
 func (o *Metric) HasQueryTimestamp() bool {
-	if o != nil && !isNil(o.QueryTimestamp) {
+	if o != nil && o.QueryTimestamp != nil {
 		return true
 	}
 
@@ -268,25 +269,25 @@ func (o *Metric) SetQueryTimestamp(v time.Time) {
 
 func (o Metric) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Href) {
+	if o.Href != nil {
 		toSerialize["href"] = o.Href
 	}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.Kind) {
+	if o.Kind != nil {
 		toSerialize["kind"] = o.Kind
 	}
-	if !isNil(o.ExternalId) {
+	if o.ExternalId != nil {
 		toSerialize["external_id"] = o.ExternalId
 	}
-	if !isNil(o.HealthState) {
+	if o.HealthState != nil {
 		toSerialize["health_state"] = o.HealthState
 	}
-	if !isNil(o.Metrics) {
+	if o.Metrics != nil {
 		toSerialize["metrics"] = o.Metrics
 	}
-	if !isNil(o.QueryTimestamp) {
+	if o.QueryTimestamp != nil {
 		toSerialize["query_timestamp"] = o.QueryTimestamp
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_metric_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_metric_all_of.go
index aea4e16c..9519cb12 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_metric_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_metric_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -43,7 +43,7 @@ func NewMetricAllOfWithDefaults() *MetricAllOf {
 
 // GetExternalId returns the ExternalId field value if set, zero value otherwise.
 func (o *MetricAllOf) GetExternalId() string {
-	if o == nil || isNil(o.ExternalId) {
+	if o == nil || o.ExternalId == nil {
 		var ret string
 		return ret
 	}
@@ -53,15 +53,15 @@ func (o *MetricAllOf) GetExternalId() string {
 // GetExternalIdOk returns a tuple with the ExternalId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *MetricAllOf) GetExternalIdOk() (*string, bool) {
-	if o == nil || isNil(o.ExternalId) {
-    return nil, false
+	if o == nil || o.ExternalId == nil {
+		return nil, false
 	}
 	return o.ExternalId, true
 }
 
 // HasExternalId returns a boolean if a field has been set.
 func (o *MetricAllOf) HasExternalId() bool {
-	if o != nil && !isNil(o.ExternalId) {
+	if o != nil && o.ExternalId != nil {
 		return true
 	}
 
@@ -75,7 +75,7 @@ func (o *MetricAllOf) SetExternalId(v string) {
 
 // GetHealthState returns the HealthState field value if set, zero value otherwise.
 func (o *MetricAllOf) GetHealthState() string {
-	if o == nil || isNil(o.HealthState) {
+	if o == nil || o.HealthState == nil {
 		var ret string
 		return ret
 	}
@@ -85,15 +85,15 @@ func (o *MetricAllOf) GetHealthState() string {
 // GetHealthStateOk returns a tuple with the HealthState field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *MetricAllOf) GetHealthStateOk() (*string, bool) {
-	if o == nil || isNil(o.HealthState) {
-    return nil, false
+	if o == nil || o.HealthState == nil {
+		return nil, false
 	}
 	return o.HealthState, true
 }
 
 // HasHealthState returns a boolean if a field has been set.
 func (o *MetricAllOf) HasHealthState() bool {
-	if o != nil && !isNil(o.HealthState) {
+	if o != nil && o.HealthState != nil {
 		return true
 	}
 
@@ -107,7 +107,7 @@ func (o *MetricAllOf) SetHealthState(v string) {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *MetricAllOf) GetId() string {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret string
 		return ret
 	}
@@ -117,15 +117,15 @@ func (o *MetricAllOf) GetId() string {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *MetricAllOf) GetIdOk() (*string, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *MetricAllOf) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -139,7 +139,7 @@ func (o *MetricAllOf) SetId(v string) {
 
 // GetMetrics returns the Metrics field value if set, zero value otherwise.
 func (o *MetricAllOf) GetMetrics() string {
-	if o == nil || isNil(o.Metrics) {
+	if o == nil || o.Metrics == nil {
 		var ret string
 		return ret
 	}
@@ -149,15 +149,15 @@ func (o *MetricAllOf) GetMetrics() string {
 // GetMetricsOk returns a tuple with the Metrics field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *MetricAllOf) GetMetricsOk() (*string, bool) {
-	if o == nil || isNil(o.Metrics) {
-    return nil, false
+	if o == nil || o.Metrics == nil {
+		return nil, false
 	}
 	return o.Metrics, true
 }
 
 // HasMetrics returns a boolean if a field has been set.
 func (o *MetricAllOf) HasMetrics() bool {
-	if o != nil && !isNil(o.Metrics) {
+	if o != nil && o.Metrics != nil {
 		return true
 	}
 
@@ -171,7 +171,7 @@ func (o *MetricAllOf) SetMetrics(v string) {
 
 // GetQueryTimestamp returns the QueryTimestamp field value if set, zero value otherwise.
 func (o *MetricAllOf) GetQueryTimestamp() time.Time {
-	if o == nil || isNil(o.QueryTimestamp) {
+	if o == nil || o.QueryTimestamp == nil {
 		var ret time.Time
 		return ret
 	}
@@ -181,15 +181,15 @@ func (o *MetricAllOf) GetQueryTimestamp() time.Time {
 // GetQueryTimestampOk returns a tuple with the QueryTimestamp field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *MetricAllOf) GetQueryTimestampOk() (*time.Time, bool) {
-	if o == nil || isNil(o.QueryTimestamp) {
-    return nil, false
+	if o == nil || o.QueryTimestamp == nil {
+		return nil, false
 	}
 	return o.QueryTimestamp, true
 }
 
 // HasQueryTimestamp returns a boolean if a field has been set.
 func (o *MetricAllOf) HasQueryTimestamp() bool {
-	if o != nil && !isNil(o.QueryTimestamp) {
+	if o != nil && o.QueryTimestamp != nil {
 		return true
 	}
 
@@ -203,19 +203,19 @@ func (o *MetricAllOf) SetQueryTimestamp(v time.Time) {
 
 func (o MetricAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.ExternalId) {
+	if o.ExternalId != nil {
 		toSerialize["external_id"] = o.ExternalId
 	}
-	if !isNil(o.HealthState) {
+	if o.HealthState != nil {
 		toSerialize["health_state"] = o.HealthState
 	}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.Metrics) {
+	if o.Metrics != nil {
 		toSerialize["metrics"] = o.Metrics
 	}
-	if !isNil(o.QueryTimestamp) {
+	if o.QueryTimestamp != nil {
 		toSerialize["query_timestamp"] = o.QueryTimestamp
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_metrics_list.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_metrics_list.go
index c891e9e4..fe1b1005 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_metrics_list.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_metrics_list.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -58,8 +58,8 @@ func (o *MetricsList) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *MetricsList) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -82,8 +82,8 @@ func (o *MetricsList) GetPage() int32 {
 // GetPageOk returns a tuple with the Page field value
 // and a boolean to check if the value has been set.
 func (o *MetricsList) GetPageOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Page, true
 }
@@ -106,8 +106,8 @@ func (o *MetricsList) GetSize() int32 {
 // GetSizeOk returns a tuple with the Size field value
 // and a boolean to check if the value has been set.
 func (o *MetricsList) GetSizeOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Size, true
 }
@@ -130,8 +130,8 @@ func (o *MetricsList) GetTotal() int32 {
 // GetTotalOk returns a tuple with the Total field value
 // and a boolean to check if the value has been set.
 func (o *MetricsList) GetTotalOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Total, true
 }
@@ -153,11 +153,11 @@ func (o *MetricsList) GetItems() []Metric {
 
 // GetItemsOk returns a tuple with the Items field value
 // and a boolean to check if the value has been set.
-func (o *MetricsList) GetItemsOk() ([]Metric, bool) {
-	if o == nil {
-    return nil, false
+func (o *MetricsList) GetItemsOk() (*[]Metric, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Items, true
+	return &o.Items, true
 }
 
 // SetItems sets field value
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_metrics_list_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_metrics_list_all_of.go
index 57232f24..bc824a16 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_metrics_list_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_metrics_list_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -16,7 +16,7 @@ import (
 
 // MetricsListAllOf struct for MetricsListAllOf
 type MetricsListAllOf struct {
-	Items []Metric `json:"items,omitempty"`
+	Items *[]Metric `json:"items,omitempty"`
 }
 
 // NewMetricsListAllOf instantiates a new MetricsListAllOf object
@@ -38,25 +38,25 @@ func NewMetricsListAllOfWithDefaults() *MetricsListAllOf {
 
 // GetItems returns the Items field value if set, zero value otherwise.
 func (o *MetricsListAllOf) GetItems() []Metric {
-	if o == nil || isNil(o.Items) {
+	if o == nil || o.Items == nil {
 		var ret []Metric
 		return ret
 	}
-	return o.Items
+	return *o.Items
 }
 
 // GetItemsOk returns a tuple with the Items field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *MetricsListAllOf) GetItemsOk() ([]Metric, bool) {
-	if o == nil || isNil(o.Items) {
-    return nil, false
+func (o *MetricsListAllOf) GetItemsOk() (*[]Metric, bool) {
+	if o == nil || o.Items == nil {
+		return nil, false
 	}
 	return o.Items, true
 }
 
 // HasItems returns a boolean if a field has been set.
 func (o *MetricsListAllOf) HasItems() bool {
-	if o != nil && !isNil(o.Items) {
+	if o != nil && o.Items != nil {
 		return true
 	}
 
@@ -65,12 +65,12 @@ func (o *MetricsListAllOf) HasItems() bool {
 
 // SetItems gets a reference to the given []Metric and assigns it to the Items field.
 func (o *MetricsListAllOf) SetItems(v []Metric) {
-	o.Items = v
+	o.Items = &v
 }
 
 func (o MetricsListAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Items) {
+	if o.Items != nil {
 		toSerialize["items"] = o.Items
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_notification_contact_create_request.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_notification_contact_create_request.go
index 2e789517..9e933405 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_notification_contact_create_request.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_notification_contact_create_request.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -38,7 +38,7 @@ func NewNotificationContactCreateRequestWithDefaults() *NotificationContactCreat
 
 // GetAccountIdentifier returns the AccountIdentifier field value if set, zero value otherwise.
 func (o *NotificationContactCreateRequest) GetAccountIdentifier() string {
-	if o == nil || isNil(o.AccountIdentifier) {
+	if o == nil || o.AccountIdentifier == nil {
 		var ret string
 		return ret
 	}
@@ -48,15 +48,15 @@ func (o *NotificationContactCreateRequest) GetAccountIdentifier() string {
 // GetAccountIdentifierOk returns a tuple with the AccountIdentifier field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *NotificationContactCreateRequest) GetAccountIdentifierOk() (*string, bool) {
-	if o == nil || isNil(o.AccountIdentifier) {
-    return nil, false
+	if o == nil || o.AccountIdentifier == nil {
+		return nil, false
 	}
 	return o.AccountIdentifier, true
 }
 
 // HasAccountIdentifier returns a boolean if a field has been set.
 func (o *NotificationContactCreateRequest) HasAccountIdentifier() bool {
-	if o != nil && !isNil(o.AccountIdentifier) {
+	if o != nil && o.AccountIdentifier != nil {
 		return true
 	}
 
@@ -70,7 +70,7 @@ func (o *NotificationContactCreateRequest) SetAccountIdentifier(v string) {
 
 func (o NotificationContactCreateRequest) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.AccountIdentifier) {
+	if o.AccountIdentifier != nil {
 		toSerialize["account_identifier"] = o.AccountIdentifier
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_notification_request.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_notification_request.go
index 0cb6ffd1..37cbcea7 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_notification_request.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_notification_request.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -24,7 +24,7 @@ type NotificationRequest struct {
 	Subject *string `json:"subject,omitempty"`
 	SubscriptionId *string `json:"subscription_id,omitempty"`
 	TemplateName string `json:"template_name"`
-	TemplateParameters []TemplateParameter `json:"template_parameters,omitempty"`
+	TemplateParameters *[]TemplateParameter `json:"template_parameters,omitempty"`
 }
 
 // NewNotificationRequest instantiates a new NotificationRequest object
@@ -47,7 +47,7 @@ func NewNotificationRequestWithDefaults() *NotificationRequest {
 
 // GetBccAddress returns the BccAddress field value if set, zero value otherwise.
 func (o *NotificationRequest) GetBccAddress() string {
-	if o == nil || isNil(o.BccAddress) {
+	if o == nil || o.BccAddress == nil {
 		var ret string
 		return ret
 	}
@@ -57,15 +57,15 @@ func (o *NotificationRequest) GetBccAddress() string {
 // GetBccAddressOk returns a tuple with the BccAddress field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *NotificationRequest) GetBccAddressOk() (*string, bool) {
-	if o == nil || isNil(o.BccAddress) {
-    return nil, false
+	if o == nil || o.BccAddress == nil {
+		return nil, false
 	}
 	return o.BccAddress, true
 }
 
 // HasBccAddress returns a boolean if a field has been set.
 func (o *NotificationRequest) HasBccAddress() bool {
-	if o != nil && !isNil(o.BccAddress) {
+	if o != nil && o.BccAddress != nil {
 		return true
 	}
 
@@ -79,7 +79,7 @@ func (o *NotificationRequest) SetBccAddress(v string) {
 
 // GetClusterId returns the ClusterId field value if set, zero value otherwise.
 func (o *NotificationRequest) GetClusterId() string {
-	if o == nil || isNil(o.ClusterId) {
+	if o == nil || o.ClusterId == nil {
 		var ret string
 		return ret
 	}
@@ -89,15 +89,15 @@ func (o *NotificationRequest) GetClusterId() string {
 // GetClusterIdOk returns a tuple with the ClusterId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *NotificationRequest) GetClusterIdOk() (*string, bool) {
-	if o == nil || isNil(o.ClusterId) {
-    return nil, false
+	if o == nil || o.ClusterId == nil {
+		return nil, false
 	}
 	return o.ClusterId, true
 }
 
 // HasClusterId returns a boolean if a field has been set.
 func (o *NotificationRequest) HasClusterId() bool {
-	if o != nil && !isNil(o.ClusterId) {
+	if o != nil && o.ClusterId != nil {
 		return true
 	}
 
@@ -111,7 +111,7 @@ func (o *NotificationRequest) SetClusterId(v string) {
 
 // GetClusterUuid returns the ClusterUuid field value if set, zero value otherwise.
 func (o *NotificationRequest) GetClusterUuid() string {
-	if o == nil || isNil(o.ClusterUuid) {
+	if o == nil || o.ClusterUuid == nil {
 		var ret string
 		return ret
 	}
@@ -121,15 +121,15 @@ func (o *NotificationRequest) GetClusterUuid() string {
 // GetClusterUuidOk returns a tuple with the ClusterUuid field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *NotificationRequest) GetClusterUuidOk() (*string, bool) {
-	if o == nil || isNil(o.ClusterUuid) {
-    return nil, false
+	if o == nil || o.ClusterUuid == nil {
+		return nil, false
 	}
 	return o.ClusterUuid, true
 }
 
 // HasClusterUuid returns a boolean if a field has been set.
 func (o *NotificationRequest) HasClusterUuid() bool {
-	if o != nil && !isNil(o.ClusterUuid) {
+	if o != nil && o.ClusterUuid != nil {
 		return true
 	}
 
@@ -143,7 +143,7 @@ func (o *NotificationRequest) SetClusterUuid(v string) {
 
 // GetIncludeRedHatAssociates returns the IncludeRedHatAssociates field value if set, zero value otherwise.
 func (o *NotificationRequest) GetIncludeRedHatAssociates() bool {
-	if o == nil || isNil(o.IncludeRedHatAssociates) {
+	if o == nil || o.IncludeRedHatAssociates == nil {
 		var ret bool
 		return ret
 	}
@@ -153,15 +153,15 @@ func (o *NotificationRequest) GetIncludeRedHatAssociates() bool {
 // GetIncludeRedHatAssociatesOk returns a tuple with the IncludeRedHatAssociates field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *NotificationRequest) GetIncludeRedHatAssociatesOk() (*bool, bool) {
-	if o == nil || isNil(o.IncludeRedHatAssociates) {
-    return nil, false
+	if o == nil || o.IncludeRedHatAssociates == nil {
+		return nil, false
 	}
 	return o.IncludeRedHatAssociates, true
 }
 
 // HasIncludeRedHatAssociates returns a boolean if a field has been set.
 func (o *NotificationRequest) HasIncludeRedHatAssociates() bool {
-	if o != nil && !isNil(o.IncludeRedHatAssociates) {
+	if o != nil && o.IncludeRedHatAssociates != nil {
 		return true
 	}
 
@@ -175,7 +175,7 @@ func (o *NotificationRequest) SetIncludeRedHatAssociates(v bool) {
 
 // GetInternalOnly returns the InternalOnly field value if set, zero value otherwise.
 func (o *NotificationRequest) GetInternalOnly() bool {
-	if o == nil || isNil(o.InternalOnly) {
+	if o == nil || o.InternalOnly == nil {
 		var ret bool
 		return ret
 	}
@@ -185,15 +185,15 @@ func (o *NotificationRequest) GetInternalOnly() bool {
 // GetInternalOnlyOk returns a tuple with the InternalOnly field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *NotificationRequest) GetInternalOnlyOk() (*bool, bool) {
-	if o == nil || isNil(o.InternalOnly) {
-    return nil, false
+	if o == nil || o.InternalOnly == nil {
+		return nil, false
 	}
 	return o.InternalOnly, true
 }
 
 // HasInternalOnly returns a boolean if a field has been set.
 func (o *NotificationRequest) HasInternalOnly() bool {
-	if o != nil && !isNil(o.InternalOnly) {
+	if o != nil && o.InternalOnly != nil {
 		return true
 	}
 
@@ -207,7 +207,7 @@ func (o *NotificationRequest) SetInternalOnly(v bool) {
 
 // GetSubject returns the Subject field value if set, zero value otherwise.
 func (o *NotificationRequest) GetSubject() string {
-	if o == nil || isNil(o.Subject) {
+	if o == nil || o.Subject == nil {
 		var ret string
 		return ret
 	}
@@ -217,15 +217,15 @@ func (o *NotificationRequest) GetSubject() string {
 // GetSubjectOk returns a tuple with the Subject field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *NotificationRequest) GetSubjectOk() (*string, bool) {
-	if o == nil || isNil(o.Subject) {
-    return nil, false
+	if o == nil || o.Subject == nil {
+		return nil, false
 	}
 	return o.Subject, true
 }
 
 // HasSubject returns a boolean if a field has been set.
 func (o *NotificationRequest) HasSubject() bool {
-	if o != nil && !isNil(o.Subject) {
+	if o != nil && o.Subject != nil {
 		return true
 	}
 
@@ -239,7 +239,7 @@ func (o *NotificationRequest) SetSubject(v string) {
 
 // GetSubscriptionId returns the SubscriptionId field value if set, zero value otherwise.
 func (o *NotificationRequest) GetSubscriptionId() string {
-	if o == nil || isNil(o.SubscriptionId) {
+	if o == nil || o.SubscriptionId == nil {
 		var ret string
 		return ret
 	}
@@ -249,15 +249,15 @@ func (o *NotificationRequest) GetSubscriptionId() string {
 // GetSubscriptionIdOk returns a tuple with the SubscriptionId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *NotificationRequest) GetSubscriptionIdOk() (*string, bool) {
-	if o == nil || isNil(o.SubscriptionId) {
-    return nil, false
+	if o == nil || o.SubscriptionId == nil {
+		return nil, false
 	}
 	return o.SubscriptionId, true
 }
 
 // HasSubscriptionId returns a boolean if a field has been set.
 func (o *NotificationRequest) HasSubscriptionId() bool {
-	if o != nil && !isNil(o.SubscriptionId) {
+	if o != nil && o.SubscriptionId != nil {
 		return true
 	}
 
@@ -282,8 +282,8 @@ func (o *NotificationRequest) GetTemplateName() string {
 // GetTemplateNameOk returns a tuple with the TemplateName field value
 // and a boolean to check if the value has been set.
 func (o *NotificationRequest) GetTemplateNameOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.TemplateName, true
 }
@@ -295,25 +295,25 @@ func (o *NotificationRequest) SetTemplateName(v string) {
 
 // GetTemplateParameters returns the TemplateParameters field value if set, zero value otherwise.
 func (o *NotificationRequest) GetTemplateParameters() []TemplateParameter {
-	if o == nil || isNil(o.TemplateParameters) {
+	if o == nil || o.TemplateParameters == nil {
 		var ret []TemplateParameter
 		return ret
 	}
-	return o.TemplateParameters
+	return *o.TemplateParameters
 }
 
 // GetTemplateParametersOk returns a tuple with the TemplateParameters field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *NotificationRequest) GetTemplateParametersOk() ([]TemplateParameter, bool) {
-	if o == nil || isNil(o.TemplateParameters) {
-    return nil, false
+func (o *NotificationRequest) GetTemplateParametersOk() (*[]TemplateParameter, bool) {
+	if o == nil || o.TemplateParameters == nil {
+		return nil, false
 	}
 	return o.TemplateParameters, true
 }
 
 // HasTemplateParameters returns a boolean if a field has been set.
 func (o *NotificationRequest) HasTemplateParameters() bool {
-	if o != nil && !isNil(o.TemplateParameters) {
+	if o != nil && o.TemplateParameters != nil {
 		return true
 	}
 
@@ -322,36 +322,36 @@ func (o *NotificationRequest) HasTemplateParameters() bool {
 
 // SetTemplateParameters gets a reference to the given []TemplateParameter and assigns it to the TemplateParameters field.
 func (o *NotificationRequest) SetTemplateParameters(v []TemplateParameter) {
-	o.TemplateParameters = v
+	o.TemplateParameters = &v
 }
 
 func (o NotificationRequest) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.BccAddress) {
+	if o.BccAddress != nil {
 		toSerialize["bcc_address"] = o.BccAddress
 	}
-	if !isNil(o.ClusterId) {
+	if o.ClusterId != nil {
 		toSerialize["cluster_id"] = o.ClusterId
 	}
-	if !isNil(o.ClusterUuid) {
+	if o.ClusterUuid != nil {
 		toSerialize["cluster_uuid"] = o.ClusterUuid
 	}
-	if !isNil(o.IncludeRedHatAssociates) {
+	if o.IncludeRedHatAssociates != nil {
 		toSerialize["include_red_hat_associates"] = o.IncludeRedHatAssociates
 	}
-	if !isNil(o.InternalOnly) {
+	if o.InternalOnly != nil {
 		toSerialize["internal_only"] = o.InternalOnly
 	}
-	if !isNil(o.Subject) {
+	if o.Subject != nil {
 		toSerialize["subject"] = o.Subject
 	}
-	if !isNil(o.SubscriptionId) {
+	if o.SubscriptionId != nil {
 		toSerialize["subscription_id"] = o.SubscriptionId
 	}
 	if true {
 		toSerialize["template_name"] = o.TemplateName
 	}
-	if !isNil(o.TemplateParameters) {
+	if o.TemplateParameters != nil {
 		toSerialize["template_parameters"] = o.TemplateParameters
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_object_reference.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_object_reference.go
index c5a0da77..fb54eec6 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_object_reference.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_object_reference.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -40,7 +40,7 @@ func NewObjectReferenceWithDefaults() *ObjectReference {
 
 // GetHref returns the Href field value if set, zero value otherwise.
 func (o *ObjectReference) GetHref() string {
-	if o == nil || isNil(o.Href) {
+	if o == nil || o.Href == nil {
 		var ret string
 		return ret
 	}
@@ -50,15 +50,15 @@ func (o *ObjectReference) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ObjectReference) GetHrefOk() (*string, bool) {
-	if o == nil || isNil(o.Href) {
-    return nil, false
+	if o == nil || o.Href == nil {
+		return nil, false
 	}
 	return o.Href, true
 }
 
 // HasHref returns a boolean if a field has been set.
 func (o *ObjectReference) HasHref() bool {
-	if o != nil && !isNil(o.Href) {
+	if o != nil && o.Href != nil {
 		return true
 	}
 
@@ -72,7 +72,7 @@ func (o *ObjectReference) SetHref(v string) {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *ObjectReference) GetId() string {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret string
 		return ret
 	}
@@ -82,15 +82,15 @@ func (o *ObjectReference) GetId() string {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ObjectReference) GetIdOk() (*string, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *ObjectReference) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -104,7 +104,7 @@ func (o *ObjectReference) SetId(v string) {
 
 // GetKind returns the Kind field value if set, zero value otherwise.
 func (o *ObjectReference) GetKind() string {
-	if o == nil || isNil(o.Kind) {
+	if o == nil || o.Kind == nil {
 		var ret string
 		return ret
 	}
@@ -114,15 +114,15 @@ func (o *ObjectReference) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ObjectReference) GetKindOk() (*string, bool) {
-	if o == nil || isNil(o.Kind) {
-    return nil, false
+	if o == nil || o.Kind == nil {
+		return nil, false
 	}
 	return o.Kind, true
 }
 
 // HasKind returns a boolean if a field has been set.
 func (o *ObjectReference) HasKind() bool {
-	if o != nil && !isNil(o.Kind) {
+	if o != nil && o.Kind != nil {
 		return true
 	}
 
@@ -136,13 +136,13 @@ func (o *ObjectReference) SetKind(v string) {
 
 func (o ObjectReference) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Href) {
+	if o.Href != nil {
 		toSerialize["href"] = o.Href
 	}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.Kind) {
+	if o.Kind != nil {
 		toSerialize["kind"] = o.Kind
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_one_metric.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_one_metric.go
index 19afc770..46c0b630 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_one_metric.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_one_metric.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -88,7 +88,7 @@ func NewOneMetricWithDefaults() *OneMetric {
 
 // GetArch returns the Arch field value if set, zero value otherwise.
 func (o *OneMetric) GetArch() string {
-	if o == nil || isNil(o.Arch) {
+	if o == nil || o.Arch == nil {
 		var ret string
 		return ret
 	}
@@ -98,15 +98,15 @@ func (o *OneMetric) GetArch() string {
 // GetArchOk returns a tuple with the Arch field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *OneMetric) GetArchOk() (*string, bool) {
-	if o == nil || isNil(o.Arch) {
-    return nil, false
+	if o == nil || o.Arch == nil {
+		return nil, false
 	}
 	return o.Arch, true
 }
 
 // HasArch returns a boolean if a field has been set.
 func (o *OneMetric) HasArch() bool {
-	if o != nil && !isNil(o.Arch) {
+	if o != nil && o.Arch != nil {
 		return true
 	}
 
@@ -120,7 +120,7 @@ func (o *OneMetric) SetArch(v string) {
 
 // GetChannelInfo returns the ChannelInfo field value if set, zero value otherwise.
 func (o *OneMetric) GetChannelInfo() string {
-	if o == nil || isNil(o.ChannelInfo) {
+	if o == nil || o.ChannelInfo == nil {
 		var ret string
 		return ret
 	}
@@ -130,15 +130,15 @@ func (o *OneMetric) GetChannelInfo() string {
 // GetChannelInfoOk returns a tuple with the ChannelInfo field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *OneMetric) GetChannelInfoOk() (*string, bool) {
-	if o == nil || isNil(o.ChannelInfo) {
-    return nil, false
+	if o == nil || o.ChannelInfo == nil {
+		return nil, false
 	}
 	return o.ChannelInfo, true
 }
 
 // HasChannelInfo returns a boolean if a field has been set.
 func (o *OneMetric) HasChannelInfo() bool {
-	if o != nil && !isNil(o.ChannelInfo) {
+	if o != nil && o.ChannelInfo != nil {
 		return true
 	}
 
@@ -163,8 +163,8 @@ func (o *OneMetric) GetCloudProvider() string {
 // GetCloudProviderOk returns a tuple with the CloudProvider field value
 // and a boolean to check if the value has been set.
 func (o *OneMetric) GetCloudProviderOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.CloudProvider, true
 }
@@ -187,8 +187,8 @@ func (o *OneMetric) GetClusterType() string {
 // GetClusterTypeOk returns a tuple with the ClusterType field value
 // and a boolean to check if the value has been set.
 func (o *OneMetric) GetClusterTypeOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.ClusterType, true
 }
@@ -211,8 +211,8 @@ func (o *OneMetric) GetComputeNodesCpu() ClusterResource {
 // GetComputeNodesCpuOk returns a tuple with the ComputeNodesCpu field value
 // and a boolean to check if the value has been set.
 func (o *OneMetric) GetComputeNodesCpuOk() (*ClusterResource, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.ComputeNodesCpu, true
 }
@@ -235,8 +235,8 @@ func (o *OneMetric) GetComputeNodesMemory() ClusterResource {
 // GetComputeNodesMemoryOk returns a tuple with the ComputeNodesMemory field value
 // and a boolean to check if the value has been set.
 func (o *OneMetric) GetComputeNodesMemoryOk() (*ClusterResource, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.ComputeNodesMemory, true
 }
@@ -259,8 +259,8 @@ func (o *OneMetric) GetComputeNodesSockets() ClusterResource {
 // GetComputeNodesSocketsOk returns a tuple with the ComputeNodesSockets field value
 // and a boolean to check if the value has been set.
 func (o *OneMetric) GetComputeNodesSocketsOk() (*ClusterResource, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.ComputeNodesSockets, true
 }
@@ -283,8 +283,8 @@ func (o *OneMetric) GetConsoleUrl() string {
 // GetConsoleUrlOk returns a tuple with the ConsoleUrl field value
 // and a boolean to check if the value has been set.
 func (o *OneMetric) GetConsoleUrlOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.ConsoleUrl, true
 }
@@ -307,8 +307,8 @@ func (o *OneMetric) GetCpu() ClusterResource {
 // GetCpuOk returns a tuple with the Cpu field value
 // and a boolean to check if the value has been set.
 func (o *OneMetric) GetCpuOk() (*ClusterResource, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Cpu, true
 }
@@ -331,8 +331,8 @@ func (o *OneMetric) GetCriticalAlertsFiring() float64 {
 // GetCriticalAlertsFiringOk returns a tuple with the CriticalAlertsFiring field value
 // and a boolean to check if the value has been set.
 func (o *OneMetric) GetCriticalAlertsFiringOk() (*float64, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.CriticalAlertsFiring, true
 }
@@ -344,7 +344,7 @@ func (o *OneMetric) SetCriticalAlertsFiring(v float64) {
 
 // GetHealthState returns the HealthState field value if set, zero value otherwise.
 func (o *OneMetric) GetHealthState() string {
-	if o == nil || isNil(o.HealthState) {
+	if o == nil || o.HealthState == nil {
 		var ret string
 		return ret
 	}
@@ -354,15 +354,15 @@ func (o *OneMetric) GetHealthState() string {
 // GetHealthStateOk returns a tuple with the HealthState field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *OneMetric) GetHealthStateOk() (*string, bool) {
-	if o == nil || isNil(o.HealthState) {
-    return nil, false
+	if o == nil || o.HealthState == nil {
+		return nil, false
 	}
 	return o.HealthState, true
 }
 
 // HasHealthState returns a boolean if a field has been set.
 func (o *OneMetric) HasHealthState() bool {
-	if o != nil && !isNil(o.HealthState) {
+	if o != nil && o.HealthState != nil {
 		return true
 	}
 
@@ -387,8 +387,8 @@ func (o *OneMetric) GetMemory() ClusterResource {
 // GetMemoryOk returns a tuple with the Memory field value
 // and a boolean to check if the value has been set.
 func (o *OneMetric) GetMemoryOk() (*ClusterResource, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Memory, true
 }
@@ -411,8 +411,8 @@ func (o *OneMetric) GetNodes() ClusterMetricsNodes {
 // GetNodesOk returns a tuple with the Nodes field value
 // and a boolean to check if the value has been set.
 func (o *OneMetric) GetNodesOk() (*ClusterMetricsNodes, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Nodes, true
 }
@@ -435,8 +435,8 @@ func (o *OneMetric) GetNonVirtNodes() float64 {
 // GetNonVirtNodesOk returns a tuple with the NonVirtNodes field value
 // and a boolean to check if the value has been set.
 func (o *OneMetric) GetNonVirtNodesOk() (*float64, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.NonVirtNodes, true
 }
@@ -459,8 +459,8 @@ func (o *OneMetric) GetOpenshiftVersion() string {
 // GetOpenshiftVersionOk returns a tuple with the OpenshiftVersion field value
 // and a boolean to check if the value has been set.
 func (o *OneMetric) GetOpenshiftVersionOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.OpenshiftVersion, true
 }
@@ -483,8 +483,8 @@ func (o *OneMetric) GetOperatingSystem() string {
 // GetOperatingSystemOk returns a tuple with the OperatingSystem field value
 // and a boolean to check if the value has been set.
 func (o *OneMetric) GetOperatingSystemOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.OperatingSystem, true
 }
@@ -507,8 +507,8 @@ func (o *OneMetric) GetOperatorsConditionFailing() float64 {
 // GetOperatorsConditionFailingOk returns a tuple with the OperatorsConditionFailing field value
 // and a boolean to check if the value has been set.
 func (o *OneMetric) GetOperatorsConditionFailingOk() (*float64, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.OperatorsConditionFailing, true
 }
@@ -520,7 +520,7 @@ func (o *OneMetric) SetOperatorsConditionFailing(v float64) {
 
 // GetQueryTimestamp returns the QueryTimestamp field value if set, zero value otherwise.
 func (o *OneMetric) GetQueryTimestamp() time.Time {
-	if o == nil || isNil(o.QueryTimestamp) {
+	if o == nil || o.QueryTimestamp == nil {
 		var ret time.Time
 		return ret
 	}
@@ -530,15 +530,15 @@ func (o *OneMetric) GetQueryTimestamp() time.Time {
 // GetQueryTimestampOk returns a tuple with the QueryTimestamp field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *OneMetric) GetQueryTimestampOk() (*time.Time, bool) {
-	if o == nil || isNil(o.QueryTimestamp) {
-    return nil, false
+	if o == nil || o.QueryTimestamp == nil {
+		return nil, false
 	}
 	return o.QueryTimestamp, true
 }
 
 // HasQueryTimestamp returns a boolean if a field has been set.
 func (o *OneMetric) HasQueryTimestamp() bool {
-	if o != nil && !isNil(o.QueryTimestamp) {
+	if o != nil && o.QueryTimestamp != nil {
 		return true
 	}
 
@@ -563,8 +563,8 @@ func (o *OneMetric) GetRegion() string {
 // GetRegionOk returns a tuple with the Region field value
 // and a boolean to check if the value has been set.
 func (o *OneMetric) GetRegionOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Region, true
 }
@@ -587,8 +587,8 @@ func (o *OneMetric) GetSockets() ClusterResource {
 // GetSocketsOk returns a tuple with the Sockets field value
 // and a boolean to check if the value has been set.
 func (o *OneMetric) GetSocketsOk() (*ClusterResource, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Sockets, true
 }
@@ -611,8 +611,8 @@ func (o *OneMetric) GetState() string {
 // GetStateOk returns a tuple with the State field value
 // and a boolean to check if the value has been set.
 func (o *OneMetric) GetStateOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.State, true
 }
@@ -635,8 +635,8 @@ func (o *OneMetric) GetStateDescription() string {
 // GetStateDescriptionOk returns a tuple with the StateDescription field value
 // and a boolean to check if the value has been set.
 func (o *OneMetric) GetStateDescriptionOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.StateDescription, true
 }
@@ -659,8 +659,8 @@ func (o *OneMetric) GetStorage() ClusterResource {
 // GetStorageOk returns a tuple with the Storage field value
 // and a boolean to check if the value has been set.
 func (o *OneMetric) GetStorageOk() (*ClusterResource, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Storage, true
 }
@@ -683,8 +683,8 @@ func (o *OneMetric) GetSubscriptionCpuTotal() float64 {
 // GetSubscriptionCpuTotalOk returns a tuple with the SubscriptionCpuTotal field value
 // and a boolean to check if the value has been set.
 func (o *OneMetric) GetSubscriptionCpuTotalOk() (*float64, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.SubscriptionCpuTotal, true
 }
@@ -707,8 +707,8 @@ func (o *OneMetric) GetSubscriptionObligationExists() float64 {
 // GetSubscriptionObligationExistsOk returns a tuple with the SubscriptionObligationExists field value
 // and a boolean to check if the value has been set.
 func (o *OneMetric) GetSubscriptionObligationExistsOk() (*float64, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.SubscriptionObligationExists, true
 }
@@ -731,8 +731,8 @@ func (o *OneMetric) GetSubscriptionSocketTotal() float64 {
 // GetSubscriptionSocketTotalOk returns a tuple with the SubscriptionSocketTotal field value
 // and a boolean to check if the value has been set.
 func (o *OneMetric) GetSubscriptionSocketTotalOk() (*float64, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.SubscriptionSocketTotal, true
 }
@@ -755,8 +755,8 @@ func (o *OneMetric) GetUpgrade() ClusterUpgrade {
 // GetUpgradeOk returns a tuple with the Upgrade field value
 // and a boolean to check if the value has been set.
 func (o *OneMetric) GetUpgradeOk() (*ClusterUpgrade, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Upgrade, true
 }
@@ -768,10 +768,10 @@ func (o *OneMetric) SetUpgrade(v ClusterUpgrade) {
 
 func (o OneMetric) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Arch) {
+	if o.Arch != nil {
 		toSerialize["arch"] = o.Arch
 	}
-	if !isNil(o.ChannelInfo) {
+	if o.ChannelInfo != nil {
 		toSerialize["channel_info"] = o.ChannelInfo
 	}
 	if true {
@@ -798,7 +798,7 @@ func (o OneMetric) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["critical_alerts_firing"] = o.CriticalAlertsFiring
 	}
-	if !isNil(o.HealthState) {
+	if o.HealthState != nil {
 		toSerialize["health_state"] = o.HealthState
 	}
 	if true {
@@ -819,7 +819,7 @@ func (o OneMetric) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["operators_condition_failing"] = o.OperatorsConditionFailing
 	}
-	if !isNil(o.QueryTimestamp) {
+	if o.QueryTimestamp != nil {
 		toSerialize["query_timestamp"] = o.QueryTimestamp
 	}
 	if true {
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_organization.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_organization.go
index c6d00c8b..8bbdf5a6 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_organization.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_organization.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -12,6 +12,7 @@ package accountmgmtclient
 
 import (
 	"encoding/json"
+	"time"
 )
 
 // Organization struct for Organization
@@ -19,11 +20,11 @@ type Organization struct {
 	Href *string `json:"href,omitempty"`
 	Id *string `json:"id,omitempty"`
 	Kind *string `json:"kind,omitempty"`
-	Capabilities []Capability `json:"capabilities,omitempty"`
+	Capabilities *[]Capability `json:"capabilities,omitempty"`
 	CreatedAt *time.Time `json:"created_at,omitempty"`
 	EbsAccountId *string `json:"ebs_account_id,omitempty"`
 	ExternalId *string `json:"external_id,omitempty"`
-	Labels []Label `json:"labels,omitempty"`
+	Labels *[]Label `json:"labels,omitempty"`
 	Name *string `json:"name,omitempty"`
 	UpdatedAt *time.Time `json:"updated_at,omitempty"`
 }
@@ -47,7 +48,7 @@ func NewOrganizationWithDefaults() *Organization {
 
 // GetHref returns the Href field value if set, zero value otherwise.
 func (o *Organization) GetHref() string {
-	if o == nil || isNil(o.Href) {
+	if o == nil || o.Href == nil {
 		var ret string
 		return ret
 	}
@@ -57,15 +58,15 @@ func (o *Organization) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Organization) GetHrefOk() (*string, bool) {
-	if o == nil || isNil(o.Href) {
-    return nil, false
+	if o == nil || o.Href == nil {
+		return nil, false
 	}
 	return o.Href, true
 }
 
 // HasHref returns a boolean if a field has been set.
 func (o *Organization) HasHref() bool {
-	if o != nil && !isNil(o.Href) {
+	if o != nil && o.Href != nil {
 		return true
 	}
 
@@ -79,7 +80,7 @@ func (o *Organization) SetHref(v string) {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *Organization) GetId() string {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret string
 		return ret
 	}
@@ -89,15 +90,15 @@ func (o *Organization) GetId() string {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Organization) GetIdOk() (*string, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *Organization) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -111,7 +112,7 @@ func (o *Organization) SetId(v string) {
 
 // GetKind returns the Kind field value if set, zero value otherwise.
 func (o *Organization) GetKind() string {
-	if o == nil || isNil(o.Kind) {
+	if o == nil || o.Kind == nil {
 		var ret string
 		return ret
 	}
@@ -121,15 +122,15 @@ func (o *Organization) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Organization) GetKindOk() (*string, bool) {
-	if o == nil || isNil(o.Kind) {
-    return nil, false
+	if o == nil || o.Kind == nil {
+		return nil, false
 	}
 	return o.Kind, true
 }
 
 // HasKind returns a boolean if a field has been set.
 func (o *Organization) HasKind() bool {
-	if o != nil && !isNil(o.Kind) {
+	if o != nil && o.Kind != nil {
 		return true
 	}
 
@@ -143,25 +144,25 @@ func (o *Organization) SetKind(v string) {
 
 // GetCapabilities returns the Capabilities field value if set, zero value otherwise.
 func (o *Organization) GetCapabilities() []Capability {
-	if o == nil || isNil(o.Capabilities) {
+	if o == nil || o.Capabilities == nil {
 		var ret []Capability
 		return ret
 	}
-	return o.Capabilities
+	return *o.Capabilities
 }
 
 // GetCapabilitiesOk returns a tuple with the Capabilities field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *Organization) GetCapabilitiesOk() ([]Capability, bool) {
-	if o == nil || isNil(o.Capabilities) {
-    return nil, false
+func (o *Organization) GetCapabilitiesOk() (*[]Capability, bool) {
+	if o == nil || o.Capabilities == nil {
+		return nil, false
 	}
 	return o.Capabilities, true
 }
 
 // HasCapabilities returns a boolean if a field has been set.
 func (o *Organization) HasCapabilities() bool {
-	if o != nil && !isNil(o.Capabilities) {
+	if o != nil && o.Capabilities != nil {
 		return true
 	}
 
@@ -170,12 +171,12 @@ func (o *Organization) HasCapabilities() bool {
 
 // SetCapabilities gets a reference to the given []Capability and assigns it to the Capabilities field.
 func (o *Organization) SetCapabilities(v []Capability) {
-	o.Capabilities = v
+	o.Capabilities = &v
 }
 
 // GetCreatedAt returns the CreatedAt field value if set, zero value otherwise.
 func (o *Organization) GetCreatedAt() time.Time {
-	if o == nil || isNil(o.CreatedAt) {
+	if o == nil || o.CreatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -185,15 +186,15 @@ func (o *Organization) GetCreatedAt() time.Time {
 // GetCreatedAtOk returns a tuple with the CreatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Organization) GetCreatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.CreatedAt) {
-    return nil, false
+	if o == nil || o.CreatedAt == nil {
+		return nil, false
 	}
 	return o.CreatedAt, true
 }
 
 // HasCreatedAt returns a boolean if a field has been set.
 func (o *Organization) HasCreatedAt() bool {
-	if o != nil && !isNil(o.CreatedAt) {
+	if o != nil && o.CreatedAt != nil {
 		return true
 	}
 
@@ -207,7 +208,7 @@ func (o *Organization) SetCreatedAt(v time.Time) {
 
 // GetEbsAccountId returns the EbsAccountId field value if set, zero value otherwise.
 func (o *Organization) GetEbsAccountId() string {
-	if o == nil || isNil(o.EbsAccountId) {
+	if o == nil || o.EbsAccountId == nil {
 		var ret string
 		return ret
 	}
@@ -217,15 +218,15 @@ func (o *Organization) GetEbsAccountId() string {
 // GetEbsAccountIdOk returns a tuple with the EbsAccountId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Organization) GetEbsAccountIdOk() (*string, bool) {
-	if o == nil || isNil(o.EbsAccountId) {
-    return nil, false
+	if o == nil || o.EbsAccountId == nil {
+		return nil, false
 	}
 	return o.EbsAccountId, true
 }
 
 // HasEbsAccountId returns a boolean if a field has been set.
 func (o *Organization) HasEbsAccountId() bool {
-	if o != nil && !isNil(o.EbsAccountId) {
+	if o != nil && o.EbsAccountId != nil {
 		return true
 	}
 
@@ -239,7 +240,7 @@ func (o *Organization) SetEbsAccountId(v string) {
 
 // GetExternalId returns the ExternalId field value if set, zero value otherwise.
 func (o *Organization) GetExternalId() string {
-	if o == nil || isNil(o.ExternalId) {
+	if o == nil || o.ExternalId == nil {
 		var ret string
 		return ret
 	}
@@ -249,15 +250,15 @@ func (o *Organization) GetExternalId() string {
 // GetExternalIdOk returns a tuple with the ExternalId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Organization) GetExternalIdOk() (*string, bool) {
-	if o == nil || isNil(o.ExternalId) {
-    return nil, false
+	if o == nil || o.ExternalId == nil {
+		return nil, false
 	}
 	return o.ExternalId, true
 }
 
 // HasExternalId returns a boolean if a field has been set.
 func (o *Organization) HasExternalId() bool {
-	if o != nil && !isNil(o.ExternalId) {
+	if o != nil && o.ExternalId != nil {
 		return true
 	}
 
@@ -271,25 +272,25 @@ func (o *Organization) SetExternalId(v string) {
 
 // GetLabels returns the Labels field value if set, zero value otherwise.
 func (o *Organization) GetLabels() []Label {
-	if o == nil || isNil(o.Labels) {
+	if o == nil || o.Labels == nil {
 		var ret []Label
 		return ret
 	}
-	return o.Labels
+	return *o.Labels
 }
 
 // GetLabelsOk returns a tuple with the Labels field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *Organization) GetLabelsOk() ([]Label, bool) {
-	if o == nil || isNil(o.Labels) {
-    return nil, false
+func (o *Organization) GetLabelsOk() (*[]Label, bool) {
+	if o == nil || o.Labels == nil {
+		return nil, false
 	}
 	return o.Labels, true
 }
 
 // HasLabels returns a boolean if a field has been set.
 func (o *Organization) HasLabels() bool {
-	if o != nil && !isNil(o.Labels) {
+	if o != nil && o.Labels != nil {
 		return true
 	}
 
@@ -298,12 +299,12 @@ func (o *Organization) HasLabels() bool {
 
 // SetLabels gets a reference to the given []Label and assigns it to the Labels field.
 func (o *Organization) SetLabels(v []Label) {
-	o.Labels = v
+	o.Labels = &v
 }
 
 // GetName returns the Name field value if set, zero value otherwise.
 func (o *Organization) GetName() string {
-	if o == nil || isNil(o.Name) {
+	if o == nil || o.Name == nil {
 		var ret string
 		return ret
 	}
@@ -313,15 +314,15 @@ func (o *Organization) GetName() string {
 // GetNameOk returns a tuple with the Name field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Organization) GetNameOk() (*string, bool) {
-	if o == nil || isNil(o.Name) {
-    return nil, false
+	if o == nil || o.Name == nil {
+		return nil, false
 	}
 	return o.Name, true
 }
 
 // HasName returns a boolean if a field has been set.
 func (o *Organization) HasName() bool {
-	if o != nil && !isNil(o.Name) {
+	if o != nil && o.Name != nil {
 		return true
 	}
 
@@ -335,7 +336,7 @@ func (o *Organization) SetName(v string) {
 
 // GetUpdatedAt returns the UpdatedAt field value if set, zero value otherwise.
 func (o *Organization) GetUpdatedAt() time.Time {
-	if o == nil || isNil(o.UpdatedAt) {
+	if o == nil || o.UpdatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -345,15 +346,15 @@ func (o *Organization) GetUpdatedAt() time.Time {
 // GetUpdatedAtOk returns a tuple with the UpdatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Organization) GetUpdatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.UpdatedAt) {
-    return nil, false
+	if o == nil || o.UpdatedAt == nil {
+		return nil, false
 	}
 	return o.UpdatedAt, true
 }
 
 // HasUpdatedAt returns a boolean if a field has been set.
 func (o *Organization) HasUpdatedAt() bool {
-	if o != nil && !isNil(o.UpdatedAt) {
+	if o != nil && o.UpdatedAt != nil {
 		return true
 	}
 
@@ -367,34 +368,34 @@ func (o *Organization) SetUpdatedAt(v time.Time) {
 
 func (o Organization) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Href) {
+	if o.Href != nil {
 		toSerialize["href"] = o.Href
 	}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.Kind) {
+	if o.Kind != nil {
 		toSerialize["kind"] = o.Kind
 	}
-	if !isNil(o.Capabilities) {
+	if o.Capabilities != nil {
 		toSerialize["capabilities"] = o.Capabilities
 	}
-	if !isNil(o.CreatedAt) {
+	if o.CreatedAt != nil {
 		toSerialize["created_at"] = o.CreatedAt
 	}
-	if !isNil(o.EbsAccountId) {
+	if o.EbsAccountId != nil {
 		toSerialize["ebs_account_id"] = o.EbsAccountId
 	}
-	if !isNil(o.ExternalId) {
+	if o.ExternalId != nil {
 		toSerialize["external_id"] = o.ExternalId
 	}
-	if !isNil(o.Labels) {
+	if o.Labels != nil {
 		toSerialize["labels"] = o.Labels
 	}
-	if !isNil(o.Name) {
+	if o.Name != nil {
 		toSerialize["name"] = o.Name
 	}
-	if !isNil(o.UpdatedAt) {
+	if o.UpdatedAt != nil {
 		toSerialize["updated_at"] = o.UpdatedAt
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_organization_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_organization_all_of.go
index dfee43ca..1ad9d43e 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_organization_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_organization_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -17,11 +17,11 @@ import (
 
 // OrganizationAllOf struct for OrganizationAllOf
 type OrganizationAllOf struct {
-	Capabilities []Capability `json:"capabilities,omitempty"`
+	Capabilities *[]Capability `json:"capabilities,omitempty"`
 	CreatedAt *time.Time `json:"created_at,omitempty"`
 	EbsAccountId *string `json:"ebs_account_id,omitempty"`
 	ExternalId *string `json:"external_id,omitempty"`
-	Labels []Label `json:"labels,omitempty"`
+	Labels *[]Label `json:"labels,omitempty"`
 	Name *string `json:"name,omitempty"`
 	UpdatedAt *time.Time `json:"updated_at,omitempty"`
 }
@@ -45,25 +45,25 @@ func NewOrganizationAllOfWithDefaults() *OrganizationAllOf {
 
 // GetCapabilities returns the Capabilities field value if set, zero value otherwise.
 func (o *OrganizationAllOf) GetCapabilities() []Capability {
-	if o == nil || isNil(o.Capabilities) {
+	if o == nil || o.Capabilities == nil {
 		var ret []Capability
 		return ret
 	}
-	return o.Capabilities
+	return *o.Capabilities
 }
 
 // GetCapabilitiesOk returns a tuple with the Capabilities field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *OrganizationAllOf) GetCapabilitiesOk() ([]Capability, bool) {
-	if o == nil || isNil(o.Capabilities) {
-    return nil, false
+func (o *OrganizationAllOf) GetCapabilitiesOk() (*[]Capability, bool) {
+	if o == nil || o.Capabilities == nil {
+		return nil, false
 	}
 	return o.Capabilities, true
 }
 
 // HasCapabilities returns a boolean if a field has been set.
 func (o *OrganizationAllOf) HasCapabilities() bool {
-	if o != nil && !isNil(o.Capabilities) {
+	if o != nil && o.Capabilities != nil {
 		return true
 	}
 
@@ -72,12 +72,12 @@ func (o *OrganizationAllOf) HasCapabilities() bool {
 
 // SetCapabilities gets a reference to the given []Capability and assigns it to the Capabilities field.
 func (o *OrganizationAllOf) SetCapabilities(v []Capability) {
-	o.Capabilities = v
+	o.Capabilities = &v
 }
 
 // GetCreatedAt returns the CreatedAt field value if set, zero value otherwise.
 func (o *OrganizationAllOf) GetCreatedAt() time.Time {
-	if o == nil || isNil(o.CreatedAt) {
+	if o == nil || o.CreatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -87,15 +87,15 @@ func (o *OrganizationAllOf) GetCreatedAt() time.Time {
 // GetCreatedAtOk returns a tuple with the CreatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *OrganizationAllOf) GetCreatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.CreatedAt) {
-    return nil, false
+	if o == nil || o.CreatedAt == nil {
+		return nil, false
 	}
 	return o.CreatedAt, true
 }
 
 // HasCreatedAt returns a boolean if a field has been set.
 func (o *OrganizationAllOf) HasCreatedAt() bool {
-	if o != nil && !isNil(o.CreatedAt) {
+	if o != nil && o.CreatedAt != nil {
 		return true
 	}
 
@@ -109,7 +109,7 @@ func (o *OrganizationAllOf) SetCreatedAt(v time.Time) {
 
 // GetEbsAccountId returns the EbsAccountId field value if set, zero value otherwise.
 func (o *OrganizationAllOf) GetEbsAccountId() string {
-	if o == nil || isNil(o.EbsAccountId) {
+	if o == nil || o.EbsAccountId == nil {
 		var ret string
 		return ret
 	}
@@ -119,15 +119,15 @@ func (o *OrganizationAllOf) GetEbsAccountId() string {
 // GetEbsAccountIdOk returns a tuple with the EbsAccountId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *OrganizationAllOf) GetEbsAccountIdOk() (*string, bool) {
-	if o == nil || isNil(o.EbsAccountId) {
-    return nil, false
+	if o == nil || o.EbsAccountId == nil {
+		return nil, false
 	}
 	return o.EbsAccountId, true
 }
 
 // HasEbsAccountId returns a boolean if a field has been set.
 func (o *OrganizationAllOf) HasEbsAccountId() bool {
-	if o != nil && !isNil(o.EbsAccountId) {
+	if o != nil && o.EbsAccountId != nil {
 		return true
 	}
 
@@ -141,7 +141,7 @@ func (o *OrganizationAllOf) SetEbsAccountId(v string) {
 
 // GetExternalId returns the ExternalId field value if set, zero value otherwise.
 func (o *OrganizationAllOf) GetExternalId() string {
-	if o == nil || isNil(o.ExternalId) {
+	if o == nil || o.ExternalId == nil {
 		var ret string
 		return ret
 	}
@@ -151,15 +151,15 @@ func (o *OrganizationAllOf) GetExternalId() string {
 // GetExternalIdOk returns a tuple with the ExternalId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *OrganizationAllOf) GetExternalIdOk() (*string, bool) {
-	if o == nil || isNil(o.ExternalId) {
-    return nil, false
+	if o == nil || o.ExternalId == nil {
+		return nil, false
 	}
 	return o.ExternalId, true
 }
 
 // HasExternalId returns a boolean if a field has been set.
 func (o *OrganizationAllOf) HasExternalId() bool {
-	if o != nil && !isNil(o.ExternalId) {
+	if o != nil && o.ExternalId != nil {
 		return true
 	}
 
@@ -173,25 +173,25 @@ func (o *OrganizationAllOf) SetExternalId(v string) {
 
 // GetLabels returns the Labels field value if set, zero value otherwise.
 func (o *OrganizationAllOf) GetLabels() []Label {
-	if o == nil || isNil(o.Labels) {
+	if o == nil || o.Labels == nil {
 		var ret []Label
 		return ret
 	}
-	return o.Labels
+	return *o.Labels
 }
 
 // GetLabelsOk returns a tuple with the Labels field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *OrganizationAllOf) GetLabelsOk() ([]Label, bool) {
-	if o == nil || isNil(o.Labels) {
-    return nil, false
+func (o *OrganizationAllOf) GetLabelsOk() (*[]Label, bool) {
+	if o == nil || o.Labels == nil {
+		return nil, false
 	}
 	return o.Labels, true
 }
 
 // HasLabels returns a boolean if a field has been set.
 func (o *OrganizationAllOf) HasLabels() bool {
-	if o != nil && !isNil(o.Labels) {
+	if o != nil && o.Labels != nil {
 		return true
 	}
 
@@ -200,12 +200,12 @@ func (o *OrganizationAllOf) HasLabels() bool {
 
 // SetLabels gets a reference to the given []Label and assigns it to the Labels field.
 func (o *OrganizationAllOf) SetLabels(v []Label) {
-	o.Labels = v
+	o.Labels = &v
 }
 
 // GetName returns the Name field value if set, zero value otherwise.
 func (o *OrganizationAllOf) GetName() string {
-	if o == nil || isNil(o.Name) {
+	if o == nil || o.Name == nil {
 		var ret string
 		return ret
 	}
@@ -215,15 +215,15 @@ func (o *OrganizationAllOf) GetName() string {
 // GetNameOk returns a tuple with the Name field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *OrganizationAllOf) GetNameOk() (*string, bool) {
-	if o == nil || isNil(o.Name) {
-    return nil, false
+	if o == nil || o.Name == nil {
+		return nil, false
 	}
 	return o.Name, true
 }
 
 // HasName returns a boolean if a field has been set.
 func (o *OrganizationAllOf) HasName() bool {
-	if o != nil && !isNil(o.Name) {
+	if o != nil && o.Name != nil {
 		return true
 	}
 
@@ -237,7 +237,7 @@ func (o *OrganizationAllOf) SetName(v string) {
 
 // GetUpdatedAt returns the UpdatedAt field value if set, zero value otherwise.
 func (o *OrganizationAllOf) GetUpdatedAt() time.Time {
-	if o == nil || isNil(o.UpdatedAt) {
+	if o == nil || o.UpdatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -247,15 +247,15 @@ func (o *OrganizationAllOf) GetUpdatedAt() time.Time {
 // GetUpdatedAtOk returns a tuple with the UpdatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *OrganizationAllOf) GetUpdatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.UpdatedAt) {
-    return nil, false
+	if o == nil || o.UpdatedAt == nil {
+		return nil, false
 	}
 	return o.UpdatedAt, true
 }
 
 // HasUpdatedAt returns a boolean if a field has been set.
 func (o *OrganizationAllOf) HasUpdatedAt() bool {
-	if o != nil && !isNil(o.UpdatedAt) {
+	if o != nil && o.UpdatedAt != nil {
 		return true
 	}
 
@@ -269,25 +269,25 @@ func (o *OrganizationAllOf) SetUpdatedAt(v time.Time) {
 
 func (o OrganizationAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Capabilities) {
+	if o.Capabilities != nil {
 		toSerialize["capabilities"] = o.Capabilities
 	}
-	if !isNil(o.CreatedAt) {
+	if o.CreatedAt != nil {
 		toSerialize["created_at"] = o.CreatedAt
 	}
-	if !isNil(o.EbsAccountId) {
+	if o.EbsAccountId != nil {
 		toSerialize["ebs_account_id"] = o.EbsAccountId
 	}
-	if !isNil(o.ExternalId) {
+	if o.ExternalId != nil {
 		toSerialize["external_id"] = o.ExternalId
 	}
-	if !isNil(o.Labels) {
+	if o.Labels != nil {
 		toSerialize["labels"] = o.Labels
 	}
-	if !isNil(o.Name) {
+	if o.Name != nil {
 		toSerialize["name"] = o.Name
 	}
-	if !isNil(o.UpdatedAt) {
+	if o.UpdatedAt != nil {
 		toSerialize["updated_at"] = o.UpdatedAt
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_organization_list.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_organization_list.go
index cb47b8e0..77b3a400 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_organization_list.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_organization_list.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -58,8 +58,8 @@ func (o *OrganizationList) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *OrganizationList) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -82,8 +82,8 @@ func (o *OrganizationList) GetPage() int32 {
 // GetPageOk returns a tuple with the Page field value
 // and a boolean to check if the value has been set.
 func (o *OrganizationList) GetPageOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Page, true
 }
@@ -106,8 +106,8 @@ func (o *OrganizationList) GetSize() int32 {
 // GetSizeOk returns a tuple with the Size field value
 // and a boolean to check if the value has been set.
 func (o *OrganizationList) GetSizeOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Size, true
 }
@@ -130,8 +130,8 @@ func (o *OrganizationList) GetTotal() int32 {
 // GetTotalOk returns a tuple with the Total field value
 // and a boolean to check if the value has been set.
 func (o *OrganizationList) GetTotalOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Total, true
 }
@@ -153,11 +153,11 @@ func (o *OrganizationList) GetItems() []Organization {
 
 // GetItemsOk returns a tuple with the Items field value
 // and a boolean to check if the value has been set.
-func (o *OrganizationList) GetItemsOk() ([]Organization, bool) {
-	if o == nil {
-    return nil, false
+func (o *OrganizationList) GetItemsOk() (*[]Organization, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Items, true
+	return &o.Items, true
 }
 
 // SetItems sets field value
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_organization_list_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_organization_list_all_of.go
index a349e10f..527bbe44 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_organization_list_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_organization_list_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -16,7 +16,7 @@ import (
 
 // OrganizationListAllOf struct for OrganizationListAllOf
 type OrganizationListAllOf struct {
-	Items []Organization `json:"items,omitempty"`
+	Items *[]Organization `json:"items,omitempty"`
 }
 
 // NewOrganizationListAllOf instantiates a new OrganizationListAllOf object
@@ -38,25 +38,25 @@ func NewOrganizationListAllOfWithDefaults() *OrganizationListAllOf {
 
 // GetItems returns the Items field value if set, zero value otherwise.
 func (o *OrganizationListAllOf) GetItems() []Organization {
-	if o == nil || isNil(o.Items) {
+	if o == nil || o.Items == nil {
 		var ret []Organization
 		return ret
 	}
-	return o.Items
+	return *o.Items
 }
 
 // GetItemsOk returns a tuple with the Items field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *OrganizationListAllOf) GetItemsOk() ([]Organization, bool) {
-	if o == nil || isNil(o.Items) {
-    return nil, false
+func (o *OrganizationListAllOf) GetItemsOk() (*[]Organization, bool) {
+	if o == nil || o.Items == nil {
+		return nil, false
 	}
 	return o.Items, true
 }
 
 // HasItems returns a boolean if a field has been set.
 func (o *OrganizationListAllOf) HasItems() bool {
-	if o != nil && !isNil(o.Items) {
+	if o != nil && o.Items != nil {
 		return true
 	}
 
@@ -65,12 +65,12 @@ func (o *OrganizationListAllOf) HasItems() bool {
 
 // SetItems gets a reference to the given []Organization and assigns it to the Items field.
 func (o *OrganizationListAllOf) SetItems(v []Organization) {
-	o.Items = v
+	o.Items = &v
 }
 
 func (o OrganizationListAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Items) {
+	if o.Items != nil {
 		toSerialize["items"] = o.Items
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_organization_patch_request.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_organization_patch_request.go
index e496fceb..7dcd725c 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_organization_patch_request.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_organization_patch_request.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -40,7 +40,7 @@ func NewOrganizationPatchRequestWithDefaults() *OrganizationPatchRequest {
 
 // GetEbsAccountId returns the EbsAccountId field value if set, zero value otherwise.
 func (o *OrganizationPatchRequest) GetEbsAccountId() string {
-	if o == nil || isNil(o.EbsAccountId) {
+	if o == nil || o.EbsAccountId == nil {
 		var ret string
 		return ret
 	}
@@ -50,15 +50,15 @@ func (o *OrganizationPatchRequest) GetEbsAccountId() string {
 // GetEbsAccountIdOk returns a tuple with the EbsAccountId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *OrganizationPatchRequest) GetEbsAccountIdOk() (*string, bool) {
-	if o == nil || isNil(o.EbsAccountId) {
-    return nil, false
+	if o == nil || o.EbsAccountId == nil {
+		return nil, false
 	}
 	return o.EbsAccountId, true
 }
 
 // HasEbsAccountId returns a boolean if a field has been set.
 func (o *OrganizationPatchRequest) HasEbsAccountId() bool {
-	if o != nil && !isNil(o.EbsAccountId) {
+	if o != nil && o.EbsAccountId != nil {
 		return true
 	}
 
@@ -72,7 +72,7 @@ func (o *OrganizationPatchRequest) SetEbsAccountId(v string) {
 
 // GetExternalId returns the ExternalId field value if set, zero value otherwise.
 func (o *OrganizationPatchRequest) GetExternalId() string {
-	if o == nil || isNil(o.ExternalId) {
+	if o == nil || o.ExternalId == nil {
 		var ret string
 		return ret
 	}
@@ -82,15 +82,15 @@ func (o *OrganizationPatchRequest) GetExternalId() string {
 // GetExternalIdOk returns a tuple with the ExternalId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *OrganizationPatchRequest) GetExternalIdOk() (*string, bool) {
-	if o == nil || isNil(o.ExternalId) {
-    return nil, false
+	if o == nil || o.ExternalId == nil {
+		return nil, false
 	}
 	return o.ExternalId, true
 }
 
 // HasExternalId returns a boolean if a field has been set.
 func (o *OrganizationPatchRequest) HasExternalId() bool {
-	if o != nil && !isNil(o.ExternalId) {
+	if o != nil && o.ExternalId != nil {
 		return true
 	}
 
@@ -104,7 +104,7 @@ func (o *OrganizationPatchRequest) SetExternalId(v string) {
 
 // GetName returns the Name field value if set, zero value otherwise.
 func (o *OrganizationPatchRequest) GetName() string {
-	if o == nil || isNil(o.Name) {
+	if o == nil || o.Name == nil {
 		var ret string
 		return ret
 	}
@@ -114,15 +114,15 @@ func (o *OrganizationPatchRequest) GetName() string {
 // GetNameOk returns a tuple with the Name field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *OrganizationPatchRequest) GetNameOk() (*string, bool) {
-	if o == nil || isNil(o.Name) {
-    return nil, false
+	if o == nil || o.Name == nil {
+		return nil, false
 	}
 	return o.Name, true
 }
 
 // HasName returns a boolean if a field has been set.
 func (o *OrganizationPatchRequest) HasName() bool {
-	if o != nil && !isNil(o.Name) {
+	if o != nil && o.Name != nil {
 		return true
 	}
 
@@ -136,13 +136,13 @@ func (o *OrganizationPatchRequest) SetName(v string) {
 
 func (o OrganizationPatchRequest) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.EbsAccountId) {
+	if o.EbsAccountId != nil {
 		toSerialize["ebs_account_id"] = o.EbsAccountId
 	}
-	if !isNil(o.ExternalId) {
+	if o.ExternalId != nil {
 		toSerialize["external_id"] = o.ExternalId
 	}
-	if !isNil(o.Name) {
+	if o.Name != nil {
 		toSerialize["name"] = o.Name
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_permission.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_permission.go
index 3e351a06..90d2aeef 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_permission.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_permission.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -39,7 +39,7 @@ func NewPermissionWithDefaults() *Permission {
 
 // GetAction returns the Action field value if set, zero value otherwise.
 func (o *Permission) GetAction() string {
-	if o == nil || isNil(o.Action) {
+	if o == nil || o.Action == nil {
 		var ret string
 		return ret
 	}
@@ -49,15 +49,15 @@ func (o *Permission) GetAction() string {
 // GetActionOk returns a tuple with the Action field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Permission) GetActionOk() (*string, bool) {
-	if o == nil || isNil(o.Action) {
-    return nil, false
+	if o == nil || o.Action == nil {
+		return nil, false
 	}
 	return o.Action, true
 }
 
 // HasAction returns a boolean if a field has been set.
 func (o *Permission) HasAction() bool {
-	if o != nil && !isNil(o.Action) {
+	if o != nil && o.Action != nil {
 		return true
 	}
 
@@ -71,7 +71,7 @@ func (o *Permission) SetAction(v string) {
 
 // GetResource returns the Resource field value if set, zero value otherwise.
 func (o *Permission) GetResource() string {
-	if o == nil || isNil(o.Resource) {
+	if o == nil || o.Resource == nil {
 		var ret string
 		return ret
 	}
@@ -81,15 +81,15 @@ func (o *Permission) GetResource() string {
 // GetResourceOk returns a tuple with the Resource field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Permission) GetResourceOk() (*string, bool) {
-	if o == nil || isNil(o.Resource) {
-    return nil, false
+	if o == nil || o.Resource == nil {
+		return nil, false
 	}
 	return o.Resource, true
 }
 
 // HasResource returns a boolean if a field has been set.
 func (o *Permission) HasResource() bool {
-	if o != nil && !isNil(o.Resource) {
+	if o != nil && o.Resource != nil {
 		return true
 	}
 
@@ -103,10 +103,10 @@ func (o *Permission) SetResource(v string) {
 
 func (o Permission) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Action) {
+	if o.Action != nil {
 		toSerialize["action"] = o.Action
 	}
-	if !isNil(o.Resource) {
+	if o.Resource != nil {
 		toSerialize["resource"] = o.Resource
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_permission_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_permission_all_of.go
index 87b0cd73..359acf01 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_permission_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_permission_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -39,7 +39,7 @@ func NewPermissionAllOfWithDefaults() *PermissionAllOf {
 
 // GetAction returns the Action field value if set, zero value otherwise.
 func (o *PermissionAllOf) GetAction() string {
-	if o == nil || isNil(o.Action) {
+	if o == nil || o.Action == nil {
 		var ret string
 		return ret
 	}
@@ -49,15 +49,15 @@ func (o *PermissionAllOf) GetAction() string {
 // GetActionOk returns a tuple with the Action field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *PermissionAllOf) GetActionOk() (*string, bool) {
-	if o == nil || isNil(o.Action) {
-    return nil, false
+	if o == nil || o.Action == nil {
+		return nil, false
 	}
 	return o.Action, true
 }
 
 // HasAction returns a boolean if a field has been set.
 func (o *PermissionAllOf) HasAction() bool {
-	if o != nil && !isNil(o.Action) {
+	if o != nil && o.Action != nil {
 		return true
 	}
 
@@ -71,7 +71,7 @@ func (o *PermissionAllOf) SetAction(v string) {
 
 // GetResource returns the Resource field value if set, zero value otherwise.
 func (o *PermissionAllOf) GetResource() string {
-	if o == nil || isNil(o.Resource) {
+	if o == nil || o.Resource == nil {
 		var ret string
 		return ret
 	}
@@ -81,15 +81,15 @@ func (o *PermissionAllOf) GetResource() string {
 // GetResourceOk returns a tuple with the Resource field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *PermissionAllOf) GetResourceOk() (*string, bool) {
-	if o == nil || isNil(o.Resource) {
-    return nil, false
+	if o == nil || o.Resource == nil {
+		return nil, false
 	}
 	return o.Resource, true
 }
 
 // HasResource returns a boolean if a field has been set.
 func (o *PermissionAllOf) HasResource() bool {
-	if o != nil && !isNil(o.Resource) {
+	if o != nil && o.Resource != nil {
 		return true
 	}
 
@@ -103,10 +103,10 @@ func (o *PermissionAllOf) SetResource(v string) {
 
 func (o PermissionAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Action) {
+	if o.Action != nil {
 		toSerialize["action"] = o.Action
 	}
-	if !isNil(o.Resource) {
+	if o.Resource != nil {
 		toSerialize["resource"] = o.Resource
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_permission_list.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_permission_list.go
index d9fda536..7770ab25 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_permission_list.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_permission_list.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -58,8 +58,8 @@ func (o *PermissionList) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *PermissionList) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -82,8 +82,8 @@ func (o *PermissionList) GetPage() int32 {
 // GetPageOk returns a tuple with the Page field value
 // and a boolean to check if the value has been set.
 func (o *PermissionList) GetPageOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Page, true
 }
@@ -106,8 +106,8 @@ func (o *PermissionList) GetSize() int32 {
 // GetSizeOk returns a tuple with the Size field value
 // and a boolean to check if the value has been set.
 func (o *PermissionList) GetSizeOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Size, true
 }
@@ -130,8 +130,8 @@ func (o *PermissionList) GetTotal() int32 {
 // GetTotalOk returns a tuple with the Total field value
 // and a boolean to check if the value has been set.
 func (o *PermissionList) GetTotalOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Total, true
 }
@@ -153,11 +153,11 @@ func (o *PermissionList) GetItems() []Permission {
 
 // GetItemsOk returns a tuple with the Items field value
 // and a boolean to check if the value has been set.
-func (o *PermissionList) GetItemsOk() ([]Permission, bool) {
-	if o == nil {
-    return nil, false
+func (o *PermissionList) GetItemsOk() (*[]Permission, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Items, true
+	return &o.Items, true
 }
 
 // SetItems sets field value
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_permission_list_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_permission_list_all_of.go
index 273f4d9f..83d19553 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_permission_list_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_permission_list_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -16,7 +16,7 @@ import (
 
 // PermissionListAllOf struct for PermissionListAllOf
 type PermissionListAllOf struct {
-	Items []Permission `json:"items,omitempty"`
+	Items *[]Permission `json:"items,omitempty"`
 }
 
 // NewPermissionListAllOf instantiates a new PermissionListAllOf object
@@ -38,25 +38,25 @@ func NewPermissionListAllOfWithDefaults() *PermissionListAllOf {
 
 // GetItems returns the Items field value if set, zero value otherwise.
 func (o *PermissionListAllOf) GetItems() []Permission {
-	if o == nil || isNil(o.Items) {
+	if o == nil || o.Items == nil {
 		var ret []Permission
 		return ret
 	}
-	return o.Items
+	return *o.Items
 }
 
 // GetItemsOk returns a tuple with the Items field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *PermissionListAllOf) GetItemsOk() ([]Permission, bool) {
-	if o == nil || isNil(o.Items) {
-    return nil, false
+func (o *PermissionListAllOf) GetItemsOk() (*[]Permission, bool) {
+	if o == nil || o.Items == nil {
+		return nil, false
 	}
 	return o.Items, true
 }
 
 // HasItems returns a boolean if a field has been set.
 func (o *PermissionListAllOf) HasItems() bool {
-	if o != nil && !isNil(o.Items) {
+	if o != nil && o.Items != nil {
 		return true
 	}
 
@@ -65,12 +65,12 @@ func (o *PermissionListAllOf) HasItems() bool {
 
 // SetItems gets a reference to the given []Permission and assigns it to the Items field.
 func (o *PermissionListAllOf) SetItems(v []Permission) {
-	o.Items = v
+	o.Items = &v
 }
 
 func (o PermissionListAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Items) {
+	if o.Items != nil {
 		toSerialize["items"] = o.Items
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_plan.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_plan.go
index 07440735..e671f2c3 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_plan.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_plan.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -43,7 +43,7 @@ func NewPlanWithDefaults() *Plan {
 
 // GetHref returns the Href field value if set, zero value otherwise.
 func (o *Plan) GetHref() string {
-	if o == nil || isNil(o.Href) {
+	if o == nil || o.Href == nil {
 		var ret string
 		return ret
 	}
@@ -53,15 +53,15 @@ func (o *Plan) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Plan) GetHrefOk() (*string, bool) {
-	if o == nil || isNil(o.Href) {
-    return nil, false
+	if o == nil || o.Href == nil {
+		return nil, false
 	}
 	return o.Href, true
 }
 
 // HasHref returns a boolean if a field has been set.
 func (o *Plan) HasHref() bool {
-	if o != nil && !isNil(o.Href) {
+	if o != nil && o.Href != nil {
 		return true
 	}
 
@@ -75,7 +75,7 @@ func (o *Plan) SetHref(v string) {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *Plan) GetId() string {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret string
 		return ret
 	}
@@ -85,15 +85,15 @@ func (o *Plan) GetId() string {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Plan) GetIdOk() (*string, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *Plan) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -107,7 +107,7 @@ func (o *Plan) SetId(v string) {
 
 // GetKind returns the Kind field value if set, zero value otherwise.
 func (o *Plan) GetKind() string {
-	if o == nil || isNil(o.Kind) {
+	if o == nil || o.Kind == nil {
 		var ret string
 		return ret
 	}
@@ -117,15 +117,15 @@ func (o *Plan) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Plan) GetKindOk() (*string, bool) {
-	if o == nil || isNil(o.Kind) {
-    return nil, false
+	if o == nil || o.Kind == nil {
+		return nil, false
 	}
 	return o.Kind, true
 }
 
 // HasKind returns a boolean if a field has been set.
 func (o *Plan) HasKind() bool {
-	if o != nil && !isNil(o.Kind) {
+	if o != nil && o.Kind != nil {
 		return true
 	}
 
@@ -139,7 +139,7 @@ func (o *Plan) SetKind(v string) {
 
 // GetCategory returns the Category field value if set, zero value otherwise.
 func (o *Plan) GetCategory() string {
-	if o == nil || isNil(o.Category) {
+	if o == nil || o.Category == nil {
 		var ret string
 		return ret
 	}
@@ -149,15 +149,15 @@ func (o *Plan) GetCategory() string {
 // GetCategoryOk returns a tuple with the Category field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Plan) GetCategoryOk() (*string, bool) {
-	if o == nil || isNil(o.Category) {
-    return nil, false
+	if o == nil || o.Category == nil {
+		return nil, false
 	}
 	return o.Category, true
 }
 
 // HasCategory returns a boolean if a field has been set.
 func (o *Plan) HasCategory() bool {
-	if o != nil && !isNil(o.Category) {
+	if o != nil && o.Category != nil {
 		return true
 	}
 
@@ -171,7 +171,7 @@ func (o *Plan) SetCategory(v string) {
 
 // GetName returns the Name field value if set, zero value otherwise.
 func (o *Plan) GetName() string {
-	if o == nil || isNil(o.Name) {
+	if o == nil || o.Name == nil {
 		var ret string
 		return ret
 	}
@@ -181,15 +181,15 @@ func (o *Plan) GetName() string {
 // GetNameOk returns a tuple with the Name field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Plan) GetNameOk() (*string, bool) {
-	if o == nil || isNil(o.Name) {
-    return nil, false
+	if o == nil || o.Name == nil {
+		return nil, false
 	}
 	return o.Name, true
 }
 
 // HasName returns a boolean if a field has been set.
 func (o *Plan) HasName() bool {
-	if o != nil && !isNil(o.Name) {
+	if o != nil && o.Name != nil {
 		return true
 	}
 
@@ -203,7 +203,7 @@ func (o *Plan) SetName(v string) {
 
 // GetType returns the Type field value if set, zero value otherwise.
 func (o *Plan) GetType() string {
-	if o == nil || isNil(o.Type) {
+	if o == nil || o.Type == nil {
 		var ret string
 		return ret
 	}
@@ -213,15 +213,15 @@ func (o *Plan) GetType() string {
 // GetTypeOk returns a tuple with the Type field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Plan) GetTypeOk() (*string, bool) {
-	if o == nil || isNil(o.Type) {
-    return nil, false
+	if o == nil || o.Type == nil {
+		return nil, false
 	}
 	return o.Type, true
 }
 
 // HasType returns a boolean if a field has been set.
 func (o *Plan) HasType() bool {
-	if o != nil && !isNil(o.Type) {
+	if o != nil && o.Type != nil {
 		return true
 	}
 
@@ -235,22 +235,22 @@ func (o *Plan) SetType(v string) {
 
 func (o Plan) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Href) {
+	if o.Href != nil {
 		toSerialize["href"] = o.Href
 	}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.Kind) {
+	if o.Kind != nil {
 		toSerialize["kind"] = o.Kind
 	}
-	if !isNil(o.Category) {
+	if o.Category != nil {
 		toSerialize["category"] = o.Category
 	}
-	if !isNil(o.Name) {
+	if o.Name != nil {
 		toSerialize["name"] = o.Name
 	}
-	if !isNil(o.Type) {
+	if o.Type != nil {
 		toSerialize["type"] = o.Type
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_plan_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_plan_all_of.go
index 48d5c04a..f0fab146 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_plan_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_plan_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -40,7 +40,7 @@ func NewPlanAllOfWithDefaults() *PlanAllOf {
 
 // GetCategory returns the Category field value if set, zero value otherwise.
 func (o *PlanAllOf) GetCategory() string {
-	if o == nil || isNil(o.Category) {
+	if o == nil || o.Category == nil {
 		var ret string
 		return ret
 	}
@@ -50,15 +50,15 @@ func (o *PlanAllOf) GetCategory() string {
 // GetCategoryOk returns a tuple with the Category field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *PlanAllOf) GetCategoryOk() (*string, bool) {
-	if o == nil || isNil(o.Category) {
-    return nil, false
+	if o == nil || o.Category == nil {
+		return nil, false
 	}
 	return o.Category, true
 }
 
 // HasCategory returns a boolean if a field has been set.
 func (o *PlanAllOf) HasCategory() bool {
-	if o != nil && !isNil(o.Category) {
+	if o != nil && o.Category != nil {
 		return true
 	}
 
@@ -72,7 +72,7 @@ func (o *PlanAllOf) SetCategory(v string) {
 
 // GetName returns the Name field value if set, zero value otherwise.
 func (o *PlanAllOf) GetName() string {
-	if o == nil || isNil(o.Name) {
+	if o == nil || o.Name == nil {
 		var ret string
 		return ret
 	}
@@ -82,15 +82,15 @@ func (o *PlanAllOf) GetName() string {
 // GetNameOk returns a tuple with the Name field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *PlanAllOf) GetNameOk() (*string, bool) {
-	if o == nil || isNil(o.Name) {
-    return nil, false
+	if o == nil || o.Name == nil {
+		return nil, false
 	}
 	return o.Name, true
 }
 
 // HasName returns a boolean if a field has been set.
 func (o *PlanAllOf) HasName() bool {
-	if o != nil && !isNil(o.Name) {
+	if o != nil && o.Name != nil {
 		return true
 	}
 
@@ -104,7 +104,7 @@ func (o *PlanAllOf) SetName(v string) {
 
 // GetType returns the Type field value if set, zero value otherwise.
 func (o *PlanAllOf) GetType() string {
-	if o == nil || isNil(o.Type) {
+	if o == nil || o.Type == nil {
 		var ret string
 		return ret
 	}
@@ -114,15 +114,15 @@ func (o *PlanAllOf) GetType() string {
 // GetTypeOk returns a tuple with the Type field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *PlanAllOf) GetTypeOk() (*string, bool) {
-	if o == nil || isNil(o.Type) {
-    return nil, false
+	if o == nil || o.Type == nil {
+		return nil, false
 	}
 	return o.Type, true
 }
 
 // HasType returns a boolean if a field has been set.
 func (o *PlanAllOf) HasType() bool {
-	if o != nil && !isNil(o.Type) {
+	if o != nil && o.Type != nil {
 		return true
 	}
 
@@ -136,13 +136,13 @@ func (o *PlanAllOf) SetType(v string) {
 
 func (o PlanAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Category) {
+	if o.Category != nil {
 		toSerialize["category"] = o.Category
 	}
-	if !isNil(o.Name) {
+	if o.Name != nil {
 		toSerialize["name"] = o.Name
 	}
-	if !isNil(o.Type) {
+	if o.Type != nil {
 		toSerialize["type"] = o.Type
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_plan_list.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_plan_list.go
index bdff743d..24e32819 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_plan_list.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_plan_list.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -58,8 +58,8 @@ func (o *PlanList) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *PlanList) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -82,8 +82,8 @@ func (o *PlanList) GetPage() int32 {
 // GetPageOk returns a tuple with the Page field value
 // and a boolean to check if the value has been set.
 func (o *PlanList) GetPageOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Page, true
 }
@@ -106,8 +106,8 @@ func (o *PlanList) GetSize() int32 {
 // GetSizeOk returns a tuple with the Size field value
 // and a boolean to check if the value has been set.
 func (o *PlanList) GetSizeOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Size, true
 }
@@ -130,8 +130,8 @@ func (o *PlanList) GetTotal() int32 {
 // GetTotalOk returns a tuple with the Total field value
 // and a boolean to check if the value has been set.
 func (o *PlanList) GetTotalOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Total, true
 }
@@ -153,11 +153,11 @@ func (o *PlanList) GetItems() []Plan {
 
 // GetItemsOk returns a tuple with the Items field value
 // and a boolean to check if the value has been set.
-func (o *PlanList) GetItemsOk() ([]Plan, bool) {
-	if o == nil {
-    return nil, false
+func (o *PlanList) GetItemsOk() (*[]Plan, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Items, true
+	return &o.Items, true
 }
 
 // SetItems sets field value
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_plan_list_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_plan_list_all_of.go
index 9ad3bee6..f9baa9f1 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_plan_list_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_plan_list_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -16,7 +16,7 @@ import (
 
 // PlanListAllOf struct for PlanListAllOf
 type PlanListAllOf struct {
-	Items []Plan `json:"items,omitempty"`
+	Items *[]Plan `json:"items,omitempty"`
 }
 
 // NewPlanListAllOf instantiates a new PlanListAllOf object
@@ -38,25 +38,25 @@ func NewPlanListAllOfWithDefaults() *PlanListAllOf {
 
 // GetItems returns the Items field value if set, zero value otherwise.
 func (o *PlanListAllOf) GetItems() []Plan {
-	if o == nil || isNil(o.Items) {
+	if o == nil || o.Items == nil {
 		var ret []Plan
 		return ret
 	}
-	return o.Items
+	return *o.Items
 }
 
 // GetItemsOk returns a tuple with the Items field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *PlanListAllOf) GetItemsOk() ([]Plan, bool) {
-	if o == nil || isNil(o.Items) {
-    return nil, false
+func (o *PlanListAllOf) GetItemsOk() (*[]Plan, bool) {
+	if o == nil || o.Items == nil {
+		return nil, false
 	}
 	return o.Items, true
 }
 
 // HasItems returns a boolean if a field has been set.
 func (o *PlanListAllOf) HasItems() bool {
-	if o != nil && !isNil(o.Items) {
+	if o != nil && o.Items != nil {
 		return true
 	}
 
@@ -65,12 +65,12 @@ func (o *PlanListAllOf) HasItems() bool {
 
 // SetItems gets a reference to the given []Plan and assigns it to the Items field.
 func (o *PlanListAllOf) SetItems(v []Plan) {
-	o.Items = v
+	o.Items = &v
 }
 
 func (o PlanListAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Items) {
+	if o.Items != nil {
 		toSerialize["items"] = o.Items
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_pull_secret_request.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_pull_secret_request.go
index 00cf6d0f..ed891d35 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_pull_secret_request.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_pull_secret_request.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -50,8 +50,8 @@ func (o *PullSecretRequest) GetExternalResourceId() string {
 // GetExternalResourceIdOk returns a tuple with the ExternalResourceId field value
 // and a boolean to check if the value has been set.
 func (o *PullSecretRequest) GetExternalResourceIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.ExternalResourceId, true
 }
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_quota.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_quota.go
index 711e6f22..cb58b79e 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_quota.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_quota.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -12,6 +12,7 @@ package accountmgmtclient
 
 import (
 	"encoding/json"
+	"time"
 )
 
 // Quota struct for Quota
@@ -44,7 +45,7 @@ func NewQuotaWithDefaults() *Quota {
 
 // GetHref returns the Href field value if set, zero value otherwise.
 func (o *Quota) GetHref() string {
-	if o == nil || isNil(o.Href) {
+	if o == nil || o.Href == nil {
 		var ret string
 		return ret
 	}
@@ -54,15 +55,15 @@ func (o *Quota) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Quota) GetHrefOk() (*string, bool) {
-	if o == nil || isNil(o.Href) {
-    return nil, false
+	if o == nil || o.Href == nil {
+		return nil, false
 	}
 	return o.Href, true
 }
 
 // HasHref returns a boolean if a field has been set.
 func (o *Quota) HasHref() bool {
-	if o != nil && !isNil(o.Href) {
+	if o != nil && o.Href != nil {
 		return true
 	}
 
@@ -76,7 +77,7 @@ func (o *Quota) SetHref(v string) {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *Quota) GetId() string {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret string
 		return ret
 	}
@@ -86,15 +87,15 @@ func (o *Quota) GetId() string {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Quota) GetIdOk() (*string, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *Quota) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -108,7 +109,7 @@ func (o *Quota) SetId(v string) {
 
 // GetKind returns the Kind field value if set, zero value otherwise.
 func (o *Quota) GetKind() string {
-	if o == nil || isNil(o.Kind) {
+	if o == nil || o.Kind == nil {
 		var ret string
 		return ret
 	}
@@ -118,15 +119,15 @@ func (o *Quota) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Quota) GetKindOk() (*string, bool) {
-	if o == nil || isNil(o.Kind) {
-    return nil, false
+	if o == nil || o.Kind == nil {
+		return nil, false
 	}
 	return o.Kind, true
 }
 
 // HasKind returns a boolean if a field has been set.
 func (o *Quota) HasKind() bool {
-	if o != nil && !isNil(o.Kind) {
+	if o != nil && o.Kind != nil {
 		return true
 	}
 
@@ -140,7 +141,7 @@ func (o *Quota) SetKind(v string) {
 
 // GetCreatedAt returns the CreatedAt field value if set, zero value otherwise.
 func (o *Quota) GetCreatedAt() time.Time {
-	if o == nil || isNil(o.CreatedAt) {
+	if o == nil || o.CreatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -150,15 +151,15 @@ func (o *Quota) GetCreatedAt() time.Time {
 // GetCreatedAtOk returns a tuple with the CreatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Quota) GetCreatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.CreatedAt) {
-    return nil, false
+	if o == nil || o.CreatedAt == nil {
+		return nil, false
 	}
 	return o.CreatedAt, true
 }
 
 // HasCreatedAt returns a boolean if a field has been set.
 func (o *Quota) HasCreatedAt() bool {
-	if o != nil && !isNil(o.CreatedAt) {
+	if o != nil && o.CreatedAt != nil {
 		return true
 	}
 
@@ -172,7 +173,7 @@ func (o *Quota) SetCreatedAt(v time.Time) {
 
 // GetDescription returns the Description field value if set, zero value otherwise.
 func (o *Quota) GetDescription() string {
-	if o == nil || isNil(o.Description) {
+	if o == nil || o.Description == nil {
 		var ret string
 		return ret
 	}
@@ -182,15 +183,15 @@ func (o *Quota) GetDescription() string {
 // GetDescriptionOk returns a tuple with the Description field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Quota) GetDescriptionOk() (*string, bool) {
-	if o == nil || isNil(o.Description) {
-    return nil, false
+	if o == nil || o.Description == nil {
+		return nil, false
 	}
 	return o.Description, true
 }
 
 // HasDescription returns a boolean if a field has been set.
 func (o *Quota) HasDescription() bool {
-	if o != nil && !isNil(o.Description) {
+	if o != nil && o.Description != nil {
 		return true
 	}
 
@@ -204,7 +205,7 @@ func (o *Quota) SetDescription(v string) {
 
 // GetResourceType returns the ResourceType field value if set, zero value otherwise.
 func (o *Quota) GetResourceType() string {
-	if o == nil || isNil(o.ResourceType) {
+	if o == nil || o.ResourceType == nil {
 		var ret string
 		return ret
 	}
@@ -214,15 +215,15 @@ func (o *Quota) GetResourceType() string {
 // GetResourceTypeOk returns a tuple with the ResourceType field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Quota) GetResourceTypeOk() (*string, bool) {
-	if o == nil || isNil(o.ResourceType) {
-    return nil, false
+	if o == nil || o.ResourceType == nil {
+		return nil, false
 	}
 	return o.ResourceType, true
 }
 
 // HasResourceType returns a boolean if a field has been set.
 func (o *Quota) HasResourceType() bool {
-	if o != nil && !isNil(o.ResourceType) {
+	if o != nil && o.ResourceType != nil {
 		return true
 	}
 
@@ -236,7 +237,7 @@ func (o *Quota) SetResourceType(v string) {
 
 // GetUpdatedAt returns the UpdatedAt field value if set, zero value otherwise.
 func (o *Quota) GetUpdatedAt() time.Time {
-	if o == nil || isNil(o.UpdatedAt) {
+	if o == nil || o.UpdatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -246,15 +247,15 @@ func (o *Quota) GetUpdatedAt() time.Time {
 // GetUpdatedAtOk returns a tuple with the UpdatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Quota) GetUpdatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.UpdatedAt) {
-    return nil, false
+	if o == nil || o.UpdatedAt == nil {
+		return nil, false
 	}
 	return o.UpdatedAt, true
 }
 
 // HasUpdatedAt returns a boolean if a field has been set.
 func (o *Quota) HasUpdatedAt() bool {
-	if o != nil && !isNil(o.UpdatedAt) {
+	if o != nil && o.UpdatedAt != nil {
 		return true
 	}
 
@@ -268,25 +269,25 @@ func (o *Quota) SetUpdatedAt(v time.Time) {
 
 func (o Quota) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Href) {
+	if o.Href != nil {
 		toSerialize["href"] = o.Href
 	}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.Kind) {
+	if o.Kind != nil {
 		toSerialize["kind"] = o.Kind
 	}
-	if !isNil(o.CreatedAt) {
+	if o.CreatedAt != nil {
 		toSerialize["created_at"] = o.CreatedAt
 	}
-	if !isNil(o.Description) {
+	if o.Description != nil {
 		toSerialize["description"] = o.Description
 	}
-	if !isNil(o.ResourceType) {
+	if o.ResourceType != nil {
 		toSerialize["resource_type"] = o.ResourceType
 	}
-	if !isNil(o.UpdatedAt) {
+	if o.UpdatedAt != nil {
 		toSerialize["updated_at"] = o.UpdatedAt
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_quota_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_quota_all_of.go
index 6d258707..6b30a6ff 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_quota_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_quota_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -42,7 +42,7 @@ func NewQuotaAllOfWithDefaults() *QuotaAllOf {
 
 // GetCreatedAt returns the CreatedAt field value if set, zero value otherwise.
 func (o *QuotaAllOf) GetCreatedAt() time.Time {
-	if o == nil || isNil(o.CreatedAt) {
+	if o == nil || o.CreatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -52,15 +52,15 @@ func (o *QuotaAllOf) GetCreatedAt() time.Time {
 // GetCreatedAtOk returns a tuple with the CreatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *QuotaAllOf) GetCreatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.CreatedAt) {
-    return nil, false
+	if o == nil || o.CreatedAt == nil {
+		return nil, false
 	}
 	return o.CreatedAt, true
 }
 
 // HasCreatedAt returns a boolean if a field has been set.
 func (o *QuotaAllOf) HasCreatedAt() bool {
-	if o != nil && !isNil(o.CreatedAt) {
+	if o != nil && o.CreatedAt != nil {
 		return true
 	}
 
@@ -74,7 +74,7 @@ func (o *QuotaAllOf) SetCreatedAt(v time.Time) {
 
 // GetDescription returns the Description field value if set, zero value otherwise.
 func (o *QuotaAllOf) GetDescription() string {
-	if o == nil || isNil(o.Description) {
+	if o == nil || o.Description == nil {
 		var ret string
 		return ret
 	}
@@ -84,15 +84,15 @@ func (o *QuotaAllOf) GetDescription() string {
 // GetDescriptionOk returns a tuple with the Description field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *QuotaAllOf) GetDescriptionOk() (*string, bool) {
-	if o == nil || isNil(o.Description) {
-    return nil, false
+	if o == nil || o.Description == nil {
+		return nil, false
 	}
 	return o.Description, true
 }
 
 // HasDescription returns a boolean if a field has been set.
 func (o *QuotaAllOf) HasDescription() bool {
-	if o != nil && !isNil(o.Description) {
+	if o != nil && o.Description != nil {
 		return true
 	}
 
@@ -106,7 +106,7 @@ func (o *QuotaAllOf) SetDescription(v string) {
 
 // GetResourceType returns the ResourceType field value if set, zero value otherwise.
 func (o *QuotaAllOf) GetResourceType() string {
-	if o == nil || isNil(o.ResourceType) {
+	if o == nil || o.ResourceType == nil {
 		var ret string
 		return ret
 	}
@@ -116,15 +116,15 @@ func (o *QuotaAllOf) GetResourceType() string {
 // GetResourceTypeOk returns a tuple with the ResourceType field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *QuotaAllOf) GetResourceTypeOk() (*string, bool) {
-	if o == nil || isNil(o.ResourceType) {
-    return nil, false
+	if o == nil || o.ResourceType == nil {
+		return nil, false
 	}
 	return o.ResourceType, true
 }
 
 // HasResourceType returns a boolean if a field has been set.
 func (o *QuotaAllOf) HasResourceType() bool {
-	if o != nil && !isNil(o.ResourceType) {
+	if o != nil && o.ResourceType != nil {
 		return true
 	}
 
@@ -138,7 +138,7 @@ func (o *QuotaAllOf) SetResourceType(v string) {
 
 // GetUpdatedAt returns the UpdatedAt field value if set, zero value otherwise.
 func (o *QuotaAllOf) GetUpdatedAt() time.Time {
-	if o == nil || isNil(o.UpdatedAt) {
+	if o == nil || o.UpdatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -148,15 +148,15 @@ func (o *QuotaAllOf) GetUpdatedAt() time.Time {
 // GetUpdatedAtOk returns a tuple with the UpdatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *QuotaAllOf) GetUpdatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.UpdatedAt) {
-    return nil, false
+	if o == nil || o.UpdatedAt == nil {
+		return nil, false
 	}
 	return o.UpdatedAt, true
 }
 
 // HasUpdatedAt returns a boolean if a field has been set.
 func (o *QuotaAllOf) HasUpdatedAt() bool {
-	if o != nil && !isNil(o.UpdatedAt) {
+	if o != nil && o.UpdatedAt != nil {
 		return true
 	}
 
@@ -170,16 +170,16 @@ func (o *QuotaAllOf) SetUpdatedAt(v time.Time) {
 
 func (o QuotaAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.CreatedAt) {
+	if o.CreatedAt != nil {
 		toSerialize["created_at"] = o.CreatedAt
 	}
-	if !isNil(o.Description) {
+	if o.Description != nil {
 		toSerialize["description"] = o.Description
 	}
-	if !isNil(o.ResourceType) {
+	if o.ResourceType != nil {
 		toSerialize["resource_type"] = o.ResourceType
 	}
-	if !isNil(o.UpdatedAt) {
+	if o.UpdatedAt != nil {
 		toSerialize["updated_at"] = o.UpdatedAt
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_quota_cost.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_quota_cost.go
index bc7b7fb1..00be5489 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_quota_cost.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_quota_cost.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -20,11 +20,11 @@ type QuotaCost struct {
 	Id *string `json:"id,omitempty"`
 	Kind *string `json:"kind,omitempty"`
 	Allowed int32 `json:"allowed"`
-	CloudAccounts []CloudAccount `json:"cloud_accounts,omitempty"`
+	CloudAccounts *[]CloudAccount `json:"cloud_accounts,omitempty"`
 	Consumed int32 `json:"consumed"`
 	OrganizationId *string `json:"organization_id,omitempty"`
 	QuotaId string `json:"quota_id"`
-	RelatedResources []RelatedResource `json:"related_resources,omitempty"`
+	RelatedResources *[]RelatedResource `json:"related_resources,omitempty"`
 	Version *string `json:"version,omitempty"`
 }
 
@@ -50,7 +50,7 @@ func NewQuotaCostWithDefaults() *QuotaCost {
 
 // GetHref returns the Href field value if set, zero value otherwise.
 func (o *QuotaCost) GetHref() string {
-	if o == nil || isNil(o.Href) {
+	if o == nil || o.Href == nil {
 		var ret string
 		return ret
 	}
@@ -60,15 +60,15 @@ func (o *QuotaCost) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *QuotaCost) GetHrefOk() (*string, bool) {
-	if o == nil || isNil(o.Href) {
-    return nil, false
+	if o == nil || o.Href == nil {
+		return nil, false
 	}
 	return o.Href, true
 }
 
 // HasHref returns a boolean if a field has been set.
 func (o *QuotaCost) HasHref() bool {
-	if o != nil && !isNil(o.Href) {
+	if o != nil && o.Href != nil {
 		return true
 	}
 
@@ -82,7 +82,7 @@ func (o *QuotaCost) SetHref(v string) {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *QuotaCost) GetId() string {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret string
 		return ret
 	}
@@ -92,15 +92,15 @@ func (o *QuotaCost) GetId() string {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *QuotaCost) GetIdOk() (*string, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *QuotaCost) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -114,7 +114,7 @@ func (o *QuotaCost) SetId(v string) {
 
 // GetKind returns the Kind field value if set, zero value otherwise.
 func (o *QuotaCost) GetKind() string {
-	if o == nil || isNil(o.Kind) {
+	if o == nil || o.Kind == nil {
 		var ret string
 		return ret
 	}
@@ -124,15 +124,15 @@ func (o *QuotaCost) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *QuotaCost) GetKindOk() (*string, bool) {
-	if o == nil || isNil(o.Kind) {
-    return nil, false
+	if o == nil || o.Kind == nil {
+		return nil, false
 	}
 	return o.Kind, true
 }
 
 // HasKind returns a boolean if a field has been set.
 func (o *QuotaCost) HasKind() bool {
-	if o != nil && !isNil(o.Kind) {
+	if o != nil && o.Kind != nil {
 		return true
 	}
 
@@ -157,8 +157,8 @@ func (o *QuotaCost) GetAllowed() int32 {
 // GetAllowedOk returns a tuple with the Allowed field value
 // and a boolean to check if the value has been set.
 func (o *QuotaCost) GetAllowedOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Allowed, true
 }
@@ -170,25 +170,25 @@ func (o *QuotaCost) SetAllowed(v int32) {
 
 // GetCloudAccounts returns the CloudAccounts field value if set, zero value otherwise.
 func (o *QuotaCost) GetCloudAccounts() []CloudAccount {
-	if o == nil || isNil(o.CloudAccounts) {
+	if o == nil || o.CloudAccounts == nil {
 		var ret []CloudAccount
 		return ret
 	}
-	return o.CloudAccounts
+	return *o.CloudAccounts
 }
 
 // GetCloudAccountsOk returns a tuple with the CloudAccounts field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *QuotaCost) GetCloudAccountsOk() ([]CloudAccount, bool) {
-	if o == nil || isNil(o.CloudAccounts) {
-    return nil, false
+func (o *QuotaCost) GetCloudAccountsOk() (*[]CloudAccount, bool) {
+	if o == nil || o.CloudAccounts == nil {
+		return nil, false
 	}
 	return o.CloudAccounts, true
 }
 
 // HasCloudAccounts returns a boolean if a field has been set.
 func (o *QuotaCost) HasCloudAccounts() bool {
-	if o != nil && !isNil(o.CloudAccounts) {
+	if o != nil && o.CloudAccounts != nil {
 		return true
 	}
 
@@ -197,7 +197,7 @@ func (o *QuotaCost) HasCloudAccounts() bool {
 
 // SetCloudAccounts gets a reference to the given []CloudAccount and assigns it to the CloudAccounts field.
 func (o *QuotaCost) SetCloudAccounts(v []CloudAccount) {
-	o.CloudAccounts = v
+	o.CloudAccounts = &v
 }
 
 // GetConsumed returns the Consumed field value
@@ -213,8 +213,8 @@ func (o *QuotaCost) GetConsumed() int32 {
 // GetConsumedOk returns a tuple with the Consumed field value
 // and a boolean to check if the value has been set.
 func (o *QuotaCost) GetConsumedOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Consumed, true
 }
@@ -226,7 +226,7 @@ func (o *QuotaCost) SetConsumed(v int32) {
 
 // GetOrganizationId returns the OrganizationId field value if set, zero value otherwise.
 func (o *QuotaCost) GetOrganizationId() string {
-	if o == nil || isNil(o.OrganizationId) {
+	if o == nil || o.OrganizationId == nil {
 		var ret string
 		return ret
 	}
@@ -236,15 +236,15 @@ func (o *QuotaCost) GetOrganizationId() string {
 // GetOrganizationIdOk returns a tuple with the OrganizationId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *QuotaCost) GetOrganizationIdOk() (*string, bool) {
-	if o == nil || isNil(o.OrganizationId) {
-    return nil, false
+	if o == nil || o.OrganizationId == nil {
+		return nil, false
 	}
 	return o.OrganizationId, true
 }
 
 // HasOrganizationId returns a boolean if a field has been set.
 func (o *QuotaCost) HasOrganizationId() bool {
-	if o != nil && !isNil(o.OrganizationId) {
+	if o != nil && o.OrganizationId != nil {
 		return true
 	}
 
@@ -269,8 +269,8 @@ func (o *QuotaCost) GetQuotaId() string {
 // GetQuotaIdOk returns a tuple with the QuotaId field value
 // and a boolean to check if the value has been set.
 func (o *QuotaCost) GetQuotaIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.QuotaId, true
 }
@@ -282,25 +282,25 @@ func (o *QuotaCost) SetQuotaId(v string) {
 
 // GetRelatedResources returns the RelatedResources field value if set, zero value otherwise.
 func (o *QuotaCost) GetRelatedResources() []RelatedResource {
-	if o == nil || isNil(o.RelatedResources) {
+	if o == nil || o.RelatedResources == nil {
 		var ret []RelatedResource
 		return ret
 	}
-	return o.RelatedResources
+	return *o.RelatedResources
 }
 
 // GetRelatedResourcesOk returns a tuple with the RelatedResources field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *QuotaCost) GetRelatedResourcesOk() ([]RelatedResource, bool) {
-	if o == nil || isNil(o.RelatedResources) {
-    return nil, false
+func (o *QuotaCost) GetRelatedResourcesOk() (*[]RelatedResource, bool) {
+	if o == nil || o.RelatedResources == nil {
+		return nil, false
 	}
 	return o.RelatedResources, true
 }
 
 // HasRelatedResources returns a boolean if a field has been set.
 func (o *QuotaCost) HasRelatedResources() bool {
-	if o != nil && !isNil(o.RelatedResources) {
+	if o != nil && o.RelatedResources != nil {
 		return true
 	}
 
@@ -309,12 +309,12 @@ func (o *QuotaCost) HasRelatedResources() bool {
 
 // SetRelatedResources gets a reference to the given []RelatedResource and assigns it to the RelatedResources field.
 func (o *QuotaCost) SetRelatedResources(v []RelatedResource) {
-	o.RelatedResources = v
+	o.RelatedResources = &v
 }
 
 // GetVersion returns the Version field value if set, zero value otherwise.
 func (o *QuotaCost) GetVersion() string {
-	if o == nil || isNil(o.Version) {
+	if o == nil || o.Version == nil {
 		var ret string
 		return ret
 	}
@@ -324,15 +324,15 @@ func (o *QuotaCost) GetVersion() string {
 // GetVersionOk returns a tuple with the Version field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *QuotaCost) GetVersionOk() (*string, bool) {
-	if o == nil || isNil(o.Version) {
-    return nil, false
+	if o == nil || o.Version == nil {
+		return nil, false
 	}
 	return o.Version, true
 }
 
 // HasVersion returns a boolean if a field has been set.
 func (o *QuotaCost) HasVersion() bool {
-	if o != nil && !isNil(o.Version) {
+	if o != nil && o.Version != nil {
 		return true
 	}
 
@@ -346,34 +346,34 @@ func (o *QuotaCost) SetVersion(v string) {
 
 func (o QuotaCost) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Href) {
+	if o.Href != nil {
 		toSerialize["href"] = o.Href
 	}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.Kind) {
+	if o.Kind != nil {
 		toSerialize["kind"] = o.Kind
 	}
 	if true {
 		toSerialize["allowed"] = o.Allowed
 	}
-	if !isNil(o.CloudAccounts) {
+	if o.CloudAccounts != nil {
 		toSerialize["cloud_accounts"] = o.CloudAccounts
 	}
 	if true {
 		toSerialize["consumed"] = o.Consumed
 	}
-	if !isNil(o.OrganizationId) {
+	if o.OrganizationId != nil {
 		toSerialize["organization_id"] = o.OrganizationId
 	}
 	if true {
 		toSerialize["quota_id"] = o.QuotaId
 	}
-	if !isNil(o.RelatedResources) {
+	if o.RelatedResources != nil {
 		toSerialize["related_resources"] = o.RelatedResources
 	}
-	if !isNil(o.Version) {
+	if o.Version != nil {
 		toSerialize["version"] = o.Version
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_quota_cost_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_quota_cost_all_of.go
index 7b77fd47..fb8184d7 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_quota_cost_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_quota_cost_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -17,11 +17,11 @@ import (
 // QuotaCostAllOf struct for QuotaCostAllOf
 type QuotaCostAllOf struct {
 	Allowed int32 `json:"allowed"`
-	CloudAccounts []CloudAccount `json:"cloud_accounts,omitempty"`
+	CloudAccounts *[]CloudAccount `json:"cloud_accounts,omitempty"`
 	Consumed int32 `json:"consumed"`
 	OrganizationId *string `json:"organization_id,omitempty"`
 	QuotaId string `json:"quota_id"`
-	RelatedResources []RelatedResource `json:"related_resources,omitempty"`
+	RelatedResources *[]RelatedResource `json:"related_resources,omitempty"`
 	Version *string `json:"version,omitempty"`
 }
 
@@ -58,8 +58,8 @@ func (o *QuotaCostAllOf) GetAllowed() int32 {
 // GetAllowedOk returns a tuple with the Allowed field value
 // and a boolean to check if the value has been set.
 func (o *QuotaCostAllOf) GetAllowedOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Allowed, true
 }
@@ -71,25 +71,25 @@ func (o *QuotaCostAllOf) SetAllowed(v int32) {
 
 // GetCloudAccounts returns the CloudAccounts field value if set, zero value otherwise.
 func (o *QuotaCostAllOf) GetCloudAccounts() []CloudAccount {
-	if o == nil || isNil(o.CloudAccounts) {
+	if o == nil || o.CloudAccounts == nil {
 		var ret []CloudAccount
 		return ret
 	}
-	return o.CloudAccounts
+	return *o.CloudAccounts
 }
 
 // GetCloudAccountsOk returns a tuple with the CloudAccounts field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *QuotaCostAllOf) GetCloudAccountsOk() ([]CloudAccount, bool) {
-	if o == nil || isNil(o.CloudAccounts) {
-    return nil, false
+func (o *QuotaCostAllOf) GetCloudAccountsOk() (*[]CloudAccount, bool) {
+	if o == nil || o.CloudAccounts == nil {
+		return nil, false
 	}
 	return o.CloudAccounts, true
 }
 
 // HasCloudAccounts returns a boolean if a field has been set.
 func (o *QuotaCostAllOf) HasCloudAccounts() bool {
-	if o != nil && !isNil(o.CloudAccounts) {
+	if o != nil && o.CloudAccounts != nil {
 		return true
 	}
 
@@ -98,7 +98,7 @@ func (o *QuotaCostAllOf) HasCloudAccounts() bool {
 
 // SetCloudAccounts gets a reference to the given []CloudAccount and assigns it to the CloudAccounts field.
 func (o *QuotaCostAllOf) SetCloudAccounts(v []CloudAccount) {
-	o.CloudAccounts = v
+	o.CloudAccounts = &v
 }
 
 // GetConsumed returns the Consumed field value
@@ -114,8 +114,8 @@ func (o *QuotaCostAllOf) GetConsumed() int32 {
 // GetConsumedOk returns a tuple with the Consumed field value
 // and a boolean to check if the value has been set.
 func (o *QuotaCostAllOf) GetConsumedOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Consumed, true
 }
@@ -127,7 +127,7 @@ func (o *QuotaCostAllOf) SetConsumed(v int32) {
 
 // GetOrganizationId returns the OrganizationId field value if set, zero value otherwise.
 func (o *QuotaCostAllOf) GetOrganizationId() string {
-	if o == nil || isNil(o.OrganizationId) {
+	if o == nil || o.OrganizationId == nil {
 		var ret string
 		return ret
 	}
@@ -137,15 +137,15 @@ func (o *QuotaCostAllOf) GetOrganizationId() string {
 // GetOrganizationIdOk returns a tuple with the OrganizationId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *QuotaCostAllOf) GetOrganizationIdOk() (*string, bool) {
-	if o == nil || isNil(o.OrganizationId) {
-    return nil, false
+	if o == nil || o.OrganizationId == nil {
+		return nil, false
 	}
 	return o.OrganizationId, true
 }
 
 // HasOrganizationId returns a boolean if a field has been set.
 func (o *QuotaCostAllOf) HasOrganizationId() bool {
-	if o != nil && !isNil(o.OrganizationId) {
+	if o != nil && o.OrganizationId != nil {
 		return true
 	}
 
@@ -170,8 +170,8 @@ func (o *QuotaCostAllOf) GetQuotaId() string {
 // GetQuotaIdOk returns a tuple with the QuotaId field value
 // and a boolean to check if the value has been set.
 func (o *QuotaCostAllOf) GetQuotaIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.QuotaId, true
 }
@@ -183,25 +183,25 @@ func (o *QuotaCostAllOf) SetQuotaId(v string) {
 
 // GetRelatedResources returns the RelatedResources field value if set, zero value otherwise.
 func (o *QuotaCostAllOf) GetRelatedResources() []RelatedResource {
-	if o == nil || isNil(o.RelatedResources) {
+	if o == nil || o.RelatedResources == nil {
 		var ret []RelatedResource
 		return ret
 	}
-	return o.RelatedResources
+	return *o.RelatedResources
 }
 
 // GetRelatedResourcesOk returns a tuple with the RelatedResources field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *QuotaCostAllOf) GetRelatedResourcesOk() ([]RelatedResource, bool) {
-	if o == nil || isNil(o.RelatedResources) {
-    return nil, false
+func (o *QuotaCostAllOf) GetRelatedResourcesOk() (*[]RelatedResource, bool) {
+	if o == nil || o.RelatedResources == nil {
+		return nil, false
 	}
 	return o.RelatedResources, true
 }
 
 // HasRelatedResources returns a boolean if a field has been set.
 func (o *QuotaCostAllOf) HasRelatedResources() bool {
-	if o != nil && !isNil(o.RelatedResources) {
+	if o != nil && o.RelatedResources != nil {
 		return true
 	}
 
@@ -210,12 +210,12 @@ func (o *QuotaCostAllOf) HasRelatedResources() bool {
 
 // SetRelatedResources gets a reference to the given []RelatedResource and assigns it to the RelatedResources field.
 func (o *QuotaCostAllOf) SetRelatedResources(v []RelatedResource) {
-	o.RelatedResources = v
+	o.RelatedResources = &v
 }
 
 // GetVersion returns the Version field value if set, zero value otherwise.
 func (o *QuotaCostAllOf) GetVersion() string {
-	if o == nil || isNil(o.Version) {
+	if o == nil || o.Version == nil {
 		var ret string
 		return ret
 	}
@@ -225,15 +225,15 @@ func (o *QuotaCostAllOf) GetVersion() string {
 // GetVersionOk returns a tuple with the Version field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *QuotaCostAllOf) GetVersionOk() (*string, bool) {
-	if o == nil || isNil(o.Version) {
-    return nil, false
+	if o == nil || o.Version == nil {
+		return nil, false
 	}
 	return o.Version, true
 }
 
 // HasVersion returns a boolean if a field has been set.
 func (o *QuotaCostAllOf) HasVersion() bool {
-	if o != nil && !isNil(o.Version) {
+	if o != nil && o.Version != nil {
 		return true
 	}
 
@@ -250,22 +250,22 @@ func (o QuotaCostAllOf) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["allowed"] = o.Allowed
 	}
-	if !isNil(o.CloudAccounts) {
+	if o.CloudAccounts != nil {
 		toSerialize["cloud_accounts"] = o.CloudAccounts
 	}
 	if true {
 		toSerialize["consumed"] = o.Consumed
 	}
-	if !isNil(o.OrganizationId) {
+	if o.OrganizationId != nil {
 		toSerialize["organization_id"] = o.OrganizationId
 	}
 	if true {
 		toSerialize["quota_id"] = o.QuotaId
 	}
-	if !isNil(o.RelatedResources) {
+	if o.RelatedResources != nil {
 		toSerialize["related_resources"] = o.RelatedResources
 	}
-	if !isNil(o.Version) {
+	if o.Version != nil {
 		toSerialize["version"] = o.Version
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_quota_cost_list.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_quota_cost_list.go
index 9ceed08a..4ba3f5f9 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_quota_cost_list.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_quota_cost_list.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -58,8 +58,8 @@ func (o *QuotaCostList) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *QuotaCostList) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -82,8 +82,8 @@ func (o *QuotaCostList) GetPage() int32 {
 // GetPageOk returns a tuple with the Page field value
 // and a boolean to check if the value has been set.
 func (o *QuotaCostList) GetPageOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Page, true
 }
@@ -106,8 +106,8 @@ func (o *QuotaCostList) GetSize() int32 {
 // GetSizeOk returns a tuple with the Size field value
 // and a boolean to check if the value has been set.
 func (o *QuotaCostList) GetSizeOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Size, true
 }
@@ -130,8 +130,8 @@ func (o *QuotaCostList) GetTotal() int32 {
 // GetTotalOk returns a tuple with the Total field value
 // and a boolean to check if the value has been set.
 func (o *QuotaCostList) GetTotalOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Total, true
 }
@@ -153,11 +153,11 @@ func (o *QuotaCostList) GetItems() []QuotaCost {
 
 // GetItemsOk returns a tuple with the Items field value
 // and a boolean to check if the value has been set.
-func (o *QuotaCostList) GetItemsOk() ([]QuotaCost, bool) {
-	if o == nil {
-    return nil, false
+func (o *QuotaCostList) GetItemsOk() (*[]QuotaCost, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Items, true
+	return &o.Items, true
 }
 
 // SetItems sets field value
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_quota_cost_list_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_quota_cost_list_all_of.go
index 108228dd..b87bf91d 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_quota_cost_list_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_quota_cost_list_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -16,7 +16,7 @@ import (
 
 // QuotaCostListAllOf struct for QuotaCostListAllOf
 type QuotaCostListAllOf struct {
-	Items []QuotaCost `json:"items,omitempty"`
+	Items *[]QuotaCost `json:"items,omitempty"`
 }
 
 // NewQuotaCostListAllOf instantiates a new QuotaCostListAllOf object
@@ -38,25 +38,25 @@ func NewQuotaCostListAllOfWithDefaults() *QuotaCostListAllOf {
 
 // GetItems returns the Items field value if set, zero value otherwise.
 func (o *QuotaCostListAllOf) GetItems() []QuotaCost {
-	if o == nil || isNil(o.Items) {
+	if o == nil || o.Items == nil {
 		var ret []QuotaCost
 		return ret
 	}
-	return o.Items
+	return *o.Items
 }
 
 // GetItemsOk returns a tuple with the Items field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *QuotaCostListAllOf) GetItemsOk() ([]QuotaCost, bool) {
-	if o == nil || isNil(o.Items) {
-    return nil, false
+func (o *QuotaCostListAllOf) GetItemsOk() (*[]QuotaCost, bool) {
+	if o == nil || o.Items == nil {
+		return nil, false
 	}
 	return o.Items, true
 }
 
 // HasItems returns a boolean if a field has been set.
 func (o *QuotaCostListAllOf) HasItems() bool {
-	if o != nil && !isNil(o.Items) {
+	if o != nil && o.Items != nil {
 		return true
 	}
 
@@ -65,12 +65,12 @@ func (o *QuotaCostListAllOf) HasItems() bool {
 
 // SetItems gets a reference to the given []QuotaCost and assigns it to the Items field.
 func (o *QuotaCostListAllOf) SetItems(v []QuotaCost) {
-	o.Items = v
+	o.Items = &v
 }
 
 func (o QuotaCostListAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Items) {
+	if o.Items != nil {
 		toSerialize["items"] = o.Items
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_quota_list.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_quota_list.go
index 2f0737c6..ad622d31 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_quota_list.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_quota_list.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -58,8 +58,8 @@ func (o *QuotaList) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *QuotaList) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -82,8 +82,8 @@ func (o *QuotaList) GetPage() int32 {
 // GetPageOk returns a tuple with the Page field value
 // and a boolean to check if the value has been set.
 func (o *QuotaList) GetPageOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Page, true
 }
@@ -106,8 +106,8 @@ func (o *QuotaList) GetSize() int32 {
 // GetSizeOk returns a tuple with the Size field value
 // and a boolean to check if the value has been set.
 func (o *QuotaList) GetSizeOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Size, true
 }
@@ -130,8 +130,8 @@ func (o *QuotaList) GetTotal() int32 {
 // GetTotalOk returns a tuple with the Total field value
 // and a boolean to check if the value has been set.
 func (o *QuotaList) GetTotalOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Total, true
 }
@@ -153,11 +153,11 @@ func (o *QuotaList) GetItems() []Quota {
 
 // GetItemsOk returns a tuple with the Items field value
 // and a boolean to check if the value has been set.
-func (o *QuotaList) GetItemsOk() ([]Quota, bool) {
-	if o == nil {
-    return nil, false
+func (o *QuotaList) GetItemsOk() (*[]Quota, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Items, true
+	return &o.Items, true
 }
 
 // SetItems sets field value
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_quota_list_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_quota_list_all_of.go
index 651481c7..4074816d 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_quota_list_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_quota_list_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -16,7 +16,7 @@ import (
 
 // QuotaListAllOf struct for QuotaListAllOf
 type QuotaListAllOf struct {
-	Items []Quota `json:"items,omitempty"`
+	Items *[]Quota `json:"items,omitempty"`
 }
 
 // NewQuotaListAllOf instantiates a new QuotaListAllOf object
@@ -38,25 +38,25 @@ func NewQuotaListAllOfWithDefaults() *QuotaListAllOf {
 
 // GetItems returns the Items field value if set, zero value otherwise.
 func (o *QuotaListAllOf) GetItems() []Quota {
-	if o == nil || isNil(o.Items) {
+	if o == nil || o.Items == nil {
 		var ret []Quota
 		return ret
 	}
-	return o.Items
+	return *o.Items
 }
 
 // GetItemsOk returns a tuple with the Items field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *QuotaListAllOf) GetItemsOk() ([]Quota, bool) {
-	if o == nil || isNil(o.Items) {
-    return nil, false
+func (o *QuotaListAllOf) GetItemsOk() (*[]Quota, bool) {
+	if o == nil || o.Items == nil {
+		return nil, false
 	}
 	return o.Items, true
 }
 
 // HasItems returns a boolean if a field has been set.
 func (o *QuotaListAllOf) HasItems() bool {
-	if o != nil && !isNil(o.Items) {
+	if o != nil && o.Items != nil {
 		return true
 	}
 
@@ -65,12 +65,12 @@ func (o *QuotaListAllOf) HasItems() bool {
 
 // SetItems gets a reference to the given []Quota and assigns it to the Items field.
 func (o *QuotaListAllOf) SetItems(v []Quota) {
-	o.Items = v
+	o.Items = &v
 }
 
 func (o QuotaListAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Items) {
+	if o.Items != nil {
 		toSerialize["items"] = o.Items
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_quota_rules.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_quota_rules.go
index ffdf2a7f..04e01474 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_quota_rules.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_quota_rules.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -50,7 +50,7 @@ func NewQuotaRulesWithDefaults() *QuotaRules {
 
 // GetHref returns the Href field value if set, zero value otherwise.
 func (o *QuotaRules) GetHref() string {
-	if o == nil || isNil(o.Href) {
+	if o == nil || o.Href == nil {
 		var ret string
 		return ret
 	}
@@ -60,15 +60,15 @@ func (o *QuotaRules) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *QuotaRules) GetHrefOk() (*string, bool) {
-	if o == nil || isNil(o.Href) {
-    return nil, false
+	if o == nil || o.Href == nil {
+		return nil, false
 	}
 	return o.Href, true
 }
 
 // HasHref returns a boolean if a field has been set.
 func (o *QuotaRules) HasHref() bool {
-	if o != nil && !isNil(o.Href) {
+	if o != nil && o.Href != nil {
 		return true
 	}
 
@@ -82,7 +82,7 @@ func (o *QuotaRules) SetHref(v string) {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *QuotaRules) GetId() string {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret string
 		return ret
 	}
@@ -92,15 +92,15 @@ func (o *QuotaRules) GetId() string {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *QuotaRules) GetIdOk() (*string, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *QuotaRules) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -114,7 +114,7 @@ func (o *QuotaRules) SetId(v string) {
 
 // GetKind returns the Kind field value if set, zero value otherwise.
 func (o *QuotaRules) GetKind() string {
-	if o == nil || isNil(o.Kind) {
+	if o == nil || o.Kind == nil {
 		var ret string
 		return ret
 	}
@@ -124,15 +124,15 @@ func (o *QuotaRules) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *QuotaRules) GetKindOk() (*string, bool) {
-	if o == nil || isNil(o.Kind) {
-    return nil, false
+	if o == nil || o.Kind == nil {
+		return nil, false
 	}
 	return o.Kind, true
 }
 
 // HasKind returns a boolean if a field has been set.
 func (o *QuotaRules) HasKind() bool {
-	if o != nil && !isNil(o.Kind) {
+	if o != nil && o.Kind != nil {
 		return true
 	}
 
@@ -146,7 +146,7 @@ func (o *QuotaRules) SetKind(v string) {
 
 // GetAvailabilityZone returns the AvailabilityZone field value if set, zero value otherwise.
 func (o *QuotaRules) GetAvailabilityZone() string {
-	if o == nil || isNil(o.AvailabilityZone) {
+	if o == nil || o.AvailabilityZone == nil {
 		var ret string
 		return ret
 	}
@@ -156,15 +156,15 @@ func (o *QuotaRules) GetAvailabilityZone() string {
 // GetAvailabilityZoneOk returns a tuple with the AvailabilityZone field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *QuotaRules) GetAvailabilityZoneOk() (*string, bool) {
-	if o == nil || isNil(o.AvailabilityZone) {
-    return nil, false
+	if o == nil || o.AvailabilityZone == nil {
+		return nil, false
 	}
 	return o.AvailabilityZone, true
 }
 
 // HasAvailabilityZone returns a boolean if a field has been set.
 func (o *QuotaRules) HasAvailabilityZone() bool {
-	if o != nil && !isNil(o.AvailabilityZone) {
+	if o != nil && o.AvailabilityZone != nil {
 		return true
 	}
 
@@ -178,7 +178,7 @@ func (o *QuotaRules) SetAvailabilityZone(v string) {
 
 // GetBillingModel returns the BillingModel field value if set, zero value otherwise.
 func (o *QuotaRules) GetBillingModel() string {
-	if o == nil || isNil(o.BillingModel) {
+	if o == nil || o.BillingModel == nil {
 		var ret string
 		return ret
 	}
@@ -188,15 +188,15 @@ func (o *QuotaRules) GetBillingModel() string {
 // GetBillingModelOk returns a tuple with the BillingModel field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *QuotaRules) GetBillingModelOk() (*string, bool) {
-	if o == nil || isNil(o.BillingModel) {
-    return nil, false
+	if o == nil || o.BillingModel == nil {
+		return nil, false
 	}
 	return o.BillingModel, true
 }
 
 // HasBillingModel returns a boolean if a field has been set.
 func (o *QuotaRules) HasBillingModel() bool {
-	if o != nil && !isNil(o.BillingModel) {
+	if o != nil && o.BillingModel != nil {
 		return true
 	}
 
@@ -210,7 +210,7 @@ func (o *QuotaRules) SetBillingModel(v string) {
 
 // GetByoc returns the Byoc field value if set, zero value otherwise.
 func (o *QuotaRules) GetByoc() string {
-	if o == nil || isNil(o.Byoc) {
+	if o == nil || o.Byoc == nil {
 		var ret string
 		return ret
 	}
@@ -220,15 +220,15 @@ func (o *QuotaRules) GetByoc() string {
 // GetByocOk returns a tuple with the Byoc field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *QuotaRules) GetByocOk() (*string, bool) {
-	if o == nil || isNil(o.Byoc) {
-    return nil, false
+	if o == nil || o.Byoc == nil {
+		return nil, false
 	}
 	return o.Byoc, true
 }
 
 // HasByoc returns a boolean if a field has been set.
 func (o *QuotaRules) HasByoc() bool {
-	if o != nil && !isNil(o.Byoc) {
+	if o != nil && o.Byoc != nil {
 		return true
 	}
 
@@ -242,7 +242,7 @@ func (o *QuotaRules) SetByoc(v string) {
 
 // GetCloud returns the Cloud field value if set, zero value otherwise.
 func (o *QuotaRules) GetCloud() string {
-	if o == nil || isNil(o.Cloud) {
+	if o == nil || o.Cloud == nil {
 		var ret string
 		return ret
 	}
@@ -252,15 +252,15 @@ func (o *QuotaRules) GetCloud() string {
 // GetCloudOk returns a tuple with the Cloud field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *QuotaRules) GetCloudOk() (*string, bool) {
-	if o == nil || isNil(o.Cloud) {
-    return nil, false
+	if o == nil || o.Cloud == nil {
+		return nil, false
 	}
 	return o.Cloud, true
 }
 
 // HasCloud returns a boolean if a field has been set.
 func (o *QuotaRules) HasCloud() bool {
-	if o != nil && !isNil(o.Cloud) {
+	if o != nil && o.Cloud != nil {
 		return true
 	}
 
@@ -285,8 +285,8 @@ func (o *QuotaRules) GetCost() int32 {
 // GetCostOk returns a tuple with the Cost field value
 // and a boolean to check if the value has been set.
 func (o *QuotaRules) GetCostOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Cost, true
 }
@@ -298,7 +298,7 @@ func (o *QuotaRules) SetCost(v int32) {
 
 // GetName returns the Name field value if set, zero value otherwise.
 func (o *QuotaRules) GetName() string {
-	if o == nil || isNil(o.Name) {
+	if o == nil || o.Name == nil {
 		var ret string
 		return ret
 	}
@@ -308,15 +308,15 @@ func (o *QuotaRules) GetName() string {
 // GetNameOk returns a tuple with the Name field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *QuotaRules) GetNameOk() (*string, bool) {
-	if o == nil || isNil(o.Name) {
-    return nil, false
+	if o == nil || o.Name == nil {
+		return nil, false
 	}
 	return o.Name, true
 }
 
 // HasName returns a boolean if a field has been set.
 func (o *QuotaRules) HasName() bool {
-	if o != nil && !isNil(o.Name) {
+	if o != nil && o.Name != nil {
 		return true
 	}
 
@@ -330,7 +330,7 @@ func (o *QuotaRules) SetName(v string) {
 
 // GetProduct returns the Product field value if set, zero value otherwise.
 func (o *QuotaRules) GetProduct() string {
-	if o == nil || isNil(o.Product) {
+	if o == nil || o.Product == nil {
 		var ret string
 		return ret
 	}
@@ -340,15 +340,15 @@ func (o *QuotaRules) GetProduct() string {
 // GetProductOk returns a tuple with the Product field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *QuotaRules) GetProductOk() (*string, bool) {
-	if o == nil || isNil(o.Product) {
-    return nil, false
+	if o == nil || o.Product == nil {
+		return nil, false
 	}
 	return o.Product, true
 }
 
 // HasProduct returns a boolean if a field has been set.
 func (o *QuotaRules) HasProduct() bool {
-	if o != nil && !isNil(o.Product) {
+	if o != nil && o.Product != nil {
 		return true
 	}
 
@@ -362,7 +362,7 @@ func (o *QuotaRules) SetProduct(v string) {
 
 // GetQuotaId returns the QuotaId field value if set, zero value otherwise.
 func (o *QuotaRules) GetQuotaId() string {
-	if o == nil || isNil(o.QuotaId) {
+	if o == nil || o.QuotaId == nil {
 		var ret string
 		return ret
 	}
@@ -372,15 +372,15 @@ func (o *QuotaRules) GetQuotaId() string {
 // GetQuotaIdOk returns a tuple with the QuotaId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *QuotaRules) GetQuotaIdOk() (*string, bool) {
-	if o == nil || isNil(o.QuotaId) {
-    return nil, false
+	if o == nil || o.QuotaId == nil {
+		return nil, false
 	}
 	return o.QuotaId, true
 }
 
 // HasQuotaId returns a boolean if a field has been set.
 func (o *QuotaRules) HasQuotaId() bool {
-	if o != nil && !isNil(o.QuotaId) {
+	if o != nil && o.QuotaId != nil {
 		return true
 	}
 
@@ -394,7 +394,7 @@ func (o *QuotaRules) SetQuotaId(v string) {
 
 // GetType returns the Type field value if set, zero value otherwise.
 func (o *QuotaRules) GetType() string {
-	if o == nil || isNil(o.Type) {
+	if o == nil || o.Type == nil {
 		var ret string
 		return ret
 	}
@@ -404,15 +404,15 @@ func (o *QuotaRules) GetType() string {
 // GetTypeOk returns a tuple with the Type field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *QuotaRules) GetTypeOk() (*string, bool) {
-	if o == nil || isNil(o.Type) {
-    return nil, false
+	if o == nil || o.Type == nil {
+		return nil, false
 	}
 	return o.Type, true
 }
 
 // HasType returns a boolean if a field has been set.
 func (o *QuotaRules) HasType() bool {
-	if o != nil && !isNil(o.Type) {
+	if o != nil && o.Type != nil {
 		return true
 	}
 
@@ -426,40 +426,40 @@ func (o *QuotaRules) SetType(v string) {
 
 func (o QuotaRules) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Href) {
+	if o.Href != nil {
 		toSerialize["href"] = o.Href
 	}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.Kind) {
+	if o.Kind != nil {
 		toSerialize["kind"] = o.Kind
 	}
-	if !isNil(o.AvailabilityZone) {
+	if o.AvailabilityZone != nil {
 		toSerialize["availability_zone"] = o.AvailabilityZone
 	}
-	if !isNil(o.BillingModel) {
+	if o.BillingModel != nil {
 		toSerialize["billing_model"] = o.BillingModel
 	}
-	if !isNil(o.Byoc) {
+	if o.Byoc != nil {
 		toSerialize["byoc"] = o.Byoc
 	}
-	if !isNil(o.Cloud) {
+	if o.Cloud != nil {
 		toSerialize["cloud"] = o.Cloud
 	}
 	if true {
 		toSerialize["cost"] = o.Cost
 	}
-	if !isNil(o.Name) {
+	if o.Name != nil {
 		toSerialize["name"] = o.Name
 	}
-	if !isNil(o.Product) {
+	if o.Product != nil {
 		toSerialize["product"] = o.Product
 	}
-	if !isNil(o.QuotaId) {
+	if o.QuotaId != nil {
 		toSerialize["quota_id"] = o.QuotaId
 	}
-	if !isNil(o.Type) {
+	if o.Type != nil {
 		toSerialize["type"] = o.Type
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_quota_rules_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_quota_rules_all_of.go
index 1cb79ddb..37406a6d 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_quota_rules_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_quota_rules_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -47,7 +47,7 @@ func NewQuotaRulesAllOfWithDefaults() *QuotaRulesAllOf {
 
 // GetAvailabilityZone returns the AvailabilityZone field value if set, zero value otherwise.
 func (o *QuotaRulesAllOf) GetAvailabilityZone() string {
-	if o == nil || isNil(o.AvailabilityZone) {
+	if o == nil || o.AvailabilityZone == nil {
 		var ret string
 		return ret
 	}
@@ -57,15 +57,15 @@ func (o *QuotaRulesAllOf) GetAvailabilityZone() string {
 // GetAvailabilityZoneOk returns a tuple with the AvailabilityZone field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *QuotaRulesAllOf) GetAvailabilityZoneOk() (*string, bool) {
-	if o == nil || isNil(o.AvailabilityZone) {
-    return nil, false
+	if o == nil || o.AvailabilityZone == nil {
+		return nil, false
 	}
 	return o.AvailabilityZone, true
 }
 
 // HasAvailabilityZone returns a boolean if a field has been set.
 func (o *QuotaRulesAllOf) HasAvailabilityZone() bool {
-	if o != nil && !isNil(o.AvailabilityZone) {
+	if o != nil && o.AvailabilityZone != nil {
 		return true
 	}
 
@@ -79,7 +79,7 @@ func (o *QuotaRulesAllOf) SetAvailabilityZone(v string) {
 
 // GetBillingModel returns the BillingModel field value if set, zero value otherwise.
 func (o *QuotaRulesAllOf) GetBillingModel() string {
-	if o == nil || isNil(o.BillingModel) {
+	if o == nil || o.BillingModel == nil {
 		var ret string
 		return ret
 	}
@@ -89,15 +89,15 @@ func (o *QuotaRulesAllOf) GetBillingModel() string {
 // GetBillingModelOk returns a tuple with the BillingModel field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *QuotaRulesAllOf) GetBillingModelOk() (*string, bool) {
-	if o == nil || isNil(o.BillingModel) {
-    return nil, false
+	if o == nil || o.BillingModel == nil {
+		return nil, false
 	}
 	return o.BillingModel, true
 }
 
 // HasBillingModel returns a boolean if a field has been set.
 func (o *QuotaRulesAllOf) HasBillingModel() bool {
-	if o != nil && !isNil(o.BillingModel) {
+	if o != nil && o.BillingModel != nil {
 		return true
 	}
 
@@ -111,7 +111,7 @@ func (o *QuotaRulesAllOf) SetBillingModel(v string) {
 
 // GetByoc returns the Byoc field value if set, zero value otherwise.
 func (o *QuotaRulesAllOf) GetByoc() string {
-	if o == nil || isNil(o.Byoc) {
+	if o == nil || o.Byoc == nil {
 		var ret string
 		return ret
 	}
@@ -121,15 +121,15 @@ func (o *QuotaRulesAllOf) GetByoc() string {
 // GetByocOk returns a tuple with the Byoc field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *QuotaRulesAllOf) GetByocOk() (*string, bool) {
-	if o == nil || isNil(o.Byoc) {
-    return nil, false
+	if o == nil || o.Byoc == nil {
+		return nil, false
 	}
 	return o.Byoc, true
 }
 
 // HasByoc returns a boolean if a field has been set.
 func (o *QuotaRulesAllOf) HasByoc() bool {
-	if o != nil && !isNil(o.Byoc) {
+	if o != nil && o.Byoc != nil {
 		return true
 	}
 
@@ -143,7 +143,7 @@ func (o *QuotaRulesAllOf) SetByoc(v string) {
 
 // GetCloud returns the Cloud field value if set, zero value otherwise.
 func (o *QuotaRulesAllOf) GetCloud() string {
-	if o == nil || isNil(o.Cloud) {
+	if o == nil || o.Cloud == nil {
 		var ret string
 		return ret
 	}
@@ -153,15 +153,15 @@ func (o *QuotaRulesAllOf) GetCloud() string {
 // GetCloudOk returns a tuple with the Cloud field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *QuotaRulesAllOf) GetCloudOk() (*string, bool) {
-	if o == nil || isNil(o.Cloud) {
-    return nil, false
+	if o == nil || o.Cloud == nil {
+		return nil, false
 	}
 	return o.Cloud, true
 }
 
 // HasCloud returns a boolean if a field has been set.
 func (o *QuotaRulesAllOf) HasCloud() bool {
-	if o != nil && !isNil(o.Cloud) {
+	if o != nil && o.Cloud != nil {
 		return true
 	}
 
@@ -186,8 +186,8 @@ func (o *QuotaRulesAllOf) GetCost() int32 {
 // GetCostOk returns a tuple with the Cost field value
 // and a boolean to check if the value has been set.
 func (o *QuotaRulesAllOf) GetCostOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Cost, true
 }
@@ -199,7 +199,7 @@ func (o *QuotaRulesAllOf) SetCost(v int32) {
 
 // GetName returns the Name field value if set, zero value otherwise.
 func (o *QuotaRulesAllOf) GetName() string {
-	if o == nil || isNil(o.Name) {
+	if o == nil || o.Name == nil {
 		var ret string
 		return ret
 	}
@@ -209,15 +209,15 @@ func (o *QuotaRulesAllOf) GetName() string {
 // GetNameOk returns a tuple with the Name field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *QuotaRulesAllOf) GetNameOk() (*string, bool) {
-	if o == nil || isNil(o.Name) {
-    return nil, false
+	if o == nil || o.Name == nil {
+		return nil, false
 	}
 	return o.Name, true
 }
 
 // HasName returns a boolean if a field has been set.
 func (o *QuotaRulesAllOf) HasName() bool {
-	if o != nil && !isNil(o.Name) {
+	if o != nil && o.Name != nil {
 		return true
 	}
 
@@ -231,7 +231,7 @@ func (o *QuotaRulesAllOf) SetName(v string) {
 
 // GetProduct returns the Product field value if set, zero value otherwise.
 func (o *QuotaRulesAllOf) GetProduct() string {
-	if o == nil || isNil(o.Product) {
+	if o == nil || o.Product == nil {
 		var ret string
 		return ret
 	}
@@ -241,15 +241,15 @@ func (o *QuotaRulesAllOf) GetProduct() string {
 // GetProductOk returns a tuple with the Product field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *QuotaRulesAllOf) GetProductOk() (*string, bool) {
-	if o == nil || isNil(o.Product) {
-    return nil, false
+	if o == nil || o.Product == nil {
+		return nil, false
 	}
 	return o.Product, true
 }
 
 // HasProduct returns a boolean if a field has been set.
 func (o *QuotaRulesAllOf) HasProduct() bool {
-	if o != nil && !isNil(o.Product) {
+	if o != nil && o.Product != nil {
 		return true
 	}
 
@@ -263,7 +263,7 @@ func (o *QuotaRulesAllOf) SetProduct(v string) {
 
 // GetQuotaId returns the QuotaId field value if set, zero value otherwise.
 func (o *QuotaRulesAllOf) GetQuotaId() string {
-	if o == nil || isNil(o.QuotaId) {
+	if o == nil || o.QuotaId == nil {
 		var ret string
 		return ret
 	}
@@ -273,15 +273,15 @@ func (o *QuotaRulesAllOf) GetQuotaId() string {
 // GetQuotaIdOk returns a tuple with the QuotaId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *QuotaRulesAllOf) GetQuotaIdOk() (*string, bool) {
-	if o == nil || isNil(o.QuotaId) {
-    return nil, false
+	if o == nil || o.QuotaId == nil {
+		return nil, false
 	}
 	return o.QuotaId, true
 }
 
 // HasQuotaId returns a boolean if a field has been set.
 func (o *QuotaRulesAllOf) HasQuotaId() bool {
-	if o != nil && !isNil(o.QuotaId) {
+	if o != nil && o.QuotaId != nil {
 		return true
 	}
 
@@ -295,7 +295,7 @@ func (o *QuotaRulesAllOf) SetQuotaId(v string) {
 
 // GetType returns the Type field value if set, zero value otherwise.
 func (o *QuotaRulesAllOf) GetType() string {
-	if o == nil || isNil(o.Type) {
+	if o == nil || o.Type == nil {
 		var ret string
 		return ret
 	}
@@ -305,15 +305,15 @@ func (o *QuotaRulesAllOf) GetType() string {
 // GetTypeOk returns a tuple with the Type field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *QuotaRulesAllOf) GetTypeOk() (*string, bool) {
-	if o == nil || isNil(o.Type) {
-    return nil, false
+	if o == nil || o.Type == nil {
+		return nil, false
 	}
 	return o.Type, true
 }
 
 // HasType returns a boolean if a field has been set.
 func (o *QuotaRulesAllOf) HasType() bool {
-	if o != nil && !isNil(o.Type) {
+	if o != nil && o.Type != nil {
 		return true
 	}
 
@@ -327,31 +327,31 @@ func (o *QuotaRulesAllOf) SetType(v string) {
 
 func (o QuotaRulesAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.AvailabilityZone) {
+	if o.AvailabilityZone != nil {
 		toSerialize["availability_zone"] = o.AvailabilityZone
 	}
-	if !isNil(o.BillingModel) {
+	if o.BillingModel != nil {
 		toSerialize["billing_model"] = o.BillingModel
 	}
-	if !isNil(o.Byoc) {
+	if o.Byoc != nil {
 		toSerialize["byoc"] = o.Byoc
 	}
-	if !isNil(o.Cloud) {
+	if o.Cloud != nil {
 		toSerialize["cloud"] = o.Cloud
 	}
 	if true {
 		toSerialize["cost"] = o.Cost
 	}
-	if !isNil(o.Name) {
+	if o.Name != nil {
 		toSerialize["name"] = o.Name
 	}
-	if !isNil(o.Product) {
+	if o.Product != nil {
 		toSerialize["product"] = o.Product
 	}
-	if !isNil(o.QuotaId) {
+	if o.QuotaId != nil {
 		toSerialize["quota_id"] = o.QuotaId
 	}
-	if !isNil(o.Type) {
+	if o.Type != nil {
 		toSerialize["type"] = o.Type
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_quota_rules_list.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_quota_rules_list.go
index 81fca64e..27b576ff 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_quota_rules_list.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_quota_rules_list.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -58,8 +58,8 @@ func (o *QuotaRulesList) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *QuotaRulesList) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -82,8 +82,8 @@ func (o *QuotaRulesList) GetPage() int32 {
 // GetPageOk returns a tuple with the Page field value
 // and a boolean to check if the value has been set.
 func (o *QuotaRulesList) GetPageOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Page, true
 }
@@ -106,8 +106,8 @@ func (o *QuotaRulesList) GetSize() int32 {
 // GetSizeOk returns a tuple with the Size field value
 // and a boolean to check if the value has been set.
 func (o *QuotaRulesList) GetSizeOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Size, true
 }
@@ -130,8 +130,8 @@ func (o *QuotaRulesList) GetTotal() int32 {
 // GetTotalOk returns a tuple with the Total field value
 // and a boolean to check if the value has been set.
 func (o *QuotaRulesList) GetTotalOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Total, true
 }
@@ -153,11 +153,11 @@ func (o *QuotaRulesList) GetItems() []QuotaRules {
 
 // GetItemsOk returns a tuple with the Items field value
 // and a boolean to check if the value has been set.
-func (o *QuotaRulesList) GetItemsOk() ([]QuotaRules, bool) {
-	if o == nil {
-    return nil, false
+func (o *QuotaRulesList) GetItemsOk() (*[]QuotaRules, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Items, true
+	return &o.Items, true
 }
 
 // SetItems sets field value
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_quota_rules_list_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_quota_rules_list_all_of.go
index 0ca4e561..313e3dd8 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_quota_rules_list_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_quota_rules_list_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -16,7 +16,7 @@ import (
 
 // QuotaRulesListAllOf struct for QuotaRulesListAllOf
 type QuotaRulesListAllOf struct {
-	Items []QuotaRules `json:"items,omitempty"`
+	Items *[]QuotaRules `json:"items,omitempty"`
 }
 
 // NewQuotaRulesListAllOf instantiates a new QuotaRulesListAllOf object
@@ -38,25 +38,25 @@ func NewQuotaRulesListAllOfWithDefaults() *QuotaRulesListAllOf {
 
 // GetItems returns the Items field value if set, zero value otherwise.
 func (o *QuotaRulesListAllOf) GetItems() []QuotaRules {
-	if o == nil || isNil(o.Items) {
+	if o == nil || o.Items == nil {
 		var ret []QuotaRules
 		return ret
 	}
-	return o.Items
+	return *o.Items
 }
 
 // GetItemsOk returns a tuple with the Items field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *QuotaRulesListAllOf) GetItemsOk() ([]QuotaRules, bool) {
-	if o == nil || isNil(o.Items) {
-    return nil, false
+func (o *QuotaRulesListAllOf) GetItemsOk() (*[]QuotaRules, bool) {
+	if o == nil || o.Items == nil {
+		return nil, false
 	}
 	return o.Items, true
 }
 
 // HasItems returns a boolean if a field has been set.
 func (o *QuotaRulesListAllOf) HasItems() bool {
-	if o != nil && !isNil(o.Items) {
+	if o != nil && o.Items != nil {
 		return true
 	}
 
@@ -65,12 +65,12 @@ func (o *QuotaRulesListAllOf) HasItems() bool {
 
 // SetItems gets a reference to the given []QuotaRules and assigns it to the Items field.
 func (o *QuotaRulesListAllOf) SetItems(v []QuotaRules) {
-	o.Items = v
+	o.Items = &v
 }
 
 func (o QuotaRulesListAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Items) {
+	if o.Items != nil {
 		toSerialize["items"] = o.Items
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_registry.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_registry.go
index 00503b8c..53cd0bf9 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_registry.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_registry.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -12,6 +12,7 @@ package accountmgmtclient
 
 import (
 	"encoding/json"
+	"time"
 )
 
 // Registry struct for Registry
@@ -48,7 +49,7 @@ func NewRegistryWithDefaults() *Registry {
 
 // GetHref returns the Href field value if set, zero value otherwise.
 func (o *Registry) GetHref() string {
-	if o == nil || isNil(o.Href) {
+	if o == nil || o.Href == nil {
 		var ret string
 		return ret
 	}
@@ -58,15 +59,15 @@ func (o *Registry) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Registry) GetHrefOk() (*string, bool) {
-	if o == nil || isNil(o.Href) {
-    return nil, false
+	if o == nil || o.Href == nil {
+		return nil, false
 	}
 	return o.Href, true
 }
 
 // HasHref returns a boolean if a field has been set.
 func (o *Registry) HasHref() bool {
-	if o != nil && !isNil(o.Href) {
+	if o != nil && o.Href != nil {
 		return true
 	}
 
@@ -80,7 +81,7 @@ func (o *Registry) SetHref(v string) {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *Registry) GetId() string {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret string
 		return ret
 	}
@@ -90,15 +91,15 @@ func (o *Registry) GetId() string {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Registry) GetIdOk() (*string, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *Registry) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -112,7 +113,7 @@ func (o *Registry) SetId(v string) {
 
 // GetKind returns the Kind field value if set, zero value otherwise.
 func (o *Registry) GetKind() string {
-	if o == nil || isNil(o.Kind) {
+	if o == nil || o.Kind == nil {
 		var ret string
 		return ret
 	}
@@ -122,15 +123,15 @@ func (o *Registry) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Registry) GetKindOk() (*string, bool) {
-	if o == nil || isNil(o.Kind) {
-    return nil, false
+	if o == nil || o.Kind == nil {
+		return nil, false
 	}
 	return o.Kind, true
 }
 
 // HasKind returns a boolean if a field has been set.
 func (o *Registry) HasKind() bool {
-	if o != nil && !isNil(o.Kind) {
+	if o != nil && o.Kind != nil {
 		return true
 	}
 
@@ -144,7 +145,7 @@ func (o *Registry) SetKind(v string) {
 
 // GetCloudAlias returns the CloudAlias field value if set, zero value otherwise.
 func (o *Registry) GetCloudAlias() bool {
-	if o == nil || isNil(o.CloudAlias) {
+	if o == nil || o.CloudAlias == nil {
 		var ret bool
 		return ret
 	}
@@ -154,15 +155,15 @@ func (o *Registry) GetCloudAlias() bool {
 // GetCloudAliasOk returns a tuple with the CloudAlias field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Registry) GetCloudAliasOk() (*bool, bool) {
-	if o == nil || isNil(o.CloudAlias) {
-    return nil, false
+	if o == nil || o.CloudAlias == nil {
+		return nil, false
 	}
 	return o.CloudAlias, true
 }
 
 // HasCloudAlias returns a boolean if a field has been set.
 func (o *Registry) HasCloudAlias() bool {
-	if o != nil && !isNil(o.CloudAlias) {
+	if o != nil && o.CloudAlias != nil {
 		return true
 	}
 
@@ -176,7 +177,7 @@ func (o *Registry) SetCloudAlias(v bool) {
 
 // GetCreatedAt returns the CreatedAt field value if set, zero value otherwise.
 func (o *Registry) GetCreatedAt() time.Time {
-	if o == nil || isNil(o.CreatedAt) {
+	if o == nil || o.CreatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -186,15 +187,15 @@ func (o *Registry) GetCreatedAt() time.Time {
 // GetCreatedAtOk returns a tuple with the CreatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Registry) GetCreatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.CreatedAt) {
-    return nil, false
+	if o == nil || o.CreatedAt == nil {
+		return nil, false
 	}
 	return o.CreatedAt, true
 }
 
 // HasCreatedAt returns a boolean if a field has been set.
 func (o *Registry) HasCreatedAt() bool {
-	if o != nil && !isNil(o.CreatedAt) {
+	if o != nil && o.CreatedAt != nil {
 		return true
 	}
 
@@ -208,7 +209,7 @@ func (o *Registry) SetCreatedAt(v time.Time) {
 
 // GetName returns the Name field value if set, zero value otherwise.
 func (o *Registry) GetName() string {
-	if o == nil || isNil(o.Name) {
+	if o == nil || o.Name == nil {
 		var ret string
 		return ret
 	}
@@ -218,15 +219,15 @@ func (o *Registry) GetName() string {
 // GetNameOk returns a tuple with the Name field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Registry) GetNameOk() (*string, bool) {
-	if o == nil || isNil(o.Name) {
-    return nil, false
+	if o == nil || o.Name == nil {
+		return nil, false
 	}
 	return o.Name, true
 }
 
 // HasName returns a boolean if a field has been set.
 func (o *Registry) HasName() bool {
-	if o != nil && !isNil(o.Name) {
+	if o != nil && o.Name != nil {
 		return true
 	}
 
@@ -240,7 +241,7 @@ func (o *Registry) SetName(v string) {
 
 // GetOrgName returns the OrgName field value if set, zero value otherwise.
 func (o *Registry) GetOrgName() string {
-	if o == nil || isNil(o.OrgName) {
+	if o == nil || o.OrgName == nil {
 		var ret string
 		return ret
 	}
@@ -250,15 +251,15 @@ func (o *Registry) GetOrgName() string {
 // GetOrgNameOk returns a tuple with the OrgName field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Registry) GetOrgNameOk() (*string, bool) {
-	if o == nil || isNil(o.OrgName) {
-    return nil, false
+	if o == nil || o.OrgName == nil {
+		return nil, false
 	}
 	return o.OrgName, true
 }
 
 // HasOrgName returns a boolean if a field has been set.
 func (o *Registry) HasOrgName() bool {
-	if o != nil && !isNil(o.OrgName) {
+	if o != nil && o.OrgName != nil {
 		return true
 	}
 
@@ -272,7 +273,7 @@ func (o *Registry) SetOrgName(v string) {
 
 // GetTeamName returns the TeamName field value if set, zero value otherwise.
 func (o *Registry) GetTeamName() string {
-	if o == nil || isNil(o.TeamName) {
+	if o == nil || o.TeamName == nil {
 		var ret string
 		return ret
 	}
@@ -282,15 +283,15 @@ func (o *Registry) GetTeamName() string {
 // GetTeamNameOk returns a tuple with the TeamName field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Registry) GetTeamNameOk() (*string, bool) {
-	if o == nil || isNil(o.TeamName) {
-    return nil, false
+	if o == nil || o.TeamName == nil {
+		return nil, false
 	}
 	return o.TeamName, true
 }
 
 // HasTeamName returns a boolean if a field has been set.
 func (o *Registry) HasTeamName() bool {
-	if o != nil && !isNil(o.TeamName) {
+	if o != nil && o.TeamName != nil {
 		return true
 	}
 
@@ -304,7 +305,7 @@ func (o *Registry) SetTeamName(v string) {
 
 // GetType returns the Type field value if set, zero value otherwise.
 func (o *Registry) GetType() string {
-	if o == nil || isNil(o.Type) {
+	if o == nil || o.Type == nil {
 		var ret string
 		return ret
 	}
@@ -314,15 +315,15 @@ func (o *Registry) GetType() string {
 // GetTypeOk returns a tuple with the Type field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Registry) GetTypeOk() (*string, bool) {
-	if o == nil || isNil(o.Type) {
-    return nil, false
+	if o == nil || o.Type == nil {
+		return nil, false
 	}
 	return o.Type, true
 }
 
 // HasType returns a boolean if a field has been set.
 func (o *Registry) HasType() bool {
-	if o != nil && !isNil(o.Type) {
+	if o != nil && o.Type != nil {
 		return true
 	}
 
@@ -336,7 +337,7 @@ func (o *Registry) SetType(v string) {
 
 // GetUpdatedAt returns the UpdatedAt field value if set, zero value otherwise.
 func (o *Registry) GetUpdatedAt() time.Time {
-	if o == nil || isNil(o.UpdatedAt) {
+	if o == nil || o.UpdatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -346,15 +347,15 @@ func (o *Registry) GetUpdatedAt() time.Time {
 // GetUpdatedAtOk returns a tuple with the UpdatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Registry) GetUpdatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.UpdatedAt) {
-    return nil, false
+	if o == nil || o.UpdatedAt == nil {
+		return nil, false
 	}
 	return o.UpdatedAt, true
 }
 
 // HasUpdatedAt returns a boolean if a field has been set.
 func (o *Registry) HasUpdatedAt() bool {
-	if o != nil && !isNil(o.UpdatedAt) {
+	if o != nil && o.UpdatedAt != nil {
 		return true
 	}
 
@@ -368,7 +369,7 @@ func (o *Registry) SetUpdatedAt(v time.Time) {
 
 // GetUrl returns the Url field value if set, zero value otherwise.
 func (o *Registry) GetUrl() string {
-	if o == nil || isNil(o.Url) {
+	if o == nil || o.Url == nil {
 		var ret string
 		return ret
 	}
@@ -378,15 +379,15 @@ func (o *Registry) GetUrl() string {
 // GetUrlOk returns a tuple with the Url field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Registry) GetUrlOk() (*string, bool) {
-	if o == nil || isNil(o.Url) {
-    return nil, false
+	if o == nil || o.Url == nil {
+		return nil, false
 	}
 	return o.Url, true
 }
 
 // HasUrl returns a boolean if a field has been set.
 func (o *Registry) HasUrl() bool {
-	if o != nil && !isNil(o.Url) {
+	if o != nil && o.Url != nil {
 		return true
 	}
 
@@ -400,37 +401,37 @@ func (o *Registry) SetUrl(v string) {
 
 func (o Registry) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Href) {
+	if o.Href != nil {
 		toSerialize["href"] = o.Href
 	}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.Kind) {
+	if o.Kind != nil {
 		toSerialize["kind"] = o.Kind
 	}
-	if !isNil(o.CloudAlias) {
+	if o.CloudAlias != nil {
 		toSerialize["cloudAlias"] = o.CloudAlias
 	}
-	if !isNil(o.CreatedAt) {
+	if o.CreatedAt != nil {
 		toSerialize["created_at"] = o.CreatedAt
 	}
-	if !isNil(o.Name) {
+	if o.Name != nil {
 		toSerialize["name"] = o.Name
 	}
-	if !isNil(o.OrgName) {
+	if o.OrgName != nil {
 		toSerialize["org_name"] = o.OrgName
 	}
-	if !isNil(o.TeamName) {
+	if o.TeamName != nil {
 		toSerialize["team_name"] = o.TeamName
 	}
-	if !isNil(o.Type) {
+	if o.Type != nil {
 		toSerialize["type"] = o.Type
 	}
-	if !isNil(o.UpdatedAt) {
+	if o.UpdatedAt != nil {
 		toSerialize["updated_at"] = o.UpdatedAt
 	}
-	if !isNil(o.Url) {
+	if o.Url != nil {
 		toSerialize["url"] = o.Url
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_registry_address_value.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_registry_address_value.go
deleted file mode 100644
index 172d05cc..00000000
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_registry_address_value.go
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
-
-// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
-
-package accountmgmtclient
-
-import (
-	"encoding/json"
-)
-
-// RegistryAddressValue struct for RegistryAddressValue
-type RegistryAddressValue struct {
-	Auth *string `json:"auth,omitempty"`
-	Email *string `json:"email,omitempty"`
-}
-
-// NewRegistryAddressValue instantiates a new RegistryAddressValue object
-// This constructor will assign default values to properties that have it defined,
-// and makes sure properties required by API are set, but the set of arguments
-// will change when the set of required properties is changed
-func NewRegistryAddressValue() *RegistryAddressValue {
-	this := RegistryAddressValue{}
-	return &this
-}
-
-// NewRegistryAddressValueWithDefaults instantiates a new RegistryAddressValue object
-// This constructor will only assign default values to properties that have it defined,
-// but it doesn't guarantee that properties required by API are set
-func NewRegistryAddressValueWithDefaults() *RegistryAddressValue {
-	this := RegistryAddressValue{}
-	return &this
-}
-
-// GetAuth returns the Auth field value if set, zero value otherwise.
-func (o *RegistryAddressValue) GetAuth() string {
-	if o == nil || isNil(o.Auth) {
-		var ret string
-		return ret
-	}
-	return *o.Auth
-}
-
-// GetAuthOk returns a tuple with the Auth field value if set, nil otherwise
-// and a boolean to check if the value has been set.
-func (o *RegistryAddressValue) GetAuthOk() (*string, bool) {
-	if o == nil || isNil(o.Auth) {
-    return nil, false
-	}
-	return o.Auth, true
-}
-
-// HasAuth returns a boolean if a field has been set.
-func (o *RegistryAddressValue) HasAuth() bool {
-	if o != nil && !isNil(o.Auth) {
-		return true
-	}
-
-	return false
-}
-
-// SetAuth gets a reference to the given string and assigns it to the Auth field.
-func (o *RegistryAddressValue) SetAuth(v string) {
-	o.Auth = &v
-}
-
-// GetEmail returns the Email field value if set, zero value otherwise.
-func (o *RegistryAddressValue) GetEmail() string {
-	if o == nil || isNil(o.Email) {
-		var ret string
-		return ret
-	}
-	return *o.Email
-}
-
-// GetEmailOk returns a tuple with the Email field value if set, nil otherwise
-// and a boolean to check if the value has been set.
-func (o *RegistryAddressValue) GetEmailOk() (*string, bool) {
-	if o == nil || isNil(o.Email) {
-    return nil, false
-	}
-	return o.Email, true
-}
-
-// HasEmail returns a boolean if a field has been set.
-func (o *RegistryAddressValue) HasEmail() bool {
-	if o != nil && !isNil(o.Email) {
-		return true
-	}
-
-	return false
-}
-
-// SetEmail gets a reference to the given string and assigns it to the Email field.
-func (o *RegistryAddressValue) SetEmail(v string) {
-	o.Email = &v
-}
-
-func (o RegistryAddressValue) MarshalJSON() ([]byte, error) {
-	toSerialize := map[string]interface{}{}
-	if !isNil(o.Auth) {
-		toSerialize["auth"] = o.Auth
-	}
-	if !isNil(o.Email) {
-		toSerialize["email"] = o.Email
-	}
-	return json.Marshal(toSerialize)
-}
-
-type NullableRegistryAddressValue struct {
-	value *RegistryAddressValue
-	isSet bool
-}
-
-func (v NullableRegistryAddressValue) Get() *RegistryAddressValue {
-	return v.value
-}
-
-func (v *NullableRegistryAddressValue) Set(val *RegistryAddressValue) {
-	v.value = val
-	v.isSet = true
-}
-
-func (v NullableRegistryAddressValue) IsSet() bool {
-	return v.isSet
-}
-
-func (v *NullableRegistryAddressValue) Unset() {
-	v.value = nil
-	v.isSet = false
-}
-
-func NewNullableRegistryAddressValue(val *RegistryAddressValue) *NullableRegistryAddressValue {
-	return &NullableRegistryAddressValue{value: val, isSet: true}
-}
-
-func (v NullableRegistryAddressValue) MarshalJSON() ([]byte, error) {
-	return json.Marshal(v.value)
-}
-
-func (v *NullableRegistryAddressValue) UnmarshalJSON(src []byte) error {
-	v.isSet = true
-	return json.Unmarshal(src, &v.value)
-}
-
-
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_registry_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_registry_all_of.go
index 7f991853..21e80487 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_registry_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_registry_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -46,7 +46,7 @@ func NewRegistryAllOfWithDefaults() *RegistryAllOf {
 
 // GetCloudAlias returns the CloudAlias field value if set, zero value otherwise.
 func (o *RegistryAllOf) GetCloudAlias() bool {
-	if o == nil || isNil(o.CloudAlias) {
+	if o == nil || o.CloudAlias == nil {
 		var ret bool
 		return ret
 	}
@@ -56,15 +56,15 @@ func (o *RegistryAllOf) GetCloudAlias() bool {
 // GetCloudAliasOk returns a tuple with the CloudAlias field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RegistryAllOf) GetCloudAliasOk() (*bool, bool) {
-	if o == nil || isNil(o.CloudAlias) {
-    return nil, false
+	if o == nil || o.CloudAlias == nil {
+		return nil, false
 	}
 	return o.CloudAlias, true
 }
 
 // HasCloudAlias returns a boolean if a field has been set.
 func (o *RegistryAllOf) HasCloudAlias() bool {
-	if o != nil && !isNil(o.CloudAlias) {
+	if o != nil && o.CloudAlias != nil {
 		return true
 	}
 
@@ -78,7 +78,7 @@ func (o *RegistryAllOf) SetCloudAlias(v bool) {
 
 // GetCreatedAt returns the CreatedAt field value if set, zero value otherwise.
 func (o *RegistryAllOf) GetCreatedAt() time.Time {
-	if o == nil || isNil(o.CreatedAt) {
+	if o == nil || o.CreatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -88,15 +88,15 @@ func (o *RegistryAllOf) GetCreatedAt() time.Time {
 // GetCreatedAtOk returns a tuple with the CreatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RegistryAllOf) GetCreatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.CreatedAt) {
-    return nil, false
+	if o == nil || o.CreatedAt == nil {
+		return nil, false
 	}
 	return o.CreatedAt, true
 }
 
 // HasCreatedAt returns a boolean if a field has been set.
 func (o *RegistryAllOf) HasCreatedAt() bool {
-	if o != nil && !isNil(o.CreatedAt) {
+	if o != nil && o.CreatedAt != nil {
 		return true
 	}
 
@@ -110,7 +110,7 @@ func (o *RegistryAllOf) SetCreatedAt(v time.Time) {
 
 // GetName returns the Name field value if set, zero value otherwise.
 func (o *RegistryAllOf) GetName() string {
-	if o == nil || isNil(o.Name) {
+	if o == nil || o.Name == nil {
 		var ret string
 		return ret
 	}
@@ -120,15 +120,15 @@ func (o *RegistryAllOf) GetName() string {
 // GetNameOk returns a tuple with the Name field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RegistryAllOf) GetNameOk() (*string, bool) {
-	if o == nil || isNil(o.Name) {
-    return nil, false
+	if o == nil || o.Name == nil {
+		return nil, false
 	}
 	return o.Name, true
 }
 
 // HasName returns a boolean if a field has been set.
 func (o *RegistryAllOf) HasName() bool {
-	if o != nil && !isNil(o.Name) {
+	if o != nil && o.Name != nil {
 		return true
 	}
 
@@ -142,7 +142,7 @@ func (o *RegistryAllOf) SetName(v string) {
 
 // GetOrgName returns the OrgName field value if set, zero value otherwise.
 func (o *RegistryAllOf) GetOrgName() string {
-	if o == nil || isNil(o.OrgName) {
+	if o == nil || o.OrgName == nil {
 		var ret string
 		return ret
 	}
@@ -152,15 +152,15 @@ func (o *RegistryAllOf) GetOrgName() string {
 // GetOrgNameOk returns a tuple with the OrgName field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RegistryAllOf) GetOrgNameOk() (*string, bool) {
-	if o == nil || isNil(o.OrgName) {
-    return nil, false
+	if o == nil || o.OrgName == nil {
+		return nil, false
 	}
 	return o.OrgName, true
 }
 
 // HasOrgName returns a boolean if a field has been set.
 func (o *RegistryAllOf) HasOrgName() bool {
-	if o != nil && !isNil(o.OrgName) {
+	if o != nil && o.OrgName != nil {
 		return true
 	}
 
@@ -174,7 +174,7 @@ func (o *RegistryAllOf) SetOrgName(v string) {
 
 // GetTeamName returns the TeamName field value if set, zero value otherwise.
 func (o *RegistryAllOf) GetTeamName() string {
-	if o == nil || isNil(o.TeamName) {
+	if o == nil || o.TeamName == nil {
 		var ret string
 		return ret
 	}
@@ -184,15 +184,15 @@ func (o *RegistryAllOf) GetTeamName() string {
 // GetTeamNameOk returns a tuple with the TeamName field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RegistryAllOf) GetTeamNameOk() (*string, bool) {
-	if o == nil || isNil(o.TeamName) {
-    return nil, false
+	if o == nil || o.TeamName == nil {
+		return nil, false
 	}
 	return o.TeamName, true
 }
 
 // HasTeamName returns a boolean if a field has been set.
 func (o *RegistryAllOf) HasTeamName() bool {
-	if o != nil && !isNil(o.TeamName) {
+	if o != nil && o.TeamName != nil {
 		return true
 	}
 
@@ -206,7 +206,7 @@ func (o *RegistryAllOf) SetTeamName(v string) {
 
 // GetType returns the Type field value if set, zero value otherwise.
 func (o *RegistryAllOf) GetType() string {
-	if o == nil || isNil(o.Type) {
+	if o == nil || o.Type == nil {
 		var ret string
 		return ret
 	}
@@ -216,15 +216,15 @@ func (o *RegistryAllOf) GetType() string {
 // GetTypeOk returns a tuple with the Type field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RegistryAllOf) GetTypeOk() (*string, bool) {
-	if o == nil || isNil(o.Type) {
-    return nil, false
+	if o == nil || o.Type == nil {
+		return nil, false
 	}
 	return o.Type, true
 }
 
 // HasType returns a boolean if a field has been set.
 func (o *RegistryAllOf) HasType() bool {
-	if o != nil && !isNil(o.Type) {
+	if o != nil && o.Type != nil {
 		return true
 	}
 
@@ -238,7 +238,7 @@ func (o *RegistryAllOf) SetType(v string) {
 
 // GetUpdatedAt returns the UpdatedAt field value if set, zero value otherwise.
 func (o *RegistryAllOf) GetUpdatedAt() time.Time {
-	if o == nil || isNil(o.UpdatedAt) {
+	if o == nil || o.UpdatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -248,15 +248,15 @@ func (o *RegistryAllOf) GetUpdatedAt() time.Time {
 // GetUpdatedAtOk returns a tuple with the UpdatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RegistryAllOf) GetUpdatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.UpdatedAt) {
-    return nil, false
+	if o == nil || o.UpdatedAt == nil {
+		return nil, false
 	}
 	return o.UpdatedAt, true
 }
 
 // HasUpdatedAt returns a boolean if a field has been set.
 func (o *RegistryAllOf) HasUpdatedAt() bool {
-	if o != nil && !isNil(o.UpdatedAt) {
+	if o != nil && o.UpdatedAt != nil {
 		return true
 	}
 
@@ -270,7 +270,7 @@ func (o *RegistryAllOf) SetUpdatedAt(v time.Time) {
 
 // GetUrl returns the Url field value if set, zero value otherwise.
 func (o *RegistryAllOf) GetUrl() string {
-	if o == nil || isNil(o.Url) {
+	if o == nil || o.Url == nil {
 		var ret string
 		return ret
 	}
@@ -280,15 +280,15 @@ func (o *RegistryAllOf) GetUrl() string {
 // GetUrlOk returns a tuple with the Url field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RegistryAllOf) GetUrlOk() (*string, bool) {
-	if o == nil || isNil(o.Url) {
-    return nil, false
+	if o == nil || o.Url == nil {
+		return nil, false
 	}
 	return o.Url, true
 }
 
 // HasUrl returns a boolean if a field has been set.
 func (o *RegistryAllOf) HasUrl() bool {
-	if o != nil && !isNil(o.Url) {
+	if o != nil && o.Url != nil {
 		return true
 	}
 
@@ -302,28 +302,28 @@ func (o *RegistryAllOf) SetUrl(v string) {
 
 func (o RegistryAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.CloudAlias) {
+	if o.CloudAlias != nil {
 		toSerialize["cloudAlias"] = o.CloudAlias
 	}
-	if !isNil(o.CreatedAt) {
+	if o.CreatedAt != nil {
 		toSerialize["created_at"] = o.CreatedAt
 	}
-	if !isNil(o.Name) {
+	if o.Name != nil {
 		toSerialize["name"] = o.Name
 	}
-	if !isNil(o.OrgName) {
+	if o.OrgName != nil {
 		toSerialize["org_name"] = o.OrgName
 	}
-	if !isNil(o.TeamName) {
+	if o.TeamName != nil {
 		toSerialize["team_name"] = o.TeamName
 	}
-	if !isNil(o.Type) {
+	if o.Type != nil {
 		toSerialize["type"] = o.Type
 	}
-	if !isNil(o.UpdatedAt) {
+	if o.UpdatedAt != nil {
 		toSerialize["updated_at"] = o.UpdatedAt
 	}
-	if !isNil(o.Url) {
+	if o.Url != nil {
 		toSerialize["url"] = o.Url
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_registry_create_request.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_registry_create_request.go
index 90743ea8..f0b8bfdb 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_registry_create_request.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_registry_create_request.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -46,7 +46,7 @@ func NewRegistryCreateRequestWithDefaults() *RegistryCreateRequest {
 
 // GetCloudAlias returns the CloudAlias field value if set, zero value otherwise.
 func (o *RegistryCreateRequest) GetCloudAlias() bool {
-	if o == nil || isNil(o.CloudAlias) {
+	if o == nil || o.CloudAlias == nil {
 		var ret bool
 		return ret
 	}
@@ -56,15 +56,15 @@ func (o *RegistryCreateRequest) GetCloudAlias() bool {
 // GetCloudAliasOk returns a tuple with the CloudAlias field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RegistryCreateRequest) GetCloudAliasOk() (*bool, bool) {
-	if o == nil || isNil(o.CloudAlias) {
-    return nil, false
+	if o == nil || o.CloudAlias == nil {
+		return nil, false
 	}
 	return o.CloudAlias, true
 }
 
 // HasCloudAlias returns a boolean if a field has been set.
 func (o *RegistryCreateRequest) HasCloudAlias() bool {
-	if o != nil && !isNil(o.CloudAlias) {
+	if o != nil && o.CloudAlias != nil {
 		return true
 	}
 
@@ -89,8 +89,8 @@ func (o *RegistryCreateRequest) GetName() string {
 // GetNameOk returns a tuple with the Name field value
 // and a boolean to check if the value has been set.
 func (o *RegistryCreateRequest) GetNameOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Name, true
 }
@@ -102,7 +102,7 @@ func (o *RegistryCreateRequest) SetName(v string) {
 
 // GetOrgName returns the OrgName field value if set, zero value otherwise.
 func (o *RegistryCreateRequest) GetOrgName() string {
-	if o == nil || isNil(o.OrgName) {
+	if o == nil || o.OrgName == nil {
 		var ret string
 		return ret
 	}
@@ -112,15 +112,15 @@ func (o *RegistryCreateRequest) GetOrgName() string {
 // GetOrgNameOk returns a tuple with the OrgName field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RegistryCreateRequest) GetOrgNameOk() (*string, bool) {
-	if o == nil || isNil(o.OrgName) {
-    return nil, false
+	if o == nil || o.OrgName == nil {
+		return nil, false
 	}
 	return o.OrgName, true
 }
 
 // HasOrgName returns a boolean if a field has been set.
 func (o *RegistryCreateRequest) HasOrgName() bool {
-	if o != nil && !isNil(o.OrgName) {
+	if o != nil && o.OrgName != nil {
 		return true
 	}
 
@@ -134,7 +134,7 @@ func (o *RegistryCreateRequest) SetOrgName(v string) {
 
 // GetTeamName returns the TeamName field value if set, zero value otherwise.
 func (o *RegistryCreateRequest) GetTeamName() string {
-	if o == nil || isNil(o.TeamName) {
+	if o == nil || o.TeamName == nil {
 		var ret string
 		return ret
 	}
@@ -144,15 +144,15 @@ func (o *RegistryCreateRequest) GetTeamName() string {
 // GetTeamNameOk returns a tuple with the TeamName field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RegistryCreateRequest) GetTeamNameOk() (*string, bool) {
-	if o == nil || isNil(o.TeamName) {
-    return nil, false
+	if o == nil || o.TeamName == nil {
+		return nil, false
 	}
 	return o.TeamName, true
 }
 
 // HasTeamName returns a boolean if a field has been set.
 func (o *RegistryCreateRequest) HasTeamName() bool {
-	if o != nil && !isNil(o.TeamName) {
+	if o != nil && o.TeamName != nil {
 		return true
 	}
 
@@ -177,8 +177,8 @@ func (o *RegistryCreateRequest) GetType() string {
 // GetTypeOk returns a tuple with the Type field value
 // and a boolean to check if the value has been set.
 func (o *RegistryCreateRequest) GetTypeOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Type, true
 }
@@ -201,8 +201,8 @@ func (o *RegistryCreateRequest) GetUrl() string {
 // GetUrlOk returns a tuple with the Url field value
 // and a boolean to check if the value has been set.
 func (o *RegistryCreateRequest) GetUrlOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Url, true
 }
@@ -214,16 +214,16 @@ func (o *RegistryCreateRequest) SetUrl(v string) {
 
 func (o RegistryCreateRequest) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.CloudAlias) {
+	if o.CloudAlias != nil {
 		toSerialize["cloudAlias"] = o.CloudAlias
 	}
 	if true {
 		toSerialize["name"] = o.Name
 	}
-	if !isNil(o.OrgName) {
+	if o.OrgName != nil {
 		toSerialize["org_name"] = o.OrgName
 	}
-	if !isNil(o.TeamName) {
+	if o.TeamName != nil {
 		toSerialize["team_name"] = o.TeamName
 	}
 	if true {
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_registry_credential.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_registry_credential.go
index 4bc86ad6..cb97b305 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_registry_credential.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_registry_credential.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -12,6 +12,7 @@ package accountmgmtclient
 
 import (
 	"encoding/json"
+	"time"
 )
 
 // RegistryCredential struct for RegistryCredential
@@ -47,7 +48,7 @@ func NewRegistryCredentialWithDefaults() *RegistryCredential {
 
 // GetHref returns the Href field value if set, zero value otherwise.
 func (o *RegistryCredential) GetHref() string {
-	if o == nil || isNil(o.Href) {
+	if o == nil || o.Href == nil {
 		var ret string
 		return ret
 	}
@@ -57,15 +58,15 @@ func (o *RegistryCredential) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RegistryCredential) GetHrefOk() (*string, bool) {
-	if o == nil || isNil(o.Href) {
-    return nil, false
+	if o == nil || o.Href == nil {
+		return nil, false
 	}
 	return o.Href, true
 }
 
 // HasHref returns a boolean if a field has been set.
 func (o *RegistryCredential) HasHref() bool {
-	if o != nil && !isNil(o.Href) {
+	if o != nil && o.Href != nil {
 		return true
 	}
 
@@ -79,7 +80,7 @@ func (o *RegistryCredential) SetHref(v string) {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *RegistryCredential) GetId() string {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret string
 		return ret
 	}
@@ -89,15 +90,15 @@ func (o *RegistryCredential) GetId() string {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RegistryCredential) GetIdOk() (*string, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *RegistryCredential) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -111,7 +112,7 @@ func (o *RegistryCredential) SetId(v string) {
 
 // GetKind returns the Kind field value if set, zero value otherwise.
 func (o *RegistryCredential) GetKind() string {
-	if o == nil || isNil(o.Kind) {
+	if o == nil || o.Kind == nil {
 		var ret string
 		return ret
 	}
@@ -121,15 +122,15 @@ func (o *RegistryCredential) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RegistryCredential) GetKindOk() (*string, bool) {
-	if o == nil || isNil(o.Kind) {
-    return nil, false
+	if o == nil || o.Kind == nil {
+		return nil, false
 	}
 	return o.Kind, true
 }
 
 // HasKind returns a boolean if a field has been set.
 func (o *RegistryCredential) HasKind() bool {
-	if o != nil && !isNil(o.Kind) {
+	if o != nil && o.Kind != nil {
 		return true
 	}
 
@@ -143,7 +144,7 @@ func (o *RegistryCredential) SetKind(v string) {
 
 // GetAccount returns the Account field value if set, zero value otherwise.
 func (o *RegistryCredential) GetAccount() ObjectReference {
-	if o == nil || isNil(o.Account) {
+	if o == nil || o.Account == nil {
 		var ret ObjectReference
 		return ret
 	}
@@ -153,15 +154,15 @@ func (o *RegistryCredential) GetAccount() ObjectReference {
 // GetAccountOk returns a tuple with the Account field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RegistryCredential) GetAccountOk() (*ObjectReference, bool) {
-	if o == nil || isNil(o.Account) {
-    return nil, false
+	if o == nil || o.Account == nil {
+		return nil, false
 	}
 	return o.Account, true
 }
 
 // HasAccount returns a boolean if a field has been set.
 func (o *RegistryCredential) HasAccount() bool {
-	if o != nil && !isNil(o.Account) {
+	if o != nil && o.Account != nil {
 		return true
 	}
 
@@ -175,7 +176,7 @@ func (o *RegistryCredential) SetAccount(v ObjectReference) {
 
 // GetCreatedAt returns the CreatedAt field value if set, zero value otherwise.
 func (o *RegistryCredential) GetCreatedAt() time.Time {
-	if o == nil || isNil(o.CreatedAt) {
+	if o == nil || o.CreatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -185,15 +186,15 @@ func (o *RegistryCredential) GetCreatedAt() time.Time {
 // GetCreatedAtOk returns a tuple with the CreatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RegistryCredential) GetCreatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.CreatedAt) {
-    return nil, false
+	if o == nil || o.CreatedAt == nil {
+		return nil, false
 	}
 	return o.CreatedAt, true
 }
 
 // HasCreatedAt returns a boolean if a field has been set.
 func (o *RegistryCredential) HasCreatedAt() bool {
-	if o != nil && !isNil(o.CreatedAt) {
+	if o != nil && o.CreatedAt != nil {
 		return true
 	}
 
@@ -207,7 +208,7 @@ func (o *RegistryCredential) SetCreatedAt(v time.Time) {
 
 // GetExternalResourceId returns the ExternalResourceId field value if set, zero value otherwise.
 func (o *RegistryCredential) GetExternalResourceId() string {
-	if o == nil || isNil(o.ExternalResourceId) {
+	if o == nil || o.ExternalResourceId == nil {
 		var ret string
 		return ret
 	}
@@ -217,15 +218,15 @@ func (o *RegistryCredential) GetExternalResourceId() string {
 // GetExternalResourceIdOk returns a tuple with the ExternalResourceId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RegistryCredential) GetExternalResourceIdOk() (*string, bool) {
-	if o == nil || isNil(o.ExternalResourceId) {
-    return nil, false
+	if o == nil || o.ExternalResourceId == nil {
+		return nil, false
 	}
 	return o.ExternalResourceId, true
 }
 
 // HasExternalResourceId returns a boolean if a field has been set.
 func (o *RegistryCredential) HasExternalResourceId() bool {
-	if o != nil && !isNil(o.ExternalResourceId) {
+	if o != nil && o.ExternalResourceId != nil {
 		return true
 	}
 
@@ -239,7 +240,7 @@ func (o *RegistryCredential) SetExternalResourceId(v string) {
 
 // GetRegistry returns the Registry field value if set, zero value otherwise.
 func (o *RegistryCredential) GetRegistry() ObjectReference {
-	if o == nil || isNil(o.Registry) {
+	if o == nil || o.Registry == nil {
 		var ret ObjectReference
 		return ret
 	}
@@ -249,15 +250,15 @@ func (o *RegistryCredential) GetRegistry() ObjectReference {
 // GetRegistryOk returns a tuple with the Registry field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RegistryCredential) GetRegistryOk() (*ObjectReference, bool) {
-	if o == nil || isNil(o.Registry) {
-    return nil, false
+	if o == nil || o.Registry == nil {
+		return nil, false
 	}
 	return o.Registry, true
 }
 
 // HasRegistry returns a boolean if a field has been set.
 func (o *RegistryCredential) HasRegistry() bool {
-	if o != nil && !isNil(o.Registry) {
+	if o != nil && o.Registry != nil {
 		return true
 	}
 
@@ -271,7 +272,7 @@ func (o *RegistryCredential) SetRegistry(v ObjectReference) {
 
 // GetToken returns the Token field value if set, zero value otherwise.
 func (o *RegistryCredential) GetToken() string {
-	if o == nil || isNil(o.Token) {
+	if o == nil || o.Token == nil {
 		var ret string
 		return ret
 	}
@@ -281,15 +282,15 @@ func (o *RegistryCredential) GetToken() string {
 // GetTokenOk returns a tuple with the Token field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RegistryCredential) GetTokenOk() (*string, bool) {
-	if o == nil || isNil(o.Token) {
-    return nil, false
+	if o == nil || o.Token == nil {
+		return nil, false
 	}
 	return o.Token, true
 }
 
 // HasToken returns a boolean if a field has been set.
 func (o *RegistryCredential) HasToken() bool {
-	if o != nil && !isNil(o.Token) {
+	if o != nil && o.Token != nil {
 		return true
 	}
 
@@ -303,7 +304,7 @@ func (o *RegistryCredential) SetToken(v string) {
 
 // GetUpdatedAt returns the UpdatedAt field value if set, zero value otherwise.
 func (o *RegistryCredential) GetUpdatedAt() time.Time {
-	if o == nil || isNil(o.UpdatedAt) {
+	if o == nil || o.UpdatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -313,15 +314,15 @@ func (o *RegistryCredential) GetUpdatedAt() time.Time {
 // GetUpdatedAtOk returns a tuple with the UpdatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RegistryCredential) GetUpdatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.UpdatedAt) {
-    return nil, false
+	if o == nil || o.UpdatedAt == nil {
+		return nil, false
 	}
 	return o.UpdatedAt, true
 }
 
 // HasUpdatedAt returns a boolean if a field has been set.
 func (o *RegistryCredential) HasUpdatedAt() bool {
-	if o != nil && !isNil(o.UpdatedAt) {
+	if o != nil && o.UpdatedAt != nil {
 		return true
 	}
 
@@ -335,7 +336,7 @@ func (o *RegistryCredential) SetUpdatedAt(v time.Time) {
 
 // GetUsername returns the Username field value if set, zero value otherwise.
 func (o *RegistryCredential) GetUsername() string {
-	if o == nil || isNil(o.Username) {
+	if o == nil || o.Username == nil {
 		var ret string
 		return ret
 	}
@@ -345,15 +346,15 @@ func (o *RegistryCredential) GetUsername() string {
 // GetUsernameOk returns a tuple with the Username field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RegistryCredential) GetUsernameOk() (*string, bool) {
-	if o == nil || isNil(o.Username) {
-    return nil, false
+	if o == nil || o.Username == nil {
+		return nil, false
 	}
 	return o.Username, true
 }
 
 // HasUsername returns a boolean if a field has been set.
 func (o *RegistryCredential) HasUsername() bool {
-	if o != nil && !isNil(o.Username) {
+	if o != nil && o.Username != nil {
 		return true
 	}
 
@@ -367,34 +368,34 @@ func (o *RegistryCredential) SetUsername(v string) {
 
 func (o RegistryCredential) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Href) {
+	if o.Href != nil {
 		toSerialize["href"] = o.Href
 	}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.Kind) {
+	if o.Kind != nil {
 		toSerialize["kind"] = o.Kind
 	}
-	if !isNil(o.Account) {
+	if o.Account != nil {
 		toSerialize["account"] = o.Account
 	}
-	if !isNil(o.CreatedAt) {
+	if o.CreatedAt != nil {
 		toSerialize["created_at"] = o.CreatedAt
 	}
-	if !isNil(o.ExternalResourceId) {
+	if o.ExternalResourceId != nil {
 		toSerialize["external_resource_id"] = o.ExternalResourceId
 	}
-	if !isNil(o.Registry) {
+	if o.Registry != nil {
 		toSerialize["registry"] = o.Registry
 	}
-	if !isNil(o.Token) {
+	if o.Token != nil {
 		toSerialize["token"] = o.Token
 	}
-	if !isNil(o.UpdatedAt) {
+	if o.UpdatedAt != nil {
 		toSerialize["updated_at"] = o.UpdatedAt
 	}
-	if !isNil(o.Username) {
+	if o.Username != nil {
 		toSerialize["username"] = o.Username
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_registry_credential_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_registry_credential_all_of.go
index 127f05a4..1db78920 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_registry_credential_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_registry_credential_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -45,7 +45,7 @@ func NewRegistryCredentialAllOfWithDefaults() *RegistryCredentialAllOf {
 
 // GetAccount returns the Account field value if set, zero value otherwise.
 func (o *RegistryCredentialAllOf) GetAccount() ObjectReference {
-	if o == nil || isNil(o.Account) {
+	if o == nil || o.Account == nil {
 		var ret ObjectReference
 		return ret
 	}
@@ -55,15 +55,15 @@ func (o *RegistryCredentialAllOf) GetAccount() ObjectReference {
 // GetAccountOk returns a tuple with the Account field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RegistryCredentialAllOf) GetAccountOk() (*ObjectReference, bool) {
-	if o == nil || isNil(o.Account) {
-    return nil, false
+	if o == nil || o.Account == nil {
+		return nil, false
 	}
 	return o.Account, true
 }
 
 // HasAccount returns a boolean if a field has been set.
 func (o *RegistryCredentialAllOf) HasAccount() bool {
-	if o != nil && !isNil(o.Account) {
+	if o != nil && o.Account != nil {
 		return true
 	}
 
@@ -77,7 +77,7 @@ func (o *RegistryCredentialAllOf) SetAccount(v ObjectReference) {
 
 // GetCreatedAt returns the CreatedAt field value if set, zero value otherwise.
 func (o *RegistryCredentialAllOf) GetCreatedAt() time.Time {
-	if o == nil || isNil(o.CreatedAt) {
+	if o == nil || o.CreatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -87,15 +87,15 @@ func (o *RegistryCredentialAllOf) GetCreatedAt() time.Time {
 // GetCreatedAtOk returns a tuple with the CreatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RegistryCredentialAllOf) GetCreatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.CreatedAt) {
-    return nil, false
+	if o == nil || o.CreatedAt == nil {
+		return nil, false
 	}
 	return o.CreatedAt, true
 }
 
 // HasCreatedAt returns a boolean if a field has been set.
 func (o *RegistryCredentialAllOf) HasCreatedAt() bool {
-	if o != nil && !isNil(o.CreatedAt) {
+	if o != nil && o.CreatedAt != nil {
 		return true
 	}
 
@@ -109,7 +109,7 @@ func (o *RegistryCredentialAllOf) SetCreatedAt(v time.Time) {
 
 // GetExternalResourceId returns the ExternalResourceId field value if set, zero value otherwise.
 func (o *RegistryCredentialAllOf) GetExternalResourceId() string {
-	if o == nil || isNil(o.ExternalResourceId) {
+	if o == nil || o.ExternalResourceId == nil {
 		var ret string
 		return ret
 	}
@@ -119,15 +119,15 @@ func (o *RegistryCredentialAllOf) GetExternalResourceId() string {
 // GetExternalResourceIdOk returns a tuple with the ExternalResourceId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RegistryCredentialAllOf) GetExternalResourceIdOk() (*string, bool) {
-	if o == nil || isNil(o.ExternalResourceId) {
-    return nil, false
+	if o == nil || o.ExternalResourceId == nil {
+		return nil, false
 	}
 	return o.ExternalResourceId, true
 }
 
 // HasExternalResourceId returns a boolean if a field has been set.
 func (o *RegistryCredentialAllOf) HasExternalResourceId() bool {
-	if o != nil && !isNil(o.ExternalResourceId) {
+	if o != nil && o.ExternalResourceId != nil {
 		return true
 	}
 
@@ -141,7 +141,7 @@ func (o *RegistryCredentialAllOf) SetExternalResourceId(v string) {
 
 // GetRegistry returns the Registry field value if set, zero value otherwise.
 func (o *RegistryCredentialAllOf) GetRegistry() ObjectReference {
-	if o == nil || isNil(o.Registry) {
+	if o == nil || o.Registry == nil {
 		var ret ObjectReference
 		return ret
 	}
@@ -151,15 +151,15 @@ func (o *RegistryCredentialAllOf) GetRegistry() ObjectReference {
 // GetRegistryOk returns a tuple with the Registry field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RegistryCredentialAllOf) GetRegistryOk() (*ObjectReference, bool) {
-	if o == nil || isNil(o.Registry) {
-    return nil, false
+	if o == nil || o.Registry == nil {
+		return nil, false
 	}
 	return o.Registry, true
 }
 
 // HasRegistry returns a boolean if a field has been set.
 func (o *RegistryCredentialAllOf) HasRegistry() bool {
-	if o != nil && !isNil(o.Registry) {
+	if o != nil && o.Registry != nil {
 		return true
 	}
 
@@ -173,7 +173,7 @@ func (o *RegistryCredentialAllOf) SetRegistry(v ObjectReference) {
 
 // GetToken returns the Token field value if set, zero value otherwise.
 func (o *RegistryCredentialAllOf) GetToken() string {
-	if o == nil || isNil(o.Token) {
+	if o == nil || o.Token == nil {
 		var ret string
 		return ret
 	}
@@ -183,15 +183,15 @@ func (o *RegistryCredentialAllOf) GetToken() string {
 // GetTokenOk returns a tuple with the Token field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RegistryCredentialAllOf) GetTokenOk() (*string, bool) {
-	if o == nil || isNil(o.Token) {
-    return nil, false
+	if o == nil || o.Token == nil {
+		return nil, false
 	}
 	return o.Token, true
 }
 
 // HasToken returns a boolean if a field has been set.
 func (o *RegistryCredentialAllOf) HasToken() bool {
-	if o != nil && !isNil(o.Token) {
+	if o != nil && o.Token != nil {
 		return true
 	}
 
@@ -205,7 +205,7 @@ func (o *RegistryCredentialAllOf) SetToken(v string) {
 
 // GetUpdatedAt returns the UpdatedAt field value if set, zero value otherwise.
 func (o *RegistryCredentialAllOf) GetUpdatedAt() time.Time {
-	if o == nil || isNil(o.UpdatedAt) {
+	if o == nil || o.UpdatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -215,15 +215,15 @@ func (o *RegistryCredentialAllOf) GetUpdatedAt() time.Time {
 // GetUpdatedAtOk returns a tuple with the UpdatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RegistryCredentialAllOf) GetUpdatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.UpdatedAt) {
-    return nil, false
+	if o == nil || o.UpdatedAt == nil {
+		return nil, false
 	}
 	return o.UpdatedAt, true
 }
 
 // HasUpdatedAt returns a boolean if a field has been set.
 func (o *RegistryCredentialAllOf) HasUpdatedAt() bool {
-	if o != nil && !isNil(o.UpdatedAt) {
+	if o != nil && o.UpdatedAt != nil {
 		return true
 	}
 
@@ -237,7 +237,7 @@ func (o *RegistryCredentialAllOf) SetUpdatedAt(v time.Time) {
 
 // GetUsername returns the Username field value if set, zero value otherwise.
 func (o *RegistryCredentialAllOf) GetUsername() string {
-	if o == nil || isNil(o.Username) {
+	if o == nil || o.Username == nil {
 		var ret string
 		return ret
 	}
@@ -247,15 +247,15 @@ func (o *RegistryCredentialAllOf) GetUsername() string {
 // GetUsernameOk returns a tuple with the Username field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RegistryCredentialAllOf) GetUsernameOk() (*string, bool) {
-	if o == nil || isNil(o.Username) {
-    return nil, false
+	if o == nil || o.Username == nil {
+		return nil, false
 	}
 	return o.Username, true
 }
 
 // HasUsername returns a boolean if a field has been set.
 func (o *RegistryCredentialAllOf) HasUsername() bool {
-	if o != nil && !isNil(o.Username) {
+	if o != nil && o.Username != nil {
 		return true
 	}
 
@@ -269,25 +269,25 @@ func (o *RegistryCredentialAllOf) SetUsername(v string) {
 
 func (o RegistryCredentialAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Account) {
+	if o.Account != nil {
 		toSerialize["account"] = o.Account
 	}
-	if !isNil(o.CreatedAt) {
+	if o.CreatedAt != nil {
 		toSerialize["created_at"] = o.CreatedAt
 	}
-	if !isNil(o.ExternalResourceId) {
+	if o.ExternalResourceId != nil {
 		toSerialize["external_resource_id"] = o.ExternalResourceId
 	}
-	if !isNil(o.Registry) {
+	if o.Registry != nil {
 		toSerialize["registry"] = o.Registry
 	}
-	if !isNil(o.Token) {
+	if o.Token != nil {
 		toSerialize["token"] = o.Token
 	}
-	if !isNil(o.UpdatedAt) {
+	if o.UpdatedAt != nil {
 		toSerialize["updated_at"] = o.UpdatedAt
 	}
-	if !isNil(o.Username) {
+	if o.Username != nil {
 		toSerialize["username"] = o.Username
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_registry_credential_list.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_registry_credential_list.go
index a4c3e00b..443e0c56 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_registry_credential_list.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_registry_credential_list.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -58,8 +58,8 @@ func (o *RegistryCredentialList) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *RegistryCredentialList) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -82,8 +82,8 @@ func (o *RegistryCredentialList) GetPage() int32 {
 // GetPageOk returns a tuple with the Page field value
 // and a boolean to check if the value has been set.
 func (o *RegistryCredentialList) GetPageOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Page, true
 }
@@ -106,8 +106,8 @@ func (o *RegistryCredentialList) GetSize() int32 {
 // GetSizeOk returns a tuple with the Size field value
 // and a boolean to check if the value has been set.
 func (o *RegistryCredentialList) GetSizeOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Size, true
 }
@@ -130,8 +130,8 @@ func (o *RegistryCredentialList) GetTotal() int32 {
 // GetTotalOk returns a tuple with the Total field value
 // and a boolean to check if the value has been set.
 func (o *RegistryCredentialList) GetTotalOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Total, true
 }
@@ -153,11 +153,11 @@ func (o *RegistryCredentialList) GetItems() []RegistryCredential {
 
 // GetItemsOk returns a tuple with the Items field value
 // and a boolean to check if the value has been set.
-func (o *RegistryCredentialList) GetItemsOk() ([]RegistryCredential, bool) {
-	if o == nil {
-    return nil, false
+func (o *RegistryCredentialList) GetItemsOk() (*[]RegistryCredential, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Items, true
+	return &o.Items, true
 }
 
 // SetItems sets field value
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_registry_credential_list_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_registry_credential_list_all_of.go
index 74ac4771..59dff1fc 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_registry_credential_list_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_registry_credential_list_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -16,7 +16,7 @@ import (
 
 // RegistryCredentialListAllOf struct for RegistryCredentialListAllOf
 type RegistryCredentialListAllOf struct {
-	Items []RegistryCredential `json:"items,omitempty"`
+	Items *[]RegistryCredential `json:"items,omitempty"`
 }
 
 // NewRegistryCredentialListAllOf instantiates a new RegistryCredentialListAllOf object
@@ -38,25 +38,25 @@ func NewRegistryCredentialListAllOfWithDefaults() *RegistryCredentialListAllOf {
 
 // GetItems returns the Items field value if set, zero value otherwise.
 func (o *RegistryCredentialListAllOf) GetItems() []RegistryCredential {
-	if o == nil || isNil(o.Items) {
+	if o == nil || o.Items == nil {
 		var ret []RegistryCredential
 		return ret
 	}
-	return o.Items
+	return *o.Items
 }
 
 // GetItemsOk returns a tuple with the Items field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *RegistryCredentialListAllOf) GetItemsOk() ([]RegistryCredential, bool) {
-	if o == nil || isNil(o.Items) {
-    return nil, false
+func (o *RegistryCredentialListAllOf) GetItemsOk() (*[]RegistryCredential, bool) {
+	if o == nil || o.Items == nil {
+		return nil, false
 	}
 	return o.Items, true
 }
 
 // HasItems returns a boolean if a field has been set.
 func (o *RegistryCredentialListAllOf) HasItems() bool {
-	if o != nil && !isNil(o.Items) {
+	if o != nil && o.Items != nil {
 		return true
 	}
 
@@ -65,12 +65,12 @@ func (o *RegistryCredentialListAllOf) HasItems() bool {
 
 // SetItems gets a reference to the given []RegistryCredential and assigns it to the Items field.
 func (o *RegistryCredentialListAllOf) SetItems(v []RegistryCredential) {
-	o.Items = v
+	o.Items = &v
 }
 
 func (o RegistryCredentialListAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Items) {
+	if o.Items != nil {
 		toSerialize["items"] = o.Items
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_registry_credential_patch_request.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_registry_credential_patch_request.go
index a46aacf3..a0909041 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_registry_credential_patch_request.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_registry_credential_patch_request.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -42,7 +42,7 @@ func NewRegistryCredentialPatchRequestWithDefaults() *RegistryCredentialPatchReq
 
 // GetAccountId returns the AccountId field value if set, zero value otherwise.
 func (o *RegistryCredentialPatchRequest) GetAccountId() string {
-	if o == nil || isNil(o.AccountId) {
+	if o == nil || o.AccountId == nil {
 		var ret string
 		return ret
 	}
@@ -52,15 +52,15 @@ func (o *RegistryCredentialPatchRequest) GetAccountId() string {
 // GetAccountIdOk returns a tuple with the AccountId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RegistryCredentialPatchRequest) GetAccountIdOk() (*string, bool) {
-	if o == nil || isNil(o.AccountId) {
-    return nil, false
+	if o == nil || o.AccountId == nil {
+		return nil, false
 	}
 	return o.AccountId, true
 }
 
 // HasAccountId returns a boolean if a field has been set.
 func (o *RegistryCredentialPatchRequest) HasAccountId() bool {
-	if o != nil && !isNil(o.AccountId) {
+	if o != nil && o.AccountId != nil {
 		return true
 	}
 
@@ -74,7 +74,7 @@ func (o *RegistryCredentialPatchRequest) SetAccountId(v string) {
 
 // GetExternalResourceId returns the ExternalResourceId field value if set, zero value otherwise.
 func (o *RegistryCredentialPatchRequest) GetExternalResourceId() string {
-	if o == nil || isNil(o.ExternalResourceId) {
+	if o == nil || o.ExternalResourceId == nil {
 		var ret string
 		return ret
 	}
@@ -84,15 +84,15 @@ func (o *RegistryCredentialPatchRequest) GetExternalResourceId() string {
 // GetExternalResourceIdOk returns a tuple with the ExternalResourceId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RegistryCredentialPatchRequest) GetExternalResourceIdOk() (*string, bool) {
-	if o == nil || isNil(o.ExternalResourceId) {
-    return nil, false
+	if o == nil || o.ExternalResourceId == nil {
+		return nil, false
 	}
 	return o.ExternalResourceId, true
 }
 
 // HasExternalResourceId returns a boolean if a field has been set.
 func (o *RegistryCredentialPatchRequest) HasExternalResourceId() bool {
-	if o != nil && !isNil(o.ExternalResourceId) {
+	if o != nil && o.ExternalResourceId != nil {
 		return true
 	}
 
@@ -106,7 +106,7 @@ func (o *RegistryCredentialPatchRequest) SetExternalResourceId(v string) {
 
 // GetRegistryId returns the RegistryId field value if set, zero value otherwise.
 func (o *RegistryCredentialPatchRequest) GetRegistryId() string {
-	if o == nil || isNil(o.RegistryId) {
+	if o == nil || o.RegistryId == nil {
 		var ret string
 		return ret
 	}
@@ -116,15 +116,15 @@ func (o *RegistryCredentialPatchRequest) GetRegistryId() string {
 // GetRegistryIdOk returns a tuple with the RegistryId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RegistryCredentialPatchRequest) GetRegistryIdOk() (*string, bool) {
-	if o == nil || isNil(o.RegistryId) {
-    return nil, false
+	if o == nil || o.RegistryId == nil {
+		return nil, false
 	}
 	return o.RegistryId, true
 }
 
 // HasRegistryId returns a boolean if a field has been set.
 func (o *RegistryCredentialPatchRequest) HasRegistryId() bool {
-	if o != nil && !isNil(o.RegistryId) {
+	if o != nil && o.RegistryId != nil {
 		return true
 	}
 
@@ -138,7 +138,7 @@ func (o *RegistryCredentialPatchRequest) SetRegistryId(v string) {
 
 // GetToken returns the Token field value if set, zero value otherwise.
 func (o *RegistryCredentialPatchRequest) GetToken() string {
-	if o == nil || isNil(o.Token) {
+	if o == nil || o.Token == nil {
 		var ret string
 		return ret
 	}
@@ -148,15 +148,15 @@ func (o *RegistryCredentialPatchRequest) GetToken() string {
 // GetTokenOk returns a tuple with the Token field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RegistryCredentialPatchRequest) GetTokenOk() (*string, bool) {
-	if o == nil || isNil(o.Token) {
-    return nil, false
+	if o == nil || o.Token == nil {
+		return nil, false
 	}
 	return o.Token, true
 }
 
 // HasToken returns a boolean if a field has been set.
 func (o *RegistryCredentialPatchRequest) HasToken() bool {
-	if o != nil && !isNil(o.Token) {
+	if o != nil && o.Token != nil {
 		return true
 	}
 
@@ -170,7 +170,7 @@ func (o *RegistryCredentialPatchRequest) SetToken(v string) {
 
 // GetUsername returns the Username field value if set, zero value otherwise.
 func (o *RegistryCredentialPatchRequest) GetUsername() string {
-	if o == nil || isNil(o.Username) {
+	if o == nil || o.Username == nil {
 		var ret string
 		return ret
 	}
@@ -180,15 +180,15 @@ func (o *RegistryCredentialPatchRequest) GetUsername() string {
 // GetUsernameOk returns a tuple with the Username field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RegistryCredentialPatchRequest) GetUsernameOk() (*string, bool) {
-	if o == nil || isNil(o.Username) {
-    return nil, false
+	if o == nil || o.Username == nil {
+		return nil, false
 	}
 	return o.Username, true
 }
 
 // HasUsername returns a boolean if a field has been set.
 func (o *RegistryCredentialPatchRequest) HasUsername() bool {
-	if o != nil && !isNil(o.Username) {
+	if o != nil && o.Username != nil {
 		return true
 	}
 
@@ -202,19 +202,19 @@ func (o *RegistryCredentialPatchRequest) SetUsername(v string) {
 
 func (o RegistryCredentialPatchRequest) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.AccountId) {
+	if o.AccountId != nil {
 		toSerialize["account_id"] = o.AccountId
 	}
-	if !isNil(o.ExternalResourceId) {
+	if o.ExternalResourceId != nil {
 		toSerialize["external_resource_id"] = o.ExternalResourceId
 	}
-	if !isNil(o.RegistryId) {
+	if o.RegistryId != nil {
 		toSerialize["registry_id"] = o.RegistryId
 	}
-	if !isNil(o.Token) {
+	if o.Token != nil {
 		toSerialize["token"] = o.Token
 	}
-	if !isNil(o.Username) {
+	if o.Username != nil {
 		toSerialize["username"] = o.Username
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_registry_list.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_registry_list.go
index 1af86471..a9777792 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_registry_list.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_registry_list.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -58,8 +58,8 @@ func (o *RegistryList) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *RegistryList) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -82,8 +82,8 @@ func (o *RegistryList) GetPage() int32 {
 // GetPageOk returns a tuple with the Page field value
 // and a boolean to check if the value has been set.
 func (o *RegistryList) GetPageOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Page, true
 }
@@ -106,8 +106,8 @@ func (o *RegistryList) GetSize() int32 {
 // GetSizeOk returns a tuple with the Size field value
 // and a boolean to check if the value has been set.
 func (o *RegistryList) GetSizeOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Size, true
 }
@@ -130,8 +130,8 @@ func (o *RegistryList) GetTotal() int32 {
 // GetTotalOk returns a tuple with the Total field value
 // and a boolean to check if the value has been set.
 func (o *RegistryList) GetTotalOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Total, true
 }
@@ -153,11 +153,11 @@ func (o *RegistryList) GetItems() []Registry {
 
 // GetItemsOk returns a tuple with the Items field value
 // and a boolean to check if the value has been set.
-func (o *RegistryList) GetItemsOk() ([]Registry, bool) {
-	if o == nil {
-    return nil, false
+func (o *RegistryList) GetItemsOk() (*[]Registry, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Items, true
+	return &o.Items, true
 }
 
 // SetItems sets field value
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_registry_list_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_registry_list_all_of.go
index d0664d63..9f81e1cc 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_registry_list_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_registry_list_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -16,7 +16,7 @@ import (
 
 // RegistryListAllOf struct for RegistryListAllOf
 type RegistryListAllOf struct {
-	Items []Registry `json:"items,omitempty"`
+	Items *[]Registry `json:"items,omitempty"`
 }
 
 // NewRegistryListAllOf instantiates a new RegistryListAllOf object
@@ -38,25 +38,25 @@ func NewRegistryListAllOfWithDefaults() *RegistryListAllOf {
 
 // GetItems returns the Items field value if set, zero value otherwise.
 func (o *RegistryListAllOf) GetItems() []Registry {
-	if o == nil || isNil(o.Items) {
+	if o == nil || o.Items == nil {
 		var ret []Registry
 		return ret
 	}
-	return o.Items
+	return *o.Items
 }
 
 // GetItemsOk returns a tuple with the Items field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *RegistryListAllOf) GetItemsOk() ([]Registry, bool) {
-	if o == nil || isNil(o.Items) {
-    return nil, false
+func (o *RegistryListAllOf) GetItemsOk() (*[]Registry, bool) {
+	if o == nil || o.Items == nil {
+		return nil, false
 	}
 	return o.Items, true
 }
 
 // HasItems returns a boolean if a field has been set.
 func (o *RegistryListAllOf) HasItems() bool {
-	if o != nil && !isNil(o.Items) {
+	if o != nil && o.Items != nil {
 		return true
 	}
 
@@ -65,12 +65,12 @@ func (o *RegistryListAllOf) HasItems() bool {
 
 // SetItems gets a reference to the given []Registry and assigns it to the Items field.
 func (o *RegistryListAllOf) SetItems(v []Registry) {
-	o.Items = v
+	o.Items = &v
 }
 
 func (o RegistryListAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Items) {
+	if o.Items != nil {
 		toSerialize["items"] = o.Items
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_registry_request.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_registry_request.go
index 79c0cb55..aa5a8f4b 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_registry_request.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_registry_request.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -43,7 +43,7 @@ func NewRegistryRequestWithDefaults() *RegistryRequest {
 
 // GetCloudAlias returns the CloudAlias field value if set, zero value otherwise.
 func (o *RegistryRequest) GetCloudAlias() bool {
-	if o == nil || isNil(o.CloudAlias) {
+	if o == nil || o.CloudAlias == nil {
 		var ret bool
 		return ret
 	}
@@ -53,15 +53,15 @@ func (o *RegistryRequest) GetCloudAlias() bool {
 // GetCloudAliasOk returns a tuple with the CloudAlias field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RegistryRequest) GetCloudAliasOk() (*bool, bool) {
-	if o == nil || isNil(o.CloudAlias) {
-    return nil, false
+	if o == nil || o.CloudAlias == nil {
+		return nil, false
 	}
 	return o.CloudAlias, true
 }
 
 // HasCloudAlias returns a boolean if a field has been set.
 func (o *RegistryRequest) HasCloudAlias() bool {
-	if o != nil && !isNil(o.CloudAlias) {
+	if o != nil && o.CloudAlias != nil {
 		return true
 	}
 
@@ -75,7 +75,7 @@ func (o *RegistryRequest) SetCloudAlias(v bool) {
 
 // GetName returns the Name field value if set, zero value otherwise.
 func (o *RegistryRequest) GetName() string {
-	if o == nil || isNil(o.Name) {
+	if o == nil || o.Name == nil {
 		var ret string
 		return ret
 	}
@@ -85,15 +85,15 @@ func (o *RegistryRequest) GetName() string {
 // GetNameOk returns a tuple with the Name field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RegistryRequest) GetNameOk() (*string, bool) {
-	if o == nil || isNil(o.Name) {
-    return nil, false
+	if o == nil || o.Name == nil {
+		return nil, false
 	}
 	return o.Name, true
 }
 
 // HasName returns a boolean if a field has been set.
 func (o *RegistryRequest) HasName() bool {
-	if o != nil && !isNil(o.Name) {
+	if o != nil && o.Name != nil {
 		return true
 	}
 
@@ -107,7 +107,7 @@ func (o *RegistryRequest) SetName(v string) {
 
 // GetOrgName returns the OrgName field value if set, zero value otherwise.
 func (o *RegistryRequest) GetOrgName() string {
-	if o == nil || isNil(o.OrgName) {
+	if o == nil || o.OrgName == nil {
 		var ret string
 		return ret
 	}
@@ -117,15 +117,15 @@ func (o *RegistryRequest) GetOrgName() string {
 // GetOrgNameOk returns a tuple with the OrgName field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RegistryRequest) GetOrgNameOk() (*string, bool) {
-	if o == nil || isNil(o.OrgName) {
-    return nil, false
+	if o == nil || o.OrgName == nil {
+		return nil, false
 	}
 	return o.OrgName, true
 }
 
 // HasOrgName returns a boolean if a field has been set.
 func (o *RegistryRequest) HasOrgName() bool {
-	if o != nil && !isNil(o.OrgName) {
+	if o != nil && o.OrgName != nil {
 		return true
 	}
 
@@ -139,7 +139,7 @@ func (o *RegistryRequest) SetOrgName(v string) {
 
 // GetTeamName returns the TeamName field value if set, zero value otherwise.
 func (o *RegistryRequest) GetTeamName() string {
-	if o == nil || isNil(o.TeamName) {
+	if o == nil || o.TeamName == nil {
 		var ret string
 		return ret
 	}
@@ -149,15 +149,15 @@ func (o *RegistryRequest) GetTeamName() string {
 // GetTeamNameOk returns a tuple with the TeamName field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RegistryRequest) GetTeamNameOk() (*string, bool) {
-	if o == nil || isNil(o.TeamName) {
-    return nil, false
+	if o == nil || o.TeamName == nil {
+		return nil, false
 	}
 	return o.TeamName, true
 }
 
 // HasTeamName returns a boolean if a field has been set.
 func (o *RegistryRequest) HasTeamName() bool {
-	if o != nil && !isNil(o.TeamName) {
+	if o != nil && o.TeamName != nil {
 		return true
 	}
 
@@ -171,7 +171,7 @@ func (o *RegistryRequest) SetTeamName(v string) {
 
 // GetType returns the Type field value if set, zero value otherwise.
 func (o *RegistryRequest) GetType() string {
-	if o == nil || isNil(o.Type) {
+	if o == nil || o.Type == nil {
 		var ret string
 		return ret
 	}
@@ -181,15 +181,15 @@ func (o *RegistryRequest) GetType() string {
 // GetTypeOk returns a tuple with the Type field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RegistryRequest) GetTypeOk() (*string, bool) {
-	if o == nil || isNil(o.Type) {
-    return nil, false
+	if o == nil || o.Type == nil {
+		return nil, false
 	}
 	return o.Type, true
 }
 
 // HasType returns a boolean if a field has been set.
 func (o *RegistryRequest) HasType() bool {
-	if o != nil && !isNil(o.Type) {
+	if o != nil && o.Type != nil {
 		return true
 	}
 
@@ -203,7 +203,7 @@ func (o *RegistryRequest) SetType(v string) {
 
 // GetUrl returns the Url field value if set, zero value otherwise.
 func (o *RegistryRequest) GetUrl() string {
-	if o == nil || isNil(o.Url) {
+	if o == nil || o.Url == nil {
 		var ret string
 		return ret
 	}
@@ -213,15 +213,15 @@ func (o *RegistryRequest) GetUrl() string {
 // GetUrlOk returns a tuple with the Url field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RegistryRequest) GetUrlOk() (*string, bool) {
-	if o == nil || isNil(o.Url) {
-    return nil, false
+	if o == nil || o.Url == nil {
+		return nil, false
 	}
 	return o.Url, true
 }
 
 // HasUrl returns a boolean if a field has been set.
 func (o *RegistryRequest) HasUrl() bool {
-	if o != nil && !isNil(o.Url) {
+	if o != nil && o.Url != nil {
 		return true
 	}
 
@@ -235,22 +235,22 @@ func (o *RegistryRequest) SetUrl(v string) {
 
 func (o RegistryRequest) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.CloudAlias) {
+	if o.CloudAlias != nil {
 		toSerialize["cloudAlias"] = o.CloudAlias
 	}
-	if !isNil(o.Name) {
+	if o.Name != nil {
 		toSerialize["name"] = o.Name
 	}
-	if !isNil(o.OrgName) {
+	if o.OrgName != nil {
 		toSerialize["org_name"] = o.OrgName
 	}
-	if !isNil(o.TeamName) {
+	if o.TeamName != nil {
 		toSerialize["team_name"] = o.TeamName
 	}
-	if !isNil(o.Type) {
+	if o.Type != nil {
 		toSerialize["type"] = o.Type
 	}
-	if !isNil(o.Url) {
+	if o.Url != nil {
 		toSerialize["url"] = o.Url
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_related_resource.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_related_resource.go
index e5f69a70..033b646e 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_related_resource.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_related_resource.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -56,7 +56,7 @@ func NewRelatedResourceWithDefaults() *RelatedResource {
 
 // GetHref returns the Href field value if set, zero value otherwise.
 func (o *RelatedResource) GetHref() string {
-	if o == nil || isNil(o.Href) {
+	if o == nil || o.Href == nil {
 		var ret string
 		return ret
 	}
@@ -66,15 +66,15 @@ func (o *RelatedResource) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RelatedResource) GetHrefOk() (*string, bool) {
-	if o == nil || isNil(o.Href) {
-    return nil, false
+	if o == nil || o.Href == nil {
+		return nil, false
 	}
 	return o.Href, true
 }
 
 // HasHref returns a boolean if a field has been set.
 func (o *RelatedResource) HasHref() bool {
-	if o != nil && !isNil(o.Href) {
+	if o != nil && o.Href != nil {
 		return true
 	}
 
@@ -88,7 +88,7 @@ func (o *RelatedResource) SetHref(v string) {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *RelatedResource) GetId() string {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret string
 		return ret
 	}
@@ -98,15 +98,15 @@ func (o *RelatedResource) GetId() string {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RelatedResource) GetIdOk() (*string, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *RelatedResource) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -120,7 +120,7 @@ func (o *RelatedResource) SetId(v string) {
 
 // GetKind returns the Kind field value if set, zero value otherwise.
 func (o *RelatedResource) GetKind() string {
-	if o == nil || isNil(o.Kind) {
+	if o == nil || o.Kind == nil {
 		var ret string
 		return ret
 	}
@@ -130,15 +130,15 @@ func (o *RelatedResource) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RelatedResource) GetKindOk() (*string, bool) {
-	if o == nil || isNil(o.Kind) {
-    return nil, false
+	if o == nil || o.Kind == nil {
+		return nil, false
 	}
 	return o.Kind, true
 }
 
 // HasKind returns a boolean if a field has been set.
 func (o *RelatedResource) HasKind() bool {
-	if o != nil && !isNil(o.Kind) {
+	if o != nil && o.Kind != nil {
 		return true
 	}
 
@@ -163,8 +163,8 @@ func (o *RelatedResource) GetAvailabilityZoneType() string {
 // GetAvailabilityZoneTypeOk returns a tuple with the AvailabilityZoneType field value
 // and a boolean to check if the value has been set.
 func (o *RelatedResource) GetAvailabilityZoneTypeOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.AvailabilityZoneType, true
 }
@@ -187,8 +187,8 @@ func (o *RelatedResource) GetBillingModel() string {
 // GetBillingModelOk returns a tuple with the BillingModel field value
 // and a boolean to check if the value has been set.
 func (o *RelatedResource) GetBillingModelOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.BillingModel, true
 }
@@ -211,8 +211,8 @@ func (o *RelatedResource) GetByoc() string {
 // GetByocOk returns a tuple with the Byoc field value
 // and a boolean to check if the value has been set.
 func (o *RelatedResource) GetByocOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Byoc, true
 }
@@ -235,8 +235,8 @@ func (o *RelatedResource) GetCloudProvider() string {
 // GetCloudProviderOk returns a tuple with the CloudProvider field value
 // and a boolean to check if the value has been set.
 func (o *RelatedResource) GetCloudProviderOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.CloudProvider, true
 }
@@ -259,8 +259,8 @@ func (o *RelatedResource) GetCost() int32 {
 // GetCostOk returns a tuple with the Cost field value
 // and a boolean to check if the value has been set.
 func (o *RelatedResource) GetCostOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Cost, true
 }
@@ -283,8 +283,8 @@ func (o *RelatedResource) GetProduct() string {
 // GetProductOk returns a tuple with the Product field value
 // and a boolean to check if the value has been set.
 func (o *RelatedResource) GetProductOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Product, true
 }
@@ -296,7 +296,7 @@ func (o *RelatedResource) SetProduct(v string) {
 
 // GetProductId returns the ProductId field value if set, zero value otherwise.
 func (o *RelatedResource) GetProductId() string {
-	if o == nil || isNil(o.ProductId) {
+	if o == nil || o.ProductId == nil {
 		var ret string
 		return ret
 	}
@@ -306,15 +306,15 @@ func (o *RelatedResource) GetProductId() string {
 // GetProductIdOk returns a tuple with the ProductId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RelatedResource) GetProductIdOk() (*string, bool) {
-	if o == nil || isNil(o.ProductId) {
-    return nil, false
+	if o == nil || o.ProductId == nil {
+		return nil, false
 	}
 	return o.ProductId, true
 }
 
 // HasProductId returns a boolean if a field has been set.
 func (o *RelatedResource) HasProductId() bool {
-	if o != nil && !isNil(o.ProductId) {
+	if o != nil && o.ProductId != nil {
 		return true
 	}
 
@@ -328,7 +328,7 @@ func (o *RelatedResource) SetProductId(v string) {
 
 // GetResourceName returns the ResourceName field value if set, zero value otherwise.
 func (o *RelatedResource) GetResourceName() string {
-	if o == nil || isNil(o.ResourceName) {
+	if o == nil || o.ResourceName == nil {
 		var ret string
 		return ret
 	}
@@ -338,15 +338,15 @@ func (o *RelatedResource) GetResourceName() string {
 // GetResourceNameOk returns a tuple with the ResourceName field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RelatedResource) GetResourceNameOk() (*string, bool) {
-	if o == nil || isNil(o.ResourceName) {
-    return nil, false
+	if o == nil || o.ResourceName == nil {
+		return nil, false
 	}
 	return o.ResourceName, true
 }
 
 // HasResourceName returns a boolean if a field has been set.
 func (o *RelatedResource) HasResourceName() bool {
-	if o != nil && !isNil(o.ResourceName) {
+	if o != nil && o.ResourceName != nil {
 		return true
 	}
 
@@ -371,8 +371,8 @@ func (o *RelatedResource) GetResourceType() string {
 // GetResourceTypeOk returns a tuple with the ResourceType field value
 // and a boolean to check if the value has been set.
 func (o *RelatedResource) GetResourceTypeOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.ResourceType, true
 }
@@ -384,13 +384,13 @@ func (o *RelatedResource) SetResourceType(v string) {
 
 func (o RelatedResource) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Href) {
+	if o.Href != nil {
 		toSerialize["href"] = o.Href
 	}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.Kind) {
+	if o.Kind != nil {
 		toSerialize["kind"] = o.Kind
 	}
 	if true {
@@ -411,10 +411,10 @@ func (o RelatedResource) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["product"] = o.Product
 	}
-	if !isNil(o.ProductId) {
+	if o.ProductId != nil {
 		toSerialize["product_id"] = o.ProductId
 	}
-	if !isNil(o.ResourceName) {
+	if o.ResourceName != nil {
 		toSerialize["resource_name"] = o.ResourceName
 	}
 	if true {
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_related_resource_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_related_resource_all_of.go
index 6628f76f..06b65cc2 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_related_resource_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_related_resource_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -64,8 +64,8 @@ func (o *RelatedResourceAllOf) GetAvailabilityZoneType() string {
 // GetAvailabilityZoneTypeOk returns a tuple with the AvailabilityZoneType field value
 // and a boolean to check if the value has been set.
 func (o *RelatedResourceAllOf) GetAvailabilityZoneTypeOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.AvailabilityZoneType, true
 }
@@ -88,8 +88,8 @@ func (o *RelatedResourceAllOf) GetBillingModel() string {
 // GetBillingModelOk returns a tuple with the BillingModel field value
 // and a boolean to check if the value has been set.
 func (o *RelatedResourceAllOf) GetBillingModelOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.BillingModel, true
 }
@@ -112,8 +112,8 @@ func (o *RelatedResourceAllOf) GetByoc() string {
 // GetByocOk returns a tuple with the Byoc field value
 // and a boolean to check if the value has been set.
 func (o *RelatedResourceAllOf) GetByocOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Byoc, true
 }
@@ -136,8 +136,8 @@ func (o *RelatedResourceAllOf) GetCloudProvider() string {
 // GetCloudProviderOk returns a tuple with the CloudProvider field value
 // and a boolean to check if the value has been set.
 func (o *RelatedResourceAllOf) GetCloudProviderOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.CloudProvider, true
 }
@@ -160,8 +160,8 @@ func (o *RelatedResourceAllOf) GetCost() int32 {
 // GetCostOk returns a tuple with the Cost field value
 // and a boolean to check if the value has been set.
 func (o *RelatedResourceAllOf) GetCostOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Cost, true
 }
@@ -184,8 +184,8 @@ func (o *RelatedResourceAllOf) GetProduct() string {
 // GetProductOk returns a tuple with the Product field value
 // and a boolean to check if the value has been set.
 func (o *RelatedResourceAllOf) GetProductOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Product, true
 }
@@ -197,7 +197,7 @@ func (o *RelatedResourceAllOf) SetProduct(v string) {
 
 // GetProductId returns the ProductId field value if set, zero value otherwise.
 func (o *RelatedResourceAllOf) GetProductId() string {
-	if o == nil || isNil(o.ProductId) {
+	if o == nil || o.ProductId == nil {
 		var ret string
 		return ret
 	}
@@ -207,15 +207,15 @@ func (o *RelatedResourceAllOf) GetProductId() string {
 // GetProductIdOk returns a tuple with the ProductId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RelatedResourceAllOf) GetProductIdOk() (*string, bool) {
-	if o == nil || isNil(o.ProductId) {
-    return nil, false
+	if o == nil || o.ProductId == nil {
+		return nil, false
 	}
 	return o.ProductId, true
 }
 
 // HasProductId returns a boolean if a field has been set.
 func (o *RelatedResourceAllOf) HasProductId() bool {
-	if o != nil && !isNil(o.ProductId) {
+	if o != nil && o.ProductId != nil {
 		return true
 	}
 
@@ -229,7 +229,7 @@ func (o *RelatedResourceAllOf) SetProductId(v string) {
 
 // GetResourceName returns the ResourceName field value if set, zero value otherwise.
 func (o *RelatedResourceAllOf) GetResourceName() string {
-	if o == nil || isNil(o.ResourceName) {
+	if o == nil || o.ResourceName == nil {
 		var ret string
 		return ret
 	}
@@ -239,15 +239,15 @@ func (o *RelatedResourceAllOf) GetResourceName() string {
 // GetResourceNameOk returns a tuple with the ResourceName field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RelatedResourceAllOf) GetResourceNameOk() (*string, bool) {
-	if o == nil || isNil(o.ResourceName) {
-    return nil, false
+	if o == nil || o.ResourceName == nil {
+		return nil, false
 	}
 	return o.ResourceName, true
 }
 
 // HasResourceName returns a boolean if a field has been set.
 func (o *RelatedResourceAllOf) HasResourceName() bool {
-	if o != nil && !isNil(o.ResourceName) {
+	if o != nil && o.ResourceName != nil {
 		return true
 	}
 
@@ -272,8 +272,8 @@ func (o *RelatedResourceAllOf) GetResourceType() string {
 // GetResourceTypeOk returns a tuple with the ResourceType field value
 // and a boolean to check if the value has been set.
 func (o *RelatedResourceAllOf) GetResourceTypeOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.ResourceType, true
 }
@@ -303,10 +303,10 @@ func (o RelatedResourceAllOf) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["product"] = o.Product
 	}
-	if !isNil(o.ProductId) {
+	if o.ProductId != nil {
 		toSerialize["product_id"] = o.ProductId
 	}
-	if !isNil(o.ResourceName) {
+	if o.ResourceName != nil {
 		toSerialize["resource_name"] = o.ResourceName
 	}
 	if true {
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_reserved_resource.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_reserved_resource.go
index 6e003b6c..cf95ba63 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_reserved_resource.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_reserved_resource.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -12,6 +12,7 @@ package accountmgmtclient
 
 import (
 	"encoding/json"
+	"time"
 )
 
 // ReservedResource struct for ReservedResource
@@ -52,7 +53,7 @@ func NewReservedResourceWithDefaults() *ReservedResource {
 
 // GetHref returns the Href field value if set, zero value otherwise.
 func (o *ReservedResource) GetHref() string {
-	if o == nil || isNil(o.Href) {
+	if o == nil || o.Href == nil {
 		var ret string
 		return ret
 	}
@@ -62,15 +63,15 @@ func (o *ReservedResource) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ReservedResource) GetHrefOk() (*string, bool) {
-	if o == nil || isNil(o.Href) {
-    return nil, false
+	if o == nil || o.Href == nil {
+		return nil, false
 	}
 	return o.Href, true
 }
 
 // HasHref returns a boolean if a field has been set.
 func (o *ReservedResource) HasHref() bool {
-	if o != nil && !isNil(o.Href) {
+	if o != nil && o.Href != nil {
 		return true
 	}
 
@@ -84,7 +85,7 @@ func (o *ReservedResource) SetHref(v string) {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *ReservedResource) GetId() string {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret string
 		return ret
 	}
@@ -94,15 +95,15 @@ func (o *ReservedResource) GetId() string {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ReservedResource) GetIdOk() (*string, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *ReservedResource) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -116,7 +117,7 @@ func (o *ReservedResource) SetId(v string) {
 
 // GetKind returns the Kind field value if set, zero value otherwise.
 func (o *ReservedResource) GetKind() string {
-	if o == nil || isNil(o.Kind) {
+	if o == nil || o.Kind == nil {
 		var ret string
 		return ret
 	}
@@ -126,15 +127,15 @@ func (o *ReservedResource) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ReservedResource) GetKindOk() (*string, bool) {
-	if o == nil || isNil(o.Kind) {
-    return nil, false
+	if o == nil || o.Kind == nil {
+		return nil, false
 	}
 	return o.Kind, true
 }
 
 // HasKind returns a boolean if a field has been set.
 func (o *ReservedResource) HasKind() bool {
-	if o != nil && !isNil(o.Kind) {
+	if o != nil && o.Kind != nil {
 		return true
 	}
 
@@ -148,7 +149,7 @@ func (o *ReservedResource) SetKind(v string) {
 
 // GetAvailabilityZoneType returns the AvailabilityZoneType field value if set, zero value otherwise.
 func (o *ReservedResource) GetAvailabilityZoneType() string {
-	if o == nil || isNil(o.AvailabilityZoneType) {
+	if o == nil || o.AvailabilityZoneType == nil {
 		var ret string
 		return ret
 	}
@@ -158,15 +159,15 @@ func (o *ReservedResource) GetAvailabilityZoneType() string {
 // GetAvailabilityZoneTypeOk returns a tuple with the AvailabilityZoneType field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ReservedResource) GetAvailabilityZoneTypeOk() (*string, bool) {
-	if o == nil || isNil(o.AvailabilityZoneType) {
-    return nil, false
+	if o == nil || o.AvailabilityZoneType == nil {
+		return nil, false
 	}
 	return o.AvailabilityZoneType, true
 }
 
 // HasAvailabilityZoneType returns a boolean if a field has been set.
 func (o *ReservedResource) HasAvailabilityZoneType() bool {
-	if o != nil && !isNil(o.AvailabilityZoneType) {
+	if o != nil && o.AvailabilityZoneType != nil {
 		return true
 	}
 
@@ -180,7 +181,7 @@ func (o *ReservedResource) SetAvailabilityZoneType(v string) {
 
 // GetBillingMarketplaceAccount returns the BillingMarketplaceAccount field value if set, zero value otherwise.
 func (o *ReservedResource) GetBillingMarketplaceAccount() string {
-	if o == nil || isNil(o.BillingMarketplaceAccount) {
+	if o == nil || o.BillingMarketplaceAccount == nil {
 		var ret string
 		return ret
 	}
@@ -190,15 +191,15 @@ func (o *ReservedResource) GetBillingMarketplaceAccount() string {
 // GetBillingMarketplaceAccountOk returns a tuple with the BillingMarketplaceAccount field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ReservedResource) GetBillingMarketplaceAccountOk() (*string, bool) {
-	if o == nil || isNil(o.BillingMarketplaceAccount) {
-    return nil, false
+	if o == nil || o.BillingMarketplaceAccount == nil {
+		return nil, false
 	}
 	return o.BillingMarketplaceAccount, true
 }
 
 // HasBillingMarketplaceAccount returns a boolean if a field has been set.
 func (o *ReservedResource) HasBillingMarketplaceAccount() bool {
-	if o != nil && !isNil(o.BillingMarketplaceAccount) {
+	if o != nil && o.BillingMarketplaceAccount != nil {
 		return true
 	}
 
@@ -212,7 +213,7 @@ func (o *ReservedResource) SetBillingMarketplaceAccount(v string) {
 
 // GetBillingModel returns the BillingModel field value if set, zero value otherwise.
 func (o *ReservedResource) GetBillingModel() string {
-	if o == nil || isNil(o.BillingModel) {
+	if o == nil || o.BillingModel == nil {
 		var ret string
 		return ret
 	}
@@ -222,15 +223,15 @@ func (o *ReservedResource) GetBillingModel() string {
 // GetBillingModelOk returns a tuple with the BillingModel field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ReservedResource) GetBillingModelOk() (*string, bool) {
-	if o == nil || isNil(o.BillingModel) {
-    return nil, false
+	if o == nil || o.BillingModel == nil {
+		return nil, false
 	}
 	return o.BillingModel, true
 }
 
 // HasBillingModel returns a boolean if a field has been set.
 func (o *ReservedResource) HasBillingModel() bool {
-	if o != nil && !isNil(o.BillingModel) {
+	if o != nil && o.BillingModel != nil {
 		return true
 	}
 
@@ -255,8 +256,8 @@ func (o *ReservedResource) GetByoc() bool {
 // GetByocOk returns a tuple with the Byoc field value
 // and a boolean to check if the value has been set.
 func (o *ReservedResource) GetByocOk() (*bool, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Byoc, true
 }
@@ -268,7 +269,7 @@ func (o *ReservedResource) SetByoc(v bool) {
 
 // GetCluster returns the Cluster field value if set, zero value otherwise.
 func (o *ReservedResource) GetCluster() bool {
-	if o == nil || isNil(o.Cluster) {
+	if o == nil || o.Cluster == nil {
 		var ret bool
 		return ret
 	}
@@ -278,15 +279,15 @@ func (o *ReservedResource) GetCluster() bool {
 // GetClusterOk returns a tuple with the Cluster field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ReservedResource) GetClusterOk() (*bool, bool) {
-	if o == nil || isNil(o.Cluster) {
-    return nil, false
+	if o == nil || o.Cluster == nil {
+		return nil, false
 	}
 	return o.Cluster, true
 }
 
 // HasCluster returns a boolean if a field has been set.
 func (o *ReservedResource) HasCluster() bool {
-	if o != nil && !isNil(o.Cluster) {
+	if o != nil && o.Cluster != nil {
 		return true
 	}
 
@@ -300,7 +301,7 @@ func (o *ReservedResource) SetCluster(v bool) {
 
 // GetCount returns the Count field value if set, zero value otherwise.
 func (o *ReservedResource) GetCount() int32 {
-	if o == nil || isNil(o.Count) {
+	if o == nil || o.Count == nil {
 		var ret int32
 		return ret
 	}
@@ -310,15 +311,15 @@ func (o *ReservedResource) GetCount() int32 {
 // GetCountOk returns a tuple with the Count field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ReservedResource) GetCountOk() (*int32, bool) {
-	if o == nil || isNil(o.Count) {
-    return nil, false
+	if o == nil || o.Count == nil {
+		return nil, false
 	}
 	return o.Count, true
 }
 
 // HasCount returns a boolean if a field has been set.
 func (o *ReservedResource) HasCount() bool {
-	if o != nil && !isNil(o.Count) {
+	if o != nil && o.Count != nil {
 		return true
 	}
 
@@ -332,7 +333,7 @@ func (o *ReservedResource) SetCount(v int32) {
 
 // GetCreatedAt returns the CreatedAt field value if set, zero value otherwise.
 func (o *ReservedResource) GetCreatedAt() time.Time {
-	if o == nil || isNil(o.CreatedAt) {
+	if o == nil || o.CreatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -342,15 +343,15 @@ func (o *ReservedResource) GetCreatedAt() time.Time {
 // GetCreatedAtOk returns a tuple with the CreatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ReservedResource) GetCreatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.CreatedAt) {
-    return nil, false
+	if o == nil || o.CreatedAt == nil {
+		return nil, false
 	}
 	return o.CreatedAt, true
 }
 
 // HasCreatedAt returns a boolean if a field has been set.
 func (o *ReservedResource) HasCreatedAt() bool {
-	if o != nil && !isNil(o.CreatedAt) {
+	if o != nil && o.CreatedAt != nil {
 		return true
 	}
 
@@ -364,7 +365,7 @@ func (o *ReservedResource) SetCreatedAt(v time.Time) {
 
 // GetResourceName returns the ResourceName field value if set, zero value otherwise.
 func (o *ReservedResource) GetResourceName() string {
-	if o == nil || isNil(o.ResourceName) {
+	if o == nil || o.ResourceName == nil {
 		var ret string
 		return ret
 	}
@@ -374,15 +375,15 @@ func (o *ReservedResource) GetResourceName() string {
 // GetResourceNameOk returns a tuple with the ResourceName field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ReservedResource) GetResourceNameOk() (*string, bool) {
-	if o == nil || isNil(o.ResourceName) {
-    return nil, false
+	if o == nil || o.ResourceName == nil {
+		return nil, false
 	}
 	return o.ResourceName, true
 }
 
 // HasResourceName returns a boolean if a field has been set.
 func (o *ReservedResource) HasResourceName() bool {
-	if o != nil && !isNil(o.ResourceName) {
+	if o != nil && o.ResourceName != nil {
 		return true
 	}
 
@@ -396,7 +397,7 @@ func (o *ReservedResource) SetResourceName(v string) {
 
 // GetResourceType returns the ResourceType field value if set, zero value otherwise.
 func (o *ReservedResource) GetResourceType() string {
-	if o == nil || isNil(o.ResourceType) {
+	if o == nil || o.ResourceType == nil {
 		var ret string
 		return ret
 	}
@@ -406,15 +407,15 @@ func (o *ReservedResource) GetResourceType() string {
 // GetResourceTypeOk returns a tuple with the ResourceType field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ReservedResource) GetResourceTypeOk() (*string, bool) {
-	if o == nil || isNil(o.ResourceType) {
-    return nil, false
+	if o == nil || o.ResourceType == nil {
+		return nil, false
 	}
 	return o.ResourceType, true
 }
 
 // HasResourceType returns a boolean if a field has been set.
 func (o *ReservedResource) HasResourceType() bool {
-	if o != nil && !isNil(o.ResourceType) {
+	if o != nil && o.ResourceType != nil {
 		return true
 	}
 
@@ -428,7 +429,7 @@ func (o *ReservedResource) SetResourceType(v string) {
 
 // GetSubscription returns the Subscription field value if set, zero value otherwise.
 func (o *ReservedResource) GetSubscription() ObjectReference {
-	if o == nil || isNil(o.Subscription) {
+	if o == nil || o.Subscription == nil {
 		var ret ObjectReference
 		return ret
 	}
@@ -438,15 +439,15 @@ func (o *ReservedResource) GetSubscription() ObjectReference {
 // GetSubscriptionOk returns a tuple with the Subscription field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ReservedResource) GetSubscriptionOk() (*ObjectReference, bool) {
-	if o == nil || isNil(o.Subscription) {
-    return nil, false
+	if o == nil || o.Subscription == nil {
+		return nil, false
 	}
 	return o.Subscription, true
 }
 
 // HasSubscription returns a boolean if a field has been set.
 func (o *ReservedResource) HasSubscription() bool {
-	if o != nil && !isNil(o.Subscription) {
+	if o != nil && o.Subscription != nil {
 		return true
 	}
 
@@ -460,7 +461,7 @@ func (o *ReservedResource) SetSubscription(v ObjectReference) {
 
 // GetUpdatedAt returns the UpdatedAt field value if set, zero value otherwise.
 func (o *ReservedResource) GetUpdatedAt() time.Time {
-	if o == nil || isNil(o.UpdatedAt) {
+	if o == nil || o.UpdatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -470,15 +471,15 @@ func (o *ReservedResource) GetUpdatedAt() time.Time {
 // GetUpdatedAtOk returns a tuple with the UpdatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ReservedResource) GetUpdatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.UpdatedAt) {
-    return nil, false
+	if o == nil || o.UpdatedAt == nil {
+		return nil, false
 	}
 	return o.UpdatedAt, true
 }
 
 // HasUpdatedAt returns a boolean if a field has been set.
 func (o *ReservedResource) HasUpdatedAt() bool {
-	if o != nil && !isNil(o.UpdatedAt) {
+	if o != nil && o.UpdatedAt != nil {
 		return true
 	}
 
@@ -492,46 +493,46 @@ func (o *ReservedResource) SetUpdatedAt(v time.Time) {
 
 func (o ReservedResource) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Href) {
+	if o.Href != nil {
 		toSerialize["href"] = o.Href
 	}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.Kind) {
+	if o.Kind != nil {
 		toSerialize["kind"] = o.Kind
 	}
-	if !isNil(o.AvailabilityZoneType) {
+	if o.AvailabilityZoneType != nil {
 		toSerialize["availability_zone_type"] = o.AvailabilityZoneType
 	}
-	if !isNil(o.BillingMarketplaceAccount) {
+	if o.BillingMarketplaceAccount != nil {
 		toSerialize["billing_marketplace_account"] = o.BillingMarketplaceAccount
 	}
-	if !isNil(o.BillingModel) {
+	if o.BillingModel != nil {
 		toSerialize["billing_model"] = o.BillingModel
 	}
 	if true {
 		toSerialize["byoc"] = o.Byoc
 	}
-	if !isNil(o.Cluster) {
+	if o.Cluster != nil {
 		toSerialize["cluster"] = o.Cluster
 	}
-	if !isNil(o.Count) {
+	if o.Count != nil {
 		toSerialize["count"] = o.Count
 	}
-	if !isNil(o.CreatedAt) {
+	if o.CreatedAt != nil {
 		toSerialize["created_at"] = o.CreatedAt
 	}
-	if !isNil(o.ResourceName) {
+	if o.ResourceName != nil {
 		toSerialize["resource_name"] = o.ResourceName
 	}
-	if !isNil(o.ResourceType) {
+	if o.ResourceType != nil {
 		toSerialize["resource_type"] = o.ResourceType
 	}
-	if !isNil(o.Subscription) {
+	if o.Subscription != nil {
 		toSerialize["subscription"] = o.Subscription
 	}
-	if !isNil(o.UpdatedAt) {
+	if o.UpdatedAt != nil {
 		toSerialize["updated_at"] = o.UpdatedAt
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_reserved_resource_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_reserved_resource_all_of.go
index 1140e384..aa96ecd8 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_reserved_resource_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_reserved_resource_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -50,7 +50,7 @@ func NewReservedResourceAllOfWithDefaults() *ReservedResourceAllOf {
 
 // GetAvailabilityZoneType returns the AvailabilityZoneType field value if set, zero value otherwise.
 func (o *ReservedResourceAllOf) GetAvailabilityZoneType() string {
-	if o == nil || isNil(o.AvailabilityZoneType) {
+	if o == nil || o.AvailabilityZoneType == nil {
 		var ret string
 		return ret
 	}
@@ -60,15 +60,15 @@ func (o *ReservedResourceAllOf) GetAvailabilityZoneType() string {
 // GetAvailabilityZoneTypeOk returns a tuple with the AvailabilityZoneType field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ReservedResourceAllOf) GetAvailabilityZoneTypeOk() (*string, bool) {
-	if o == nil || isNil(o.AvailabilityZoneType) {
-    return nil, false
+	if o == nil || o.AvailabilityZoneType == nil {
+		return nil, false
 	}
 	return o.AvailabilityZoneType, true
 }
 
 // HasAvailabilityZoneType returns a boolean if a field has been set.
 func (o *ReservedResourceAllOf) HasAvailabilityZoneType() bool {
-	if o != nil && !isNil(o.AvailabilityZoneType) {
+	if o != nil && o.AvailabilityZoneType != nil {
 		return true
 	}
 
@@ -82,7 +82,7 @@ func (o *ReservedResourceAllOf) SetAvailabilityZoneType(v string) {
 
 // GetBillingMarketplaceAccount returns the BillingMarketplaceAccount field value if set, zero value otherwise.
 func (o *ReservedResourceAllOf) GetBillingMarketplaceAccount() string {
-	if o == nil || isNil(o.BillingMarketplaceAccount) {
+	if o == nil || o.BillingMarketplaceAccount == nil {
 		var ret string
 		return ret
 	}
@@ -92,15 +92,15 @@ func (o *ReservedResourceAllOf) GetBillingMarketplaceAccount() string {
 // GetBillingMarketplaceAccountOk returns a tuple with the BillingMarketplaceAccount field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ReservedResourceAllOf) GetBillingMarketplaceAccountOk() (*string, bool) {
-	if o == nil || isNil(o.BillingMarketplaceAccount) {
-    return nil, false
+	if o == nil || o.BillingMarketplaceAccount == nil {
+		return nil, false
 	}
 	return o.BillingMarketplaceAccount, true
 }
 
 // HasBillingMarketplaceAccount returns a boolean if a field has been set.
 func (o *ReservedResourceAllOf) HasBillingMarketplaceAccount() bool {
-	if o != nil && !isNil(o.BillingMarketplaceAccount) {
+	if o != nil && o.BillingMarketplaceAccount != nil {
 		return true
 	}
 
@@ -114,7 +114,7 @@ func (o *ReservedResourceAllOf) SetBillingMarketplaceAccount(v string) {
 
 // GetBillingModel returns the BillingModel field value if set, zero value otherwise.
 func (o *ReservedResourceAllOf) GetBillingModel() string {
-	if o == nil || isNil(o.BillingModel) {
+	if o == nil || o.BillingModel == nil {
 		var ret string
 		return ret
 	}
@@ -124,15 +124,15 @@ func (o *ReservedResourceAllOf) GetBillingModel() string {
 // GetBillingModelOk returns a tuple with the BillingModel field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ReservedResourceAllOf) GetBillingModelOk() (*string, bool) {
-	if o == nil || isNil(o.BillingModel) {
-    return nil, false
+	if o == nil || o.BillingModel == nil {
+		return nil, false
 	}
 	return o.BillingModel, true
 }
 
 // HasBillingModel returns a boolean if a field has been set.
 func (o *ReservedResourceAllOf) HasBillingModel() bool {
-	if o != nil && !isNil(o.BillingModel) {
+	if o != nil && o.BillingModel != nil {
 		return true
 	}
 
@@ -157,8 +157,8 @@ func (o *ReservedResourceAllOf) GetByoc() bool {
 // GetByocOk returns a tuple with the Byoc field value
 // and a boolean to check if the value has been set.
 func (o *ReservedResourceAllOf) GetByocOk() (*bool, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Byoc, true
 }
@@ -170,7 +170,7 @@ func (o *ReservedResourceAllOf) SetByoc(v bool) {
 
 // GetCluster returns the Cluster field value if set, zero value otherwise.
 func (o *ReservedResourceAllOf) GetCluster() bool {
-	if o == nil || isNil(o.Cluster) {
+	if o == nil || o.Cluster == nil {
 		var ret bool
 		return ret
 	}
@@ -180,15 +180,15 @@ func (o *ReservedResourceAllOf) GetCluster() bool {
 // GetClusterOk returns a tuple with the Cluster field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ReservedResourceAllOf) GetClusterOk() (*bool, bool) {
-	if o == nil || isNil(o.Cluster) {
-    return nil, false
+	if o == nil || o.Cluster == nil {
+		return nil, false
 	}
 	return o.Cluster, true
 }
 
 // HasCluster returns a boolean if a field has been set.
 func (o *ReservedResourceAllOf) HasCluster() bool {
-	if o != nil && !isNil(o.Cluster) {
+	if o != nil && o.Cluster != nil {
 		return true
 	}
 
@@ -202,7 +202,7 @@ func (o *ReservedResourceAllOf) SetCluster(v bool) {
 
 // GetCount returns the Count field value if set, zero value otherwise.
 func (o *ReservedResourceAllOf) GetCount() int32 {
-	if o == nil || isNil(o.Count) {
+	if o == nil || o.Count == nil {
 		var ret int32
 		return ret
 	}
@@ -212,15 +212,15 @@ func (o *ReservedResourceAllOf) GetCount() int32 {
 // GetCountOk returns a tuple with the Count field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ReservedResourceAllOf) GetCountOk() (*int32, bool) {
-	if o == nil || isNil(o.Count) {
-    return nil, false
+	if o == nil || o.Count == nil {
+		return nil, false
 	}
 	return o.Count, true
 }
 
 // HasCount returns a boolean if a field has been set.
 func (o *ReservedResourceAllOf) HasCount() bool {
-	if o != nil && !isNil(o.Count) {
+	if o != nil && o.Count != nil {
 		return true
 	}
 
@@ -234,7 +234,7 @@ func (o *ReservedResourceAllOf) SetCount(v int32) {
 
 // GetCreatedAt returns the CreatedAt field value if set, zero value otherwise.
 func (o *ReservedResourceAllOf) GetCreatedAt() time.Time {
-	if o == nil || isNil(o.CreatedAt) {
+	if o == nil || o.CreatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -244,15 +244,15 @@ func (o *ReservedResourceAllOf) GetCreatedAt() time.Time {
 // GetCreatedAtOk returns a tuple with the CreatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ReservedResourceAllOf) GetCreatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.CreatedAt) {
-    return nil, false
+	if o == nil || o.CreatedAt == nil {
+		return nil, false
 	}
 	return o.CreatedAt, true
 }
 
 // HasCreatedAt returns a boolean if a field has been set.
 func (o *ReservedResourceAllOf) HasCreatedAt() bool {
-	if o != nil && !isNil(o.CreatedAt) {
+	if o != nil && o.CreatedAt != nil {
 		return true
 	}
 
@@ -266,7 +266,7 @@ func (o *ReservedResourceAllOf) SetCreatedAt(v time.Time) {
 
 // GetResourceName returns the ResourceName field value if set, zero value otherwise.
 func (o *ReservedResourceAllOf) GetResourceName() string {
-	if o == nil || isNil(o.ResourceName) {
+	if o == nil || o.ResourceName == nil {
 		var ret string
 		return ret
 	}
@@ -276,15 +276,15 @@ func (o *ReservedResourceAllOf) GetResourceName() string {
 // GetResourceNameOk returns a tuple with the ResourceName field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ReservedResourceAllOf) GetResourceNameOk() (*string, bool) {
-	if o == nil || isNil(o.ResourceName) {
-    return nil, false
+	if o == nil || o.ResourceName == nil {
+		return nil, false
 	}
 	return o.ResourceName, true
 }
 
 // HasResourceName returns a boolean if a field has been set.
 func (o *ReservedResourceAllOf) HasResourceName() bool {
-	if o != nil && !isNil(o.ResourceName) {
+	if o != nil && o.ResourceName != nil {
 		return true
 	}
 
@@ -298,7 +298,7 @@ func (o *ReservedResourceAllOf) SetResourceName(v string) {
 
 // GetResourceType returns the ResourceType field value if set, zero value otherwise.
 func (o *ReservedResourceAllOf) GetResourceType() string {
-	if o == nil || isNil(o.ResourceType) {
+	if o == nil || o.ResourceType == nil {
 		var ret string
 		return ret
 	}
@@ -308,15 +308,15 @@ func (o *ReservedResourceAllOf) GetResourceType() string {
 // GetResourceTypeOk returns a tuple with the ResourceType field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ReservedResourceAllOf) GetResourceTypeOk() (*string, bool) {
-	if o == nil || isNil(o.ResourceType) {
-    return nil, false
+	if o == nil || o.ResourceType == nil {
+		return nil, false
 	}
 	return o.ResourceType, true
 }
 
 // HasResourceType returns a boolean if a field has been set.
 func (o *ReservedResourceAllOf) HasResourceType() bool {
-	if o != nil && !isNil(o.ResourceType) {
+	if o != nil && o.ResourceType != nil {
 		return true
 	}
 
@@ -330,7 +330,7 @@ func (o *ReservedResourceAllOf) SetResourceType(v string) {
 
 // GetSubscription returns the Subscription field value if set, zero value otherwise.
 func (o *ReservedResourceAllOf) GetSubscription() ObjectReference {
-	if o == nil || isNil(o.Subscription) {
+	if o == nil || o.Subscription == nil {
 		var ret ObjectReference
 		return ret
 	}
@@ -340,15 +340,15 @@ func (o *ReservedResourceAllOf) GetSubscription() ObjectReference {
 // GetSubscriptionOk returns a tuple with the Subscription field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ReservedResourceAllOf) GetSubscriptionOk() (*ObjectReference, bool) {
-	if o == nil || isNil(o.Subscription) {
-    return nil, false
+	if o == nil || o.Subscription == nil {
+		return nil, false
 	}
 	return o.Subscription, true
 }
 
 // HasSubscription returns a boolean if a field has been set.
 func (o *ReservedResourceAllOf) HasSubscription() bool {
-	if o != nil && !isNil(o.Subscription) {
+	if o != nil && o.Subscription != nil {
 		return true
 	}
 
@@ -362,7 +362,7 @@ func (o *ReservedResourceAllOf) SetSubscription(v ObjectReference) {
 
 // GetUpdatedAt returns the UpdatedAt field value if set, zero value otherwise.
 func (o *ReservedResourceAllOf) GetUpdatedAt() time.Time {
-	if o == nil || isNil(o.UpdatedAt) {
+	if o == nil || o.UpdatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -372,15 +372,15 @@ func (o *ReservedResourceAllOf) GetUpdatedAt() time.Time {
 // GetUpdatedAtOk returns a tuple with the UpdatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ReservedResourceAllOf) GetUpdatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.UpdatedAt) {
-    return nil, false
+	if o == nil || o.UpdatedAt == nil {
+		return nil, false
 	}
 	return o.UpdatedAt, true
 }
 
 // HasUpdatedAt returns a boolean if a field has been set.
 func (o *ReservedResourceAllOf) HasUpdatedAt() bool {
-	if o != nil && !isNil(o.UpdatedAt) {
+	if o != nil && o.UpdatedAt != nil {
 		return true
 	}
 
@@ -394,37 +394,37 @@ func (o *ReservedResourceAllOf) SetUpdatedAt(v time.Time) {
 
 func (o ReservedResourceAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.AvailabilityZoneType) {
+	if o.AvailabilityZoneType != nil {
 		toSerialize["availability_zone_type"] = o.AvailabilityZoneType
 	}
-	if !isNil(o.BillingMarketplaceAccount) {
+	if o.BillingMarketplaceAccount != nil {
 		toSerialize["billing_marketplace_account"] = o.BillingMarketplaceAccount
 	}
-	if !isNil(o.BillingModel) {
+	if o.BillingModel != nil {
 		toSerialize["billing_model"] = o.BillingModel
 	}
 	if true {
 		toSerialize["byoc"] = o.Byoc
 	}
-	if !isNil(o.Cluster) {
+	if o.Cluster != nil {
 		toSerialize["cluster"] = o.Cluster
 	}
-	if !isNil(o.Count) {
+	if o.Count != nil {
 		toSerialize["count"] = o.Count
 	}
-	if !isNil(o.CreatedAt) {
+	if o.CreatedAt != nil {
 		toSerialize["created_at"] = o.CreatedAt
 	}
-	if !isNil(o.ResourceName) {
+	if o.ResourceName != nil {
 		toSerialize["resource_name"] = o.ResourceName
 	}
-	if !isNil(o.ResourceType) {
+	if o.ResourceType != nil {
 		toSerialize["resource_type"] = o.ResourceType
 	}
-	if !isNil(o.Subscription) {
+	if o.Subscription != nil {
 		toSerialize["subscription"] = o.Subscription
 	}
-	if !isNil(o.UpdatedAt) {
+	if o.UpdatedAt != nil {
 		toSerialize["updated_at"] = o.UpdatedAt
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_reserved_resource_list.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_reserved_resource_list.go
index b89375c4..b45b1f02 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_reserved_resource_list.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_reserved_resource_list.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -58,8 +58,8 @@ func (o *ReservedResourceList) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *ReservedResourceList) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -82,8 +82,8 @@ func (o *ReservedResourceList) GetPage() int32 {
 // GetPageOk returns a tuple with the Page field value
 // and a boolean to check if the value has been set.
 func (o *ReservedResourceList) GetPageOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Page, true
 }
@@ -106,8 +106,8 @@ func (o *ReservedResourceList) GetSize() int32 {
 // GetSizeOk returns a tuple with the Size field value
 // and a boolean to check if the value has been set.
 func (o *ReservedResourceList) GetSizeOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Size, true
 }
@@ -130,8 +130,8 @@ func (o *ReservedResourceList) GetTotal() int32 {
 // GetTotalOk returns a tuple with the Total field value
 // and a boolean to check if the value has been set.
 func (o *ReservedResourceList) GetTotalOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Total, true
 }
@@ -153,11 +153,11 @@ func (o *ReservedResourceList) GetItems() []ReservedResource {
 
 // GetItemsOk returns a tuple with the Items field value
 // and a boolean to check if the value has been set.
-func (o *ReservedResourceList) GetItemsOk() ([]ReservedResource, bool) {
-	if o == nil {
-    return nil, false
+func (o *ReservedResourceList) GetItemsOk() (*[]ReservedResource, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Items, true
+	return &o.Items, true
 }
 
 // SetItems sets field value
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_reserved_resource_list_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_reserved_resource_list_all_of.go
index b597b198..d10b3a37 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_reserved_resource_list_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_reserved_resource_list_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -16,7 +16,7 @@ import (
 
 // ReservedResourceListAllOf struct for ReservedResourceListAllOf
 type ReservedResourceListAllOf struct {
-	Items []ReservedResource `json:"items,omitempty"`
+	Items *[]ReservedResource `json:"items,omitempty"`
 }
 
 // NewReservedResourceListAllOf instantiates a new ReservedResourceListAllOf object
@@ -38,25 +38,25 @@ func NewReservedResourceListAllOfWithDefaults() *ReservedResourceListAllOf {
 
 // GetItems returns the Items field value if set, zero value otherwise.
 func (o *ReservedResourceListAllOf) GetItems() []ReservedResource {
-	if o == nil || isNil(o.Items) {
+	if o == nil || o.Items == nil {
 		var ret []ReservedResource
 		return ret
 	}
-	return o.Items
+	return *o.Items
 }
 
 // GetItemsOk returns a tuple with the Items field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *ReservedResourceListAllOf) GetItemsOk() ([]ReservedResource, bool) {
-	if o == nil || isNil(o.Items) {
-    return nil, false
+func (o *ReservedResourceListAllOf) GetItemsOk() (*[]ReservedResource, bool) {
+	if o == nil || o.Items == nil {
+		return nil, false
 	}
 	return o.Items, true
 }
 
 // HasItems returns a boolean if a field has been set.
 func (o *ReservedResourceListAllOf) HasItems() bool {
-	if o != nil && !isNil(o.Items) {
+	if o != nil && o.Items != nil {
 		return true
 	}
 
@@ -65,12 +65,12 @@ func (o *ReservedResourceListAllOf) HasItems() bool {
 
 // SetItems gets a reference to the given []ReservedResource and assigns it to the Items field.
 func (o *ReservedResourceListAllOf) SetItems(v []ReservedResource) {
-	o.Items = v
+	o.Items = &v
 }
 
 func (o ReservedResourceListAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Items) {
+	if o.Items != nil {
 		toSerialize["items"] = o.Items
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_reserved_resource_patch_request.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_reserved_resource_patch_request.go
index 06e7d10a..dd7be466 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_reserved_resource_patch_request.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_reserved_resource_patch_request.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -38,7 +38,7 @@ func NewReservedResourcePatchRequestWithDefaults() *ReservedResourcePatchRequest
 
 // GetBillingModel returns the BillingModel field value if set, zero value otherwise.
 func (o *ReservedResourcePatchRequest) GetBillingModel() string {
-	if o == nil || isNil(o.BillingModel) {
+	if o == nil || o.BillingModel == nil {
 		var ret string
 		return ret
 	}
@@ -48,15 +48,15 @@ func (o *ReservedResourcePatchRequest) GetBillingModel() string {
 // GetBillingModelOk returns a tuple with the BillingModel field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ReservedResourcePatchRequest) GetBillingModelOk() (*string, bool) {
-	if o == nil || isNil(o.BillingModel) {
-    return nil, false
+	if o == nil || o.BillingModel == nil {
+		return nil, false
 	}
 	return o.BillingModel, true
 }
 
 // HasBillingModel returns a boolean if a field has been set.
 func (o *ReservedResourcePatchRequest) HasBillingModel() bool {
-	if o != nil && !isNil(o.BillingModel) {
+	if o != nil && o.BillingModel != nil {
 		return true
 	}
 
@@ -70,7 +70,7 @@ func (o *ReservedResourcePatchRequest) SetBillingModel(v string) {
 
 func (o ReservedResourcePatchRequest) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.BillingModel) {
+	if o.BillingModel != nil {
 		toSerialize["billing_model"] = o.BillingModel
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_resource_quota.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_resource_quota.go
index 881f0528..9bf3bb3e 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_resource_quota.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_resource_quota.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -12,6 +12,7 @@ package accountmgmtclient
 
 import (
 	"encoding/json"
+	"time"
 )
 
 // ResourceQuota struct for ResourceQuota
@@ -47,7 +48,7 @@ func NewResourceQuotaWithDefaults() *ResourceQuota {
 
 // GetHref returns the Href field value if set, zero value otherwise.
 func (o *ResourceQuota) GetHref() string {
-	if o == nil || isNil(o.Href) {
+	if o == nil || o.Href == nil {
 		var ret string
 		return ret
 	}
@@ -57,15 +58,15 @@ func (o *ResourceQuota) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ResourceQuota) GetHrefOk() (*string, bool) {
-	if o == nil || isNil(o.Href) {
-    return nil, false
+	if o == nil || o.Href == nil {
+		return nil, false
 	}
 	return o.Href, true
 }
 
 // HasHref returns a boolean if a field has been set.
 func (o *ResourceQuota) HasHref() bool {
-	if o != nil && !isNil(o.Href) {
+	if o != nil && o.Href != nil {
 		return true
 	}
 
@@ -79,7 +80,7 @@ func (o *ResourceQuota) SetHref(v string) {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *ResourceQuota) GetId() string {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret string
 		return ret
 	}
@@ -89,15 +90,15 @@ func (o *ResourceQuota) GetId() string {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ResourceQuota) GetIdOk() (*string, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *ResourceQuota) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -111,7 +112,7 @@ func (o *ResourceQuota) SetId(v string) {
 
 // GetKind returns the Kind field value if set, zero value otherwise.
 func (o *ResourceQuota) GetKind() string {
-	if o == nil || isNil(o.Kind) {
+	if o == nil || o.Kind == nil {
 		var ret string
 		return ret
 	}
@@ -121,15 +122,15 @@ func (o *ResourceQuota) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ResourceQuota) GetKindOk() (*string, bool) {
-	if o == nil || isNil(o.Kind) {
-    return nil, false
+	if o == nil || o.Kind == nil {
+		return nil, false
 	}
 	return o.Kind, true
 }
 
 // HasKind returns a boolean if a field has been set.
 func (o *ResourceQuota) HasKind() bool {
-	if o != nil && !isNil(o.Kind) {
+	if o != nil && o.Kind != nil {
 		return true
 	}
 
@@ -143,7 +144,7 @@ func (o *ResourceQuota) SetKind(v string) {
 
 // GetCreatedAt returns the CreatedAt field value if set, zero value otherwise.
 func (o *ResourceQuota) GetCreatedAt() time.Time {
-	if o == nil || isNil(o.CreatedAt) {
+	if o == nil || o.CreatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -153,15 +154,15 @@ func (o *ResourceQuota) GetCreatedAt() time.Time {
 // GetCreatedAtOk returns a tuple with the CreatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ResourceQuota) GetCreatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.CreatedAt) {
-    return nil, false
+	if o == nil || o.CreatedAt == nil {
+		return nil, false
 	}
 	return o.CreatedAt, true
 }
 
 // HasCreatedAt returns a boolean if a field has been set.
 func (o *ResourceQuota) HasCreatedAt() bool {
-	if o != nil && !isNil(o.CreatedAt) {
+	if o != nil && o.CreatedAt != nil {
 		return true
 	}
 
@@ -175,7 +176,7 @@ func (o *ResourceQuota) SetCreatedAt(v time.Time) {
 
 // GetOrganizationId returns the OrganizationId field value if set, zero value otherwise.
 func (o *ResourceQuota) GetOrganizationId() string {
-	if o == nil || isNil(o.OrganizationId) {
+	if o == nil || o.OrganizationId == nil {
 		var ret string
 		return ret
 	}
@@ -185,15 +186,15 @@ func (o *ResourceQuota) GetOrganizationId() string {
 // GetOrganizationIdOk returns a tuple with the OrganizationId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ResourceQuota) GetOrganizationIdOk() (*string, bool) {
-	if o == nil || isNil(o.OrganizationId) {
-    return nil, false
+	if o == nil || o.OrganizationId == nil {
+		return nil, false
 	}
 	return o.OrganizationId, true
 }
 
 // HasOrganizationId returns a boolean if a field has been set.
 func (o *ResourceQuota) HasOrganizationId() bool {
-	if o != nil && !isNil(o.OrganizationId) {
+	if o != nil && o.OrganizationId != nil {
 		return true
 	}
 
@@ -207,7 +208,7 @@ func (o *ResourceQuota) SetOrganizationId(v string) {
 
 // GetSku returns the Sku field value if set, zero value otherwise.
 func (o *ResourceQuota) GetSku() string {
-	if o == nil || isNil(o.Sku) {
+	if o == nil || o.Sku == nil {
 		var ret string
 		return ret
 	}
@@ -217,15 +218,15 @@ func (o *ResourceQuota) GetSku() string {
 // GetSkuOk returns a tuple with the Sku field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ResourceQuota) GetSkuOk() (*string, bool) {
-	if o == nil || isNil(o.Sku) {
-    return nil, false
+	if o == nil || o.Sku == nil {
+		return nil, false
 	}
 	return o.Sku, true
 }
 
 // HasSku returns a boolean if a field has been set.
 func (o *ResourceQuota) HasSku() bool {
-	if o != nil && !isNil(o.Sku) {
+	if o != nil && o.Sku != nil {
 		return true
 	}
 
@@ -250,8 +251,8 @@ func (o *ResourceQuota) GetSkuCount() int32 {
 // GetSkuCountOk returns a tuple with the SkuCount field value
 // and a boolean to check if the value has been set.
 func (o *ResourceQuota) GetSkuCountOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.SkuCount, true
 }
@@ -263,7 +264,7 @@ func (o *ResourceQuota) SetSkuCount(v int32) {
 
 // GetType returns the Type field value if set, zero value otherwise.
 func (o *ResourceQuota) GetType() string {
-	if o == nil || isNil(o.Type) {
+	if o == nil || o.Type == nil {
 		var ret string
 		return ret
 	}
@@ -273,15 +274,15 @@ func (o *ResourceQuota) GetType() string {
 // GetTypeOk returns a tuple with the Type field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ResourceQuota) GetTypeOk() (*string, bool) {
-	if o == nil || isNil(o.Type) {
-    return nil, false
+	if o == nil || o.Type == nil {
+		return nil, false
 	}
 	return o.Type, true
 }
 
 // HasType returns a boolean if a field has been set.
 func (o *ResourceQuota) HasType() bool {
-	if o != nil && !isNil(o.Type) {
+	if o != nil && o.Type != nil {
 		return true
 	}
 
@@ -295,7 +296,7 @@ func (o *ResourceQuota) SetType(v string) {
 
 // GetUpdatedAt returns the UpdatedAt field value if set, zero value otherwise.
 func (o *ResourceQuota) GetUpdatedAt() time.Time {
-	if o == nil || isNil(o.UpdatedAt) {
+	if o == nil || o.UpdatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -305,15 +306,15 @@ func (o *ResourceQuota) GetUpdatedAt() time.Time {
 // GetUpdatedAtOk returns a tuple with the UpdatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ResourceQuota) GetUpdatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.UpdatedAt) {
-    return nil, false
+	if o == nil || o.UpdatedAt == nil {
+		return nil, false
 	}
 	return o.UpdatedAt, true
 }
 
 // HasUpdatedAt returns a boolean if a field has been set.
 func (o *ResourceQuota) HasUpdatedAt() bool {
-	if o != nil && !isNil(o.UpdatedAt) {
+	if o != nil && o.UpdatedAt != nil {
 		return true
 	}
 
@@ -327,31 +328,31 @@ func (o *ResourceQuota) SetUpdatedAt(v time.Time) {
 
 func (o ResourceQuota) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Href) {
+	if o.Href != nil {
 		toSerialize["href"] = o.Href
 	}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.Kind) {
+	if o.Kind != nil {
 		toSerialize["kind"] = o.Kind
 	}
-	if !isNil(o.CreatedAt) {
+	if o.CreatedAt != nil {
 		toSerialize["created_at"] = o.CreatedAt
 	}
-	if !isNil(o.OrganizationId) {
+	if o.OrganizationId != nil {
 		toSerialize["organization_id"] = o.OrganizationId
 	}
-	if !isNil(o.Sku) {
+	if o.Sku != nil {
 		toSerialize["sku"] = o.Sku
 	}
 	if true {
 		toSerialize["sku_count"] = o.SkuCount
 	}
-	if !isNil(o.Type) {
+	if o.Type != nil {
 		toSerialize["type"] = o.Type
 	}
-	if !isNil(o.UpdatedAt) {
+	if o.UpdatedAt != nil {
 		toSerialize["updated_at"] = o.UpdatedAt
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_resource_quota_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_resource_quota_all_of.go
index 48ff2b38..89502a22 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_resource_quota_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_resource_quota_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -45,7 +45,7 @@ func NewResourceQuotaAllOfWithDefaults() *ResourceQuotaAllOf {
 
 // GetCreatedAt returns the CreatedAt field value if set, zero value otherwise.
 func (o *ResourceQuotaAllOf) GetCreatedAt() time.Time {
-	if o == nil || isNil(o.CreatedAt) {
+	if o == nil || o.CreatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -55,15 +55,15 @@ func (o *ResourceQuotaAllOf) GetCreatedAt() time.Time {
 // GetCreatedAtOk returns a tuple with the CreatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ResourceQuotaAllOf) GetCreatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.CreatedAt) {
-    return nil, false
+	if o == nil || o.CreatedAt == nil {
+		return nil, false
 	}
 	return o.CreatedAt, true
 }
 
 // HasCreatedAt returns a boolean if a field has been set.
 func (o *ResourceQuotaAllOf) HasCreatedAt() bool {
-	if o != nil && !isNil(o.CreatedAt) {
+	if o != nil && o.CreatedAt != nil {
 		return true
 	}
 
@@ -77,7 +77,7 @@ func (o *ResourceQuotaAllOf) SetCreatedAt(v time.Time) {
 
 // GetOrganizationId returns the OrganizationId field value if set, zero value otherwise.
 func (o *ResourceQuotaAllOf) GetOrganizationId() string {
-	if o == nil || isNil(o.OrganizationId) {
+	if o == nil || o.OrganizationId == nil {
 		var ret string
 		return ret
 	}
@@ -87,15 +87,15 @@ func (o *ResourceQuotaAllOf) GetOrganizationId() string {
 // GetOrganizationIdOk returns a tuple with the OrganizationId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ResourceQuotaAllOf) GetOrganizationIdOk() (*string, bool) {
-	if o == nil || isNil(o.OrganizationId) {
-    return nil, false
+	if o == nil || o.OrganizationId == nil {
+		return nil, false
 	}
 	return o.OrganizationId, true
 }
 
 // HasOrganizationId returns a boolean if a field has been set.
 func (o *ResourceQuotaAllOf) HasOrganizationId() bool {
-	if o != nil && !isNil(o.OrganizationId) {
+	if o != nil && o.OrganizationId != nil {
 		return true
 	}
 
@@ -109,7 +109,7 @@ func (o *ResourceQuotaAllOf) SetOrganizationId(v string) {
 
 // GetSku returns the Sku field value if set, zero value otherwise.
 func (o *ResourceQuotaAllOf) GetSku() string {
-	if o == nil || isNil(o.Sku) {
+	if o == nil || o.Sku == nil {
 		var ret string
 		return ret
 	}
@@ -119,15 +119,15 @@ func (o *ResourceQuotaAllOf) GetSku() string {
 // GetSkuOk returns a tuple with the Sku field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ResourceQuotaAllOf) GetSkuOk() (*string, bool) {
-	if o == nil || isNil(o.Sku) {
-    return nil, false
+	if o == nil || o.Sku == nil {
+		return nil, false
 	}
 	return o.Sku, true
 }
 
 // HasSku returns a boolean if a field has been set.
 func (o *ResourceQuotaAllOf) HasSku() bool {
-	if o != nil && !isNil(o.Sku) {
+	if o != nil && o.Sku != nil {
 		return true
 	}
 
@@ -152,8 +152,8 @@ func (o *ResourceQuotaAllOf) GetSkuCount() int32 {
 // GetSkuCountOk returns a tuple with the SkuCount field value
 // and a boolean to check if the value has been set.
 func (o *ResourceQuotaAllOf) GetSkuCountOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.SkuCount, true
 }
@@ -165,7 +165,7 @@ func (o *ResourceQuotaAllOf) SetSkuCount(v int32) {
 
 // GetType returns the Type field value if set, zero value otherwise.
 func (o *ResourceQuotaAllOf) GetType() string {
-	if o == nil || isNil(o.Type) {
+	if o == nil || o.Type == nil {
 		var ret string
 		return ret
 	}
@@ -175,15 +175,15 @@ func (o *ResourceQuotaAllOf) GetType() string {
 // GetTypeOk returns a tuple with the Type field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ResourceQuotaAllOf) GetTypeOk() (*string, bool) {
-	if o == nil || isNil(o.Type) {
-    return nil, false
+	if o == nil || o.Type == nil {
+		return nil, false
 	}
 	return o.Type, true
 }
 
 // HasType returns a boolean if a field has been set.
 func (o *ResourceQuotaAllOf) HasType() bool {
-	if o != nil && !isNil(o.Type) {
+	if o != nil && o.Type != nil {
 		return true
 	}
 
@@ -197,7 +197,7 @@ func (o *ResourceQuotaAllOf) SetType(v string) {
 
 // GetUpdatedAt returns the UpdatedAt field value if set, zero value otherwise.
 func (o *ResourceQuotaAllOf) GetUpdatedAt() time.Time {
-	if o == nil || isNil(o.UpdatedAt) {
+	if o == nil || o.UpdatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -207,15 +207,15 @@ func (o *ResourceQuotaAllOf) GetUpdatedAt() time.Time {
 // GetUpdatedAtOk returns a tuple with the UpdatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ResourceQuotaAllOf) GetUpdatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.UpdatedAt) {
-    return nil, false
+	if o == nil || o.UpdatedAt == nil {
+		return nil, false
 	}
 	return o.UpdatedAt, true
 }
 
 // HasUpdatedAt returns a boolean if a field has been set.
 func (o *ResourceQuotaAllOf) HasUpdatedAt() bool {
-	if o != nil && !isNil(o.UpdatedAt) {
+	if o != nil && o.UpdatedAt != nil {
 		return true
 	}
 
@@ -229,22 +229,22 @@ func (o *ResourceQuotaAllOf) SetUpdatedAt(v time.Time) {
 
 func (o ResourceQuotaAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.CreatedAt) {
+	if o.CreatedAt != nil {
 		toSerialize["created_at"] = o.CreatedAt
 	}
-	if !isNil(o.OrganizationId) {
+	if o.OrganizationId != nil {
 		toSerialize["organization_id"] = o.OrganizationId
 	}
-	if !isNil(o.Sku) {
+	if o.Sku != nil {
 		toSerialize["sku"] = o.Sku
 	}
 	if true {
 		toSerialize["sku_count"] = o.SkuCount
 	}
-	if !isNil(o.Type) {
+	if o.Type != nil {
 		toSerialize["type"] = o.Type
 	}
-	if !isNil(o.UpdatedAt) {
+	if o.UpdatedAt != nil {
 		toSerialize["updated_at"] = o.UpdatedAt
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_resource_quota_list.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_resource_quota_list.go
index e48b2f19..327e677c 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_resource_quota_list.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_resource_quota_list.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -58,8 +58,8 @@ func (o *ResourceQuotaList) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *ResourceQuotaList) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -82,8 +82,8 @@ func (o *ResourceQuotaList) GetPage() int32 {
 // GetPageOk returns a tuple with the Page field value
 // and a boolean to check if the value has been set.
 func (o *ResourceQuotaList) GetPageOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Page, true
 }
@@ -106,8 +106,8 @@ func (o *ResourceQuotaList) GetSize() int32 {
 // GetSizeOk returns a tuple with the Size field value
 // and a boolean to check if the value has been set.
 func (o *ResourceQuotaList) GetSizeOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Size, true
 }
@@ -130,8 +130,8 @@ func (o *ResourceQuotaList) GetTotal() int32 {
 // GetTotalOk returns a tuple with the Total field value
 // and a boolean to check if the value has been set.
 func (o *ResourceQuotaList) GetTotalOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Total, true
 }
@@ -153,11 +153,11 @@ func (o *ResourceQuotaList) GetItems() []ResourceQuota {
 
 // GetItemsOk returns a tuple with the Items field value
 // and a boolean to check if the value has been set.
-func (o *ResourceQuotaList) GetItemsOk() ([]ResourceQuota, bool) {
-	if o == nil {
-    return nil, false
+func (o *ResourceQuotaList) GetItemsOk() (*[]ResourceQuota, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Items, true
+	return &o.Items, true
 }
 
 // SetItems sets field value
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_resource_quota_list_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_resource_quota_list_all_of.go
index c19d2cfe..9f91aa5d 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_resource_quota_list_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_resource_quota_list_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -16,7 +16,7 @@ import (
 
 // ResourceQuotaListAllOf struct for ResourceQuotaListAllOf
 type ResourceQuotaListAllOf struct {
-	Items []ResourceQuota `json:"items,omitempty"`
+	Items *[]ResourceQuota `json:"items,omitempty"`
 }
 
 // NewResourceQuotaListAllOf instantiates a new ResourceQuotaListAllOf object
@@ -38,25 +38,25 @@ func NewResourceQuotaListAllOfWithDefaults() *ResourceQuotaListAllOf {
 
 // GetItems returns the Items field value if set, zero value otherwise.
 func (o *ResourceQuotaListAllOf) GetItems() []ResourceQuota {
-	if o == nil || isNil(o.Items) {
+	if o == nil || o.Items == nil {
 		var ret []ResourceQuota
 		return ret
 	}
-	return o.Items
+	return *o.Items
 }
 
 // GetItemsOk returns a tuple with the Items field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *ResourceQuotaListAllOf) GetItemsOk() ([]ResourceQuota, bool) {
-	if o == nil || isNil(o.Items) {
-    return nil, false
+func (o *ResourceQuotaListAllOf) GetItemsOk() (*[]ResourceQuota, bool) {
+	if o == nil || o.Items == nil {
+		return nil, false
 	}
 	return o.Items, true
 }
 
 // HasItems returns a boolean if a field has been set.
 func (o *ResourceQuotaListAllOf) HasItems() bool {
-	if o != nil && !isNil(o.Items) {
+	if o != nil && o.Items != nil {
 		return true
 	}
 
@@ -65,12 +65,12 @@ func (o *ResourceQuotaListAllOf) HasItems() bool {
 
 // SetItems gets a reference to the given []ResourceQuota and assigns it to the Items field.
 func (o *ResourceQuotaListAllOf) SetItems(v []ResourceQuota) {
-	o.Items = v
+	o.Items = &v
 }
 
 func (o ResourceQuotaListAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Items) {
+	if o.Items != nil {
 		toSerialize["items"] = o.Items
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_resource_quota_request.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_resource_quota_request.go
index 030f4aed..df954494 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_resource_quota_request.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_resource_quota_request.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -53,8 +53,8 @@ func (o *ResourceQuotaRequest) GetSku() string {
 // GetSkuOk returns a tuple with the Sku field value
 // and a boolean to check if the value has been set.
 func (o *ResourceQuotaRequest) GetSkuOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Sku, true
 }
@@ -77,8 +77,8 @@ func (o *ResourceQuotaRequest) GetSkuCount() int32 {
 // GetSkuCountOk returns a tuple with the SkuCount field value
 // and a boolean to check if the value has been set.
 func (o *ResourceQuotaRequest) GetSkuCountOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.SkuCount, true
 }
@@ -90,7 +90,7 @@ func (o *ResourceQuotaRequest) SetSkuCount(v int32) {
 
 // GetType returns the Type field value if set, zero value otherwise.
 func (o *ResourceQuotaRequest) GetType() string {
-	if o == nil || isNil(o.Type) {
+	if o == nil || o.Type == nil {
 		var ret string
 		return ret
 	}
@@ -100,15 +100,15 @@ func (o *ResourceQuotaRequest) GetType() string {
 // GetTypeOk returns a tuple with the Type field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ResourceQuotaRequest) GetTypeOk() (*string, bool) {
-	if o == nil || isNil(o.Type) {
-    return nil, false
+	if o == nil || o.Type == nil {
+		return nil, false
 	}
 	return o.Type, true
 }
 
 // HasType returns a boolean if a field has been set.
 func (o *ResourceQuotaRequest) HasType() bool {
-	if o != nil && !isNil(o.Type) {
+	if o != nil && o.Type != nil {
 		return true
 	}
 
@@ -128,7 +128,7 @@ func (o ResourceQuotaRequest) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["sku_count"] = o.SkuCount
 	}
-	if !isNil(o.Type) {
+	if o.Type != nil {
 		toSerialize["type"] = o.Type
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_resource_review.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_resource_review.go
index aa93aab1..01201c66 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_resource_review.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_resource_review.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -62,8 +62,8 @@ func (o *ResourceReview) GetAccountUsername() string {
 // GetAccountUsernameOk returns a tuple with the AccountUsername field value
 // and a boolean to check if the value has been set.
 func (o *ResourceReview) GetAccountUsernameOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.AccountUsername, true
 }
@@ -86,8 +86,8 @@ func (o *ResourceReview) GetAction() string {
 // GetActionOk returns a tuple with the Action field value
 // and a boolean to check if the value has been set.
 func (o *ResourceReview) GetActionOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Action, true
 }
@@ -109,11 +109,11 @@ func (o *ResourceReview) GetClusterIds() []string {
 
 // GetClusterIdsOk returns a tuple with the ClusterIds field value
 // and a boolean to check if the value has been set.
-func (o *ResourceReview) GetClusterIdsOk() ([]string, bool) {
-	if o == nil {
-    return nil, false
+func (o *ResourceReview) GetClusterIdsOk() (*[]string, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.ClusterIds, true
+	return &o.ClusterIds, true
 }
 
 // SetClusterIds sets field value
@@ -133,11 +133,11 @@ func (o *ResourceReview) GetClusterUuids() []string {
 
 // GetClusterUuidsOk returns a tuple with the ClusterUuids field value
 // and a boolean to check if the value has been set.
-func (o *ResourceReview) GetClusterUuidsOk() ([]string, bool) {
-	if o == nil {
-    return nil, false
+func (o *ResourceReview) GetClusterUuidsOk() (*[]string, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.ClusterUuids, true
+	return &o.ClusterUuids, true
 }
 
 // SetClusterUuids sets field value
@@ -157,11 +157,11 @@ func (o *ResourceReview) GetOrganizationIds() []string {
 
 // GetOrganizationIdsOk returns a tuple with the OrganizationIds field value
 // and a boolean to check if the value has been set.
-func (o *ResourceReview) GetOrganizationIdsOk() ([]string, bool) {
-	if o == nil {
-    return nil, false
+func (o *ResourceReview) GetOrganizationIdsOk() (*[]string, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.OrganizationIds, true
+	return &o.OrganizationIds, true
 }
 
 // SetOrganizationIds sets field value
@@ -182,8 +182,8 @@ func (o *ResourceReview) GetResourceType() string {
 // GetResourceTypeOk returns a tuple with the ResourceType field value
 // and a boolean to check if the value has been set.
 func (o *ResourceReview) GetResourceTypeOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.ResourceType, true
 }
@@ -205,11 +205,11 @@ func (o *ResourceReview) GetSubscriptionIds() []string {
 
 // GetSubscriptionIdsOk returns a tuple with the SubscriptionIds field value
 // and a boolean to check if the value has been set.
-func (o *ResourceReview) GetSubscriptionIdsOk() ([]string, bool) {
-	if o == nil {
-    return nil, false
+func (o *ResourceReview) GetSubscriptionIdsOk() (*[]string, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.SubscriptionIds, true
+	return &o.SubscriptionIds, true
 }
 
 // SetSubscriptionIds sets field value
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_resource_review_request.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_resource_review_request.go
index 44d64753..bf14300f 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_resource_review_request.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_resource_review_request.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -40,7 +40,7 @@ func NewResourceReviewRequestWithDefaults() *ResourceReviewRequest {
 
 // GetAccountUsername returns the AccountUsername field value if set, zero value otherwise.
 func (o *ResourceReviewRequest) GetAccountUsername() string {
-	if o == nil || isNil(o.AccountUsername) {
+	if o == nil || o.AccountUsername == nil {
 		var ret string
 		return ret
 	}
@@ -50,15 +50,15 @@ func (o *ResourceReviewRequest) GetAccountUsername() string {
 // GetAccountUsernameOk returns a tuple with the AccountUsername field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ResourceReviewRequest) GetAccountUsernameOk() (*string, bool) {
-	if o == nil || isNil(o.AccountUsername) {
-    return nil, false
+	if o == nil || o.AccountUsername == nil {
+		return nil, false
 	}
 	return o.AccountUsername, true
 }
 
 // HasAccountUsername returns a boolean if a field has been set.
 func (o *ResourceReviewRequest) HasAccountUsername() bool {
-	if o != nil && !isNil(o.AccountUsername) {
+	if o != nil && o.AccountUsername != nil {
 		return true
 	}
 
@@ -72,7 +72,7 @@ func (o *ResourceReviewRequest) SetAccountUsername(v string) {
 
 // GetAction returns the Action field value if set, zero value otherwise.
 func (o *ResourceReviewRequest) GetAction() string {
-	if o == nil || isNil(o.Action) {
+	if o == nil || o.Action == nil {
 		var ret string
 		return ret
 	}
@@ -82,15 +82,15 @@ func (o *ResourceReviewRequest) GetAction() string {
 // GetActionOk returns a tuple with the Action field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ResourceReviewRequest) GetActionOk() (*string, bool) {
-	if o == nil || isNil(o.Action) {
-    return nil, false
+	if o == nil || o.Action == nil {
+		return nil, false
 	}
 	return o.Action, true
 }
 
 // HasAction returns a boolean if a field has been set.
 func (o *ResourceReviewRequest) HasAction() bool {
-	if o != nil && !isNil(o.Action) {
+	if o != nil && o.Action != nil {
 		return true
 	}
 
@@ -104,7 +104,7 @@ func (o *ResourceReviewRequest) SetAction(v string) {
 
 // GetResourceType returns the ResourceType field value if set, zero value otherwise.
 func (o *ResourceReviewRequest) GetResourceType() string {
-	if o == nil || isNil(o.ResourceType) {
+	if o == nil || o.ResourceType == nil {
 		var ret string
 		return ret
 	}
@@ -114,15 +114,15 @@ func (o *ResourceReviewRequest) GetResourceType() string {
 // GetResourceTypeOk returns a tuple with the ResourceType field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ResourceReviewRequest) GetResourceTypeOk() (*string, bool) {
-	if o == nil || isNil(o.ResourceType) {
-    return nil, false
+	if o == nil || o.ResourceType == nil {
+		return nil, false
 	}
 	return o.ResourceType, true
 }
 
 // HasResourceType returns a boolean if a field has been set.
 func (o *ResourceReviewRequest) HasResourceType() bool {
-	if o != nil && !isNil(o.ResourceType) {
+	if o != nil && o.ResourceType != nil {
 		return true
 	}
 
@@ -136,13 +136,13 @@ func (o *ResourceReviewRequest) SetResourceType(v string) {
 
 func (o ResourceReviewRequest) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.AccountUsername) {
+	if o.AccountUsername != nil {
 		toSerialize["account_username"] = o.AccountUsername
 	}
-	if !isNil(o.Action) {
+	if o.Action != nil {
 		toSerialize["action"] = o.Action
 	}
-	if !isNil(o.ResourceType) {
+	if o.ResourceType != nil {
 		toSerialize["resource_type"] = o.ResourceType
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_role.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_role.go
index 44880688..119d1a03 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_role.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_role.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -20,7 +20,7 @@ type Role struct {
 	Id *string `json:"id,omitempty"`
 	Kind *string `json:"kind,omitempty"`
 	Name *string `json:"name,omitempty"`
-	Permissions []Permission `json:"permissions,omitempty"`
+	Permissions *[]Permission `json:"permissions,omitempty"`
 }
 
 // NewRole instantiates a new Role object
@@ -42,7 +42,7 @@ func NewRoleWithDefaults() *Role {
 
 // GetHref returns the Href field value if set, zero value otherwise.
 func (o *Role) GetHref() string {
-	if o == nil || isNil(o.Href) {
+	if o == nil || o.Href == nil {
 		var ret string
 		return ret
 	}
@@ -52,15 +52,15 @@ func (o *Role) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Role) GetHrefOk() (*string, bool) {
-	if o == nil || isNil(o.Href) {
-    return nil, false
+	if o == nil || o.Href == nil {
+		return nil, false
 	}
 	return o.Href, true
 }
 
 // HasHref returns a boolean if a field has been set.
 func (o *Role) HasHref() bool {
-	if o != nil && !isNil(o.Href) {
+	if o != nil && o.Href != nil {
 		return true
 	}
 
@@ -74,7 +74,7 @@ func (o *Role) SetHref(v string) {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *Role) GetId() string {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret string
 		return ret
 	}
@@ -84,15 +84,15 @@ func (o *Role) GetId() string {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Role) GetIdOk() (*string, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *Role) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -106,7 +106,7 @@ func (o *Role) SetId(v string) {
 
 // GetKind returns the Kind field value if set, zero value otherwise.
 func (o *Role) GetKind() string {
-	if o == nil || isNil(o.Kind) {
+	if o == nil || o.Kind == nil {
 		var ret string
 		return ret
 	}
@@ -116,15 +116,15 @@ func (o *Role) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Role) GetKindOk() (*string, bool) {
-	if o == nil || isNil(o.Kind) {
-    return nil, false
+	if o == nil || o.Kind == nil {
+		return nil, false
 	}
 	return o.Kind, true
 }
 
 // HasKind returns a boolean if a field has been set.
 func (o *Role) HasKind() bool {
-	if o != nil && !isNil(o.Kind) {
+	if o != nil && o.Kind != nil {
 		return true
 	}
 
@@ -138,7 +138,7 @@ func (o *Role) SetKind(v string) {
 
 // GetName returns the Name field value if set, zero value otherwise.
 func (o *Role) GetName() string {
-	if o == nil || isNil(o.Name) {
+	if o == nil || o.Name == nil {
 		var ret string
 		return ret
 	}
@@ -148,15 +148,15 @@ func (o *Role) GetName() string {
 // GetNameOk returns a tuple with the Name field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Role) GetNameOk() (*string, bool) {
-	if o == nil || isNil(o.Name) {
-    return nil, false
+	if o == nil || o.Name == nil {
+		return nil, false
 	}
 	return o.Name, true
 }
 
 // HasName returns a boolean if a field has been set.
 func (o *Role) HasName() bool {
-	if o != nil && !isNil(o.Name) {
+	if o != nil && o.Name != nil {
 		return true
 	}
 
@@ -170,25 +170,25 @@ func (o *Role) SetName(v string) {
 
 // GetPermissions returns the Permissions field value if set, zero value otherwise.
 func (o *Role) GetPermissions() []Permission {
-	if o == nil || isNil(o.Permissions) {
+	if o == nil || o.Permissions == nil {
 		var ret []Permission
 		return ret
 	}
-	return o.Permissions
+	return *o.Permissions
 }
 
 // GetPermissionsOk returns a tuple with the Permissions field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *Role) GetPermissionsOk() ([]Permission, bool) {
-	if o == nil || isNil(o.Permissions) {
-    return nil, false
+func (o *Role) GetPermissionsOk() (*[]Permission, bool) {
+	if o == nil || o.Permissions == nil {
+		return nil, false
 	}
 	return o.Permissions, true
 }
 
 // HasPermissions returns a boolean if a field has been set.
 func (o *Role) HasPermissions() bool {
-	if o != nil && !isNil(o.Permissions) {
+	if o != nil && o.Permissions != nil {
 		return true
 	}
 
@@ -197,24 +197,24 @@ func (o *Role) HasPermissions() bool {
 
 // SetPermissions gets a reference to the given []Permission and assigns it to the Permissions field.
 func (o *Role) SetPermissions(v []Permission) {
-	o.Permissions = v
+	o.Permissions = &v
 }
 
 func (o Role) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Href) {
+	if o.Href != nil {
 		toSerialize["href"] = o.Href
 	}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.Kind) {
+	if o.Kind != nil {
 		toSerialize["kind"] = o.Kind
 	}
-	if !isNil(o.Name) {
+	if o.Name != nil {
 		toSerialize["name"] = o.Name
 	}
-	if !isNil(o.Permissions) {
+	if o.Permissions != nil {
 		toSerialize["permissions"] = o.Permissions
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_role_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_role_all_of.go
index d7273780..cc27b709 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_role_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_role_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -17,7 +17,7 @@ import (
 // RoleAllOf struct for RoleAllOf
 type RoleAllOf struct {
 	Name *string `json:"name,omitempty"`
-	Permissions []Permission `json:"permissions,omitempty"`
+	Permissions *[]Permission `json:"permissions,omitempty"`
 }
 
 // NewRoleAllOf instantiates a new RoleAllOf object
@@ -39,7 +39,7 @@ func NewRoleAllOfWithDefaults() *RoleAllOf {
 
 // GetName returns the Name field value if set, zero value otherwise.
 func (o *RoleAllOf) GetName() string {
-	if o == nil || isNil(o.Name) {
+	if o == nil || o.Name == nil {
 		var ret string
 		return ret
 	}
@@ -49,15 +49,15 @@ func (o *RoleAllOf) GetName() string {
 // GetNameOk returns a tuple with the Name field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RoleAllOf) GetNameOk() (*string, bool) {
-	if o == nil || isNil(o.Name) {
-    return nil, false
+	if o == nil || o.Name == nil {
+		return nil, false
 	}
 	return o.Name, true
 }
 
 // HasName returns a boolean if a field has been set.
 func (o *RoleAllOf) HasName() bool {
-	if o != nil && !isNil(o.Name) {
+	if o != nil && o.Name != nil {
 		return true
 	}
 
@@ -71,25 +71,25 @@ func (o *RoleAllOf) SetName(v string) {
 
 // GetPermissions returns the Permissions field value if set, zero value otherwise.
 func (o *RoleAllOf) GetPermissions() []Permission {
-	if o == nil || isNil(o.Permissions) {
+	if o == nil || o.Permissions == nil {
 		var ret []Permission
 		return ret
 	}
-	return o.Permissions
+	return *o.Permissions
 }
 
 // GetPermissionsOk returns a tuple with the Permissions field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *RoleAllOf) GetPermissionsOk() ([]Permission, bool) {
-	if o == nil || isNil(o.Permissions) {
-    return nil, false
+func (o *RoleAllOf) GetPermissionsOk() (*[]Permission, bool) {
+	if o == nil || o.Permissions == nil {
+		return nil, false
 	}
 	return o.Permissions, true
 }
 
 // HasPermissions returns a boolean if a field has been set.
 func (o *RoleAllOf) HasPermissions() bool {
-	if o != nil && !isNil(o.Permissions) {
+	if o != nil && o.Permissions != nil {
 		return true
 	}
 
@@ -98,15 +98,15 @@ func (o *RoleAllOf) HasPermissions() bool {
 
 // SetPermissions gets a reference to the given []Permission and assigns it to the Permissions field.
 func (o *RoleAllOf) SetPermissions(v []Permission) {
-	o.Permissions = v
+	o.Permissions = &v
 }
 
 func (o RoleAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Name) {
+	if o.Name != nil {
 		toSerialize["name"] = o.Name
 	}
-	if !isNil(o.Permissions) {
+	if o.Permissions != nil {
 		toSerialize["permissions"] = o.Permissions
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_role_binding.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_role_binding.go
index 57843b1f..cf11766c 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_role_binding.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_role_binding.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -12,6 +12,7 @@ package accountmgmtclient
 
 import (
 	"encoding/json"
+	"time"
 )
 
 // RoleBinding struct for RoleBinding
@@ -50,7 +51,7 @@ func NewRoleBindingWithDefaults() *RoleBinding {
 
 // GetHref returns the Href field value if set, zero value otherwise.
 func (o *RoleBinding) GetHref() string {
-	if o == nil || isNil(o.Href) {
+	if o == nil || o.Href == nil {
 		var ret string
 		return ret
 	}
@@ -60,15 +61,15 @@ func (o *RoleBinding) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RoleBinding) GetHrefOk() (*string, bool) {
-	if o == nil || isNil(o.Href) {
-    return nil, false
+	if o == nil || o.Href == nil {
+		return nil, false
 	}
 	return o.Href, true
 }
 
 // HasHref returns a boolean if a field has been set.
 func (o *RoleBinding) HasHref() bool {
-	if o != nil && !isNil(o.Href) {
+	if o != nil && o.Href != nil {
 		return true
 	}
 
@@ -82,7 +83,7 @@ func (o *RoleBinding) SetHref(v string) {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *RoleBinding) GetId() string {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret string
 		return ret
 	}
@@ -92,15 +93,15 @@ func (o *RoleBinding) GetId() string {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RoleBinding) GetIdOk() (*string, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *RoleBinding) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -114,7 +115,7 @@ func (o *RoleBinding) SetId(v string) {
 
 // GetKind returns the Kind field value if set, zero value otherwise.
 func (o *RoleBinding) GetKind() string {
-	if o == nil || isNil(o.Kind) {
+	if o == nil || o.Kind == nil {
 		var ret string
 		return ret
 	}
@@ -124,15 +125,15 @@ func (o *RoleBinding) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RoleBinding) GetKindOk() (*string, bool) {
-	if o == nil || isNil(o.Kind) {
-    return nil, false
+	if o == nil || o.Kind == nil {
+		return nil, false
 	}
 	return o.Kind, true
 }
 
 // HasKind returns a boolean if a field has been set.
 func (o *RoleBinding) HasKind() bool {
-	if o != nil && !isNil(o.Kind) {
+	if o != nil && o.Kind != nil {
 		return true
 	}
 
@@ -146,7 +147,7 @@ func (o *RoleBinding) SetKind(v string) {
 
 // GetAccount returns the Account field value if set, zero value otherwise.
 func (o *RoleBinding) GetAccount() ObjectReference {
-	if o == nil || isNil(o.Account) {
+	if o == nil || o.Account == nil {
 		var ret ObjectReference
 		return ret
 	}
@@ -156,15 +157,15 @@ func (o *RoleBinding) GetAccount() ObjectReference {
 // GetAccountOk returns a tuple with the Account field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RoleBinding) GetAccountOk() (*ObjectReference, bool) {
-	if o == nil || isNil(o.Account) {
-    return nil, false
+	if o == nil || o.Account == nil {
+		return nil, false
 	}
 	return o.Account, true
 }
 
 // HasAccount returns a boolean if a field has been set.
 func (o *RoleBinding) HasAccount() bool {
-	if o != nil && !isNil(o.Account) {
+	if o != nil && o.Account != nil {
 		return true
 	}
 
@@ -178,7 +179,7 @@ func (o *RoleBinding) SetAccount(v ObjectReference) {
 
 // GetAccountGroup returns the AccountGroup field value if set, zero value otherwise.
 func (o *RoleBinding) GetAccountGroup() ObjectReference {
-	if o == nil || isNil(o.AccountGroup) {
+	if o == nil || o.AccountGroup == nil {
 		var ret ObjectReference
 		return ret
 	}
@@ -188,15 +189,15 @@ func (o *RoleBinding) GetAccountGroup() ObjectReference {
 // GetAccountGroupOk returns a tuple with the AccountGroup field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RoleBinding) GetAccountGroupOk() (*ObjectReference, bool) {
-	if o == nil || isNil(o.AccountGroup) {
-    return nil, false
+	if o == nil || o.AccountGroup == nil {
+		return nil, false
 	}
 	return o.AccountGroup, true
 }
 
 // HasAccountGroup returns a boolean if a field has been set.
 func (o *RoleBinding) HasAccountGroup() bool {
-	if o != nil && !isNil(o.AccountGroup) {
+	if o != nil && o.AccountGroup != nil {
 		return true
 	}
 
@@ -210,7 +211,7 @@ func (o *RoleBinding) SetAccountGroup(v ObjectReference) {
 
 // GetConfigManaged returns the ConfigManaged field value if set, zero value otherwise.
 func (o *RoleBinding) GetConfigManaged() bool {
-	if o == nil || isNil(o.ConfigManaged) {
+	if o == nil || o.ConfigManaged == nil {
 		var ret bool
 		return ret
 	}
@@ -220,15 +221,15 @@ func (o *RoleBinding) GetConfigManaged() bool {
 // GetConfigManagedOk returns a tuple with the ConfigManaged field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RoleBinding) GetConfigManagedOk() (*bool, bool) {
-	if o == nil || isNil(o.ConfigManaged) {
-    return nil, false
+	if o == nil || o.ConfigManaged == nil {
+		return nil, false
 	}
 	return o.ConfigManaged, true
 }
 
 // HasConfigManaged returns a boolean if a field has been set.
 func (o *RoleBinding) HasConfigManaged() bool {
-	if o != nil && !isNil(o.ConfigManaged) {
+	if o != nil && o.ConfigManaged != nil {
 		return true
 	}
 
@@ -242,7 +243,7 @@ func (o *RoleBinding) SetConfigManaged(v bool) {
 
 // GetCreatedAt returns the CreatedAt field value if set, zero value otherwise.
 func (o *RoleBinding) GetCreatedAt() time.Time {
-	if o == nil || isNil(o.CreatedAt) {
+	if o == nil || o.CreatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -252,15 +253,15 @@ func (o *RoleBinding) GetCreatedAt() time.Time {
 // GetCreatedAtOk returns a tuple with the CreatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RoleBinding) GetCreatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.CreatedAt) {
-    return nil, false
+	if o == nil || o.CreatedAt == nil {
+		return nil, false
 	}
 	return o.CreatedAt, true
 }
 
 // HasCreatedAt returns a boolean if a field has been set.
 func (o *RoleBinding) HasCreatedAt() bool {
-	if o != nil && !isNil(o.CreatedAt) {
+	if o != nil && o.CreatedAt != nil {
 		return true
 	}
 
@@ -274,7 +275,7 @@ func (o *RoleBinding) SetCreatedAt(v time.Time) {
 
 // GetManagedBy returns the ManagedBy field value if set, zero value otherwise.
 func (o *RoleBinding) GetManagedBy() string {
-	if o == nil || isNil(o.ManagedBy) {
+	if o == nil || o.ManagedBy == nil {
 		var ret string
 		return ret
 	}
@@ -284,15 +285,15 @@ func (o *RoleBinding) GetManagedBy() string {
 // GetManagedByOk returns a tuple with the ManagedBy field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RoleBinding) GetManagedByOk() (*string, bool) {
-	if o == nil || isNil(o.ManagedBy) {
-    return nil, false
+	if o == nil || o.ManagedBy == nil {
+		return nil, false
 	}
 	return o.ManagedBy, true
 }
 
 // HasManagedBy returns a boolean if a field has been set.
 func (o *RoleBinding) HasManagedBy() bool {
-	if o != nil && !isNil(o.ManagedBy) {
+	if o != nil && o.ManagedBy != nil {
 		return true
 	}
 
@@ -306,7 +307,7 @@ func (o *RoleBinding) SetManagedBy(v string) {
 
 // GetOrganization returns the Organization field value if set, zero value otherwise.
 func (o *RoleBinding) GetOrganization() ObjectReference {
-	if o == nil || isNil(o.Organization) {
+	if o == nil || o.Organization == nil {
 		var ret ObjectReference
 		return ret
 	}
@@ -316,15 +317,15 @@ func (o *RoleBinding) GetOrganization() ObjectReference {
 // GetOrganizationOk returns a tuple with the Organization field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RoleBinding) GetOrganizationOk() (*ObjectReference, bool) {
-	if o == nil || isNil(o.Organization) {
-    return nil, false
+	if o == nil || o.Organization == nil {
+		return nil, false
 	}
 	return o.Organization, true
 }
 
 // HasOrganization returns a boolean if a field has been set.
 func (o *RoleBinding) HasOrganization() bool {
-	if o != nil && !isNil(o.Organization) {
+	if o != nil && o.Organization != nil {
 		return true
 	}
 
@@ -338,7 +339,7 @@ func (o *RoleBinding) SetOrganization(v ObjectReference) {
 
 // GetRole returns the Role field value if set, zero value otherwise.
 func (o *RoleBinding) GetRole() ObjectReference {
-	if o == nil || isNil(o.Role) {
+	if o == nil || o.Role == nil {
 		var ret ObjectReference
 		return ret
 	}
@@ -348,15 +349,15 @@ func (o *RoleBinding) GetRole() ObjectReference {
 // GetRoleOk returns a tuple with the Role field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RoleBinding) GetRoleOk() (*ObjectReference, bool) {
-	if o == nil || isNil(o.Role) {
-    return nil, false
+	if o == nil || o.Role == nil {
+		return nil, false
 	}
 	return o.Role, true
 }
 
 // HasRole returns a boolean if a field has been set.
 func (o *RoleBinding) HasRole() bool {
-	if o != nil && !isNil(o.Role) {
+	if o != nil && o.Role != nil {
 		return true
 	}
 
@@ -370,7 +371,7 @@ func (o *RoleBinding) SetRole(v ObjectReference) {
 
 // GetSubscription returns the Subscription field value if set, zero value otherwise.
 func (o *RoleBinding) GetSubscription() ObjectReference {
-	if o == nil || isNil(o.Subscription) {
+	if o == nil || o.Subscription == nil {
 		var ret ObjectReference
 		return ret
 	}
@@ -380,15 +381,15 @@ func (o *RoleBinding) GetSubscription() ObjectReference {
 // GetSubscriptionOk returns a tuple with the Subscription field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RoleBinding) GetSubscriptionOk() (*ObjectReference, bool) {
-	if o == nil || isNil(o.Subscription) {
-    return nil, false
+	if o == nil || o.Subscription == nil {
+		return nil, false
 	}
 	return o.Subscription, true
 }
 
 // HasSubscription returns a boolean if a field has been set.
 func (o *RoleBinding) HasSubscription() bool {
-	if o != nil && !isNil(o.Subscription) {
+	if o != nil && o.Subscription != nil {
 		return true
 	}
 
@@ -402,7 +403,7 @@ func (o *RoleBinding) SetSubscription(v ObjectReference) {
 
 // GetType returns the Type field value if set, zero value otherwise.
 func (o *RoleBinding) GetType() string {
-	if o == nil || isNil(o.Type) {
+	if o == nil || o.Type == nil {
 		var ret string
 		return ret
 	}
@@ -412,15 +413,15 @@ func (o *RoleBinding) GetType() string {
 // GetTypeOk returns a tuple with the Type field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RoleBinding) GetTypeOk() (*string, bool) {
-	if o == nil || isNil(o.Type) {
-    return nil, false
+	if o == nil || o.Type == nil {
+		return nil, false
 	}
 	return o.Type, true
 }
 
 // HasType returns a boolean if a field has been set.
 func (o *RoleBinding) HasType() bool {
-	if o != nil && !isNil(o.Type) {
+	if o != nil && o.Type != nil {
 		return true
 	}
 
@@ -434,7 +435,7 @@ func (o *RoleBinding) SetType(v string) {
 
 // GetUpdatedAt returns the UpdatedAt field value if set, zero value otherwise.
 func (o *RoleBinding) GetUpdatedAt() time.Time {
-	if o == nil || isNil(o.UpdatedAt) {
+	if o == nil || o.UpdatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -444,15 +445,15 @@ func (o *RoleBinding) GetUpdatedAt() time.Time {
 // GetUpdatedAtOk returns a tuple with the UpdatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RoleBinding) GetUpdatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.UpdatedAt) {
-    return nil, false
+	if o == nil || o.UpdatedAt == nil {
+		return nil, false
 	}
 	return o.UpdatedAt, true
 }
 
 // HasUpdatedAt returns a boolean if a field has been set.
 func (o *RoleBinding) HasUpdatedAt() bool {
-	if o != nil && !isNil(o.UpdatedAt) {
+	if o != nil && o.UpdatedAt != nil {
 		return true
 	}
 
@@ -466,43 +467,43 @@ func (o *RoleBinding) SetUpdatedAt(v time.Time) {
 
 func (o RoleBinding) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Href) {
+	if o.Href != nil {
 		toSerialize["href"] = o.Href
 	}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.Kind) {
+	if o.Kind != nil {
 		toSerialize["kind"] = o.Kind
 	}
-	if !isNil(o.Account) {
+	if o.Account != nil {
 		toSerialize["account"] = o.Account
 	}
-	if !isNil(o.AccountGroup) {
+	if o.AccountGroup != nil {
 		toSerialize["account_group"] = o.AccountGroup
 	}
-	if !isNil(o.ConfigManaged) {
+	if o.ConfigManaged != nil {
 		toSerialize["config_managed"] = o.ConfigManaged
 	}
-	if !isNil(o.CreatedAt) {
+	if o.CreatedAt != nil {
 		toSerialize["created_at"] = o.CreatedAt
 	}
-	if !isNil(o.ManagedBy) {
+	if o.ManagedBy != nil {
 		toSerialize["managed_by"] = o.ManagedBy
 	}
-	if !isNil(o.Organization) {
+	if o.Organization != nil {
 		toSerialize["organization"] = o.Organization
 	}
-	if !isNil(o.Role) {
+	if o.Role != nil {
 		toSerialize["role"] = o.Role
 	}
-	if !isNil(o.Subscription) {
+	if o.Subscription != nil {
 		toSerialize["subscription"] = o.Subscription
 	}
-	if !isNil(o.Type) {
+	if o.Type != nil {
 		toSerialize["type"] = o.Type
 	}
-	if !isNil(o.UpdatedAt) {
+	if o.UpdatedAt != nil {
 		toSerialize["updated_at"] = o.UpdatedAt
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_role_binding_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_role_binding_all_of.go
index 78b73327..8f418517 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_role_binding_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_role_binding_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -48,7 +48,7 @@ func NewRoleBindingAllOfWithDefaults() *RoleBindingAllOf {
 
 // GetAccount returns the Account field value if set, zero value otherwise.
 func (o *RoleBindingAllOf) GetAccount() ObjectReference {
-	if o == nil || isNil(o.Account) {
+	if o == nil || o.Account == nil {
 		var ret ObjectReference
 		return ret
 	}
@@ -58,15 +58,15 @@ func (o *RoleBindingAllOf) GetAccount() ObjectReference {
 // GetAccountOk returns a tuple with the Account field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RoleBindingAllOf) GetAccountOk() (*ObjectReference, bool) {
-	if o == nil || isNil(o.Account) {
-    return nil, false
+	if o == nil || o.Account == nil {
+		return nil, false
 	}
 	return o.Account, true
 }
 
 // HasAccount returns a boolean if a field has been set.
 func (o *RoleBindingAllOf) HasAccount() bool {
-	if o != nil && !isNil(o.Account) {
+	if o != nil && o.Account != nil {
 		return true
 	}
 
@@ -80,7 +80,7 @@ func (o *RoleBindingAllOf) SetAccount(v ObjectReference) {
 
 // GetAccountGroup returns the AccountGroup field value if set, zero value otherwise.
 func (o *RoleBindingAllOf) GetAccountGroup() ObjectReference {
-	if o == nil || isNil(o.AccountGroup) {
+	if o == nil || o.AccountGroup == nil {
 		var ret ObjectReference
 		return ret
 	}
@@ -90,15 +90,15 @@ func (o *RoleBindingAllOf) GetAccountGroup() ObjectReference {
 // GetAccountGroupOk returns a tuple with the AccountGroup field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RoleBindingAllOf) GetAccountGroupOk() (*ObjectReference, bool) {
-	if o == nil || isNil(o.AccountGroup) {
-    return nil, false
+	if o == nil || o.AccountGroup == nil {
+		return nil, false
 	}
 	return o.AccountGroup, true
 }
 
 // HasAccountGroup returns a boolean if a field has been set.
 func (o *RoleBindingAllOf) HasAccountGroup() bool {
-	if o != nil && !isNil(o.AccountGroup) {
+	if o != nil && o.AccountGroup != nil {
 		return true
 	}
 
@@ -112,7 +112,7 @@ func (o *RoleBindingAllOf) SetAccountGroup(v ObjectReference) {
 
 // GetConfigManaged returns the ConfigManaged field value if set, zero value otherwise.
 func (o *RoleBindingAllOf) GetConfigManaged() bool {
-	if o == nil || isNil(o.ConfigManaged) {
+	if o == nil || o.ConfigManaged == nil {
 		var ret bool
 		return ret
 	}
@@ -122,15 +122,15 @@ func (o *RoleBindingAllOf) GetConfigManaged() bool {
 // GetConfigManagedOk returns a tuple with the ConfigManaged field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RoleBindingAllOf) GetConfigManagedOk() (*bool, bool) {
-	if o == nil || isNil(o.ConfigManaged) {
-    return nil, false
+	if o == nil || o.ConfigManaged == nil {
+		return nil, false
 	}
 	return o.ConfigManaged, true
 }
 
 // HasConfigManaged returns a boolean if a field has been set.
 func (o *RoleBindingAllOf) HasConfigManaged() bool {
-	if o != nil && !isNil(o.ConfigManaged) {
+	if o != nil && o.ConfigManaged != nil {
 		return true
 	}
 
@@ -144,7 +144,7 @@ func (o *RoleBindingAllOf) SetConfigManaged(v bool) {
 
 // GetCreatedAt returns the CreatedAt field value if set, zero value otherwise.
 func (o *RoleBindingAllOf) GetCreatedAt() time.Time {
-	if o == nil || isNil(o.CreatedAt) {
+	if o == nil || o.CreatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -154,15 +154,15 @@ func (o *RoleBindingAllOf) GetCreatedAt() time.Time {
 // GetCreatedAtOk returns a tuple with the CreatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RoleBindingAllOf) GetCreatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.CreatedAt) {
-    return nil, false
+	if o == nil || o.CreatedAt == nil {
+		return nil, false
 	}
 	return o.CreatedAt, true
 }
 
 // HasCreatedAt returns a boolean if a field has been set.
 func (o *RoleBindingAllOf) HasCreatedAt() bool {
-	if o != nil && !isNil(o.CreatedAt) {
+	if o != nil && o.CreatedAt != nil {
 		return true
 	}
 
@@ -176,7 +176,7 @@ func (o *RoleBindingAllOf) SetCreatedAt(v time.Time) {
 
 // GetManagedBy returns the ManagedBy field value if set, zero value otherwise.
 func (o *RoleBindingAllOf) GetManagedBy() string {
-	if o == nil || isNil(o.ManagedBy) {
+	if o == nil || o.ManagedBy == nil {
 		var ret string
 		return ret
 	}
@@ -186,15 +186,15 @@ func (o *RoleBindingAllOf) GetManagedBy() string {
 // GetManagedByOk returns a tuple with the ManagedBy field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RoleBindingAllOf) GetManagedByOk() (*string, bool) {
-	if o == nil || isNil(o.ManagedBy) {
-    return nil, false
+	if o == nil || o.ManagedBy == nil {
+		return nil, false
 	}
 	return o.ManagedBy, true
 }
 
 // HasManagedBy returns a boolean if a field has been set.
 func (o *RoleBindingAllOf) HasManagedBy() bool {
-	if o != nil && !isNil(o.ManagedBy) {
+	if o != nil && o.ManagedBy != nil {
 		return true
 	}
 
@@ -208,7 +208,7 @@ func (o *RoleBindingAllOf) SetManagedBy(v string) {
 
 // GetOrganization returns the Organization field value if set, zero value otherwise.
 func (o *RoleBindingAllOf) GetOrganization() ObjectReference {
-	if o == nil || isNil(o.Organization) {
+	if o == nil || o.Organization == nil {
 		var ret ObjectReference
 		return ret
 	}
@@ -218,15 +218,15 @@ func (o *RoleBindingAllOf) GetOrganization() ObjectReference {
 // GetOrganizationOk returns a tuple with the Organization field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RoleBindingAllOf) GetOrganizationOk() (*ObjectReference, bool) {
-	if o == nil || isNil(o.Organization) {
-    return nil, false
+	if o == nil || o.Organization == nil {
+		return nil, false
 	}
 	return o.Organization, true
 }
 
 // HasOrganization returns a boolean if a field has been set.
 func (o *RoleBindingAllOf) HasOrganization() bool {
-	if o != nil && !isNil(o.Organization) {
+	if o != nil && o.Organization != nil {
 		return true
 	}
 
@@ -240,7 +240,7 @@ func (o *RoleBindingAllOf) SetOrganization(v ObjectReference) {
 
 // GetRole returns the Role field value if set, zero value otherwise.
 func (o *RoleBindingAllOf) GetRole() ObjectReference {
-	if o == nil || isNil(o.Role) {
+	if o == nil || o.Role == nil {
 		var ret ObjectReference
 		return ret
 	}
@@ -250,15 +250,15 @@ func (o *RoleBindingAllOf) GetRole() ObjectReference {
 // GetRoleOk returns a tuple with the Role field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RoleBindingAllOf) GetRoleOk() (*ObjectReference, bool) {
-	if o == nil || isNil(o.Role) {
-    return nil, false
+	if o == nil || o.Role == nil {
+		return nil, false
 	}
 	return o.Role, true
 }
 
 // HasRole returns a boolean if a field has been set.
 func (o *RoleBindingAllOf) HasRole() bool {
-	if o != nil && !isNil(o.Role) {
+	if o != nil && o.Role != nil {
 		return true
 	}
 
@@ -272,7 +272,7 @@ func (o *RoleBindingAllOf) SetRole(v ObjectReference) {
 
 // GetSubscription returns the Subscription field value if set, zero value otherwise.
 func (o *RoleBindingAllOf) GetSubscription() ObjectReference {
-	if o == nil || isNil(o.Subscription) {
+	if o == nil || o.Subscription == nil {
 		var ret ObjectReference
 		return ret
 	}
@@ -282,15 +282,15 @@ func (o *RoleBindingAllOf) GetSubscription() ObjectReference {
 // GetSubscriptionOk returns a tuple with the Subscription field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RoleBindingAllOf) GetSubscriptionOk() (*ObjectReference, bool) {
-	if o == nil || isNil(o.Subscription) {
-    return nil, false
+	if o == nil || o.Subscription == nil {
+		return nil, false
 	}
 	return o.Subscription, true
 }
 
 // HasSubscription returns a boolean if a field has been set.
 func (o *RoleBindingAllOf) HasSubscription() bool {
-	if o != nil && !isNil(o.Subscription) {
+	if o != nil && o.Subscription != nil {
 		return true
 	}
 
@@ -304,7 +304,7 @@ func (o *RoleBindingAllOf) SetSubscription(v ObjectReference) {
 
 // GetType returns the Type field value if set, zero value otherwise.
 func (o *RoleBindingAllOf) GetType() string {
-	if o == nil || isNil(o.Type) {
+	if o == nil || o.Type == nil {
 		var ret string
 		return ret
 	}
@@ -314,15 +314,15 @@ func (o *RoleBindingAllOf) GetType() string {
 // GetTypeOk returns a tuple with the Type field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RoleBindingAllOf) GetTypeOk() (*string, bool) {
-	if o == nil || isNil(o.Type) {
-    return nil, false
+	if o == nil || o.Type == nil {
+		return nil, false
 	}
 	return o.Type, true
 }
 
 // HasType returns a boolean if a field has been set.
 func (o *RoleBindingAllOf) HasType() bool {
-	if o != nil && !isNil(o.Type) {
+	if o != nil && o.Type != nil {
 		return true
 	}
 
@@ -336,7 +336,7 @@ func (o *RoleBindingAllOf) SetType(v string) {
 
 // GetUpdatedAt returns the UpdatedAt field value if set, zero value otherwise.
 func (o *RoleBindingAllOf) GetUpdatedAt() time.Time {
-	if o == nil || isNil(o.UpdatedAt) {
+	if o == nil || o.UpdatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -346,15 +346,15 @@ func (o *RoleBindingAllOf) GetUpdatedAt() time.Time {
 // GetUpdatedAtOk returns a tuple with the UpdatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RoleBindingAllOf) GetUpdatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.UpdatedAt) {
-    return nil, false
+	if o == nil || o.UpdatedAt == nil {
+		return nil, false
 	}
 	return o.UpdatedAt, true
 }
 
 // HasUpdatedAt returns a boolean if a field has been set.
 func (o *RoleBindingAllOf) HasUpdatedAt() bool {
-	if o != nil && !isNil(o.UpdatedAt) {
+	if o != nil && o.UpdatedAt != nil {
 		return true
 	}
 
@@ -368,34 +368,34 @@ func (o *RoleBindingAllOf) SetUpdatedAt(v time.Time) {
 
 func (o RoleBindingAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Account) {
+	if o.Account != nil {
 		toSerialize["account"] = o.Account
 	}
-	if !isNil(o.AccountGroup) {
+	if o.AccountGroup != nil {
 		toSerialize["account_group"] = o.AccountGroup
 	}
-	if !isNil(o.ConfigManaged) {
+	if o.ConfigManaged != nil {
 		toSerialize["config_managed"] = o.ConfigManaged
 	}
-	if !isNil(o.CreatedAt) {
+	if o.CreatedAt != nil {
 		toSerialize["created_at"] = o.CreatedAt
 	}
-	if !isNil(o.ManagedBy) {
+	if o.ManagedBy != nil {
 		toSerialize["managed_by"] = o.ManagedBy
 	}
-	if !isNil(o.Organization) {
+	if o.Organization != nil {
 		toSerialize["organization"] = o.Organization
 	}
-	if !isNil(o.Role) {
+	if o.Role != nil {
 		toSerialize["role"] = o.Role
 	}
-	if !isNil(o.Subscription) {
+	if o.Subscription != nil {
 		toSerialize["subscription"] = o.Subscription
 	}
-	if !isNil(o.Type) {
+	if o.Type != nil {
 		toSerialize["type"] = o.Type
 	}
-	if !isNil(o.UpdatedAt) {
+	if o.UpdatedAt != nil {
 		toSerialize["updated_at"] = o.UpdatedAt
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_role_binding_create_request.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_role_binding_create_request.go
index 9599146b..b527a009 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_role_binding_create_request.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_role_binding_create_request.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -47,7 +47,7 @@ func NewRoleBindingCreateRequestWithDefaults() *RoleBindingCreateRequest {
 
 // GetAccountGroupId returns the AccountGroupId field value if set, zero value otherwise.
 func (o *RoleBindingCreateRequest) GetAccountGroupId() string {
-	if o == nil || isNil(o.AccountGroupId) {
+	if o == nil || o.AccountGroupId == nil {
 		var ret string
 		return ret
 	}
@@ -57,15 +57,15 @@ func (o *RoleBindingCreateRequest) GetAccountGroupId() string {
 // GetAccountGroupIdOk returns a tuple with the AccountGroupId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RoleBindingCreateRequest) GetAccountGroupIdOk() (*string, bool) {
-	if o == nil || isNil(o.AccountGroupId) {
-    return nil, false
+	if o == nil || o.AccountGroupId == nil {
+		return nil, false
 	}
 	return o.AccountGroupId, true
 }
 
 // HasAccountGroupId returns a boolean if a field has been set.
 func (o *RoleBindingCreateRequest) HasAccountGroupId() bool {
-	if o != nil && !isNil(o.AccountGroupId) {
+	if o != nil && o.AccountGroupId != nil {
 		return true
 	}
 
@@ -79,7 +79,7 @@ func (o *RoleBindingCreateRequest) SetAccountGroupId(v string) {
 
 // GetAccountId returns the AccountId field value if set, zero value otherwise.
 func (o *RoleBindingCreateRequest) GetAccountId() string {
-	if o == nil || isNil(o.AccountId) {
+	if o == nil || o.AccountId == nil {
 		var ret string
 		return ret
 	}
@@ -89,15 +89,15 @@ func (o *RoleBindingCreateRequest) GetAccountId() string {
 // GetAccountIdOk returns a tuple with the AccountId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RoleBindingCreateRequest) GetAccountIdOk() (*string, bool) {
-	if o == nil || isNil(o.AccountId) {
-    return nil, false
+	if o == nil || o.AccountId == nil {
+		return nil, false
 	}
 	return o.AccountId, true
 }
 
 // HasAccountId returns a boolean if a field has been set.
 func (o *RoleBindingCreateRequest) HasAccountId() bool {
-	if o != nil && !isNil(o.AccountId) {
+	if o != nil && o.AccountId != nil {
 		return true
 	}
 
@@ -111,7 +111,7 @@ func (o *RoleBindingCreateRequest) SetAccountId(v string) {
 
 // GetConfigManaged returns the ConfigManaged field value if set, zero value otherwise.
 func (o *RoleBindingCreateRequest) GetConfigManaged() bool {
-	if o == nil || isNil(o.ConfigManaged) {
+	if o == nil || o.ConfigManaged == nil {
 		var ret bool
 		return ret
 	}
@@ -121,15 +121,15 @@ func (o *RoleBindingCreateRequest) GetConfigManaged() bool {
 // GetConfigManagedOk returns a tuple with the ConfigManaged field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RoleBindingCreateRequest) GetConfigManagedOk() (*bool, bool) {
-	if o == nil || isNil(o.ConfigManaged) {
-    return nil, false
+	if o == nil || o.ConfigManaged == nil {
+		return nil, false
 	}
 	return o.ConfigManaged, true
 }
 
 // HasConfigManaged returns a boolean if a field has been set.
 func (o *RoleBindingCreateRequest) HasConfigManaged() bool {
-	if o != nil && !isNil(o.ConfigManaged) {
+	if o != nil && o.ConfigManaged != nil {
 		return true
 	}
 
@@ -143,7 +143,7 @@ func (o *RoleBindingCreateRequest) SetConfigManaged(v bool) {
 
 // GetManagedBy returns the ManagedBy field value if set, zero value otherwise.
 func (o *RoleBindingCreateRequest) GetManagedBy() string {
-	if o == nil || isNil(o.ManagedBy) {
+	if o == nil || o.ManagedBy == nil {
 		var ret string
 		return ret
 	}
@@ -153,15 +153,15 @@ func (o *RoleBindingCreateRequest) GetManagedBy() string {
 // GetManagedByOk returns a tuple with the ManagedBy field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RoleBindingCreateRequest) GetManagedByOk() (*string, bool) {
-	if o == nil || isNil(o.ManagedBy) {
-    return nil, false
+	if o == nil || o.ManagedBy == nil {
+		return nil, false
 	}
 	return o.ManagedBy, true
 }
 
 // HasManagedBy returns a boolean if a field has been set.
 func (o *RoleBindingCreateRequest) HasManagedBy() bool {
-	if o != nil && !isNil(o.ManagedBy) {
+	if o != nil && o.ManagedBy != nil {
 		return true
 	}
 
@@ -175,7 +175,7 @@ func (o *RoleBindingCreateRequest) SetManagedBy(v string) {
 
 // GetOrganizationId returns the OrganizationId field value if set, zero value otherwise.
 func (o *RoleBindingCreateRequest) GetOrganizationId() string {
-	if o == nil || isNil(o.OrganizationId) {
+	if o == nil || o.OrganizationId == nil {
 		var ret string
 		return ret
 	}
@@ -185,15 +185,15 @@ func (o *RoleBindingCreateRequest) GetOrganizationId() string {
 // GetOrganizationIdOk returns a tuple with the OrganizationId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RoleBindingCreateRequest) GetOrganizationIdOk() (*string, bool) {
-	if o == nil || isNil(o.OrganizationId) {
-    return nil, false
+	if o == nil || o.OrganizationId == nil {
+		return nil, false
 	}
 	return o.OrganizationId, true
 }
 
 // HasOrganizationId returns a boolean if a field has been set.
 func (o *RoleBindingCreateRequest) HasOrganizationId() bool {
-	if o != nil && !isNil(o.OrganizationId) {
+	if o != nil && o.OrganizationId != nil {
 		return true
 	}
 
@@ -218,8 +218,8 @@ func (o *RoleBindingCreateRequest) GetRoleId() string {
 // GetRoleIdOk returns a tuple with the RoleId field value
 // and a boolean to check if the value has been set.
 func (o *RoleBindingCreateRequest) GetRoleIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.RoleId, true
 }
@@ -231,7 +231,7 @@ func (o *RoleBindingCreateRequest) SetRoleId(v string) {
 
 // GetSubscriptionId returns the SubscriptionId field value if set, zero value otherwise.
 func (o *RoleBindingCreateRequest) GetSubscriptionId() string {
-	if o == nil || isNil(o.SubscriptionId) {
+	if o == nil || o.SubscriptionId == nil {
 		var ret string
 		return ret
 	}
@@ -241,15 +241,15 @@ func (o *RoleBindingCreateRequest) GetSubscriptionId() string {
 // GetSubscriptionIdOk returns a tuple with the SubscriptionId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RoleBindingCreateRequest) GetSubscriptionIdOk() (*string, bool) {
-	if o == nil || isNil(o.SubscriptionId) {
-    return nil, false
+	if o == nil || o.SubscriptionId == nil {
+		return nil, false
 	}
 	return o.SubscriptionId, true
 }
 
 // HasSubscriptionId returns a boolean if a field has been set.
 func (o *RoleBindingCreateRequest) HasSubscriptionId() bool {
-	if o != nil && !isNil(o.SubscriptionId) {
+	if o != nil && o.SubscriptionId != nil {
 		return true
 	}
 
@@ -274,8 +274,8 @@ func (o *RoleBindingCreateRequest) GetType() string {
 // GetTypeOk returns a tuple with the Type field value
 // and a boolean to check if the value has been set.
 func (o *RoleBindingCreateRequest) GetTypeOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Type, true
 }
@@ -287,25 +287,25 @@ func (o *RoleBindingCreateRequest) SetType(v string) {
 
 func (o RoleBindingCreateRequest) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.AccountGroupId) {
+	if o.AccountGroupId != nil {
 		toSerialize["account_group_id"] = o.AccountGroupId
 	}
-	if !isNil(o.AccountId) {
+	if o.AccountId != nil {
 		toSerialize["account_id"] = o.AccountId
 	}
-	if !isNil(o.ConfigManaged) {
+	if o.ConfigManaged != nil {
 		toSerialize["config_managed"] = o.ConfigManaged
 	}
-	if !isNil(o.ManagedBy) {
+	if o.ManagedBy != nil {
 		toSerialize["managed_by"] = o.ManagedBy
 	}
-	if !isNil(o.OrganizationId) {
+	if o.OrganizationId != nil {
 		toSerialize["organization_id"] = o.OrganizationId
 	}
 	if true {
 		toSerialize["role_id"] = o.RoleId
 	}
-	if !isNil(o.SubscriptionId) {
+	if o.SubscriptionId != nil {
 		toSerialize["subscription_id"] = o.SubscriptionId
 	}
 	if true {
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_role_binding_list.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_role_binding_list.go
index 41b3ed0f..d9a16953 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_role_binding_list.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_role_binding_list.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -58,8 +58,8 @@ func (o *RoleBindingList) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *RoleBindingList) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -82,8 +82,8 @@ func (o *RoleBindingList) GetPage() int32 {
 // GetPageOk returns a tuple with the Page field value
 // and a boolean to check if the value has been set.
 func (o *RoleBindingList) GetPageOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Page, true
 }
@@ -106,8 +106,8 @@ func (o *RoleBindingList) GetSize() int32 {
 // GetSizeOk returns a tuple with the Size field value
 // and a boolean to check if the value has been set.
 func (o *RoleBindingList) GetSizeOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Size, true
 }
@@ -130,8 +130,8 @@ func (o *RoleBindingList) GetTotal() int32 {
 // GetTotalOk returns a tuple with the Total field value
 // and a boolean to check if the value has been set.
 func (o *RoleBindingList) GetTotalOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Total, true
 }
@@ -153,11 +153,11 @@ func (o *RoleBindingList) GetItems() []RoleBinding {
 
 // GetItemsOk returns a tuple with the Items field value
 // and a boolean to check if the value has been set.
-func (o *RoleBindingList) GetItemsOk() ([]RoleBinding, bool) {
-	if o == nil {
-    return nil, false
+func (o *RoleBindingList) GetItemsOk() (*[]RoleBinding, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Items, true
+	return &o.Items, true
 }
 
 // SetItems sets field value
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_role_binding_list_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_role_binding_list_all_of.go
index cdf7ee8c..dbdd28af 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_role_binding_list_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_role_binding_list_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -16,7 +16,7 @@ import (
 
 // RoleBindingListAllOf struct for RoleBindingListAllOf
 type RoleBindingListAllOf struct {
-	Items []RoleBinding `json:"items,omitempty"`
+	Items *[]RoleBinding `json:"items,omitempty"`
 }
 
 // NewRoleBindingListAllOf instantiates a new RoleBindingListAllOf object
@@ -38,25 +38,25 @@ func NewRoleBindingListAllOfWithDefaults() *RoleBindingListAllOf {
 
 // GetItems returns the Items field value if set, zero value otherwise.
 func (o *RoleBindingListAllOf) GetItems() []RoleBinding {
-	if o == nil || isNil(o.Items) {
+	if o == nil || o.Items == nil {
 		var ret []RoleBinding
 		return ret
 	}
-	return o.Items
+	return *o.Items
 }
 
 // GetItemsOk returns a tuple with the Items field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *RoleBindingListAllOf) GetItemsOk() ([]RoleBinding, bool) {
-	if o == nil || isNil(o.Items) {
-    return nil, false
+func (o *RoleBindingListAllOf) GetItemsOk() (*[]RoleBinding, bool) {
+	if o == nil || o.Items == nil {
+		return nil, false
 	}
 	return o.Items, true
 }
 
 // HasItems returns a boolean if a field has been set.
 func (o *RoleBindingListAllOf) HasItems() bool {
-	if o != nil && !isNil(o.Items) {
+	if o != nil && o.Items != nil {
 		return true
 	}
 
@@ -65,12 +65,12 @@ func (o *RoleBindingListAllOf) HasItems() bool {
 
 // SetItems gets a reference to the given []RoleBinding and assigns it to the Items field.
 func (o *RoleBindingListAllOf) SetItems(v []RoleBinding) {
-	o.Items = v
+	o.Items = &v
 }
 
 func (o RoleBindingListAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Items) {
+	if o.Items != nil {
 		toSerialize["items"] = o.Items
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_role_binding_request.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_role_binding_request.go
index 75a58c0e..a72ef66c 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_role_binding_request.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_role_binding_request.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -45,7 +45,7 @@ func NewRoleBindingRequestWithDefaults() *RoleBindingRequest {
 
 // GetAccountGroupId returns the AccountGroupId field value if set, zero value otherwise.
 func (o *RoleBindingRequest) GetAccountGroupId() string {
-	if o == nil || isNil(o.AccountGroupId) {
+	if o == nil || o.AccountGroupId == nil {
 		var ret string
 		return ret
 	}
@@ -55,15 +55,15 @@ func (o *RoleBindingRequest) GetAccountGroupId() string {
 // GetAccountGroupIdOk returns a tuple with the AccountGroupId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RoleBindingRequest) GetAccountGroupIdOk() (*string, bool) {
-	if o == nil || isNil(o.AccountGroupId) {
-    return nil, false
+	if o == nil || o.AccountGroupId == nil {
+		return nil, false
 	}
 	return o.AccountGroupId, true
 }
 
 // HasAccountGroupId returns a boolean if a field has been set.
 func (o *RoleBindingRequest) HasAccountGroupId() bool {
-	if o != nil && !isNil(o.AccountGroupId) {
+	if o != nil && o.AccountGroupId != nil {
 		return true
 	}
 
@@ -77,7 +77,7 @@ func (o *RoleBindingRequest) SetAccountGroupId(v string) {
 
 // GetAccountId returns the AccountId field value if set, zero value otherwise.
 func (o *RoleBindingRequest) GetAccountId() string {
-	if o == nil || isNil(o.AccountId) {
+	if o == nil || o.AccountId == nil {
 		var ret string
 		return ret
 	}
@@ -87,15 +87,15 @@ func (o *RoleBindingRequest) GetAccountId() string {
 // GetAccountIdOk returns a tuple with the AccountId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RoleBindingRequest) GetAccountIdOk() (*string, bool) {
-	if o == nil || isNil(o.AccountId) {
-    return nil, false
+	if o == nil || o.AccountId == nil {
+		return nil, false
 	}
 	return o.AccountId, true
 }
 
 // HasAccountId returns a boolean if a field has been set.
 func (o *RoleBindingRequest) HasAccountId() bool {
-	if o != nil && !isNil(o.AccountId) {
+	if o != nil && o.AccountId != nil {
 		return true
 	}
 
@@ -109,7 +109,7 @@ func (o *RoleBindingRequest) SetAccountId(v string) {
 
 // GetConfigManaged returns the ConfigManaged field value if set, zero value otherwise.
 func (o *RoleBindingRequest) GetConfigManaged() bool {
-	if o == nil || isNil(o.ConfigManaged) {
+	if o == nil || o.ConfigManaged == nil {
 		var ret bool
 		return ret
 	}
@@ -119,15 +119,15 @@ func (o *RoleBindingRequest) GetConfigManaged() bool {
 // GetConfigManagedOk returns a tuple with the ConfigManaged field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RoleBindingRequest) GetConfigManagedOk() (*bool, bool) {
-	if o == nil || isNil(o.ConfigManaged) {
-    return nil, false
+	if o == nil || o.ConfigManaged == nil {
+		return nil, false
 	}
 	return o.ConfigManaged, true
 }
 
 // HasConfigManaged returns a boolean if a field has been set.
 func (o *RoleBindingRequest) HasConfigManaged() bool {
-	if o != nil && !isNil(o.ConfigManaged) {
+	if o != nil && o.ConfigManaged != nil {
 		return true
 	}
 
@@ -141,7 +141,7 @@ func (o *RoleBindingRequest) SetConfigManaged(v bool) {
 
 // GetManagedBy returns the ManagedBy field value if set, zero value otherwise.
 func (o *RoleBindingRequest) GetManagedBy() string {
-	if o == nil || isNil(o.ManagedBy) {
+	if o == nil || o.ManagedBy == nil {
 		var ret string
 		return ret
 	}
@@ -151,15 +151,15 @@ func (o *RoleBindingRequest) GetManagedBy() string {
 // GetManagedByOk returns a tuple with the ManagedBy field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RoleBindingRequest) GetManagedByOk() (*string, bool) {
-	if o == nil || isNil(o.ManagedBy) {
-    return nil, false
+	if o == nil || o.ManagedBy == nil {
+		return nil, false
 	}
 	return o.ManagedBy, true
 }
 
 // HasManagedBy returns a boolean if a field has been set.
 func (o *RoleBindingRequest) HasManagedBy() bool {
-	if o != nil && !isNil(o.ManagedBy) {
+	if o != nil && o.ManagedBy != nil {
 		return true
 	}
 
@@ -173,7 +173,7 @@ func (o *RoleBindingRequest) SetManagedBy(v string) {
 
 // GetOrganizationId returns the OrganizationId field value if set, zero value otherwise.
 func (o *RoleBindingRequest) GetOrganizationId() string {
-	if o == nil || isNil(o.OrganizationId) {
+	if o == nil || o.OrganizationId == nil {
 		var ret string
 		return ret
 	}
@@ -183,15 +183,15 @@ func (o *RoleBindingRequest) GetOrganizationId() string {
 // GetOrganizationIdOk returns a tuple with the OrganizationId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RoleBindingRequest) GetOrganizationIdOk() (*string, bool) {
-	if o == nil || isNil(o.OrganizationId) {
-    return nil, false
+	if o == nil || o.OrganizationId == nil {
+		return nil, false
 	}
 	return o.OrganizationId, true
 }
 
 // HasOrganizationId returns a boolean if a field has been set.
 func (o *RoleBindingRequest) HasOrganizationId() bool {
-	if o != nil && !isNil(o.OrganizationId) {
+	if o != nil && o.OrganizationId != nil {
 		return true
 	}
 
@@ -205,7 +205,7 @@ func (o *RoleBindingRequest) SetOrganizationId(v string) {
 
 // GetRoleId returns the RoleId field value if set, zero value otherwise.
 func (o *RoleBindingRequest) GetRoleId() string {
-	if o == nil || isNil(o.RoleId) {
+	if o == nil || o.RoleId == nil {
 		var ret string
 		return ret
 	}
@@ -215,15 +215,15 @@ func (o *RoleBindingRequest) GetRoleId() string {
 // GetRoleIdOk returns a tuple with the RoleId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RoleBindingRequest) GetRoleIdOk() (*string, bool) {
-	if o == nil || isNil(o.RoleId) {
-    return nil, false
+	if o == nil || o.RoleId == nil {
+		return nil, false
 	}
 	return o.RoleId, true
 }
 
 // HasRoleId returns a boolean if a field has been set.
 func (o *RoleBindingRequest) HasRoleId() bool {
-	if o != nil && !isNil(o.RoleId) {
+	if o != nil && o.RoleId != nil {
 		return true
 	}
 
@@ -237,7 +237,7 @@ func (o *RoleBindingRequest) SetRoleId(v string) {
 
 // GetSubscriptionId returns the SubscriptionId field value if set, zero value otherwise.
 func (o *RoleBindingRequest) GetSubscriptionId() string {
-	if o == nil || isNil(o.SubscriptionId) {
+	if o == nil || o.SubscriptionId == nil {
 		var ret string
 		return ret
 	}
@@ -247,15 +247,15 @@ func (o *RoleBindingRequest) GetSubscriptionId() string {
 // GetSubscriptionIdOk returns a tuple with the SubscriptionId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RoleBindingRequest) GetSubscriptionIdOk() (*string, bool) {
-	if o == nil || isNil(o.SubscriptionId) {
-    return nil, false
+	if o == nil || o.SubscriptionId == nil {
+		return nil, false
 	}
 	return o.SubscriptionId, true
 }
 
 // HasSubscriptionId returns a boolean if a field has been set.
 func (o *RoleBindingRequest) HasSubscriptionId() bool {
-	if o != nil && !isNil(o.SubscriptionId) {
+	if o != nil && o.SubscriptionId != nil {
 		return true
 	}
 
@@ -269,7 +269,7 @@ func (o *RoleBindingRequest) SetSubscriptionId(v string) {
 
 // GetType returns the Type field value if set, zero value otherwise.
 func (o *RoleBindingRequest) GetType() string {
-	if o == nil || isNil(o.Type) {
+	if o == nil || o.Type == nil {
 		var ret string
 		return ret
 	}
@@ -279,15 +279,15 @@ func (o *RoleBindingRequest) GetType() string {
 // GetTypeOk returns a tuple with the Type field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RoleBindingRequest) GetTypeOk() (*string, bool) {
-	if o == nil || isNil(o.Type) {
-    return nil, false
+	if o == nil || o.Type == nil {
+		return nil, false
 	}
 	return o.Type, true
 }
 
 // HasType returns a boolean if a field has been set.
 func (o *RoleBindingRequest) HasType() bool {
-	if o != nil && !isNil(o.Type) {
+	if o != nil && o.Type != nil {
 		return true
 	}
 
@@ -301,28 +301,28 @@ func (o *RoleBindingRequest) SetType(v string) {
 
 func (o RoleBindingRequest) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.AccountGroupId) {
+	if o.AccountGroupId != nil {
 		toSerialize["account_group_id"] = o.AccountGroupId
 	}
-	if !isNil(o.AccountId) {
+	if o.AccountId != nil {
 		toSerialize["account_id"] = o.AccountId
 	}
-	if !isNil(o.ConfigManaged) {
+	if o.ConfigManaged != nil {
 		toSerialize["config_managed"] = o.ConfigManaged
 	}
-	if !isNil(o.ManagedBy) {
+	if o.ManagedBy != nil {
 		toSerialize["managed_by"] = o.ManagedBy
 	}
-	if !isNil(o.OrganizationId) {
+	if o.OrganizationId != nil {
 		toSerialize["organization_id"] = o.OrganizationId
 	}
-	if !isNil(o.RoleId) {
+	if o.RoleId != nil {
 		toSerialize["role_id"] = o.RoleId
 	}
-	if !isNil(o.SubscriptionId) {
+	if o.SubscriptionId != nil {
 		toSerialize["subscription_id"] = o.SubscriptionId
 	}
-	if !isNil(o.Type) {
+	if o.Type != nil {
 		toSerialize["type"] = o.Type
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_role_list.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_role_list.go
index 313c7ddc..cfd9ccd5 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_role_list.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_role_list.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -58,8 +58,8 @@ func (o *RoleList) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *RoleList) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -82,8 +82,8 @@ func (o *RoleList) GetPage() int32 {
 // GetPageOk returns a tuple with the Page field value
 // and a boolean to check if the value has been set.
 func (o *RoleList) GetPageOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Page, true
 }
@@ -106,8 +106,8 @@ func (o *RoleList) GetSize() int32 {
 // GetSizeOk returns a tuple with the Size field value
 // and a boolean to check if the value has been set.
 func (o *RoleList) GetSizeOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Size, true
 }
@@ -130,8 +130,8 @@ func (o *RoleList) GetTotal() int32 {
 // GetTotalOk returns a tuple with the Total field value
 // and a boolean to check if the value has been set.
 func (o *RoleList) GetTotalOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Total, true
 }
@@ -153,11 +153,11 @@ func (o *RoleList) GetItems() []Role {
 
 // GetItemsOk returns a tuple with the Items field value
 // and a boolean to check if the value has been set.
-func (o *RoleList) GetItemsOk() ([]Role, bool) {
-	if o == nil {
-    return nil, false
+func (o *RoleList) GetItemsOk() (*[]Role, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Items, true
+	return &o.Items, true
 }
 
 // SetItems sets field value
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_role_list_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_role_list_all_of.go
index c475f913..12902cf4 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_role_list_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_role_list_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -16,7 +16,7 @@ import (
 
 // RoleListAllOf struct for RoleListAllOf
 type RoleListAllOf struct {
-	Items []Role `json:"items,omitempty"`
+	Items *[]Role `json:"items,omitempty"`
 }
 
 // NewRoleListAllOf instantiates a new RoleListAllOf object
@@ -38,25 +38,25 @@ func NewRoleListAllOfWithDefaults() *RoleListAllOf {
 
 // GetItems returns the Items field value if set, zero value otherwise.
 func (o *RoleListAllOf) GetItems() []Role {
-	if o == nil || isNil(o.Items) {
+	if o == nil || o.Items == nil {
 		var ret []Role
 		return ret
 	}
-	return o.Items
+	return *o.Items
 }
 
 // GetItemsOk returns a tuple with the Items field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *RoleListAllOf) GetItemsOk() ([]Role, bool) {
-	if o == nil || isNil(o.Items) {
-    return nil, false
+func (o *RoleListAllOf) GetItemsOk() (*[]Role, bool) {
+	if o == nil || o.Items == nil {
+		return nil, false
 	}
 	return o.Items, true
 }
 
 // HasItems returns a boolean if a field has been set.
 func (o *RoleListAllOf) HasItems() bool {
-	if o != nil && !isNil(o.Items) {
+	if o != nil && o.Items != nil {
 		return true
 	}
 
@@ -65,12 +65,12 @@ func (o *RoleListAllOf) HasItems() bool {
 
 // SetItems gets a reference to the given []Role and assigns it to the Items field.
 func (o *RoleListAllOf) SetItems(v []Role) {
-	o.Items = v
+	o.Items = &v
 }
 
 func (o RoleListAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Items) {
+	if o.Items != nil {
 		toSerialize["items"] = o.Items
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_self_access_review.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_self_access_review.go
index 988a59ff..93d5fad2 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_self_access_review.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_self_access_review.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -56,8 +56,8 @@ func (o *SelfAccessReview) GetAction() string {
 // GetActionOk returns a tuple with the Action field value
 // and a boolean to check if the value has been set.
 func (o *SelfAccessReview) GetActionOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Action, true
 }
@@ -69,7 +69,7 @@ func (o *SelfAccessReview) SetAction(v string) {
 
 // GetClusterId returns the ClusterId field value if set, zero value otherwise.
 func (o *SelfAccessReview) GetClusterId() string {
-	if o == nil || isNil(o.ClusterId) {
+	if o == nil || o.ClusterId == nil {
 		var ret string
 		return ret
 	}
@@ -79,15 +79,15 @@ func (o *SelfAccessReview) GetClusterId() string {
 // GetClusterIdOk returns a tuple with the ClusterId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SelfAccessReview) GetClusterIdOk() (*string, bool) {
-	if o == nil || isNil(o.ClusterId) {
-    return nil, false
+	if o == nil || o.ClusterId == nil {
+		return nil, false
 	}
 	return o.ClusterId, true
 }
 
 // HasClusterId returns a boolean if a field has been set.
 func (o *SelfAccessReview) HasClusterId() bool {
-	if o != nil && !isNil(o.ClusterId) {
+	if o != nil && o.ClusterId != nil {
 		return true
 	}
 
@@ -101,7 +101,7 @@ func (o *SelfAccessReview) SetClusterId(v string) {
 
 // GetClusterUuid returns the ClusterUuid field value if set, zero value otherwise.
 func (o *SelfAccessReview) GetClusterUuid() string {
-	if o == nil || isNil(o.ClusterUuid) {
+	if o == nil || o.ClusterUuid == nil {
 		var ret string
 		return ret
 	}
@@ -111,15 +111,15 @@ func (o *SelfAccessReview) GetClusterUuid() string {
 // GetClusterUuidOk returns a tuple with the ClusterUuid field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SelfAccessReview) GetClusterUuidOk() (*string, bool) {
-	if o == nil || isNil(o.ClusterUuid) {
-    return nil, false
+	if o == nil || o.ClusterUuid == nil {
+		return nil, false
 	}
 	return o.ClusterUuid, true
 }
 
 // HasClusterUuid returns a boolean if a field has been set.
 func (o *SelfAccessReview) HasClusterUuid() bool {
-	if o != nil && !isNil(o.ClusterUuid) {
+	if o != nil && o.ClusterUuid != nil {
 		return true
 	}
 
@@ -133,7 +133,7 @@ func (o *SelfAccessReview) SetClusterUuid(v string) {
 
 // GetOrganizationId returns the OrganizationId field value if set, zero value otherwise.
 func (o *SelfAccessReview) GetOrganizationId() string {
-	if o == nil || isNil(o.OrganizationId) {
+	if o == nil || o.OrganizationId == nil {
 		var ret string
 		return ret
 	}
@@ -143,15 +143,15 @@ func (o *SelfAccessReview) GetOrganizationId() string {
 // GetOrganizationIdOk returns a tuple with the OrganizationId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SelfAccessReview) GetOrganizationIdOk() (*string, bool) {
-	if o == nil || isNil(o.OrganizationId) {
-    return nil, false
+	if o == nil || o.OrganizationId == nil {
+		return nil, false
 	}
 	return o.OrganizationId, true
 }
 
 // HasOrganizationId returns a boolean if a field has been set.
 func (o *SelfAccessReview) HasOrganizationId() bool {
-	if o != nil && !isNil(o.OrganizationId) {
+	if o != nil && o.OrganizationId != nil {
 		return true
 	}
 
@@ -176,8 +176,8 @@ func (o *SelfAccessReview) GetResourceType() string {
 // GetResourceTypeOk returns a tuple with the ResourceType field value
 // and a boolean to check if the value has been set.
 func (o *SelfAccessReview) GetResourceTypeOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.ResourceType, true
 }
@@ -189,7 +189,7 @@ func (o *SelfAccessReview) SetResourceType(v string) {
 
 // GetSubscriptionId returns the SubscriptionId field value if set, zero value otherwise.
 func (o *SelfAccessReview) GetSubscriptionId() string {
-	if o == nil || isNil(o.SubscriptionId) {
+	if o == nil || o.SubscriptionId == nil {
 		var ret string
 		return ret
 	}
@@ -199,15 +199,15 @@ func (o *SelfAccessReview) GetSubscriptionId() string {
 // GetSubscriptionIdOk returns a tuple with the SubscriptionId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SelfAccessReview) GetSubscriptionIdOk() (*string, bool) {
-	if o == nil || isNil(o.SubscriptionId) {
-    return nil, false
+	if o == nil || o.SubscriptionId == nil {
+		return nil, false
 	}
 	return o.SubscriptionId, true
 }
 
 // HasSubscriptionId returns a boolean if a field has been set.
 func (o *SelfAccessReview) HasSubscriptionId() bool {
-	if o != nil && !isNil(o.SubscriptionId) {
+	if o != nil && o.SubscriptionId != nil {
 		return true
 	}
 
@@ -224,19 +224,19 @@ func (o SelfAccessReview) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["action"] = o.Action
 	}
-	if !isNil(o.ClusterId) {
+	if o.ClusterId != nil {
 		toSerialize["cluster_id"] = o.ClusterId
 	}
-	if !isNil(o.ClusterUuid) {
+	if o.ClusterUuid != nil {
 		toSerialize["cluster_uuid"] = o.ClusterUuid
 	}
-	if !isNil(o.OrganizationId) {
+	if o.OrganizationId != nil {
 		toSerialize["organization_id"] = o.OrganizationId
 	}
 	if true {
 		toSerialize["resource_type"] = o.ResourceType
 	}
-	if !isNil(o.SubscriptionId) {
+	if o.SubscriptionId != nil {
 		toSerialize["subscription_id"] = o.SubscriptionId
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_self_entitlement_status.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_self_entitlement_status.go
index 72fea4e1..d99e0592 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_self_entitlement_status.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_self_entitlement_status.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -39,7 +39,7 @@ func NewSelfEntitlementStatusWithDefaults() *SelfEntitlementStatus {
 
 // GetProduct returns the Product field value if set, zero value otherwise.
 func (o *SelfEntitlementStatus) GetProduct() string {
-	if o == nil || isNil(o.Product) {
+	if o == nil || o.Product == nil {
 		var ret string
 		return ret
 	}
@@ -49,15 +49,15 @@ func (o *SelfEntitlementStatus) GetProduct() string {
 // GetProductOk returns a tuple with the Product field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SelfEntitlementStatus) GetProductOk() (*string, bool) {
-	if o == nil || isNil(o.Product) {
-    return nil, false
+	if o == nil || o.Product == nil {
+		return nil, false
 	}
 	return o.Product, true
 }
 
 // HasProduct returns a boolean if a field has been set.
 func (o *SelfEntitlementStatus) HasProduct() bool {
-	if o != nil && !isNil(o.Product) {
+	if o != nil && o.Product != nil {
 		return true
 	}
 
@@ -71,7 +71,7 @@ func (o *SelfEntitlementStatus) SetProduct(v string) {
 
 // GetStatus returns the Status field value if set, zero value otherwise.
 func (o *SelfEntitlementStatus) GetStatus() string {
-	if o == nil || isNil(o.Status) {
+	if o == nil || o.Status == nil {
 		var ret string
 		return ret
 	}
@@ -81,15 +81,15 @@ func (o *SelfEntitlementStatus) GetStatus() string {
 // GetStatusOk returns a tuple with the Status field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SelfEntitlementStatus) GetStatusOk() (*string, bool) {
-	if o == nil || isNil(o.Status) {
-    return nil, false
+	if o == nil || o.Status == nil {
+		return nil, false
 	}
 	return o.Status, true
 }
 
 // HasStatus returns a boolean if a field has been set.
 func (o *SelfEntitlementStatus) HasStatus() bool {
-	if o != nil && !isNil(o.Status) {
+	if o != nil && o.Status != nil {
 		return true
 	}
 
@@ -103,10 +103,10 @@ func (o *SelfEntitlementStatus) SetStatus(v string) {
 
 func (o SelfEntitlementStatus) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Product) {
+	if o.Product != nil {
 		toSerialize["product"] = o.Product
 	}
-	if !isNil(o.Status) {
+	if o.Status != nil {
 		toSerialize["status"] = o.Status
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_self_feature_review.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_self_feature_review.go
index fcb7cb1b..11717af3 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_self_feature_review.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_self_feature_review.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -50,8 +50,8 @@ func (o *SelfFeatureReview) GetFeature() string {
 // GetFeatureOk returns a tuple with the Feature field value
 // and a boolean to check if the value has been set.
 func (o *SelfFeatureReview) GetFeatureOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Feature, true
 }
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_self_resource_review.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_self_resource_review.go
index bde5bb08..71ab914b 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_self_resource_review.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_self_resource_review.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -60,8 +60,8 @@ func (o *SelfResourceReview) GetAction() string {
 // GetActionOk returns a tuple with the Action field value
 // and a boolean to check if the value has been set.
 func (o *SelfResourceReview) GetActionOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Action, true
 }
@@ -83,11 +83,11 @@ func (o *SelfResourceReview) GetClusterIds() []string {
 
 // GetClusterIdsOk returns a tuple with the ClusterIds field value
 // and a boolean to check if the value has been set.
-func (o *SelfResourceReview) GetClusterIdsOk() ([]string, bool) {
-	if o == nil {
-    return nil, false
+func (o *SelfResourceReview) GetClusterIdsOk() (*[]string, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.ClusterIds, true
+	return &o.ClusterIds, true
 }
 
 // SetClusterIds sets field value
@@ -107,11 +107,11 @@ func (o *SelfResourceReview) GetClusterUuids() []string {
 
 // GetClusterUuidsOk returns a tuple with the ClusterUuids field value
 // and a boolean to check if the value has been set.
-func (o *SelfResourceReview) GetClusterUuidsOk() ([]string, bool) {
-	if o == nil {
-    return nil, false
+func (o *SelfResourceReview) GetClusterUuidsOk() (*[]string, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.ClusterUuids, true
+	return &o.ClusterUuids, true
 }
 
 // SetClusterUuids sets field value
@@ -131,11 +131,11 @@ func (o *SelfResourceReview) GetOrganizationIds() []string {
 
 // GetOrganizationIdsOk returns a tuple with the OrganizationIds field value
 // and a boolean to check if the value has been set.
-func (o *SelfResourceReview) GetOrganizationIdsOk() ([]string, bool) {
-	if o == nil {
-    return nil, false
+func (o *SelfResourceReview) GetOrganizationIdsOk() (*[]string, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.OrganizationIds, true
+	return &o.OrganizationIds, true
 }
 
 // SetOrganizationIds sets field value
@@ -156,8 +156,8 @@ func (o *SelfResourceReview) GetResourceType() string {
 // GetResourceTypeOk returns a tuple with the ResourceType field value
 // and a boolean to check if the value has been set.
 func (o *SelfResourceReview) GetResourceTypeOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.ResourceType, true
 }
@@ -179,11 +179,11 @@ func (o *SelfResourceReview) GetSubscriptionIds() []string {
 
 // GetSubscriptionIdsOk returns a tuple with the SubscriptionIds field value
 // and a boolean to check if the value has been set.
-func (o *SelfResourceReview) GetSubscriptionIdsOk() ([]string, bool) {
-	if o == nil {
-    return nil, false
+func (o *SelfResourceReview) GetSubscriptionIdsOk() (*[]string, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.SubscriptionIds, true
+	return &o.SubscriptionIds, true
 }
 
 // SetSubscriptionIds sets field value
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_self_resource_review_request.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_self_resource_review_request.go
index 62ae608f..589483eb 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_self_resource_review_request.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_self_resource_review_request.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -39,7 +39,7 @@ func NewSelfResourceReviewRequestWithDefaults() *SelfResourceReviewRequest {
 
 // GetAction returns the Action field value if set, zero value otherwise.
 func (o *SelfResourceReviewRequest) GetAction() string {
-	if o == nil || isNil(o.Action) {
+	if o == nil || o.Action == nil {
 		var ret string
 		return ret
 	}
@@ -49,15 +49,15 @@ func (o *SelfResourceReviewRequest) GetAction() string {
 // GetActionOk returns a tuple with the Action field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SelfResourceReviewRequest) GetActionOk() (*string, bool) {
-	if o == nil || isNil(o.Action) {
-    return nil, false
+	if o == nil || o.Action == nil {
+		return nil, false
 	}
 	return o.Action, true
 }
 
 // HasAction returns a boolean if a field has been set.
 func (o *SelfResourceReviewRequest) HasAction() bool {
-	if o != nil && !isNil(o.Action) {
+	if o != nil && o.Action != nil {
 		return true
 	}
 
@@ -71,7 +71,7 @@ func (o *SelfResourceReviewRequest) SetAction(v string) {
 
 // GetResourceType returns the ResourceType field value if set, zero value otherwise.
 func (o *SelfResourceReviewRequest) GetResourceType() string {
-	if o == nil || isNil(o.ResourceType) {
+	if o == nil || o.ResourceType == nil {
 		var ret string
 		return ret
 	}
@@ -81,15 +81,15 @@ func (o *SelfResourceReviewRequest) GetResourceType() string {
 // GetResourceTypeOk returns a tuple with the ResourceType field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SelfResourceReviewRequest) GetResourceTypeOk() (*string, bool) {
-	if o == nil || isNil(o.ResourceType) {
-    return nil, false
+	if o == nil || o.ResourceType == nil {
+		return nil, false
 	}
 	return o.ResourceType, true
 }
 
 // HasResourceType returns a boolean if a field has been set.
 func (o *SelfResourceReviewRequest) HasResourceType() bool {
-	if o != nil && !isNil(o.ResourceType) {
+	if o != nil && o.ResourceType != nil {
 		return true
 	}
 
@@ -103,10 +103,10 @@ func (o *SelfResourceReviewRequest) SetResourceType(v string) {
 
 func (o SelfResourceReviewRequest) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Action) {
+	if o.Action != nil {
 		toSerialize["action"] = o.Action
 	}
-	if !isNil(o.ResourceType) {
+	if o.ResourceType != nil {
 		toSerialize["resource_type"] = o.ResourceType
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_self_service_landing_page_schema.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_self_service_landing_page_schema.go
index cdf10393..d695bf35 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_self_service_landing_page_schema.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_self_service_landing_page_schema.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -39,7 +39,7 @@ func NewSelfServiceLandingPageSchemaWithDefaults() *SelfServiceLandingPageSchema
 
 // GetConfigTryLearn returns the ConfigTryLearn field value if set, zero value otherwise.
 func (o *SelfServiceLandingPageSchema) GetConfigTryLearn() SelfServiceLandingPageSchemaConfigTryLearn {
-	if o == nil || isNil(o.ConfigTryLearn) {
+	if o == nil || o.ConfigTryLearn == nil {
 		var ret SelfServiceLandingPageSchemaConfigTryLearn
 		return ret
 	}
@@ -49,15 +49,15 @@ func (o *SelfServiceLandingPageSchema) GetConfigTryLearn() SelfServiceLandingPag
 // GetConfigTryLearnOk returns a tuple with the ConfigTryLearn field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SelfServiceLandingPageSchema) GetConfigTryLearnOk() (*SelfServiceLandingPageSchemaConfigTryLearn, bool) {
-	if o == nil || isNil(o.ConfigTryLearn) {
-    return nil, false
+	if o == nil || o.ConfigTryLearn == nil {
+		return nil, false
 	}
 	return o.ConfigTryLearn, true
 }
 
 // HasConfigTryLearn returns a boolean if a field has been set.
 func (o *SelfServiceLandingPageSchema) HasConfigTryLearn() bool {
-	if o != nil && !isNil(o.ConfigTryLearn) {
+	if o != nil && o.ConfigTryLearn != nil {
 		return true
 	}
 
@@ -71,7 +71,7 @@ func (o *SelfServiceLandingPageSchema) SetConfigTryLearn(v SelfServiceLandingPag
 
 // GetEstate returns the Estate field value if set, zero value otherwise.
 func (o *SelfServiceLandingPageSchema) GetEstate() SelfServiceLandingPageSchemaEstate {
-	if o == nil || isNil(o.Estate) {
+	if o == nil || o.Estate == nil {
 		var ret SelfServiceLandingPageSchemaEstate
 		return ret
 	}
@@ -81,15 +81,15 @@ func (o *SelfServiceLandingPageSchema) GetEstate() SelfServiceLandingPageSchemaE
 // GetEstateOk returns a tuple with the Estate field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SelfServiceLandingPageSchema) GetEstateOk() (*SelfServiceLandingPageSchemaEstate, bool) {
-	if o == nil || isNil(o.Estate) {
-    return nil, false
+	if o == nil || o.Estate == nil {
+		return nil, false
 	}
 	return o.Estate, true
 }
 
 // HasEstate returns a boolean if a field has been set.
 func (o *SelfServiceLandingPageSchema) HasEstate() bool {
-	if o != nil && !isNil(o.Estate) {
+	if o != nil && o.Estate != nil {
 		return true
 	}
 
@@ -103,10 +103,10 @@ func (o *SelfServiceLandingPageSchema) SetEstate(v SelfServiceLandingPageSchemaE
 
 func (o SelfServiceLandingPageSchema) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.ConfigTryLearn) {
+	if o.ConfigTryLearn != nil {
 		toSerialize["configTryLearn"] = o.ConfigTryLearn
 	}
-	if !isNil(o.Estate) {
+	if o.Estate != nil {
 		toSerialize["estate"] = o.Estate
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_self_service_landing_page_schema_config_try_learn.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_self_service_landing_page_schema_config_try_learn.go
index b229fd65..453a8915 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_self_service_landing_page_schema_config_try_learn.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_self_service_landing_page_schema_config_try_learn.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -16,8 +16,8 @@ import (
 
 // SelfServiceLandingPageSchemaConfigTryLearn struct for SelfServiceLandingPageSchemaConfigTryLearn
 type SelfServiceLandingPageSchemaConfigTryLearn struct {
-	Configure []LandingPageCTLItem `json:"configure,omitempty"`
-	Try []LandingPageCTLItem `json:"try,omitempty"`
+	Configure *[]LandingPageCTLItem `json:"configure,omitempty"`
+	Try *[]LandingPageCTLItem `json:"try,omitempty"`
 }
 
 // NewSelfServiceLandingPageSchemaConfigTryLearn instantiates a new SelfServiceLandingPageSchemaConfigTryLearn object
@@ -39,25 +39,25 @@ func NewSelfServiceLandingPageSchemaConfigTryLearnWithDefaults() *SelfServiceLan
 
 // GetConfigure returns the Configure field value if set, zero value otherwise.
 func (o *SelfServiceLandingPageSchemaConfigTryLearn) GetConfigure() []LandingPageCTLItem {
-	if o == nil || isNil(o.Configure) {
+	if o == nil || o.Configure == nil {
 		var ret []LandingPageCTLItem
 		return ret
 	}
-	return o.Configure
+	return *o.Configure
 }
 
 // GetConfigureOk returns a tuple with the Configure field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *SelfServiceLandingPageSchemaConfigTryLearn) GetConfigureOk() ([]LandingPageCTLItem, bool) {
-	if o == nil || isNil(o.Configure) {
-    return nil, false
+func (o *SelfServiceLandingPageSchemaConfigTryLearn) GetConfigureOk() (*[]LandingPageCTLItem, bool) {
+	if o == nil || o.Configure == nil {
+		return nil, false
 	}
 	return o.Configure, true
 }
 
 // HasConfigure returns a boolean if a field has been set.
 func (o *SelfServiceLandingPageSchemaConfigTryLearn) HasConfigure() bool {
-	if o != nil && !isNil(o.Configure) {
+	if o != nil && o.Configure != nil {
 		return true
 	}
 
@@ -66,30 +66,30 @@ func (o *SelfServiceLandingPageSchemaConfigTryLearn) HasConfigure() bool {
 
 // SetConfigure gets a reference to the given []LandingPageCTLItem and assigns it to the Configure field.
 func (o *SelfServiceLandingPageSchemaConfigTryLearn) SetConfigure(v []LandingPageCTLItem) {
-	o.Configure = v
+	o.Configure = &v
 }
 
 // GetTry returns the Try field value if set, zero value otherwise.
 func (o *SelfServiceLandingPageSchemaConfigTryLearn) GetTry() []LandingPageCTLItem {
-	if o == nil || isNil(o.Try) {
+	if o == nil || o.Try == nil {
 		var ret []LandingPageCTLItem
 		return ret
 	}
-	return o.Try
+	return *o.Try
 }
 
 // GetTryOk returns a tuple with the Try field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *SelfServiceLandingPageSchemaConfigTryLearn) GetTryOk() ([]LandingPageCTLItem, bool) {
-	if o == nil || isNil(o.Try) {
-    return nil, false
+func (o *SelfServiceLandingPageSchemaConfigTryLearn) GetTryOk() (*[]LandingPageCTLItem, bool) {
+	if o == nil || o.Try == nil {
+		return nil, false
 	}
 	return o.Try, true
 }
 
 // HasTry returns a boolean if a field has been set.
 func (o *SelfServiceLandingPageSchemaConfigTryLearn) HasTry() bool {
-	if o != nil && !isNil(o.Try) {
+	if o != nil && o.Try != nil {
 		return true
 	}
 
@@ -98,15 +98,15 @@ func (o *SelfServiceLandingPageSchemaConfigTryLearn) HasTry() bool {
 
 // SetTry gets a reference to the given []LandingPageCTLItem and assigns it to the Try field.
 func (o *SelfServiceLandingPageSchemaConfigTryLearn) SetTry(v []LandingPageCTLItem) {
-	o.Try = v
+	o.Try = &v
 }
 
 func (o SelfServiceLandingPageSchemaConfigTryLearn) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Configure) {
+	if o.Configure != nil {
 		toSerialize["configure"] = o.Configure
 	}
-	if !isNil(o.Try) {
+	if o.Try != nil {
 		toSerialize["try"] = o.Try
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_self_service_landing_page_schema_estate.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_self_service_landing_page_schema_estate.go
index fb7835eb..5ff6aada 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_self_service_landing_page_schema_estate.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_self_service_landing_page_schema_estate.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -16,7 +16,7 @@ import (
 
 // SelfServiceLandingPageSchemaEstate struct for SelfServiceLandingPageSchemaEstate
 type SelfServiceLandingPageSchemaEstate struct {
-	Items []LandingPageEstateItem `json:"items,omitempty"`
+	Items *[]LandingPageEstateItem `json:"items,omitempty"`
 }
 
 // NewSelfServiceLandingPageSchemaEstate instantiates a new SelfServiceLandingPageSchemaEstate object
@@ -38,25 +38,25 @@ func NewSelfServiceLandingPageSchemaEstateWithDefaults() *SelfServiceLandingPage
 
 // GetItems returns the Items field value if set, zero value otherwise.
 func (o *SelfServiceLandingPageSchemaEstate) GetItems() []LandingPageEstateItem {
-	if o == nil || isNil(o.Items) {
+	if o == nil || o.Items == nil {
 		var ret []LandingPageEstateItem
 		return ret
 	}
-	return o.Items
+	return *o.Items
 }
 
 // GetItemsOk returns a tuple with the Items field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *SelfServiceLandingPageSchemaEstate) GetItemsOk() ([]LandingPageEstateItem, bool) {
-	if o == nil || isNil(o.Items) {
-    return nil, false
+func (o *SelfServiceLandingPageSchemaEstate) GetItemsOk() (*[]LandingPageEstateItem, bool) {
+	if o == nil || o.Items == nil {
+		return nil, false
 	}
 	return o.Items, true
 }
 
 // HasItems returns a boolean if a field has been set.
 func (o *SelfServiceLandingPageSchemaEstate) HasItems() bool {
-	if o != nil && !isNil(o.Items) {
+	if o != nil && o.Items != nil {
 		return true
 	}
 
@@ -65,12 +65,12 @@ func (o *SelfServiceLandingPageSchemaEstate) HasItems() bool {
 
 // SetItems gets a reference to the given []LandingPageEstateItem and assigns it to the Items field.
 func (o *SelfServiceLandingPageSchemaEstate) SetItems(v []LandingPageEstateItem) {
-	o.Items = v
+	o.Items = &v
 }
 
 func (o SelfServiceLandingPageSchemaEstate) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Items) {
+	if o.Items != nil {
 		toSerialize["items"] = o.Items
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_self_terms_review.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_self_terms_review.go
index 318d1b6c..af5c9e32 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_self_terms_review.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_self_terms_review.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -44,7 +44,7 @@ func NewSelfTermsReviewWithDefaults() *SelfTermsReview {
 
 // GetCheckOptionalTerms returns the CheckOptionalTerms field value if set, zero value otherwise.
 func (o *SelfTermsReview) GetCheckOptionalTerms() bool {
-	if o == nil || isNil(o.CheckOptionalTerms) {
+	if o == nil || o.CheckOptionalTerms == nil {
 		var ret bool
 		return ret
 	}
@@ -54,15 +54,15 @@ func (o *SelfTermsReview) GetCheckOptionalTerms() bool {
 // GetCheckOptionalTermsOk returns a tuple with the CheckOptionalTerms field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SelfTermsReview) GetCheckOptionalTermsOk() (*bool, bool) {
-	if o == nil || isNil(o.CheckOptionalTerms) {
-    return nil, false
+	if o == nil || o.CheckOptionalTerms == nil {
+		return nil, false
 	}
 	return o.CheckOptionalTerms, true
 }
 
 // HasCheckOptionalTerms returns a boolean if a field has been set.
 func (o *SelfTermsReview) HasCheckOptionalTerms() bool {
-	if o != nil && !isNil(o.CheckOptionalTerms) {
+	if o != nil && o.CheckOptionalTerms != nil {
 		return true
 	}
 
@@ -76,7 +76,7 @@ func (o *SelfTermsReview) SetCheckOptionalTerms(v bool) {
 
 // GetEventCode returns the EventCode field value if set, zero value otherwise.
 func (o *SelfTermsReview) GetEventCode() string {
-	if o == nil || isNil(o.EventCode) {
+	if o == nil || o.EventCode == nil {
 		var ret string
 		return ret
 	}
@@ -86,15 +86,15 @@ func (o *SelfTermsReview) GetEventCode() string {
 // GetEventCodeOk returns a tuple with the EventCode field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SelfTermsReview) GetEventCodeOk() (*string, bool) {
-	if o == nil || isNil(o.EventCode) {
-    return nil, false
+	if o == nil || o.EventCode == nil {
+		return nil, false
 	}
 	return o.EventCode, true
 }
 
 // HasEventCode returns a boolean if a field has been set.
 func (o *SelfTermsReview) HasEventCode() bool {
-	if o != nil && !isNil(o.EventCode) {
+	if o != nil && o.EventCode != nil {
 		return true
 	}
 
@@ -108,7 +108,7 @@ func (o *SelfTermsReview) SetEventCode(v string) {
 
 // GetSiteCode returns the SiteCode field value if set, zero value otherwise.
 func (o *SelfTermsReview) GetSiteCode() string {
-	if o == nil || isNil(o.SiteCode) {
+	if o == nil || o.SiteCode == nil {
 		var ret string
 		return ret
 	}
@@ -118,15 +118,15 @@ func (o *SelfTermsReview) GetSiteCode() string {
 // GetSiteCodeOk returns a tuple with the SiteCode field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SelfTermsReview) GetSiteCodeOk() (*string, bool) {
-	if o == nil || isNil(o.SiteCode) {
-    return nil, false
+	if o == nil || o.SiteCode == nil {
+		return nil, false
 	}
 	return o.SiteCode, true
 }
 
 // HasSiteCode returns a boolean if a field has been set.
 func (o *SelfTermsReview) HasSiteCode() bool {
-	if o != nil && !isNil(o.SiteCode) {
+	if o != nil && o.SiteCode != nil {
 		return true
 	}
 
@@ -140,13 +140,13 @@ func (o *SelfTermsReview) SetSiteCode(v string) {
 
 func (o SelfTermsReview) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.CheckOptionalTerms) {
+	if o.CheckOptionalTerms != nil {
 		toSerialize["check_optional_terms"] = o.CheckOptionalTerms
 	}
-	if !isNil(o.EventCode) {
+	if o.EventCode != nil {
 		toSerialize["event_code"] = o.EventCode
 	}
-	if !isNil(o.SiteCode) {
+	if o.SiteCode != nil {
 		toSerialize["site_code"] = o.SiteCode
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_sku.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_sku.go
index df9af797..f79c6a97 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_sku.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_sku.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -12,6 +12,7 @@ package accountmgmtclient
 
 import (
 	"encoding/json"
+	"time"
 )
 
 // SKU struct for SKU
@@ -43,7 +44,7 @@ func NewSKUWithDefaults() *SKU {
 
 // GetHref returns the Href field value if set, zero value otherwise.
 func (o *SKU) GetHref() string {
-	if o == nil || isNil(o.Href) {
+	if o == nil || o.Href == nil {
 		var ret string
 		return ret
 	}
@@ -53,15 +54,15 @@ func (o *SKU) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SKU) GetHrefOk() (*string, bool) {
-	if o == nil || isNil(o.Href) {
-    return nil, false
+	if o == nil || o.Href == nil {
+		return nil, false
 	}
 	return o.Href, true
 }
 
 // HasHref returns a boolean if a field has been set.
 func (o *SKU) HasHref() bool {
-	if o != nil && !isNil(o.Href) {
+	if o != nil && o.Href != nil {
 		return true
 	}
 
@@ -75,7 +76,7 @@ func (o *SKU) SetHref(v string) {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *SKU) GetId() string {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret string
 		return ret
 	}
@@ -85,15 +86,15 @@ func (o *SKU) GetId() string {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SKU) GetIdOk() (*string, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *SKU) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -107,7 +108,7 @@ func (o *SKU) SetId(v string) {
 
 // GetKind returns the Kind field value if set, zero value otherwise.
 func (o *SKU) GetKind() string {
-	if o == nil || isNil(o.Kind) {
+	if o == nil || o.Kind == nil {
 		var ret string
 		return ret
 	}
@@ -117,15 +118,15 @@ func (o *SKU) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SKU) GetKindOk() (*string, bool) {
-	if o == nil || isNil(o.Kind) {
-    return nil, false
+	if o == nil || o.Kind == nil {
+		return nil, false
 	}
 	return o.Kind, true
 }
 
 // HasKind returns a boolean if a field has been set.
 func (o *SKU) HasKind() bool {
-	if o != nil && !isNil(o.Kind) {
+	if o != nil && o.Kind != nil {
 		return true
 	}
 
@@ -139,7 +140,7 @@ func (o *SKU) SetKind(v string) {
 
 // GetCreatedAt returns the CreatedAt field value if set, zero value otherwise.
 func (o *SKU) GetCreatedAt() time.Time {
-	if o == nil || isNil(o.CreatedAt) {
+	if o == nil || o.CreatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -149,15 +150,15 @@ func (o *SKU) GetCreatedAt() time.Time {
 // GetCreatedAtOk returns a tuple with the CreatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SKU) GetCreatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.CreatedAt) {
-    return nil, false
+	if o == nil || o.CreatedAt == nil {
+		return nil, false
 	}
 	return o.CreatedAt, true
 }
 
 // HasCreatedAt returns a boolean if a field has been set.
 func (o *SKU) HasCreatedAt() bool {
-	if o != nil && !isNil(o.CreatedAt) {
+	if o != nil && o.CreatedAt != nil {
 		return true
 	}
 
@@ -171,7 +172,7 @@ func (o *SKU) SetCreatedAt(v time.Time) {
 
 // GetDescription returns the Description field value if set, zero value otherwise.
 func (o *SKU) GetDescription() string {
-	if o == nil || isNil(o.Description) {
+	if o == nil || o.Description == nil {
 		var ret string
 		return ret
 	}
@@ -181,15 +182,15 @@ func (o *SKU) GetDescription() string {
 // GetDescriptionOk returns a tuple with the Description field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SKU) GetDescriptionOk() (*string, bool) {
-	if o == nil || isNil(o.Description) {
-    return nil, false
+	if o == nil || o.Description == nil {
+		return nil, false
 	}
 	return o.Description, true
 }
 
 // HasDescription returns a boolean if a field has been set.
 func (o *SKU) HasDescription() bool {
-	if o != nil && !isNil(o.Description) {
+	if o != nil && o.Description != nil {
 		return true
 	}
 
@@ -203,7 +204,7 @@ func (o *SKU) SetDescription(v string) {
 
 // GetUpdatedAt returns the UpdatedAt field value if set, zero value otherwise.
 func (o *SKU) GetUpdatedAt() time.Time {
-	if o == nil || isNil(o.UpdatedAt) {
+	if o == nil || o.UpdatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -213,15 +214,15 @@ func (o *SKU) GetUpdatedAt() time.Time {
 // GetUpdatedAtOk returns a tuple with the UpdatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SKU) GetUpdatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.UpdatedAt) {
-    return nil, false
+	if o == nil || o.UpdatedAt == nil {
+		return nil, false
 	}
 	return o.UpdatedAt, true
 }
 
 // HasUpdatedAt returns a boolean if a field has been set.
 func (o *SKU) HasUpdatedAt() bool {
-	if o != nil && !isNil(o.UpdatedAt) {
+	if o != nil && o.UpdatedAt != nil {
 		return true
 	}
 
@@ -235,22 +236,22 @@ func (o *SKU) SetUpdatedAt(v time.Time) {
 
 func (o SKU) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Href) {
+	if o.Href != nil {
 		toSerialize["href"] = o.Href
 	}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.Kind) {
+	if o.Kind != nil {
 		toSerialize["kind"] = o.Kind
 	}
-	if !isNil(o.CreatedAt) {
+	if o.CreatedAt != nil {
 		toSerialize["created_at"] = o.CreatedAt
 	}
-	if !isNil(o.Description) {
+	if o.Description != nil {
 		toSerialize["description"] = o.Description
 	}
-	if !isNil(o.UpdatedAt) {
+	if o.UpdatedAt != nil {
 		toSerialize["updated_at"] = o.UpdatedAt
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_sku_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_sku_all_of.go
index fdcfab11..57dfcc64 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_sku_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_sku_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -41,7 +41,7 @@ func NewSKUAllOfWithDefaults() *SKUAllOf {
 
 // GetCreatedAt returns the CreatedAt field value if set, zero value otherwise.
 func (o *SKUAllOf) GetCreatedAt() time.Time {
-	if o == nil || isNil(o.CreatedAt) {
+	if o == nil || o.CreatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -51,15 +51,15 @@ func (o *SKUAllOf) GetCreatedAt() time.Time {
 // GetCreatedAtOk returns a tuple with the CreatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SKUAllOf) GetCreatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.CreatedAt) {
-    return nil, false
+	if o == nil || o.CreatedAt == nil {
+		return nil, false
 	}
 	return o.CreatedAt, true
 }
 
 // HasCreatedAt returns a boolean if a field has been set.
 func (o *SKUAllOf) HasCreatedAt() bool {
-	if o != nil && !isNil(o.CreatedAt) {
+	if o != nil && o.CreatedAt != nil {
 		return true
 	}
 
@@ -73,7 +73,7 @@ func (o *SKUAllOf) SetCreatedAt(v time.Time) {
 
 // GetDescription returns the Description field value if set, zero value otherwise.
 func (o *SKUAllOf) GetDescription() string {
-	if o == nil || isNil(o.Description) {
+	if o == nil || o.Description == nil {
 		var ret string
 		return ret
 	}
@@ -83,15 +83,15 @@ func (o *SKUAllOf) GetDescription() string {
 // GetDescriptionOk returns a tuple with the Description field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SKUAllOf) GetDescriptionOk() (*string, bool) {
-	if o == nil || isNil(o.Description) {
-    return nil, false
+	if o == nil || o.Description == nil {
+		return nil, false
 	}
 	return o.Description, true
 }
 
 // HasDescription returns a boolean if a field has been set.
 func (o *SKUAllOf) HasDescription() bool {
-	if o != nil && !isNil(o.Description) {
+	if o != nil && o.Description != nil {
 		return true
 	}
 
@@ -105,7 +105,7 @@ func (o *SKUAllOf) SetDescription(v string) {
 
 // GetUpdatedAt returns the UpdatedAt field value if set, zero value otherwise.
 func (o *SKUAllOf) GetUpdatedAt() time.Time {
-	if o == nil || isNil(o.UpdatedAt) {
+	if o == nil || o.UpdatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -115,15 +115,15 @@ func (o *SKUAllOf) GetUpdatedAt() time.Time {
 // GetUpdatedAtOk returns a tuple with the UpdatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SKUAllOf) GetUpdatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.UpdatedAt) {
-    return nil, false
+	if o == nil || o.UpdatedAt == nil {
+		return nil, false
 	}
 	return o.UpdatedAt, true
 }
 
 // HasUpdatedAt returns a boolean if a field has been set.
 func (o *SKUAllOf) HasUpdatedAt() bool {
-	if o != nil && !isNil(o.UpdatedAt) {
+	if o != nil && o.UpdatedAt != nil {
 		return true
 	}
 
@@ -137,13 +137,13 @@ func (o *SKUAllOf) SetUpdatedAt(v time.Time) {
 
 func (o SKUAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.CreatedAt) {
+	if o.CreatedAt != nil {
 		toSerialize["created_at"] = o.CreatedAt
 	}
-	if !isNil(o.Description) {
+	if o.Description != nil {
 		toSerialize["description"] = o.Description
 	}
-	if !isNil(o.UpdatedAt) {
+	if o.UpdatedAt != nil {
 		toSerialize["updated_at"] = o.UpdatedAt
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_sku_list.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_sku_list.go
index 785e3e34..cf98b358 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_sku_list.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_sku_list.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -58,8 +58,8 @@ func (o *SkuList) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *SkuList) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -82,8 +82,8 @@ func (o *SkuList) GetPage() int32 {
 // GetPageOk returns a tuple with the Page field value
 // and a boolean to check if the value has been set.
 func (o *SkuList) GetPageOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Page, true
 }
@@ -106,8 +106,8 @@ func (o *SkuList) GetSize() int32 {
 // GetSizeOk returns a tuple with the Size field value
 // and a boolean to check if the value has been set.
 func (o *SkuList) GetSizeOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Size, true
 }
@@ -130,8 +130,8 @@ func (o *SkuList) GetTotal() int32 {
 // GetTotalOk returns a tuple with the Total field value
 // and a boolean to check if the value has been set.
 func (o *SkuList) GetTotalOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Total, true
 }
@@ -153,11 +153,11 @@ func (o *SkuList) GetItems() []SKU {
 
 // GetItemsOk returns a tuple with the Items field value
 // and a boolean to check if the value has been set.
-func (o *SkuList) GetItemsOk() ([]SKU, bool) {
-	if o == nil {
-    return nil, false
+func (o *SkuList) GetItemsOk() (*[]SKU, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Items, true
+	return &o.Items, true
 }
 
 // SetItems sets field value
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_sku_list_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_sku_list_all_of.go
index 8c02c2fa..677f41ea 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_sku_list_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_sku_list_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -16,7 +16,7 @@ import (
 
 // SkuListAllOf struct for SkuListAllOf
 type SkuListAllOf struct {
-	Items []SKU `json:"items,omitempty"`
+	Items *[]SKU `json:"items,omitempty"`
 }
 
 // NewSkuListAllOf instantiates a new SkuListAllOf object
@@ -38,25 +38,25 @@ func NewSkuListAllOfWithDefaults() *SkuListAllOf {
 
 // GetItems returns the Items field value if set, zero value otherwise.
 func (o *SkuListAllOf) GetItems() []SKU {
-	if o == nil || isNil(o.Items) {
+	if o == nil || o.Items == nil {
 		var ret []SKU
 		return ret
 	}
-	return o.Items
+	return *o.Items
 }
 
 // GetItemsOk returns a tuple with the Items field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *SkuListAllOf) GetItemsOk() ([]SKU, bool) {
-	if o == nil || isNil(o.Items) {
-    return nil, false
+func (o *SkuListAllOf) GetItemsOk() (*[]SKU, bool) {
+	if o == nil || o.Items == nil {
+		return nil, false
 	}
 	return o.Items, true
 }
 
 // HasItems returns a boolean if a field has been set.
 func (o *SkuListAllOf) HasItems() bool {
-	if o != nil && !isNil(o.Items) {
+	if o != nil && o.Items != nil {
 		return true
 	}
 
@@ -65,12 +65,12 @@ func (o *SkuListAllOf) HasItems() bool {
 
 // SetItems gets a reference to the given []SKU and assigns it to the Items field.
 func (o *SkuListAllOf) SetItems(v []SKU) {
-	o.Items = v
+	o.Items = &v
 }
 
 func (o SkuListAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Items) {
+	if o.Items != nil {
 		toSerialize["items"] = o.Items
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_sku_rules.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_sku_rules.go
index 68aa90d6..80b41260 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_sku_rules.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_sku_rules.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -43,7 +43,7 @@ func NewSkuRulesWithDefaults() *SkuRules {
 
 // GetHref returns the Href field value if set, zero value otherwise.
 func (o *SkuRules) GetHref() string {
-	if o == nil || isNil(o.Href) {
+	if o == nil || o.Href == nil {
 		var ret string
 		return ret
 	}
@@ -53,15 +53,15 @@ func (o *SkuRules) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SkuRules) GetHrefOk() (*string, bool) {
-	if o == nil || isNil(o.Href) {
-    return nil, false
+	if o == nil || o.Href == nil {
+		return nil, false
 	}
 	return o.Href, true
 }
 
 // HasHref returns a boolean if a field has been set.
 func (o *SkuRules) HasHref() bool {
-	if o != nil && !isNil(o.Href) {
+	if o != nil && o.Href != nil {
 		return true
 	}
 
@@ -75,7 +75,7 @@ func (o *SkuRules) SetHref(v string) {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *SkuRules) GetId() string {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret string
 		return ret
 	}
@@ -85,15 +85,15 @@ func (o *SkuRules) GetId() string {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SkuRules) GetIdOk() (*string, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *SkuRules) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -107,7 +107,7 @@ func (o *SkuRules) SetId(v string) {
 
 // GetKind returns the Kind field value if set, zero value otherwise.
 func (o *SkuRules) GetKind() string {
-	if o == nil || isNil(o.Kind) {
+	if o == nil || o.Kind == nil {
 		var ret string
 		return ret
 	}
@@ -117,15 +117,15 @@ func (o *SkuRules) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SkuRules) GetKindOk() (*string, bool) {
-	if o == nil || isNil(o.Kind) {
-    return nil, false
+	if o == nil || o.Kind == nil {
+		return nil, false
 	}
 	return o.Kind, true
 }
 
 // HasKind returns a boolean if a field has been set.
 func (o *SkuRules) HasKind() bool {
-	if o != nil && !isNil(o.Kind) {
+	if o != nil && o.Kind != nil {
 		return true
 	}
 
@@ -139,7 +139,7 @@ func (o *SkuRules) SetKind(v string) {
 
 // GetAllowed returns the Allowed field value if set, zero value otherwise.
 func (o *SkuRules) GetAllowed() int32 {
-	if o == nil || isNil(o.Allowed) {
+	if o == nil || o.Allowed == nil {
 		var ret int32
 		return ret
 	}
@@ -149,15 +149,15 @@ func (o *SkuRules) GetAllowed() int32 {
 // GetAllowedOk returns a tuple with the Allowed field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SkuRules) GetAllowedOk() (*int32, bool) {
-	if o == nil || isNil(o.Allowed) {
-    return nil, false
+	if o == nil || o.Allowed == nil {
+		return nil, false
 	}
 	return o.Allowed, true
 }
 
 // HasAllowed returns a boolean if a field has been set.
 func (o *SkuRules) HasAllowed() bool {
-	if o != nil && !isNil(o.Allowed) {
+	if o != nil && o.Allowed != nil {
 		return true
 	}
 
@@ -171,7 +171,7 @@ func (o *SkuRules) SetAllowed(v int32) {
 
 // GetQuotaId returns the QuotaId field value if set, zero value otherwise.
 func (o *SkuRules) GetQuotaId() string {
-	if o == nil || isNil(o.QuotaId) {
+	if o == nil || o.QuotaId == nil {
 		var ret string
 		return ret
 	}
@@ -181,15 +181,15 @@ func (o *SkuRules) GetQuotaId() string {
 // GetQuotaIdOk returns a tuple with the QuotaId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SkuRules) GetQuotaIdOk() (*string, bool) {
-	if o == nil || isNil(o.QuotaId) {
-    return nil, false
+	if o == nil || o.QuotaId == nil {
+		return nil, false
 	}
 	return o.QuotaId, true
 }
 
 // HasQuotaId returns a boolean if a field has been set.
 func (o *SkuRules) HasQuotaId() bool {
-	if o != nil && !isNil(o.QuotaId) {
+	if o != nil && o.QuotaId != nil {
 		return true
 	}
 
@@ -203,7 +203,7 @@ func (o *SkuRules) SetQuotaId(v string) {
 
 // GetSku returns the Sku field value if set, zero value otherwise.
 func (o *SkuRules) GetSku() string {
-	if o == nil || isNil(o.Sku) {
+	if o == nil || o.Sku == nil {
 		var ret string
 		return ret
 	}
@@ -213,15 +213,15 @@ func (o *SkuRules) GetSku() string {
 // GetSkuOk returns a tuple with the Sku field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SkuRules) GetSkuOk() (*string, bool) {
-	if o == nil || isNil(o.Sku) {
-    return nil, false
+	if o == nil || o.Sku == nil {
+		return nil, false
 	}
 	return o.Sku, true
 }
 
 // HasSku returns a boolean if a field has been set.
 func (o *SkuRules) HasSku() bool {
-	if o != nil && !isNil(o.Sku) {
+	if o != nil && o.Sku != nil {
 		return true
 	}
 
@@ -235,22 +235,22 @@ func (o *SkuRules) SetSku(v string) {
 
 func (o SkuRules) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Href) {
+	if o.Href != nil {
 		toSerialize["href"] = o.Href
 	}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.Kind) {
+	if o.Kind != nil {
 		toSerialize["kind"] = o.Kind
 	}
-	if !isNil(o.Allowed) {
+	if o.Allowed != nil {
 		toSerialize["allowed"] = o.Allowed
 	}
-	if !isNil(o.QuotaId) {
+	if o.QuotaId != nil {
 		toSerialize["quota_id"] = o.QuotaId
 	}
-	if !isNil(o.Sku) {
+	if o.Sku != nil {
 		toSerialize["sku"] = o.Sku
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_sku_rules_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_sku_rules_all_of.go
index c55dcffa..6e418e38 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_sku_rules_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_sku_rules_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -40,7 +40,7 @@ func NewSkuRulesAllOfWithDefaults() *SkuRulesAllOf {
 
 // GetAllowed returns the Allowed field value if set, zero value otherwise.
 func (o *SkuRulesAllOf) GetAllowed() int32 {
-	if o == nil || isNil(o.Allowed) {
+	if o == nil || o.Allowed == nil {
 		var ret int32
 		return ret
 	}
@@ -50,15 +50,15 @@ func (o *SkuRulesAllOf) GetAllowed() int32 {
 // GetAllowedOk returns a tuple with the Allowed field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SkuRulesAllOf) GetAllowedOk() (*int32, bool) {
-	if o == nil || isNil(o.Allowed) {
-    return nil, false
+	if o == nil || o.Allowed == nil {
+		return nil, false
 	}
 	return o.Allowed, true
 }
 
 // HasAllowed returns a boolean if a field has been set.
 func (o *SkuRulesAllOf) HasAllowed() bool {
-	if o != nil && !isNil(o.Allowed) {
+	if o != nil && o.Allowed != nil {
 		return true
 	}
 
@@ -72,7 +72,7 @@ func (o *SkuRulesAllOf) SetAllowed(v int32) {
 
 // GetQuotaId returns the QuotaId field value if set, zero value otherwise.
 func (o *SkuRulesAllOf) GetQuotaId() string {
-	if o == nil || isNil(o.QuotaId) {
+	if o == nil || o.QuotaId == nil {
 		var ret string
 		return ret
 	}
@@ -82,15 +82,15 @@ func (o *SkuRulesAllOf) GetQuotaId() string {
 // GetQuotaIdOk returns a tuple with the QuotaId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SkuRulesAllOf) GetQuotaIdOk() (*string, bool) {
-	if o == nil || isNil(o.QuotaId) {
-    return nil, false
+	if o == nil || o.QuotaId == nil {
+		return nil, false
 	}
 	return o.QuotaId, true
 }
 
 // HasQuotaId returns a boolean if a field has been set.
 func (o *SkuRulesAllOf) HasQuotaId() bool {
-	if o != nil && !isNil(o.QuotaId) {
+	if o != nil && o.QuotaId != nil {
 		return true
 	}
 
@@ -104,7 +104,7 @@ func (o *SkuRulesAllOf) SetQuotaId(v string) {
 
 // GetSku returns the Sku field value if set, zero value otherwise.
 func (o *SkuRulesAllOf) GetSku() string {
-	if o == nil || isNil(o.Sku) {
+	if o == nil || o.Sku == nil {
 		var ret string
 		return ret
 	}
@@ -114,15 +114,15 @@ func (o *SkuRulesAllOf) GetSku() string {
 // GetSkuOk returns a tuple with the Sku field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SkuRulesAllOf) GetSkuOk() (*string, bool) {
-	if o == nil || isNil(o.Sku) {
-    return nil, false
+	if o == nil || o.Sku == nil {
+		return nil, false
 	}
 	return o.Sku, true
 }
 
 // HasSku returns a boolean if a field has been set.
 func (o *SkuRulesAllOf) HasSku() bool {
-	if o != nil && !isNil(o.Sku) {
+	if o != nil && o.Sku != nil {
 		return true
 	}
 
@@ -136,13 +136,13 @@ func (o *SkuRulesAllOf) SetSku(v string) {
 
 func (o SkuRulesAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Allowed) {
+	if o.Allowed != nil {
 		toSerialize["allowed"] = o.Allowed
 	}
-	if !isNil(o.QuotaId) {
+	if o.QuotaId != nil {
 		toSerialize["quota_id"] = o.QuotaId
 	}
-	if !isNil(o.Sku) {
+	if o.Sku != nil {
 		toSerialize["sku"] = o.Sku
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_sku_rules_list.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_sku_rules_list.go
index 3fa92a31..3062900c 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_sku_rules_list.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_sku_rules_list.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -58,8 +58,8 @@ func (o *SkuRulesList) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *SkuRulesList) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -82,8 +82,8 @@ func (o *SkuRulesList) GetPage() int32 {
 // GetPageOk returns a tuple with the Page field value
 // and a boolean to check if the value has been set.
 func (o *SkuRulesList) GetPageOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Page, true
 }
@@ -106,8 +106,8 @@ func (o *SkuRulesList) GetSize() int32 {
 // GetSizeOk returns a tuple with the Size field value
 // and a boolean to check if the value has been set.
 func (o *SkuRulesList) GetSizeOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Size, true
 }
@@ -130,8 +130,8 @@ func (o *SkuRulesList) GetTotal() int32 {
 // GetTotalOk returns a tuple with the Total field value
 // and a boolean to check if the value has been set.
 func (o *SkuRulesList) GetTotalOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Total, true
 }
@@ -153,11 +153,11 @@ func (o *SkuRulesList) GetItems() []SkuRules {
 
 // GetItemsOk returns a tuple with the Items field value
 // and a boolean to check if the value has been set.
-func (o *SkuRulesList) GetItemsOk() ([]SkuRules, bool) {
-	if o == nil {
-    return nil, false
+func (o *SkuRulesList) GetItemsOk() (*[]SkuRules, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Items, true
+	return &o.Items, true
 }
 
 // SetItems sets field value
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_sku_rules_list_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_sku_rules_list_all_of.go
index 7e093bf4..4db820b1 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_sku_rules_list_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_sku_rules_list_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -16,7 +16,7 @@ import (
 
 // SkuRulesListAllOf struct for SkuRulesListAllOf
 type SkuRulesListAllOf struct {
-	Items []SkuRules `json:"items,omitempty"`
+	Items *[]SkuRules `json:"items,omitempty"`
 }
 
 // NewSkuRulesListAllOf instantiates a new SkuRulesListAllOf object
@@ -38,25 +38,25 @@ func NewSkuRulesListAllOfWithDefaults() *SkuRulesListAllOf {
 
 // GetItems returns the Items field value if set, zero value otherwise.
 func (o *SkuRulesListAllOf) GetItems() []SkuRules {
-	if o == nil || isNil(o.Items) {
+	if o == nil || o.Items == nil {
 		var ret []SkuRules
 		return ret
 	}
-	return o.Items
+	return *o.Items
 }
 
 // GetItemsOk returns a tuple with the Items field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *SkuRulesListAllOf) GetItemsOk() ([]SkuRules, bool) {
-	if o == nil || isNil(o.Items) {
-    return nil, false
+func (o *SkuRulesListAllOf) GetItemsOk() (*[]SkuRules, bool) {
+	if o == nil || o.Items == nil {
+		return nil, false
 	}
 	return o.Items, true
 }
 
 // HasItems returns a boolean if a field has been set.
 func (o *SkuRulesListAllOf) HasItems() bool {
-	if o != nil && !isNil(o.Items) {
+	if o != nil && o.Items != nil {
 		return true
 	}
 
@@ -65,12 +65,12 @@ func (o *SkuRulesListAllOf) HasItems() bool {
 
 // SetItems gets a reference to the given []SkuRules and assigns it to the Items field.
 func (o *SkuRulesListAllOf) SetItems(v []SkuRules) {
-	o.Items = v
+	o.Items = &v
 }
 
 func (o SkuRulesListAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Items) {
+	if o.Items != nil {
 		toSerialize["items"] = o.Items
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription.go
index bcf7bf4a..42910874 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -12,6 +12,7 @@ package accountmgmtclient
 
 import (
 	"encoding/json"
+	"time"
 )
 
 // Subscription struct for Subscription
@@ -53,14 +54,14 @@ type Subscription struct {
 	// If the subscription is a trial, date the trial ends
 	TrialEndDate *time.Time `json:"trial_end_date,omitempty"`
 	Usage *string `json:"usage,omitempty"`
-	Capabilities []Capability `json:"capabilities,omitempty"`
+	Capabilities *[]Capability `json:"capabilities,omitempty"`
 	CreatedAt *time.Time `json:"created_at,omitempty"`
 	Creator *AccountReference `json:"creator,omitempty"`
 	// Calulated as the subscription created date + 60 days
 	EvalExpirationDate *time.Time `json:"eval_expiration_date,omitempty"`
-	Labels []Label `json:"labels,omitempty"`
-	Metrics []OneMetric `json:"metrics,omitempty"`
-	NotificationContacts []Account `json:"notification_contacts,omitempty"`
+	Labels *[]Label `json:"labels,omitempty"`
+	Metrics *[]OneMetric `json:"metrics,omitempty"`
+	NotificationContacts *[]Account `json:"notification_contacts,omitempty"`
 	Plan *Plan `json:"plan,omitempty"`
 	UpdatedAt *time.Time `json:"updated_at,omitempty"`
 }
@@ -85,7 +86,7 @@ func NewSubscriptionWithDefaults() *Subscription {
 
 // GetHref returns the Href field value if set, zero value otherwise.
 func (o *Subscription) GetHref() string {
-	if o == nil || isNil(o.Href) {
+	if o == nil || o.Href == nil {
 		var ret string
 		return ret
 	}
@@ -95,15 +96,15 @@ func (o *Subscription) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Subscription) GetHrefOk() (*string, bool) {
-	if o == nil || isNil(o.Href) {
-    return nil, false
+	if o == nil || o.Href == nil {
+		return nil, false
 	}
 	return o.Href, true
 }
 
 // HasHref returns a boolean if a field has been set.
 func (o *Subscription) HasHref() bool {
-	if o != nil && !isNil(o.Href) {
+	if o != nil && o.Href != nil {
 		return true
 	}
 
@@ -117,7 +118,7 @@ func (o *Subscription) SetHref(v string) {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *Subscription) GetId() string {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret string
 		return ret
 	}
@@ -127,15 +128,15 @@ func (o *Subscription) GetId() string {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Subscription) GetIdOk() (*string, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *Subscription) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -149,7 +150,7 @@ func (o *Subscription) SetId(v string) {
 
 // GetKind returns the Kind field value if set, zero value otherwise.
 func (o *Subscription) GetKind() string {
-	if o == nil || isNil(o.Kind) {
+	if o == nil || o.Kind == nil {
 		var ret string
 		return ret
 	}
@@ -159,15 +160,15 @@ func (o *Subscription) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Subscription) GetKindOk() (*string, bool) {
-	if o == nil || isNil(o.Kind) {
-    return nil, false
+	if o == nil || o.Kind == nil {
+		return nil, false
 	}
 	return o.Kind, true
 }
 
 // HasKind returns a boolean if a field has been set.
 func (o *Subscription) HasKind() bool {
-	if o != nil && !isNil(o.Kind) {
+	if o != nil && o.Kind != nil {
 		return true
 	}
 
@@ -181,7 +182,7 @@ func (o *Subscription) SetKind(v string) {
 
 // GetBillingExpirationDate returns the BillingExpirationDate field value if set, zero value otherwise.
 func (o *Subscription) GetBillingExpirationDate() time.Time {
-	if o == nil || isNil(o.BillingExpirationDate) {
+	if o == nil || o.BillingExpirationDate == nil {
 		var ret time.Time
 		return ret
 	}
@@ -191,15 +192,15 @@ func (o *Subscription) GetBillingExpirationDate() time.Time {
 // GetBillingExpirationDateOk returns a tuple with the BillingExpirationDate field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Subscription) GetBillingExpirationDateOk() (*time.Time, bool) {
-	if o == nil || isNil(o.BillingExpirationDate) {
-    return nil, false
+	if o == nil || o.BillingExpirationDate == nil {
+		return nil, false
 	}
 	return o.BillingExpirationDate, true
 }
 
 // HasBillingExpirationDate returns a boolean if a field has been set.
 func (o *Subscription) HasBillingExpirationDate() bool {
-	if o != nil && !isNil(o.BillingExpirationDate) {
+	if o != nil && o.BillingExpirationDate != nil {
 		return true
 	}
 
@@ -213,7 +214,7 @@ func (o *Subscription) SetBillingExpirationDate(v time.Time) {
 
 // GetBillingMarketplaceAccount returns the BillingMarketplaceAccount field value if set, zero value otherwise.
 func (o *Subscription) GetBillingMarketplaceAccount() string {
-	if o == nil || isNil(o.BillingMarketplaceAccount) {
+	if o == nil || o.BillingMarketplaceAccount == nil {
 		var ret string
 		return ret
 	}
@@ -223,15 +224,15 @@ func (o *Subscription) GetBillingMarketplaceAccount() string {
 // GetBillingMarketplaceAccountOk returns a tuple with the BillingMarketplaceAccount field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Subscription) GetBillingMarketplaceAccountOk() (*string, bool) {
-	if o == nil || isNil(o.BillingMarketplaceAccount) {
-    return nil, false
+	if o == nil || o.BillingMarketplaceAccount == nil {
+		return nil, false
 	}
 	return o.BillingMarketplaceAccount, true
 }
 
 // HasBillingMarketplaceAccount returns a boolean if a field has been set.
 func (o *Subscription) HasBillingMarketplaceAccount() bool {
-	if o != nil && !isNil(o.BillingMarketplaceAccount) {
+	if o != nil && o.BillingMarketplaceAccount != nil {
 		return true
 	}
 
@@ -245,7 +246,7 @@ func (o *Subscription) SetBillingMarketplaceAccount(v string) {
 
 // GetCloudAccountId returns the CloudAccountId field value if set, zero value otherwise.
 func (o *Subscription) GetCloudAccountId() string {
-	if o == nil || isNil(o.CloudAccountId) {
+	if o == nil || o.CloudAccountId == nil {
 		var ret string
 		return ret
 	}
@@ -255,15 +256,15 @@ func (o *Subscription) GetCloudAccountId() string {
 // GetCloudAccountIdOk returns a tuple with the CloudAccountId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Subscription) GetCloudAccountIdOk() (*string, bool) {
-	if o == nil || isNil(o.CloudAccountId) {
-    return nil, false
+	if o == nil || o.CloudAccountId == nil {
+		return nil, false
 	}
 	return o.CloudAccountId, true
 }
 
 // HasCloudAccountId returns a boolean if a field has been set.
 func (o *Subscription) HasCloudAccountId() bool {
-	if o != nil && !isNil(o.CloudAccountId) {
+	if o != nil && o.CloudAccountId != nil {
 		return true
 	}
 
@@ -277,7 +278,7 @@ func (o *Subscription) SetCloudAccountId(v string) {
 
 // GetCloudProviderId returns the CloudProviderId field value if set, zero value otherwise.
 func (o *Subscription) GetCloudProviderId() string {
-	if o == nil || isNil(o.CloudProviderId) {
+	if o == nil || o.CloudProviderId == nil {
 		var ret string
 		return ret
 	}
@@ -287,15 +288,15 @@ func (o *Subscription) GetCloudProviderId() string {
 // GetCloudProviderIdOk returns a tuple with the CloudProviderId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Subscription) GetCloudProviderIdOk() (*string, bool) {
-	if o == nil || isNil(o.CloudProviderId) {
-    return nil, false
+	if o == nil || o.CloudProviderId == nil {
+		return nil, false
 	}
 	return o.CloudProviderId, true
 }
 
 // HasCloudProviderId returns a boolean if a field has been set.
 func (o *Subscription) HasCloudProviderId() bool {
-	if o != nil && !isNil(o.CloudProviderId) {
+	if o != nil && o.CloudProviderId != nil {
 		return true
 	}
 
@@ -309,7 +310,7 @@ func (o *Subscription) SetCloudProviderId(v string) {
 
 // GetClusterBillingModel returns the ClusterBillingModel field value if set, zero value otherwise.
 func (o *Subscription) GetClusterBillingModel() string {
-	if o == nil || isNil(o.ClusterBillingModel) {
+	if o == nil || o.ClusterBillingModel == nil {
 		var ret string
 		return ret
 	}
@@ -319,15 +320,15 @@ func (o *Subscription) GetClusterBillingModel() string {
 // GetClusterBillingModelOk returns a tuple with the ClusterBillingModel field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Subscription) GetClusterBillingModelOk() (*string, bool) {
-	if o == nil || isNil(o.ClusterBillingModel) {
-    return nil, false
+	if o == nil || o.ClusterBillingModel == nil {
+		return nil, false
 	}
 	return o.ClusterBillingModel, true
 }
 
 // HasClusterBillingModel returns a boolean if a field has been set.
 func (o *Subscription) HasClusterBillingModel() bool {
-	if o != nil && !isNil(o.ClusterBillingModel) {
+	if o != nil && o.ClusterBillingModel != nil {
 		return true
 	}
 
@@ -341,7 +342,7 @@ func (o *Subscription) SetClusterBillingModel(v string) {
 
 // GetClusterId returns the ClusterId field value if set, zero value otherwise.
 func (o *Subscription) GetClusterId() string {
-	if o == nil || isNil(o.ClusterId) {
+	if o == nil || o.ClusterId == nil {
 		var ret string
 		return ret
 	}
@@ -351,15 +352,15 @@ func (o *Subscription) GetClusterId() string {
 // GetClusterIdOk returns a tuple with the ClusterId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Subscription) GetClusterIdOk() (*string, bool) {
-	if o == nil || isNil(o.ClusterId) {
-    return nil, false
+	if o == nil || o.ClusterId == nil {
+		return nil, false
 	}
 	return o.ClusterId, true
 }
 
 // HasClusterId returns a boolean if a field has been set.
 func (o *Subscription) HasClusterId() bool {
-	if o != nil && !isNil(o.ClusterId) {
+	if o != nil && o.ClusterId != nil {
 		return true
 	}
 
@@ -373,7 +374,7 @@ func (o *Subscription) SetClusterId(v string) {
 
 // GetConsoleUrl returns the ConsoleUrl field value if set, zero value otherwise.
 func (o *Subscription) GetConsoleUrl() string {
-	if o == nil || isNil(o.ConsoleUrl) {
+	if o == nil || o.ConsoleUrl == nil {
 		var ret string
 		return ret
 	}
@@ -383,15 +384,15 @@ func (o *Subscription) GetConsoleUrl() string {
 // GetConsoleUrlOk returns a tuple with the ConsoleUrl field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Subscription) GetConsoleUrlOk() (*string, bool) {
-	if o == nil || isNil(o.ConsoleUrl) {
-    return nil, false
+	if o == nil || o.ConsoleUrl == nil {
+		return nil, false
 	}
 	return o.ConsoleUrl, true
 }
 
 // HasConsoleUrl returns a boolean if a field has been set.
 func (o *Subscription) HasConsoleUrl() bool {
-	if o != nil && !isNil(o.ConsoleUrl) {
+	if o != nil && o.ConsoleUrl != nil {
 		return true
 	}
 
@@ -405,7 +406,7 @@ func (o *Subscription) SetConsoleUrl(v string) {
 
 // GetConsumerUuid returns the ConsumerUuid field value if set, zero value otherwise.
 func (o *Subscription) GetConsumerUuid() string {
-	if o == nil || isNil(o.ConsumerUuid) {
+	if o == nil || o.ConsumerUuid == nil {
 		var ret string
 		return ret
 	}
@@ -415,15 +416,15 @@ func (o *Subscription) GetConsumerUuid() string {
 // GetConsumerUuidOk returns a tuple with the ConsumerUuid field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Subscription) GetConsumerUuidOk() (*string, bool) {
-	if o == nil || isNil(o.ConsumerUuid) {
-    return nil, false
+	if o == nil || o.ConsumerUuid == nil {
+		return nil, false
 	}
 	return o.ConsumerUuid, true
 }
 
 // HasConsumerUuid returns a boolean if a field has been set.
 func (o *Subscription) HasConsumerUuid() bool {
-	if o != nil && !isNil(o.ConsumerUuid) {
+	if o != nil && o.ConsumerUuid != nil {
 		return true
 	}
 
@@ -437,7 +438,7 @@ func (o *Subscription) SetConsumerUuid(v string) {
 
 // GetCpuTotal returns the CpuTotal field value if set, zero value otherwise.
 func (o *Subscription) GetCpuTotal() int32 {
-	if o == nil || isNil(o.CpuTotal) {
+	if o == nil || o.CpuTotal == nil {
 		var ret int32
 		return ret
 	}
@@ -447,15 +448,15 @@ func (o *Subscription) GetCpuTotal() int32 {
 // GetCpuTotalOk returns a tuple with the CpuTotal field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Subscription) GetCpuTotalOk() (*int32, bool) {
-	if o == nil || isNil(o.CpuTotal) {
-    return nil, false
+	if o == nil || o.CpuTotal == nil {
+		return nil, false
 	}
 	return o.CpuTotal, true
 }
 
 // HasCpuTotal returns a boolean if a field has been set.
 func (o *Subscription) HasCpuTotal() bool {
-	if o != nil && !isNil(o.CpuTotal) {
+	if o != nil && o.CpuTotal != nil {
 		return true
 	}
 
@@ -469,7 +470,7 @@ func (o *Subscription) SetCpuTotal(v int32) {
 
 // GetCreatorId returns the CreatorId field value if set, zero value otherwise.
 func (o *Subscription) GetCreatorId() string {
-	if o == nil || isNil(o.CreatorId) {
+	if o == nil || o.CreatorId == nil {
 		var ret string
 		return ret
 	}
@@ -479,15 +480,15 @@ func (o *Subscription) GetCreatorId() string {
 // GetCreatorIdOk returns a tuple with the CreatorId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Subscription) GetCreatorIdOk() (*string, bool) {
-	if o == nil || isNil(o.CreatorId) {
-    return nil, false
+	if o == nil || o.CreatorId == nil {
+		return nil, false
 	}
 	return o.CreatorId, true
 }
 
 // HasCreatorId returns a boolean if a field has been set.
 func (o *Subscription) HasCreatorId() bool {
-	if o != nil && !isNil(o.CreatorId) {
+	if o != nil && o.CreatorId != nil {
 		return true
 	}
 
@@ -501,7 +502,7 @@ func (o *Subscription) SetCreatorId(v string) {
 
 // GetDisplayName returns the DisplayName field value if set, zero value otherwise.
 func (o *Subscription) GetDisplayName() string {
-	if o == nil || isNil(o.DisplayName) {
+	if o == nil || o.DisplayName == nil {
 		var ret string
 		return ret
 	}
@@ -511,15 +512,15 @@ func (o *Subscription) GetDisplayName() string {
 // GetDisplayNameOk returns a tuple with the DisplayName field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Subscription) GetDisplayNameOk() (*string, bool) {
-	if o == nil || isNil(o.DisplayName) {
-    return nil, false
+	if o == nil || o.DisplayName == nil {
+		return nil, false
 	}
 	return o.DisplayName, true
 }
 
 // HasDisplayName returns a boolean if a field has been set.
 func (o *Subscription) HasDisplayName() bool {
-	if o != nil && !isNil(o.DisplayName) {
+	if o != nil && o.DisplayName != nil {
 		return true
 	}
 
@@ -533,7 +534,7 @@ func (o *Subscription) SetDisplayName(v string) {
 
 // GetExternalClusterId returns the ExternalClusterId field value if set, zero value otherwise.
 func (o *Subscription) GetExternalClusterId() string {
-	if o == nil || isNil(o.ExternalClusterId) {
+	if o == nil || o.ExternalClusterId == nil {
 		var ret string
 		return ret
 	}
@@ -543,15 +544,15 @@ func (o *Subscription) GetExternalClusterId() string {
 // GetExternalClusterIdOk returns a tuple with the ExternalClusterId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Subscription) GetExternalClusterIdOk() (*string, bool) {
-	if o == nil || isNil(o.ExternalClusterId) {
-    return nil, false
+	if o == nil || o.ExternalClusterId == nil {
+		return nil, false
 	}
 	return o.ExternalClusterId, true
 }
 
 // HasExternalClusterId returns a boolean if a field has been set.
 func (o *Subscription) HasExternalClusterId() bool {
-	if o != nil && !isNil(o.ExternalClusterId) {
+	if o != nil && o.ExternalClusterId != nil {
 		return true
 	}
 
@@ -565,7 +566,7 @@ func (o *Subscription) SetExternalClusterId(v string) {
 
 // GetLastReconcileDate returns the LastReconcileDate field value if set, zero value otherwise.
 func (o *Subscription) GetLastReconcileDate() time.Time {
-	if o == nil || isNil(o.LastReconcileDate) {
+	if o == nil || o.LastReconcileDate == nil {
 		var ret time.Time
 		return ret
 	}
@@ -575,15 +576,15 @@ func (o *Subscription) GetLastReconcileDate() time.Time {
 // GetLastReconcileDateOk returns a tuple with the LastReconcileDate field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Subscription) GetLastReconcileDateOk() (*time.Time, bool) {
-	if o == nil || isNil(o.LastReconcileDate) {
-    return nil, false
+	if o == nil || o.LastReconcileDate == nil {
+		return nil, false
 	}
 	return o.LastReconcileDate, true
 }
 
 // HasLastReconcileDate returns a boolean if a field has been set.
 func (o *Subscription) HasLastReconcileDate() bool {
-	if o != nil && !isNil(o.LastReconcileDate) {
+	if o != nil && o.LastReconcileDate != nil {
 		return true
 	}
 
@@ -597,7 +598,7 @@ func (o *Subscription) SetLastReconcileDate(v time.Time) {
 
 // GetLastReleasedAt returns the LastReleasedAt field value if set, zero value otherwise.
 func (o *Subscription) GetLastReleasedAt() time.Time {
-	if o == nil || isNil(o.LastReleasedAt) {
+	if o == nil || o.LastReleasedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -607,15 +608,15 @@ func (o *Subscription) GetLastReleasedAt() time.Time {
 // GetLastReleasedAtOk returns a tuple with the LastReleasedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Subscription) GetLastReleasedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.LastReleasedAt) {
-    return nil, false
+	if o == nil || o.LastReleasedAt == nil {
+		return nil, false
 	}
 	return o.LastReleasedAt, true
 }
 
 // HasLastReleasedAt returns a boolean if a field has been set.
 func (o *Subscription) HasLastReleasedAt() bool {
-	if o != nil && !isNil(o.LastReleasedAt) {
+	if o != nil && o.LastReleasedAt != nil {
 		return true
 	}
 
@@ -629,7 +630,7 @@ func (o *Subscription) SetLastReleasedAt(v time.Time) {
 
 // GetLastTelemetryDate returns the LastTelemetryDate field value if set, zero value otherwise.
 func (o *Subscription) GetLastTelemetryDate() time.Time {
-	if o == nil || isNil(o.LastTelemetryDate) {
+	if o == nil || o.LastTelemetryDate == nil {
 		var ret time.Time
 		return ret
 	}
@@ -639,15 +640,15 @@ func (o *Subscription) GetLastTelemetryDate() time.Time {
 // GetLastTelemetryDateOk returns a tuple with the LastTelemetryDate field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Subscription) GetLastTelemetryDateOk() (*time.Time, bool) {
-	if o == nil || isNil(o.LastTelemetryDate) {
-    return nil, false
+	if o == nil || o.LastTelemetryDate == nil {
+		return nil, false
 	}
 	return o.LastTelemetryDate, true
 }
 
 // HasLastTelemetryDate returns a boolean if a field has been set.
 func (o *Subscription) HasLastTelemetryDate() bool {
-	if o != nil && !isNil(o.LastTelemetryDate) {
+	if o != nil && o.LastTelemetryDate != nil {
 		return true
 	}
 
@@ -672,8 +673,8 @@ func (o *Subscription) GetManaged() bool {
 // GetManagedOk returns a tuple with the Managed field value
 // and a boolean to check if the value has been set.
 func (o *Subscription) GetManagedOk() (*bool, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Managed, true
 }
@@ -685,7 +686,7 @@ func (o *Subscription) SetManaged(v bool) {
 
 // GetOrganizationId returns the OrganizationId field value if set, zero value otherwise.
 func (o *Subscription) GetOrganizationId() string {
-	if o == nil || isNil(o.OrganizationId) {
+	if o == nil || o.OrganizationId == nil {
 		var ret string
 		return ret
 	}
@@ -695,15 +696,15 @@ func (o *Subscription) GetOrganizationId() string {
 // GetOrganizationIdOk returns a tuple with the OrganizationId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Subscription) GetOrganizationIdOk() (*string, bool) {
-	if o == nil || isNil(o.OrganizationId) {
-    return nil, false
+	if o == nil || o.OrganizationId == nil {
+		return nil, false
 	}
 	return o.OrganizationId, true
 }
 
 // HasOrganizationId returns a boolean if a field has been set.
 func (o *Subscription) HasOrganizationId() bool {
-	if o != nil && !isNil(o.OrganizationId) {
+	if o != nil && o.OrganizationId != nil {
 		return true
 	}
 
@@ -717,7 +718,7 @@ func (o *Subscription) SetOrganizationId(v string) {
 
 // GetPlanId returns the PlanId field value if set, zero value otherwise.
 func (o *Subscription) GetPlanId() string {
-	if o == nil || isNil(o.PlanId) {
+	if o == nil || o.PlanId == nil {
 		var ret string
 		return ret
 	}
@@ -727,15 +728,15 @@ func (o *Subscription) GetPlanId() string {
 // GetPlanIdOk returns a tuple with the PlanId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Subscription) GetPlanIdOk() (*string, bool) {
-	if o == nil || isNil(o.PlanId) {
-    return nil, false
+	if o == nil || o.PlanId == nil {
+		return nil, false
 	}
 	return o.PlanId, true
 }
 
 // HasPlanId returns a boolean if a field has been set.
 func (o *Subscription) HasPlanId() bool {
-	if o != nil && !isNil(o.PlanId) {
+	if o != nil && o.PlanId != nil {
 		return true
 	}
 
@@ -749,7 +750,7 @@ func (o *Subscription) SetPlanId(v string) {
 
 // GetProductBundle returns the ProductBundle field value if set, zero value otherwise.
 func (o *Subscription) GetProductBundle() string {
-	if o == nil || isNil(o.ProductBundle) {
+	if o == nil || o.ProductBundle == nil {
 		var ret string
 		return ret
 	}
@@ -759,15 +760,15 @@ func (o *Subscription) GetProductBundle() string {
 // GetProductBundleOk returns a tuple with the ProductBundle field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Subscription) GetProductBundleOk() (*string, bool) {
-	if o == nil || isNil(o.ProductBundle) {
-    return nil, false
+	if o == nil || o.ProductBundle == nil {
+		return nil, false
 	}
 	return o.ProductBundle, true
 }
 
 // HasProductBundle returns a boolean if a field has been set.
 func (o *Subscription) HasProductBundle() bool {
-	if o != nil && !isNil(o.ProductBundle) {
+	if o != nil && o.ProductBundle != nil {
 		return true
 	}
 
@@ -781,7 +782,7 @@ func (o *Subscription) SetProductBundle(v string) {
 
 // GetProvenance returns the Provenance field value if set, zero value otherwise.
 func (o *Subscription) GetProvenance() string {
-	if o == nil || isNil(o.Provenance) {
+	if o == nil || o.Provenance == nil {
 		var ret string
 		return ret
 	}
@@ -791,15 +792,15 @@ func (o *Subscription) GetProvenance() string {
 // GetProvenanceOk returns a tuple with the Provenance field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Subscription) GetProvenanceOk() (*string, bool) {
-	if o == nil || isNil(o.Provenance) {
-    return nil, false
+	if o == nil || o.Provenance == nil {
+		return nil, false
 	}
 	return o.Provenance, true
 }
 
 // HasProvenance returns a boolean if a field has been set.
 func (o *Subscription) HasProvenance() bool {
-	if o != nil && !isNil(o.Provenance) {
+	if o != nil && o.Provenance != nil {
 		return true
 	}
 
@@ -813,7 +814,7 @@ func (o *Subscription) SetProvenance(v string) {
 
 // GetRegionId returns the RegionId field value if set, zero value otherwise.
 func (o *Subscription) GetRegionId() string {
-	if o == nil || isNil(o.RegionId) {
+	if o == nil || o.RegionId == nil {
 		var ret string
 		return ret
 	}
@@ -823,15 +824,15 @@ func (o *Subscription) GetRegionId() string {
 // GetRegionIdOk returns a tuple with the RegionId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Subscription) GetRegionIdOk() (*string, bool) {
-	if o == nil || isNil(o.RegionId) {
-    return nil, false
+	if o == nil || o.RegionId == nil {
+		return nil, false
 	}
 	return o.RegionId, true
 }
 
 // HasRegionId returns a boolean if a field has been set.
 func (o *Subscription) HasRegionId() bool {
-	if o != nil && !isNil(o.RegionId) {
+	if o != nil && o.RegionId != nil {
 		return true
 	}
 
@@ -845,7 +846,7 @@ func (o *Subscription) SetRegionId(v string) {
 
 // GetReleased returns the Released field value if set, zero value otherwise.
 func (o *Subscription) GetReleased() bool {
-	if o == nil || isNil(o.Released) {
+	if o == nil || o.Released == nil {
 		var ret bool
 		return ret
 	}
@@ -855,15 +856,15 @@ func (o *Subscription) GetReleased() bool {
 // GetReleasedOk returns a tuple with the Released field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Subscription) GetReleasedOk() (*bool, bool) {
-	if o == nil || isNil(o.Released) {
-    return nil, false
+	if o == nil || o.Released == nil {
+		return nil, false
 	}
 	return o.Released, true
 }
 
 // HasReleased returns a boolean if a field has been set.
 func (o *Subscription) HasReleased() bool {
-	if o != nil && !isNil(o.Released) {
+	if o != nil && o.Released != nil {
 		return true
 	}
 
@@ -877,7 +878,7 @@ func (o *Subscription) SetReleased(v bool) {
 
 // GetServiceLevel returns the ServiceLevel field value if set, zero value otherwise.
 func (o *Subscription) GetServiceLevel() string {
-	if o == nil || isNil(o.ServiceLevel) {
+	if o == nil || o.ServiceLevel == nil {
 		var ret string
 		return ret
 	}
@@ -887,15 +888,15 @@ func (o *Subscription) GetServiceLevel() string {
 // GetServiceLevelOk returns a tuple with the ServiceLevel field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Subscription) GetServiceLevelOk() (*string, bool) {
-	if o == nil || isNil(o.ServiceLevel) {
-    return nil, false
+	if o == nil || o.ServiceLevel == nil {
+		return nil, false
 	}
 	return o.ServiceLevel, true
 }
 
 // HasServiceLevel returns a boolean if a field has been set.
 func (o *Subscription) HasServiceLevel() bool {
-	if o != nil && !isNil(o.ServiceLevel) {
+	if o != nil && o.ServiceLevel != nil {
 		return true
 	}
 
@@ -909,7 +910,7 @@ func (o *Subscription) SetServiceLevel(v string) {
 
 // GetSocketTotal returns the SocketTotal field value if set, zero value otherwise.
 func (o *Subscription) GetSocketTotal() int32 {
-	if o == nil || isNil(o.SocketTotal) {
+	if o == nil || o.SocketTotal == nil {
 		var ret int32
 		return ret
 	}
@@ -919,15 +920,15 @@ func (o *Subscription) GetSocketTotal() int32 {
 // GetSocketTotalOk returns a tuple with the SocketTotal field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Subscription) GetSocketTotalOk() (*int32, bool) {
-	if o == nil || isNil(o.SocketTotal) {
-    return nil, false
+	if o == nil || o.SocketTotal == nil {
+		return nil, false
 	}
 	return o.SocketTotal, true
 }
 
 // HasSocketTotal returns a boolean if a field has been set.
 func (o *Subscription) HasSocketTotal() bool {
-	if o != nil && !isNil(o.SocketTotal) {
+	if o != nil && o.SocketTotal != nil {
 		return true
 	}
 
@@ -941,7 +942,7 @@ func (o *Subscription) SetSocketTotal(v int32) {
 
 // GetStatus returns the Status field value if set, zero value otherwise.
 func (o *Subscription) GetStatus() string {
-	if o == nil || isNil(o.Status) {
+	if o == nil || o.Status == nil {
 		var ret string
 		return ret
 	}
@@ -951,15 +952,15 @@ func (o *Subscription) GetStatus() string {
 // GetStatusOk returns a tuple with the Status field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Subscription) GetStatusOk() (*string, bool) {
-	if o == nil || isNil(o.Status) {
-    return nil, false
+	if o == nil || o.Status == nil {
+		return nil, false
 	}
 	return o.Status, true
 }
 
 // HasStatus returns a boolean if a field has been set.
 func (o *Subscription) HasStatus() bool {
-	if o != nil && !isNil(o.Status) {
+	if o != nil && o.Status != nil {
 		return true
 	}
 
@@ -973,7 +974,7 @@ func (o *Subscription) SetStatus(v string) {
 
 // GetSupportLevel returns the SupportLevel field value if set, zero value otherwise.
 func (o *Subscription) GetSupportLevel() string {
-	if o == nil || isNil(o.SupportLevel) {
+	if o == nil || o.SupportLevel == nil {
 		var ret string
 		return ret
 	}
@@ -983,15 +984,15 @@ func (o *Subscription) GetSupportLevel() string {
 // GetSupportLevelOk returns a tuple with the SupportLevel field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Subscription) GetSupportLevelOk() (*string, bool) {
-	if o == nil || isNil(o.SupportLevel) {
-    return nil, false
+	if o == nil || o.SupportLevel == nil {
+		return nil, false
 	}
 	return o.SupportLevel, true
 }
 
 // HasSupportLevel returns a boolean if a field has been set.
 func (o *Subscription) HasSupportLevel() bool {
-	if o != nil && !isNil(o.SupportLevel) {
+	if o != nil && o.SupportLevel != nil {
 		return true
 	}
 
@@ -1005,7 +1006,7 @@ func (o *Subscription) SetSupportLevel(v string) {
 
 // GetSystemUnits returns the SystemUnits field value if set, zero value otherwise.
 func (o *Subscription) GetSystemUnits() string {
-	if o == nil || isNil(o.SystemUnits) {
+	if o == nil || o.SystemUnits == nil {
 		var ret string
 		return ret
 	}
@@ -1015,15 +1016,15 @@ func (o *Subscription) GetSystemUnits() string {
 // GetSystemUnitsOk returns a tuple with the SystemUnits field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Subscription) GetSystemUnitsOk() (*string, bool) {
-	if o == nil || isNil(o.SystemUnits) {
-    return nil, false
+	if o == nil || o.SystemUnits == nil {
+		return nil, false
 	}
 	return o.SystemUnits, true
 }
 
 // HasSystemUnits returns a boolean if a field has been set.
 func (o *Subscription) HasSystemUnits() bool {
-	if o != nil && !isNil(o.SystemUnits) {
+	if o != nil && o.SystemUnits != nil {
 		return true
 	}
 
@@ -1037,7 +1038,7 @@ func (o *Subscription) SetSystemUnits(v string) {
 
 // GetTrialEndDate returns the TrialEndDate field value if set, zero value otherwise.
 func (o *Subscription) GetTrialEndDate() time.Time {
-	if o == nil || isNil(o.TrialEndDate) {
+	if o == nil || o.TrialEndDate == nil {
 		var ret time.Time
 		return ret
 	}
@@ -1047,15 +1048,15 @@ func (o *Subscription) GetTrialEndDate() time.Time {
 // GetTrialEndDateOk returns a tuple with the TrialEndDate field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Subscription) GetTrialEndDateOk() (*time.Time, bool) {
-	if o == nil || isNil(o.TrialEndDate) {
-    return nil, false
+	if o == nil || o.TrialEndDate == nil {
+		return nil, false
 	}
 	return o.TrialEndDate, true
 }
 
 // HasTrialEndDate returns a boolean if a field has been set.
 func (o *Subscription) HasTrialEndDate() bool {
-	if o != nil && !isNil(o.TrialEndDate) {
+	if o != nil && o.TrialEndDate != nil {
 		return true
 	}
 
@@ -1069,7 +1070,7 @@ func (o *Subscription) SetTrialEndDate(v time.Time) {
 
 // GetUsage returns the Usage field value if set, zero value otherwise.
 func (o *Subscription) GetUsage() string {
-	if o == nil || isNil(o.Usage) {
+	if o == nil || o.Usage == nil {
 		var ret string
 		return ret
 	}
@@ -1079,15 +1080,15 @@ func (o *Subscription) GetUsage() string {
 // GetUsageOk returns a tuple with the Usage field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Subscription) GetUsageOk() (*string, bool) {
-	if o == nil || isNil(o.Usage) {
-    return nil, false
+	if o == nil || o.Usage == nil {
+		return nil, false
 	}
 	return o.Usage, true
 }
 
 // HasUsage returns a boolean if a field has been set.
 func (o *Subscription) HasUsage() bool {
-	if o != nil && !isNil(o.Usage) {
+	if o != nil && o.Usage != nil {
 		return true
 	}
 
@@ -1101,25 +1102,25 @@ func (o *Subscription) SetUsage(v string) {
 
 // GetCapabilities returns the Capabilities field value if set, zero value otherwise.
 func (o *Subscription) GetCapabilities() []Capability {
-	if o == nil || isNil(o.Capabilities) {
+	if o == nil || o.Capabilities == nil {
 		var ret []Capability
 		return ret
 	}
-	return o.Capabilities
+	return *o.Capabilities
 }
 
 // GetCapabilitiesOk returns a tuple with the Capabilities field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *Subscription) GetCapabilitiesOk() ([]Capability, bool) {
-	if o == nil || isNil(o.Capabilities) {
-    return nil, false
+func (o *Subscription) GetCapabilitiesOk() (*[]Capability, bool) {
+	if o == nil || o.Capabilities == nil {
+		return nil, false
 	}
 	return o.Capabilities, true
 }
 
 // HasCapabilities returns a boolean if a field has been set.
 func (o *Subscription) HasCapabilities() bool {
-	if o != nil && !isNil(o.Capabilities) {
+	if o != nil && o.Capabilities != nil {
 		return true
 	}
 
@@ -1128,12 +1129,12 @@ func (o *Subscription) HasCapabilities() bool {
 
 // SetCapabilities gets a reference to the given []Capability and assigns it to the Capabilities field.
 func (o *Subscription) SetCapabilities(v []Capability) {
-	o.Capabilities = v
+	o.Capabilities = &v
 }
 
 // GetCreatedAt returns the CreatedAt field value if set, zero value otherwise.
 func (o *Subscription) GetCreatedAt() time.Time {
-	if o == nil || isNil(o.CreatedAt) {
+	if o == nil || o.CreatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -1143,15 +1144,15 @@ func (o *Subscription) GetCreatedAt() time.Time {
 // GetCreatedAtOk returns a tuple with the CreatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Subscription) GetCreatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.CreatedAt) {
-    return nil, false
+	if o == nil || o.CreatedAt == nil {
+		return nil, false
 	}
 	return o.CreatedAt, true
 }
 
 // HasCreatedAt returns a boolean if a field has been set.
 func (o *Subscription) HasCreatedAt() bool {
-	if o != nil && !isNil(o.CreatedAt) {
+	if o != nil && o.CreatedAt != nil {
 		return true
 	}
 
@@ -1165,7 +1166,7 @@ func (o *Subscription) SetCreatedAt(v time.Time) {
 
 // GetCreator returns the Creator field value if set, zero value otherwise.
 func (o *Subscription) GetCreator() AccountReference {
-	if o == nil || isNil(o.Creator) {
+	if o == nil || o.Creator == nil {
 		var ret AccountReference
 		return ret
 	}
@@ -1175,15 +1176,15 @@ func (o *Subscription) GetCreator() AccountReference {
 // GetCreatorOk returns a tuple with the Creator field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Subscription) GetCreatorOk() (*AccountReference, bool) {
-	if o == nil || isNil(o.Creator) {
-    return nil, false
+	if o == nil || o.Creator == nil {
+		return nil, false
 	}
 	return o.Creator, true
 }
 
 // HasCreator returns a boolean if a field has been set.
 func (o *Subscription) HasCreator() bool {
-	if o != nil && !isNil(o.Creator) {
+	if o != nil && o.Creator != nil {
 		return true
 	}
 
@@ -1197,7 +1198,7 @@ func (o *Subscription) SetCreator(v AccountReference) {
 
 // GetEvalExpirationDate returns the EvalExpirationDate field value if set, zero value otherwise.
 func (o *Subscription) GetEvalExpirationDate() time.Time {
-	if o == nil || isNil(o.EvalExpirationDate) {
+	if o == nil || o.EvalExpirationDate == nil {
 		var ret time.Time
 		return ret
 	}
@@ -1207,15 +1208,15 @@ func (o *Subscription) GetEvalExpirationDate() time.Time {
 // GetEvalExpirationDateOk returns a tuple with the EvalExpirationDate field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Subscription) GetEvalExpirationDateOk() (*time.Time, bool) {
-	if o == nil || isNil(o.EvalExpirationDate) {
-    return nil, false
+	if o == nil || o.EvalExpirationDate == nil {
+		return nil, false
 	}
 	return o.EvalExpirationDate, true
 }
 
 // HasEvalExpirationDate returns a boolean if a field has been set.
 func (o *Subscription) HasEvalExpirationDate() bool {
-	if o != nil && !isNil(o.EvalExpirationDate) {
+	if o != nil && o.EvalExpirationDate != nil {
 		return true
 	}
 
@@ -1229,25 +1230,25 @@ func (o *Subscription) SetEvalExpirationDate(v time.Time) {
 
 // GetLabels returns the Labels field value if set, zero value otherwise.
 func (o *Subscription) GetLabels() []Label {
-	if o == nil || isNil(o.Labels) {
+	if o == nil || o.Labels == nil {
 		var ret []Label
 		return ret
 	}
-	return o.Labels
+	return *o.Labels
 }
 
 // GetLabelsOk returns a tuple with the Labels field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *Subscription) GetLabelsOk() ([]Label, bool) {
-	if o == nil || isNil(o.Labels) {
-    return nil, false
+func (o *Subscription) GetLabelsOk() (*[]Label, bool) {
+	if o == nil || o.Labels == nil {
+		return nil, false
 	}
 	return o.Labels, true
 }
 
 // HasLabels returns a boolean if a field has been set.
 func (o *Subscription) HasLabels() bool {
-	if o != nil && !isNil(o.Labels) {
+	if o != nil && o.Labels != nil {
 		return true
 	}
 
@@ -1256,30 +1257,30 @@ func (o *Subscription) HasLabels() bool {
 
 // SetLabels gets a reference to the given []Label and assigns it to the Labels field.
 func (o *Subscription) SetLabels(v []Label) {
-	o.Labels = v
+	o.Labels = &v
 }
 
 // GetMetrics returns the Metrics field value if set, zero value otherwise.
 func (o *Subscription) GetMetrics() []OneMetric {
-	if o == nil || isNil(o.Metrics) {
+	if o == nil || o.Metrics == nil {
 		var ret []OneMetric
 		return ret
 	}
-	return o.Metrics
+	return *o.Metrics
 }
 
 // GetMetricsOk returns a tuple with the Metrics field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *Subscription) GetMetricsOk() ([]OneMetric, bool) {
-	if o == nil || isNil(o.Metrics) {
-    return nil, false
+func (o *Subscription) GetMetricsOk() (*[]OneMetric, bool) {
+	if o == nil || o.Metrics == nil {
+		return nil, false
 	}
 	return o.Metrics, true
 }
 
 // HasMetrics returns a boolean if a field has been set.
 func (o *Subscription) HasMetrics() bool {
-	if o != nil && !isNil(o.Metrics) {
+	if o != nil && o.Metrics != nil {
 		return true
 	}
 
@@ -1288,30 +1289,30 @@ func (o *Subscription) HasMetrics() bool {
 
 // SetMetrics gets a reference to the given []OneMetric and assigns it to the Metrics field.
 func (o *Subscription) SetMetrics(v []OneMetric) {
-	o.Metrics = v
+	o.Metrics = &v
 }
 
 // GetNotificationContacts returns the NotificationContacts field value if set, zero value otherwise.
 func (o *Subscription) GetNotificationContacts() []Account {
-	if o == nil || isNil(o.NotificationContacts) {
+	if o == nil || o.NotificationContacts == nil {
 		var ret []Account
 		return ret
 	}
-	return o.NotificationContacts
+	return *o.NotificationContacts
 }
 
 // GetNotificationContactsOk returns a tuple with the NotificationContacts field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *Subscription) GetNotificationContactsOk() ([]Account, bool) {
-	if o == nil || isNil(o.NotificationContacts) {
-    return nil, false
+func (o *Subscription) GetNotificationContactsOk() (*[]Account, bool) {
+	if o == nil || o.NotificationContacts == nil {
+		return nil, false
 	}
 	return o.NotificationContacts, true
 }
 
 // HasNotificationContacts returns a boolean if a field has been set.
 func (o *Subscription) HasNotificationContacts() bool {
-	if o != nil && !isNil(o.NotificationContacts) {
+	if o != nil && o.NotificationContacts != nil {
 		return true
 	}
 
@@ -1320,12 +1321,12 @@ func (o *Subscription) HasNotificationContacts() bool {
 
 // SetNotificationContacts gets a reference to the given []Account and assigns it to the NotificationContacts field.
 func (o *Subscription) SetNotificationContacts(v []Account) {
-	o.NotificationContacts = v
+	o.NotificationContacts = &v
 }
 
 // GetPlan returns the Plan field value if set, zero value otherwise.
 func (o *Subscription) GetPlan() Plan {
-	if o == nil || isNil(o.Plan) {
+	if o == nil || o.Plan == nil {
 		var ret Plan
 		return ret
 	}
@@ -1335,15 +1336,15 @@ func (o *Subscription) GetPlan() Plan {
 // GetPlanOk returns a tuple with the Plan field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Subscription) GetPlanOk() (*Plan, bool) {
-	if o == nil || isNil(o.Plan) {
-    return nil, false
+	if o == nil || o.Plan == nil {
+		return nil, false
 	}
 	return o.Plan, true
 }
 
 // HasPlan returns a boolean if a field has been set.
 func (o *Subscription) HasPlan() bool {
-	if o != nil && !isNil(o.Plan) {
+	if o != nil && o.Plan != nil {
 		return true
 	}
 
@@ -1357,7 +1358,7 @@ func (o *Subscription) SetPlan(v Plan) {
 
 // GetUpdatedAt returns the UpdatedAt field value if set, zero value otherwise.
 func (o *Subscription) GetUpdatedAt() time.Time {
-	if o == nil || isNil(o.UpdatedAt) {
+	if o == nil || o.UpdatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -1367,15 +1368,15 @@ func (o *Subscription) GetUpdatedAt() time.Time {
 // GetUpdatedAtOk returns a tuple with the UpdatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Subscription) GetUpdatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.UpdatedAt) {
-    return nil, false
+	if o == nil || o.UpdatedAt == nil {
+		return nil, false
 	}
 	return o.UpdatedAt, true
 }
 
 // HasUpdatedAt returns a boolean if a field has been set.
 func (o *Subscription) HasUpdatedAt() bool {
-	if o != nil && !isNil(o.UpdatedAt) {
+	if o != nil && o.UpdatedAt != nil {
 		return true
 	}
 
@@ -1389,127 +1390,127 @@ func (o *Subscription) SetUpdatedAt(v time.Time) {
 
 func (o Subscription) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Href) {
+	if o.Href != nil {
 		toSerialize["href"] = o.Href
 	}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.Kind) {
+	if o.Kind != nil {
 		toSerialize["kind"] = o.Kind
 	}
-	if !isNil(o.BillingExpirationDate) {
+	if o.BillingExpirationDate != nil {
 		toSerialize["billing_expiration_date"] = o.BillingExpirationDate
 	}
-	if !isNil(o.BillingMarketplaceAccount) {
+	if o.BillingMarketplaceAccount != nil {
 		toSerialize["billing_marketplace_account"] = o.BillingMarketplaceAccount
 	}
-	if !isNil(o.CloudAccountId) {
+	if o.CloudAccountId != nil {
 		toSerialize["cloud_account_id"] = o.CloudAccountId
 	}
-	if !isNil(o.CloudProviderId) {
+	if o.CloudProviderId != nil {
 		toSerialize["cloud_provider_id"] = o.CloudProviderId
 	}
-	if !isNil(o.ClusterBillingModel) {
+	if o.ClusterBillingModel != nil {
 		toSerialize["cluster_billing_model"] = o.ClusterBillingModel
 	}
-	if !isNil(o.ClusterId) {
+	if o.ClusterId != nil {
 		toSerialize["cluster_id"] = o.ClusterId
 	}
-	if !isNil(o.ConsoleUrl) {
+	if o.ConsoleUrl != nil {
 		toSerialize["console_url"] = o.ConsoleUrl
 	}
-	if !isNil(o.ConsumerUuid) {
+	if o.ConsumerUuid != nil {
 		toSerialize["consumer_uuid"] = o.ConsumerUuid
 	}
-	if !isNil(o.CpuTotal) {
+	if o.CpuTotal != nil {
 		toSerialize["cpu_total"] = o.CpuTotal
 	}
-	if !isNil(o.CreatorId) {
+	if o.CreatorId != nil {
 		toSerialize["creator_id"] = o.CreatorId
 	}
-	if !isNil(o.DisplayName) {
+	if o.DisplayName != nil {
 		toSerialize["display_name"] = o.DisplayName
 	}
-	if !isNil(o.ExternalClusterId) {
+	if o.ExternalClusterId != nil {
 		toSerialize["external_cluster_id"] = o.ExternalClusterId
 	}
-	if !isNil(o.LastReconcileDate) {
+	if o.LastReconcileDate != nil {
 		toSerialize["last_reconcile_date"] = o.LastReconcileDate
 	}
-	if !isNil(o.LastReleasedAt) {
+	if o.LastReleasedAt != nil {
 		toSerialize["last_released_at"] = o.LastReleasedAt
 	}
-	if !isNil(o.LastTelemetryDate) {
+	if o.LastTelemetryDate != nil {
 		toSerialize["last_telemetry_date"] = o.LastTelemetryDate
 	}
 	if true {
 		toSerialize["managed"] = o.Managed
 	}
-	if !isNil(o.OrganizationId) {
+	if o.OrganizationId != nil {
 		toSerialize["organization_id"] = o.OrganizationId
 	}
-	if !isNil(o.PlanId) {
+	if o.PlanId != nil {
 		toSerialize["plan_id"] = o.PlanId
 	}
-	if !isNil(o.ProductBundle) {
+	if o.ProductBundle != nil {
 		toSerialize["product_bundle"] = o.ProductBundle
 	}
-	if !isNil(o.Provenance) {
+	if o.Provenance != nil {
 		toSerialize["provenance"] = o.Provenance
 	}
-	if !isNil(o.RegionId) {
+	if o.RegionId != nil {
 		toSerialize["region_id"] = o.RegionId
 	}
-	if !isNil(o.Released) {
+	if o.Released != nil {
 		toSerialize["released"] = o.Released
 	}
-	if !isNil(o.ServiceLevel) {
+	if o.ServiceLevel != nil {
 		toSerialize["service_level"] = o.ServiceLevel
 	}
-	if !isNil(o.SocketTotal) {
+	if o.SocketTotal != nil {
 		toSerialize["socket_total"] = o.SocketTotal
 	}
-	if !isNil(o.Status) {
+	if o.Status != nil {
 		toSerialize["status"] = o.Status
 	}
-	if !isNil(o.SupportLevel) {
+	if o.SupportLevel != nil {
 		toSerialize["support_level"] = o.SupportLevel
 	}
-	if !isNil(o.SystemUnits) {
+	if o.SystemUnits != nil {
 		toSerialize["system_units"] = o.SystemUnits
 	}
-	if !isNil(o.TrialEndDate) {
+	if o.TrialEndDate != nil {
 		toSerialize["trial_end_date"] = o.TrialEndDate
 	}
-	if !isNil(o.Usage) {
+	if o.Usage != nil {
 		toSerialize["usage"] = o.Usage
 	}
-	if !isNil(o.Capabilities) {
+	if o.Capabilities != nil {
 		toSerialize["capabilities"] = o.Capabilities
 	}
-	if !isNil(o.CreatedAt) {
+	if o.CreatedAt != nil {
 		toSerialize["created_at"] = o.CreatedAt
 	}
-	if !isNil(o.Creator) {
+	if o.Creator != nil {
 		toSerialize["creator"] = o.Creator
 	}
-	if !isNil(o.EvalExpirationDate) {
+	if o.EvalExpirationDate != nil {
 		toSerialize["eval_expiration_date"] = o.EvalExpirationDate
 	}
-	if !isNil(o.Labels) {
+	if o.Labels != nil {
 		toSerialize["labels"] = o.Labels
 	}
-	if !isNil(o.Metrics) {
+	if o.Metrics != nil {
 		toSerialize["metrics"] = o.Metrics
 	}
-	if !isNil(o.NotificationContacts) {
+	if o.NotificationContacts != nil {
 		toSerialize["notification_contacts"] = o.NotificationContacts
 	}
-	if !isNil(o.Plan) {
+	if o.Plan != nil {
 		toSerialize["plan"] = o.Plan
 	}
-	if !isNil(o.UpdatedAt) {
+	if o.UpdatedAt != nil {
 		toSerialize["updated_at"] = o.UpdatedAt
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription_all_of.go
index 54937ddf..3e174133 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -17,14 +17,14 @@ import (
 
 // SubscriptionAllOf struct for SubscriptionAllOf
 type SubscriptionAllOf struct {
-	Capabilities []Capability `json:"capabilities,omitempty"`
+	Capabilities *[]Capability `json:"capabilities,omitempty"`
 	CreatedAt *time.Time `json:"created_at,omitempty"`
 	Creator *AccountReference `json:"creator,omitempty"`
 	// Calulated as the subscription created date + 60 days
 	EvalExpirationDate *time.Time `json:"eval_expiration_date,omitempty"`
-	Labels []Label `json:"labels,omitempty"`
-	Metrics []OneMetric `json:"metrics,omitempty"`
-	NotificationContacts []Account `json:"notification_contacts,omitempty"`
+	Labels *[]Label `json:"labels,omitempty"`
+	Metrics *[]OneMetric `json:"metrics,omitempty"`
+	NotificationContacts *[]Account `json:"notification_contacts,omitempty"`
 	Plan *Plan `json:"plan,omitempty"`
 	UpdatedAt *time.Time `json:"updated_at,omitempty"`
 }
@@ -48,25 +48,25 @@ func NewSubscriptionAllOfWithDefaults() *SubscriptionAllOf {
 
 // GetCapabilities returns the Capabilities field value if set, zero value otherwise.
 func (o *SubscriptionAllOf) GetCapabilities() []Capability {
-	if o == nil || isNil(o.Capabilities) {
+	if o == nil || o.Capabilities == nil {
 		var ret []Capability
 		return ret
 	}
-	return o.Capabilities
+	return *o.Capabilities
 }
 
 // GetCapabilitiesOk returns a tuple with the Capabilities field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *SubscriptionAllOf) GetCapabilitiesOk() ([]Capability, bool) {
-	if o == nil || isNil(o.Capabilities) {
-    return nil, false
+func (o *SubscriptionAllOf) GetCapabilitiesOk() (*[]Capability, bool) {
+	if o == nil || o.Capabilities == nil {
+		return nil, false
 	}
 	return o.Capabilities, true
 }
 
 // HasCapabilities returns a boolean if a field has been set.
 func (o *SubscriptionAllOf) HasCapabilities() bool {
-	if o != nil && !isNil(o.Capabilities) {
+	if o != nil && o.Capabilities != nil {
 		return true
 	}
 
@@ -75,12 +75,12 @@ func (o *SubscriptionAllOf) HasCapabilities() bool {
 
 // SetCapabilities gets a reference to the given []Capability and assigns it to the Capabilities field.
 func (o *SubscriptionAllOf) SetCapabilities(v []Capability) {
-	o.Capabilities = v
+	o.Capabilities = &v
 }
 
 // GetCreatedAt returns the CreatedAt field value if set, zero value otherwise.
 func (o *SubscriptionAllOf) GetCreatedAt() time.Time {
-	if o == nil || isNil(o.CreatedAt) {
+	if o == nil || o.CreatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -90,15 +90,15 @@ func (o *SubscriptionAllOf) GetCreatedAt() time.Time {
 // GetCreatedAtOk returns a tuple with the CreatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionAllOf) GetCreatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.CreatedAt) {
-    return nil, false
+	if o == nil || o.CreatedAt == nil {
+		return nil, false
 	}
 	return o.CreatedAt, true
 }
 
 // HasCreatedAt returns a boolean if a field has been set.
 func (o *SubscriptionAllOf) HasCreatedAt() bool {
-	if o != nil && !isNil(o.CreatedAt) {
+	if o != nil && o.CreatedAt != nil {
 		return true
 	}
 
@@ -112,7 +112,7 @@ func (o *SubscriptionAllOf) SetCreatedAt(v time.Time) {
 
 // GetCreator returns the Creator field value if set, zero value otherwise.
 func (o *SubscriptionAllOf) GetCreator() AccountReference {
-	if o == nil || isNil(o.Creator) {
+	if o == nil || o.Creator == nil {
 		var ret AccountReference
 		return ret
 	}
@@ -122,15 +122,15 @@ func (o *SubscriptionAllOf) GetCreator() AccountReference {
 // GetCreatorOk returns a tuple with the Creator field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionAllOf) GetCreatorOk() (*AccountReference, bool) {
-	if o == nil || isNil(o.Creator) {
-    return nil, false
+	if o == nil || o.Creator == nil {
+		return nil, false
 	}
 	return o.Creator, true
 }
 
 // HasCreator returns a boolean if a field has been set.
 func (o *SubscriptionAllOf) HasCreator() bool {
-	if o != nil && !isNil(o.Creator) {
+	if o != nil && o.Creator != nil {
 		return true
 	}
 
@@ -144,7 +144,7 @@ func (o *SubscriptionAllOf) SetCreator(v AccountReference) {
 
 // GetEvalExpirationDate returns the EvalExpirationDate field value if set, zero value otherwise.
 func (o *SubscriptionAllOf) GetEvalExpirationDate() time.Time {
-	if o == nil || isNil(o.EvalExpirationDate) {
+	if o == nil || o.EvalExpirationDate == nil {
 		var ret time.Time
 		return ret
 	}
@@ -154,15 +154,15 @@ func (o *SubscriptionAllOf) GetEvalExpirationDate() time.Time {
 // GetEvalExpirationDateOk returns a tuple with the EvalExpirationDate field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionAllOf) GetEvalExpirationDateOk() (*time.Time, bool) {
-	if o == nil || isNil(o.EvalExpirationDate) {
-    return nil, false
+	if o == nil || o.EvalExpirationDate == nil {
+		return nil, false
 	}
 	return o.EvalExpirationDate, true
 }
 
 // HasEvalExpirationDate returns a boolean if a field has been set.
 func (o *SubscriptionAllOf) HasEvalExpirationDate() bool {
-	if o != nil && !isNil(o.EvalExpirationDate) {
+	if o != nil && o.EvalExpirationDate != nil {
 		return true
 	}
 
@@ -176,25 +176,25 @@ func (o *SubscriptionAllOf) SetEvalExpirationDate(v time.Time) {
 
 // GetLabels returns the Labels field value if set, zero value otherwise.
 func (o *SubscriptionAllOf) GetLabels() []Label {
-	if o == nil || isNil(o.Labels) {
+	if o == nil || o.Labels == nil {
 		var ret []Label
 		return ret
 	}
-	return o.Labels
+	return *o.Labels
 }
 
 // GetLabelsOk returns a tuple with the Labels field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *SubscriptionAllOf) GetLabelsOk() ([]Label, bool) {
-	if o == nil || isNil(o.Labels) {
-    return nil, false
+func (o *SubscriptionAllOf) GetLabelsOk() (*[]Label, bool) {
+	if o == nil || o.Labels == nil {
+		return nil, false
 	}
 	return o.Labels, true
 }
 
 // HasLabels returns a boolean if a field has been set.
 func (o *SubscriptionAllOf) HasLabels() bool {
-	if o != nil && !isNil(o.Labels) {
+	if o != nil && o.Labels != nil {
 		return true
 	}
 
@@ -203,30 +203,30 @@ func (o *SubscriptionAllOf) HasLabels() bool {
 
 // SetLabels gets a reference to the given []Label and assigns it to the Labels field.
 func (o *SubscriptionAllOf) SetLabels(v []Label) {
-	o.Labels = v
+	o.Labels = &v
 }
 
 // GetMetrics returns the Metrics field value if set, zero value otherwise.
 func (o *SubscriptionAllOf) GetMetrics() []OneMetric {
-	if o == nil || isNil(o.Metrics) {
+	if o == nil || o.Metrics == nil {
 		var ret []OneMetric
 		return ret
 	}
-	return o.Metrics
+	return *o.Metrics
 }
 
 // GetMetricsOk returns a tuple with the Metrics field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *SubscriptionAllOf) GetMetricsOk() ([]OneMetric, bool) {
-	if o == nil || isNil(o.Metrics) {
-    return nil, false
+func (o *SubscriptionAllOf) GetMetricsOk() (*[]OneMetric, bool) {
+	if o == nil || o.Metrics == nil {
+		return nil, false
 	}
 	return o.Metrics, true
 }
 
 // HasMetrics returns a boolean if a field has been set.
 func (o *SubscriptionAllOf) HasMetrics() bool {
-	if o != nil && !isNil(o.Metrics) {
+	if o != nil && o.Metrics != nil {
 		return true
 	}
 
@@ -235,30 +235,30 @@ func (o *SubscriptionAllOf) HasMetrics() bool {
 
 // SetMetrics gets a reference to the given []OneMetric and assigns it to the Metrics field.
 func (o *SubscriptionAllOf) SetMetrics(v []OneMetric) {
-	o.Metrics = v
+	o.Metrics = &v
 }
 
 // GetNotificationContacts returns the NotificationContacts field value if set, zero value otherwise.
 func (o *SubscriptionAllOf) GetNotificationContacts() []Account {
-	if o == nil || isNil(o.NotificationContacts) {
+	if o == nil || o.NotificationContacts == nil {
 		var ret []Account
 		return ret
 	}
-	return o.NotificationContacts
+	return *o.NotificationContacts
 }
 
 // GetNotificationContactsOk returns a tuple with the NotificationContacts field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *SubscriptionAllOf) GetNotificationContactsOk() ([]Account, bool) {
-	if o == nil || isNil(o.NotificationContacts) {
-    return nil, false
+func (o *SubscriptionAllOf) GetNotificationContactsOk() (*[]Account, bool) {
+	if o == nil || o.NotificationContacts == nil {
+		return nil, false
 	}
 	return o.NotificationContacts, true
 }
 
 // HasNotificationContacts returns a boolean if a field has been set.
 func (o *SubscriptionAllOf) HasNotificationContacts() bool {
-	if o != nil && !isNil(o.NotificationContacts) {
+	if o != nil && o.NotificationContacts != nil {
 		return true
 	}
 
@@ -267,12 +267,12 @@ func (o *SubscriptionAllOf) HasNotificationContacts() bool {
 
 // SetNotificationContacts gets a reference to the given []Account and assigns it to the NotificationContacts field.
 func (o *SubscriptionAllOf) SetNotificationContacts(v []Account) {
-	o.NotificationContacts = v
+	o.NotificationContacts = &v
 }
 
 // GetPlan returns the Plan field value if set, zero value otherwise.
 func (o *SubscriptionAllOf) GetPlan() Plan {
-	if o == nil || isNil(o.Plan) {
+	if o == nil || o.Plan == nil {
 		var ret Plan
 		return ret
 	}
@@ -282,15 +282,15 @@ func (o *SubscriptionAllOf) GetPlan() Plan {
 // GetPlanOk returns a tuple with the Plan field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionAllOf) GetPlanOk() (*Plan, bool) {
-	if o == nil || isNil(o.Plan) {
-    return nil, false
+	if o == nil || o.Plan == nil {
+		return nil, false
 	}
 	return o.Plan, true
 }
 
 // HasPlan returns a boolean if a field has been set.
 func (o *SubscriptionAllOf) HasPlan() bool {
-	if o != nil && !isNil(o.Plan) {
+	if o != nil && o.Plan != nil {
 		return true
 	}
 
@@ -304,7 +304,7 @@ func (o *SubscriptionAllOf) SetPlan(v Plan) {
 
 // GetUpdatedAt returns the UpdatedAt field value if set, zero value otherwise.
 func (o *SubscriptionAllOf) GetUpdatedAt() time.Time {
-	if o == nil || isNil(o.UpdatedAt) {
+	if o == nil || o.UpdatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -314,15 +314,15 @@ func (o *SubscriptionAllOf) GetUpdatedAt() time.Time {
 // GetUpdatedAtOk returns a tuple with the UpdatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionAllOf) GetUpdatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.UpdatedAt) {
-    return nil, false
+	if o == nil || o.UpdatedAt == nil {
+		return nil, false
 	}
 	return o.UpdatedAt, true
 }
 
 // HasUpdatedAt returns a boolean if a field has been set.
 func (o *SubscriptionAllOf) HasUpdatedAt() bool {
-	if o != nil && !isNil(o.UpdatedAt) {
+	if o != nil && o.UpdatedAt != nil {
 		return true
 	}
 
@@ -336,31 +336,31 @@ func (o *SubscriptionAllOf) SetUpdatedAt(v time.Time) {
 
 func (o SubscriptionAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Capabilities) {
+	if o.Capabilities != nil {
 		toSerialize["capabilities"] = o.Capabilities
 	}
-	if !isNil(o.CreatedAt) {
+	if o.CreatedAt != nil {
 		toSerialize["created_at"] = o.CreatedAt
 	}
-	if !isNil(o.Creator) {
+	if o.Creator != nil {
 		toSerialize["creator"] = o.Creator
 	}
-	if !isNil(o.EvalExpirationDate) {
+	if o.EvalExpirationDate != nil {
 		toSerialize["eval_expiration_date"] = o.EvalExpirationDate
 	}
-	if !isNil(o.Labels) {
+	if o.Labels != nil {
 		toSerialize["labels"] = o.Labels
 	}
-	if !isNil(o.Metrics) {
+	if o.Metrics != nil {
 		toSerialize["metrics"] = o.Metrics
 	}
-	if !isNil(o.NotificationContacts) {
+	if o.NotificationContacts != nil {
 		toSerialize["notification_contacts"] = o.NotificationContacts
 	}
-	if !isNil(o.Plan) {
+	if o.Plan != nil {
 		toSerialize["plan"] = o.Plan
 	}
-	if !isNil(o.UpdatedAt) {
+	if o.UpdatedAt != nil {
 		toSerialize["updated_at"] = o.UpdatedAt
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription_common_fields.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription_common_fields.go
index 2e09096a..d37ca1a0 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription_common_fields.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription_common_fields.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -12,6 +12,7 @@ package accountmgmtclient
 
 import (
 	"encoding/json"
+	"time"
 )
 
 // SubscriptionCommonFields struct for SubscriptionCommonFields
@@ -75,7 +76,7 @@ func NewSubscriptionCommonFieldsWithDefaults() *SubscriptionCommonFields {
 
 // GetHref returns the Href field value if set, zero value otherwise.
 func (o *SubscriptionCommonFields) GetHref() string {
-	if o == nil || isNil(o.Href) {
+	if o == nil || o.Href == nil {
 		var ret string
 		return ret
 	}
@@ -85,15 +86,15 @@ func (o *SubscriptionCommonFields) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCommonFields) GetHrefOk() (*string, bool) {
-	if o == nil || isNil(o.Href) {
-    return nil, false
+	if o == nil || o.Href == nil {
+		return nil, false
 	}
 	return o.Href, true
 }
 
 // HasHref returns a boolean if a field has been set.
 func (o *SubscriptionCommonFields) HasHref() bool {
-	if o != nil && !isNil(o.Href) {
+	if o != nil && o.Href != nil {
 		return true
 	}
 
@@ -107,7 +108,7 @@ func (o *SubscriptionCommonFields) SetHref(v string) {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *SubscriptionCommonFields) GetId() string {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret string
 		return ret
 	}
@@ -117,15 +118,15 @@ func (o *SubscriptionCommonFields) GetId() string {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCommonFields) GetIdOk() (*string, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *SubscriptionCommonFields) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -139,7 +140,7 @@ func (o *SubscriptionCommonFields) SetId(v string) {
 
 // GetKind returns the Kind field value if set, zero value otherwise.
 func (o *SubscriptionCommonFields) GetKind() string {
-	if o == nil || isNil(o.Kind) {
+	if o == nil || o.Kind == nil {
 		var ret string
 		return ret
 	}
@@ -149,15 +150,15 @@ func (o *SubscriptionCommonFields) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCommonFields) GetKindOk() (*string, bool) {
-	if o == nil || isNil(o.Kind) {
-    return nil, false
+	if o == nil || o.Kind == nil {
+		return nil, false
 	}
 	return o.Kind, true
 }
 
 // HasKind returns a boolean if a field has been set.
 func (o *SubscriptionCommonFields) HasKind() bool {
-	if o != nil && !isNil(o.Kind) {
+	if o != nil && o.Kind != nil {
 		return true
 	}
 
@@ -171,7 +172,7 @@ func (o *SubscriptionCommonFields) SetKind(v string) {
 
 // GetBillingExpirationDate returns the BillingExpirationDate field value if set, zero value otherwise.
 func (o *SubscriptionCommonFields) GetBillingExpirationDate() time.Time {
-	if o == nil || isNil(o.BillingExpirationDate) {
+	if o == nil || o.BillingExpirationDate == nil {
 		var ret time.Time
 		return ret
 	}
@@ -181,15 +182,15 @@ func (o *SubscriptionCommonFields) GetBillingExpirationDate() time.Time {
 // GetBillingExpirationDateOk returns a tuple with the BillingExpirationDate field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCommonFields) GetBillingExpirationDateOk() (*time.Time, bool) {
-	if o == nil || isNil(o.BillingExpirationDate) {
-    return nil, false
+	if o == nil || o.BillingExpirationDate == nil {
+		return nil, false
 	}
 	return o.BillingExpirationDate, true
 }
 
 // HasBillingExpirationDate returns a boolean if a field has been set.
 func (o *SubscriptionCommonFields) HasBillingExpirationDate() bool {
-	if o != nil && !isNil(o.BillingExpirationDate) {
+	if o != nil && o.BillingExpirationDate != nil {
 		return true
 	}
 
@@ -203,7 +204,7 @@ func (o *SubscriptionCommonFields) SetBillingExpirationDate(v time.Time) {
 
 // GetBillingMarketplaceAccount returns the BillingMarketplaceAccount field value if set, zero value otherwise.
 func (o *SubscriptionCommonFields) GetBillingMarketplaceAccount() string {
-	if o == nil || isNil(o.BillingMarketplaceAccount) {
+	if o == nil || o.BillingMarketplaceAccount == nil {
 		var ret string
 		return ret
 	}
@@ -213,15 +214,15 @@ func (o *SubscriptionCommonFields) GetBillingMarketplaceAccount() string {
 // GetBillingMarketplaceAccountOk returns a tuple with the BillingMarketplaceAccount field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCommonFields) GetBillingMarketplaceAccountOk() (*string, bool) {
-	if o == nil || isNil(o.BillingMarketplaceAccount) {
-    return nil, false
+	if o == nil || o.BillingMarketplaceAccount == nil {
+		return nil, false
 	}
 	return o.BillingMarketplaceAccount, true
 }
 
 // HasBillingMarketplaceAccount returns a boolean if a field has been set.
 func (o *SubscriptionCommonFields) HasBillingMarketplaceAccount() bool {
-	if o != nil && !isNil(o.BillingMarketplaceAccount) {
+	if o != nil && o.BillingMarketplaceAccount != nil {
 		return true
 	}
 
@@ -235,7 +236,7 @@ func (o *SubscriptionCommonFields) SetBillingMarketplaceAccount(v string) {
 
 // GetCloudAccountId returns the CloudAccountId field value if set, zero value otherwise.
 func (o *SubscriptionCommonFields) GetCloudAccountId() string {
-	if o == nil || isNil(o.CloudAccountId) {
+	if o == nil || o.CloudAccountId == nil {
 		var ret string
 		return ret
 	}
@@ -245,15 +246,15 @@ func (o *SubscriptionCommonFields) GetCloudAccountId() string {
 // GetCloudAccountIdOk returns a tuple with the CloudAccountId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCommonFields) GetCloudAccountIdOk() (*string, bool) {
-	if o == nil || isNil(o.CloudAccountId) {
-    return nil, false
+	if o == nil || o.CloudAccountId == nil {
+		return nil, false
 	}
 	return o.CloudAccountId, true
 }
 
 // HasCloudAccountId returns a boolean if a field has been set.
 func (o *SubscriptionCommonFields) HasCloudAccountId() bool {
-	if o != nil && !isNil(o.CloudAccountId) {
+	if o != nil && o.CloudAccountId != nil {
 		return true
 	}
 
@@ -267,7 +268,7 @@ func (o *SubscriptionCommonFields) SetCloudAccountId(v string) {
 
 // GetCloudProviderId returns the CloudProviderId field value if set, zero value otherwise.
 func (o *SubscriptionCommonFields) GetCloudProviderId() string {
-	if o == nil || isNil(o.CloudProviderId) {
+	if o == nil || o.CloudProviderId == nil {
 		var ret string
 		return ret
 	}
@@ -277,15 +278,15 @@ func (o *SubscriptionCommonFields) GetCloudProviderId() string {
 // GetCloudProviderIdOk returns a tuple with the CloudProviderId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCommonFields) GetCloudProviderIdOk() (*string, bool) {
-	if o == nil || isNil(o.CloudProviderId) {
-    return nil, false
+	if o == nil || o.CloudProviderId == nil {
+		return nil, false
 	}
 	return o.CloudProviderId, true
 }
 
 // HasCloudProviderId returns a boolean if a field has been set.
 func (o *SubscriptionCommonFields) HasCloudProviderId() bool {
-	if o != nil && !isNil(o.CloudProviderId) {
+	if o != nil && o.CloudProviderId != nil {
 		return true
 	}
 
@@ -299,7 +300,7 @@ func (o *SubscriptionCommonFields) SetCloudProviderId(v string) {
 
 // GetClusterBillingModel returns the ClusterBillingModel field value if set, zero value otherwise.
 func (o *SubscriptionCommonFields) GetClusterBillingModel() string {
-	if o == nil || isNil(o.ClusterBillingModel) {
+	if o == nil || o.ClusterBillingModel == nil {
 		var ret string
 		return ret
 	}
@@ -309,15 +310,15 @@ func (o *SubscriptionCommonFields) GetClusterBillingModel() string {
 // GetClusterBillingModelOk returns a tuple with the ClusterBillingModel field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCommonFields) GetClusterBillingModelOk() (*string, bool) {
-	if o == nil || isNil(o.ClusterBillingModel) {
-    return nil, false
+	if o == nil || o.ClusterBillingModel == nil {
+		return nil, false
 	}
 	return o.ClusterBillingModel, true
 }
 
 // HasClusterBillingModel returns a boolean if a field has been set.
 func (o *SubscriptionCommonFields) HasClusterBillingModel() bool {
-	if o != nil && !isNil(o.ClusterBillingModel) {
+	if o != nil && o.ClusterBillingModel != nil {
 		return true
 	}
 
@@ -331,7 +332,7 @@ func (o *SubscriptionCommonFields) SetClusterBillingModel(v string) {
 
 // GetClusterId returns the ClusterId field value if set, zero value otherwise.
 func (o *SubscriptionCommonFields) GetClusterId() string {
-	if o == nil || isNil(o.ClusterId) {
+	if o == nil || o.ClusterId == nil {
 		var ret string
 		return ret
 	}
@@ -341,15 +342,15 @@ func (o *SubscriptionCommonFields) GetClusterId() string {
 // GetClusterIdOk returns a tuple with the ClusterId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCommonFields) GetClusterIdOk() (*string, bool) {
-	if o == nil || isNil(o.ClusterId) {
-    return nil, false
+	if o == nil || o.ClusterId == nil {
+		return nil, false
 	}
 	return o.ClusterId, true
 }
 
 // HasClusterId returns a boolean if a field has been set.
 func (o *SubscriptionCommonFields) HasClusterId() bool {
-	if o != nil && !isNil(o.ClusterId) {
+	if o != nil && o.ClusterId != nil {
 		return true
 	}
 
@@ -363,7 +364,7 @@ func (o *SubscriptionCommonFields) SetClusterId(v string) {
 
 // GetConsoleUrl returns the ConsoleUrl field value if set, zero value otherwise.
 func (o *SubscriptionCommonFields) GetConsoleUrl() string {
-	if o == nil || isNil(o.ConsoleUrl) {
+	if o == nil || o.ConsoleUrl == nil {
 		var ret string
 		return ret
 	}
@@ -373,15 +374,15 @@ func (o *SubscriptionCommonFields) GetConsoleUrl() string {
 // GetConsoleUrlOk returns a tuple with the ConsoleUrl field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCommonFields) GetConsoleUrlOk() (*string, bool) {
-	if o == nil || isNil(o.ConsoleUrl) {
-    return nil, false
+	if o == nil || o.ConsoleUrl == nil {
+		return nil, false
 	}
 	return o.ConsoleUrl, true
 }
 
 // HasConsoleUrl returns a boolean if a field has been set.
 func (o *SubscriptionCommonFields) HasConsoleUrl() bool {
-	if o != nil && !isNil(o.ConsoleUrl) {
+	if o != nil && o.ConsoleUrl != nil {
 		return true
 	}
 
@@ -395,7 +396,7 @@ func (o *SubscriptionCommonFields) SetConsoleUrl(v string) {
 
 // GetConsumerUuid returns the ConsumerUuid field value if set, zero value otherwise.
 func (o *SubscriptionCommonFields) GetConsumerUuid() string {
-	if o == nil || isNil(o.ConsumerUuid) {
+	if o == nil || o.ConsumerUuid == nil {
 		var ret string
 		return ret
 	}
@@ -405,15 +406,15 @@ func (o *SubscriptionCommonFields) GetConsumerUuid() string {
 // GetConsumerUuidOk returns a tuple with the ConsumerUuid field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCommonFields) GetConsumerUuidOk() (*string, bool) {
-	if o == nil || isNil(o.ConsumerUuid) {
-    return nil, false
+	if o == nil || o.ConsumerUuid == nil {
+		return nil, false
 	}
 	return o.ConsumerUuid, true
 }
 
 // HasConsumerUuid returns a boolean if a field has been set.
 func (o *SubscriptionCommonFields) HasConsumerUuid() bool {
-	if o != nil && !isNil(o.ConsumerUuid) {
+	if o != nil && o.ConsumerUuid != nil {
 		return true
 	}
 
@@ -427,7 +428,7 @@ func (o *SubscriptionCommonFields) SetConsumerUuid(v string) {
 
 // GetCpuTotal returns the CpuTotal field value if set, zero value otherwise.
 func (o *SubscriptionCommonFields) GetCpuTotal() int32 {
-	if o == nil || isNil(o.CpuTotal) {
+	if o == nil || o.CpuTotal == nil {
 		var ret int32
 		return ret
 	}
@@ -437,15 +438,15 @@ func (o *SubscriptionCommonFields) GetCpuTotal() int32 {
 // GetCpuTotalOk returns a tuple with the CpuTotal field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCommonFields) GetCpuTotalOk() (*int32, bool) {
-	if o == nil || isNil(o.CpuTotal) {
-    return nil, false
+	if o == nil || o.CpuTotal == nil {
+		return nil, false
 	}
 	return o.CpuTotal, true
 }
 
 // HasCpuTotal returns a boolean if a field has been set.
 func (o *SubscriptionCommonFields) HasCpuTotal() bool {
-	if o != nil && !isNil(o.CpuTotal) {
+	if o != nil && o.CpuTotal != nil {
 		return true
 	}
 
@@ -459,7 +460,7 @@ func (o *SubscriptionCommonFields) SetCpuTotal(v int32) {
 
 // GetCreatorId returns the CreatorId field value if set, zero value otherwise.
 func (o *SubscriptionCommonFields) GetCreatorId() string {
-	if o == nil || isNil(o.CreatorId) {
+	if o == nil || o.CreatorId == nil {
 		var ret string
 		return ret
 	}
@@ -469,15 +470,15 @@ func (o *SubscriptionCommonFields) GetCreatorId() string {
 // GetCreatorIdOk returns a tuple with the CreatorId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCommonFields) GetCreatorIdOk() (*string, bool) {
-	if o == nil || isNil(o.CreatorId) {
-    return nil, false
+	if o == nil || o.CreatorId == nil {
+		return nil, false
 	}
 	return o.CreatorId, true
 }
 
 // HasCreatorId returns a boolean if a field has been set.
 func (o *SubscriptionCommonFields) HasCreatorId() bool {
-	if o != nil && !isNil(o.CreatorId) {
+	if o != nil && o.CreatorId != nil {
 		return true
 	}
 
@@ -491,7 +492,7 @@ func (o *SubscriptionCommonFields) SetCreatorId(v string) {
 
 // GetDisplayName returns the DisplayName field value if set, zero value otherwise.
 func (o *SubscriptionCommonFields) GetDisplayName() string {
-	if o == nil || isNil(o.DisplayName) {
+	if o == nil || o.DisplayName == nil {
 		var ret string
 		return ret
 	}
@@ -501,15 +502,15 @@ func (o *SubscriptionCommonFields) GetDisplayName() string {
 // GetDisplayNameOk returns a tuple with the DisplayName field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCommonFields) GetDisplayNameOk() (*string, bool) {
-	if o == nil || isNil(o.DisplayName) {
-    return nil, false
+	if o == nil || o.DisplayName == nil {
+		return nil, false
 	}
 	return o.DisplayName, true
 }
 
 // HasDisplayName returns a boolean if a field has been set.
 func (o *SubscriptionCommonFields) HasDisplayName() bool {
-	if o != nil && !isNil(o.DisplayName) {
+	if o != nil && o.DisplayName != nil {
 		return true
 	}
 
@@ -523,7 +524,7 @@ func (o *SubscriptionCommonFields) SetDisplayName(v string) {
 
 // GetExternalClusterId returns the ExternalClusterId field value if set, zero value otherwise.
 func (o *SubscriptionCommonFields) GetExternalClusterId() string {
-	if o == nil || isNil(o.ExternalClusterId) {
+	if o == nil || o.ExternalClusterId == nil {
 		var ret string
 		return ret
 	}
@@ -533,15 +534,15 @@ func (o *SubscriptionCommonFields) GetExternalClusterId() string {
 // GetExternalClusterIdOk returns a tuple with the ExternalClusterId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCommonFields) GetExternalClusterIdOk() (*string, bool) {
-	if o == nil || isNil(o.ExternalClusterId) {
-    return nil, false
+	if o == nil || o.ExternalClusterId == nil {
+		return nil, false
 	}
 	return o.ExternalClusterId, true
 }
 
 // HasExternalClusterId returns a boolean if a field has been set.
 func (o *SubscriptionCommonFields) HasExternalClusterId() bool {
-	if o != nil && !isNil(o.ExternalClusterId) {
+	if o != nil && o.ExternalClusterId != nil {
 		return true
 	}
 
@@ -555,7 +556,7 @@ func (o *SubscriptionCommonFields) SetExternalClusterId(v string) {
 
 // GetLastReconcileDate returns the LastReconcileDate field value if set, zero value otherwise.
 func (o *SubscriptionCommonFields) GetLastReconcileDate() time.Time {
-	if o == nil || isNil(o.LastReconcileDate) {
+	if o == nil || o.LastReconcileDate == nil {
 		var ret time.Time
 		return ret
 	}
@@ -565,15 +566,15 @@ func (o *SubscriptionCommonFields) GetLastReconcileDate() time.Time {
 // GetLastReconcileDateOk returns a tuple with the LastReconcileDate field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCommonFields) GetLastReconcileDateOk() (*time.Time, bool) {
-	if o == nil || isNil(o.LastReconcileDate) {
-    return nil, false
+	if o == nil || o.LastReconcileDate == nil {
+		return nil, false
 	}
 	return o.LastReconcileDate, true
 }
 
 // HasLastReconcileDate returns a boolean if a field has been set.
 func (o *SubscriptionCommonFields) HasLastReconcileDate() bool {
-	if o != nil && !isNil(o.LastReconcileDate) {
+	if o != nil && o.LastReconcileDate != nil {
 		return true
 	}
 
@@ -587,7 +588,7 @@ func (o *SubscriptionCommonFields) SetLastReconcileDate(v time.Time) {
 
 // GetLastReleasedAt returns the LastReleasedAt field value if set, zero value otherwise.
 func (o *SubscriptionCommonFields) GetLastReleasedAt() time.Time {
-	if o == nil || isNil(o.LastReleasedAt) {
+	if o == nil || o.LastReleasedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -597,15 +598,15 @@ func (o *SubscriptionCommonFields) GetLastReleasedAt() time.Time {
 // GetLastReleasedAtOk returns a tuple with the LastReleasedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCommonFields) GetLastReleasedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.LastReleasedAt) {
-    return nil, false
+	if o == nil || o.LastReleasedAt == nil {
+		return nil, false
 	}
 	return o.LastReleasedAt, true
 }
 
 // HasLastReleasedAt returns a boolean if a field has been set.
 func (o *SubscriptionCommonFields) HasLastReleasedAt() bool {
-	if o != nil && !isNil(o.LastReleasedAt) {
+	if o != nil && o.LastReleasedAt != nil {
 		return true
 	}
 
@@ -619,7 +620,7 @@ func (o *SubscriptionCommonFields) SetLastReleasedAt(v time.Time) {
 
 // GetLastTelemetryDate returns the LastTelemetryDate field value if set, zero value otherwise.
 func (o *SubscriptionCommonFields) GetLastTelemetryDate() time.Time {
-	if o == nil || isNil(o.LastTelemetryDate) {
+	if o == nil || o.LastTelemetryDate == nil {
 		var ret time.Time
 		return ret
 	}
@@ -629,15 +630,15 @@ func (o *SubscriptionCommonFields) GetLastTelemetryDate() time.Time {
 // GetLastTelemetryDateOk returns a tuple with the LastTelemetryDate field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCommonFields) GetLastTelemetryDateOk() (*time.Time, bool) {
-	if o == nil || isNil(o.LastTelemetryDate) {
-    return nil, false
+	if o == nil || o.LastTelemetryDate == nil {
+		return nil, false
 	}
 	return o.LastTelemetryDate, true
 }
 
 // HasLastTelemetryDate returns a boolean if a field has been set.
 func (o *SubscriptionCommonFields) HasLastTelemetryDate() bool {
-	if o != nil && !isNil(o.LastTelemetryDate) {
+	if o != nil && o.LastTelemetryDate != nil {
 		return true
 	}
 
@@ -662,8 +663,8 @@ func (o *SubscriptionCommonFields) GetManaged() bool {
 // GetManagedOk returns a tuple with the Managed field value
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCommonFields) GetManagedOk() (*bool, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Managed, true
 }
@@ -675,7 +676,7 @@ func (o *SubscriptionCommonFields) SetManaged(v bool) {
 
 // GetOrganizationId returns the OrganizationId field value if set, zero value otherwise.
 func (o *SubscriptionCommonFields) GetOrganizationId() string {
-	if o == nil || isNil(o.OrganizationId) {
+	if o == nil || o.OrganizationId == nil {
 		var ret string
 		return ret
 	}
@@ -685,15 +686,15 @@ func (o *SubscriptionCommonFields) GetOrganizationId() string {
 // GetOrganizationIdOk returns a tuple with the OrganizationId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCommonFields) GetOrganizationIdOk() (*string, bool) {
-	if o == nil || isNil(o.OrganizationId) {
-    return nil, false
+	if o == nil || o.OrganizationId == nil {
+		return nil, false
 	}
 	return o.OrganizationId, true
 }
 
 // HasOrganizationId returns a boolean if a field has been set.
 func (o *SubscriptionCommonFields) HasOrganizationId() bool {
-	if o != nil && !isNil(o.OrganizationId) {
+	if o != nil && o.OrganizationId != nil {
 		return true
 	}
 
@@ -707,7 +708,7 @@ func (o *SubscriptionCommonFields) SetOrganizationId(v string) {
 
 // GetPlanId returns the PlanId field value if set, zero value otherwise.
 func (o *SubscriptionCommonFields) GetPlanId() string {
-	if o == nil || isNil(o.PlanId) {
+	if o == nil || o.PlanId == nil {
 		var ret string
 		return ret
 	}
@@ -717,15 +718,15 @@ func (o *SubscriptionCommonFields) GetPlanId() string {
 // GetPlanIdOk returns a tuple with the PlanId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCommonFields) GetPlanIdOk() (*string, bool) {
-	if o == nil || isNil(o.PlanId) {
-    return nil, false
+	if o == nil || o.PlanId == nil {
+		return nil, false
 	}
 	return o.PlanId, true
 }
 
 // HasPlanId returns a boolean if a field has been set.
 func (o *SubscriptionCommonFields) HasPlanId() bool {
-	if o != nil && !isNil(o.PlanId) {
+	if o != nil && o.PlanId != nil {
 		return true
 	}
 
@@ -739,7 +740,7 @@ func (o *SubscriptionCommonFields) SetPlanId(v string) {
 
 // GetProductBundle returns the ProductBundle field value if set, zero value otherwise.
 func (o *SubscriptionCommonFields) GetProductBundle() string {
-	if o == nil || isNil(o.ProductBundle) {
+	if o == nil || o.ProductBundle == nil {
 		var ret string
 		return ret
 	}
@@ -749,15 +750,15 @@ func (o *SubscriptionCommonFields) GetProductBundle() string {
 // GetProductBundleOk returns a tuple with the ProductBundle field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCommonFields) GetProductBundleOk() (*string, bool) {
-	if o == nil || isNil(o.ProductBundle) {
-    return nil, false
+	if o == nil || o.ProductBundle == nil {
+		return nil, false
 	}
 	return o.ProductBundle, true
 }
 
 // HasProductBundle returns a boolean if a field has been set.
 func (o *SubscriptionCommonFields) HasProductBundle() bool {
-	if o != nil && !isNil(o.ProductBundle) {
+	if o != nil && o.ProductBundle != nil {
 		return true
 	}
 
@@ -771,7 +772,7 @@ func (o *SubscriptionCommonFields) SetProductBundle(v string) {
 
 // GetProvenance returns the Provenance field value if set, zero value otherwise.
 func (o *SubscriptionCommonFields) GetProvenance() string {
-	if o == nil || isNil(o.Provenance) {
+	if o == nil || o.Provenance == nil {
 		var ret string
 		return ret
 	}
@@ -781,15 +782,15 @@ func (o *SubscriptionCommonFields) GetProvenance() string {
 // GetProvenanceOk returns a tuple with the Provenance field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCommonFields) GetProvenanceOk() (*string, bool) {
-	if o == nil || isNil(o.Provenance) {
-    return nil, false
+	if o == nil || o.Provenance == nil {
+		return nil, false
 	}
 	return o.Provenance, true
 }
 
 // HasProvenance returns a boolean if a field has been set.
 func (o *SubscriptionCommonFields) HasProvenance() bool {
-	if o != nil && !isNil(o.Provenance) {
+	if o != nil && o.Provenance != nil {
 		return true
 	}
 
@@ -803,7 +804,7 @@ func (o *SubscriptionCommonFields) SetProvenance(v string) {
 
 // GetRegionId returns the RegionId field value if set, zero value otherwise.
 func (o *SubscriptionCommonFields) GetRegionId() string {
-	if o == nil || isNil(o.RegionId) {
+	if o == nil || o.RegionId == nil {
 		var ret string
 		return ret
 	}
@@ -813,15 +814,15 @@ func (o *SubscriptionCommonFields) GetRegionId() string {
 // GetRegionIdOk returns a tuple with the RegionId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCommonFields) GetRegionIdOk() (*string, bool) {
-	if o == nil || isNil(o.RegionId) {
-    return nil, false
+	if o == nil || o.RegionId == nil {
+		return nil, false
 	}
 	return o.RegionId, true
 }
 
 // HasRegionId returns a boolean if a field has been set.
 func (o *SubscriptionCommonFields) HasRegionId() bool {
-	if o != nil && !isNil(o.RegionId) {
+	if o != nil && o.RegionId != nil {
 		return true
 	}
 
@@ -835,7 +836,7 @@ func (o *SubscriptionCommonFields) SetRegionId(v string) {
 
 // GetReleased returns the Released field value if set, zero value otherwise.
 func (o *SubscriptionCommonFields) GetReleased() bool {
-	if o == nil || isNil(o.Released) {
+	if o == nil || o.Released == nil {
 		var ret bool
 		return ret
 	}
@@ -845,15 +846,15 @@ func (o *SubscriptionCommonFields) GetReleased() bool {
 // GetReleasedOk returns a tuple with the Released field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCommonFields) GetReleasedOk() (*bool, bool) {
-	if o == nil || isNil(o.Released) {
-    return nil, false
+	if o == nil || o.Released == nil {
+		return nil, false
 	}
 	return o.Released, true
 }
 
 // HasReleased returns a boolean if a field has been set.
 func (o *SubscriptionCommonFields) HasReleased() bool {
-	if o != nil && !isNil(o.Released) {
+	if o != nil && o.Released != nil {
 		return true
 	}
 
@@ -867,7 +868,7 @@ func (o *SubscriptionCommonFields) SetReleased(v bool) {
 
 // GetServiceLevel returns the ServiceLevel field value if set, zero value otherwise.
 func (o *SubscriptionCommonFields) GetServiceLevel() string {
-	if o == nil || isNil(o.ServiceLevel) {
+	if o == nil || o.ServiceLevel == nil {
 		var ret string
 		return ret
 	}
@@ -877,15 +878,15 @@ func (o *SubscriptionCommonFields) GetServiceLevel() string {
 // GetServiceLevelOk returns a tuple with the ServiceLevel field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCommonFields) GetServiceLevelOk() (*string, bool) {
-	if o == nil || isNil(o.ServiceLevel) {
-    return nil, false
+	if o == nil || o.ServiceLevel == nil {
+		return nil, false
 	}
 	return o.ServiceLevel, true
 }
 
 // HasServiceLevel returns a boolean if a field has been set.
 func (o *SubscriptionCommonFields) HasServiceLevel() bool {
-	if o != nil && !isNil(o.ServiceLevel) {
+	if o != nil && o.ServiceLevel != nil {
 		return true
 	}
 
@@ -899,7 +900,7 @@ func (o *SubscriptionCommonFields) SetServiceLevel(v string) {
 
 // GetSocketTotal returns the SocketTotal field value if set, zero value otherwise.
 func (o *SubscriptionCommonFields) GetSocketTotal() int32 {
-	if o == nil || isNil(o.SocketTotal) {
+	if o == nil || o.SocketTotal == nil {
 		var ret int32
 		return ret
 	}
@@ -909,15 +910,15 @@ func (o *SubscriptionCommonFields) GetSocketTotal() int32 {
 // GetSocketTotalOk returns a tuple with the SocketTotal field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCommonFields) GetSocketTotalOk() (*int32, bool) {
-	if o == nil || isNil(o.SocketTotal) {
-    return nil, false
+	if o == nil || o.SocketTotal == nil {
+		return nil, false
 	}
 	return o.SocketTotal, true
 }
 
 // HasSocketTotal returns a boolean if a field has been set.
 func (o *SubscriptionCommonFields) HasSocketTotal() bool {
-	if o != nil && !isNil(o.SocketTotal) {
+	if o != nil && o.SocketTotal != nil {
 		return true
 	}
 
@@ -931,7 +932,7 @@ func (o *SubscriptionCommonFields) SetSocketTotal(v int32) {
 
 // GetStatus returns the Status field value if set, zero value otherwise.
 func (o *SubscriptionCommonFields) GetStatus() string {
-	if o == nil || isNil(o.Status) {
+	if o == nil || o.Status == nil {
 		var ret string
 		return ret
 	}
@@ -941,15 +942,15 @@ func (o *SubscriptionCommonFields) GetStatus() string {
 // GetStatusOk returns a tuple with the Status field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCommonFields) GetStatusOk() (*string, bool) {
-	if o == nil || isNil(o.Status) {
-    return nil, false
+	if o == nil || o.Status == nil {
+		return nil, false
 	}
 	return o.Status, true
 }
 
 // HasStatus returns a boolean if a field has been set.
 func (o *SubscriptionCommonFields) HasStatus() bool {
-	if o != nil && !isNil(o.Status) {
+	if o != nil && o.Status != nil {
 		return true
 	}
 
@@ -963,7 +964,7 @@ func (o *SubscriptionCommonFields) SetStatus(v string) {
 
 // GetSupportLevel returns the SupportLevel field value if set, zero value otherwise.
 func (o *SubscriptionCommonFields) GetSupportLevel() string {
-	if o == nil || isNil(o.SupportLevel) {
+	if o == nil || o.SupportLevel == nil {
 		var ret string
 		return ret
 	}
@@ -973,15 +974,15 @@ func (o *SubscriptionCommonFields) GetSupportLevel() string {
 // GetSupportLevelOk returns a tuple with the SupportLevel field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCommonFields) GetSupportLevelOk() (*string, bool) {
-	if o == nil || isNil(o.SupportLevel) {
-    return nil, false
+	if o == nil || o.SupportLevel == nil {
+		return nil, false
 	}
 	return o.SupportLevel, true
 }
 
 // HasSupportLevel returns a boolean if a field has been set.
 func (o *SubscriptionCommonFields) HasSupportLevel() bool {
-	if o != nil && !isNil(o.SupportLevel) {
+	if o != nil && o.SupportLevel != nil {
 		return true
 	}
 
@@ -995,7 +996,7 @@ func (o *SubscriptionCommonFields) SetSupportLevel(v string) {
 
 // GetSystemUnits returns the SystemUnits field value if set, zero value otherwise.
 func (o *SubscriptionCommonFields) GetSystemUnits() string {
-	if o == nil || isNil(o.SystemUnits) {
+	if o == nil || o.SystemUnits == nil {
 		var ret string
 		return ret
 	}
@@ -1005,15 +1006,15 @@ func (o *SubscriptionCommonFields) GetSystemUnits() string {
 // GetSystemUnitsOk returns a tuple with the SystemUnits field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCommonFields) GetSystemUnitsOk() (*string, bool) {
-	if o == nil || isNil(o.SystemUnits) {
-    return nil, false
+	if o == nil || o.SystemUnits == nil {
+		return nil, false
 	}
 	return o.SystemUnits, true
 }
 
 // HasSystemUnits returns a boolean if a field has been set.
 func (o *SubscriptionCommonFields) HasSystemUnits() bool {
-	if o != nil && !isNil(o.SystemUnits) {
+	if o != nil && o.SystemUnits != nil {
 		return true
 	}
 
@@ -1027,7 +1028,7 @@ func (o *SubscriptionCommonFields) SetSystemUnits(v string) {
 
 // GetTrialEndDate returns the TrialEndDate field value if set, zero value otherwise.
 func (o *SubscriptionCommonFields) GetTrialEndDate() time.Time {
-	if o == nil || isNil(o.TrialEndDate) {
+	if o == nil || o.TrialEndDate == nil {
 		var ret time.Time
 		return ret
 	}
@@ -1037,15 +1038,15 @@ func (o *SubscriptionCommonFields) GetTrialEndDate() time.Time {
 // GetTrialEndDateOk returns a tuple with the TrialEndDate field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCommonFields) GetTrialEndDateOk() (*time.Time, bool) {
-	if o == nil || isNil(o.TrialEndDate) {
-    return nil, false
+	if o == nil || o.TrialEndDate == nil {
+		return nil, false
 	}
 	return o.TrialEndDate, true
 }
 
 // HasTrialEndDate returns a boolean if a field has been set.
 func (o *SubscriptionCommonFields) HasTrialEndDate() bool {
-	if o != nil && !isNil(o.TrialEndDate) {
+	if o != nil && o.TrialEndDate != nil {
 		return true
 	}
 
@@ -1059,7 +1060,7 @@ func (o *SubscriptionCommonFields) SetTrialEndDate(v time.Time) {
 
 // GetUsage returns the Usage field value if set, zero value otherwise.
 func (o *SubscriptionCommonFields) GetUsage() string {
-	if o == nil || isNil(o.Usage) {
+	if o == nil || o.Usage == nil {
 		var ret string
 		return ret
 	}
@@ -1069,15 +1070,15 @@ func (o *SubscriptionCommonFields) GetUsage() string {
 // GetUsageOk returns a tuple with the Usage field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCommonFields) GetUsageOk() (*string, bool) {
-	if o == nil || isNil(o.Usage) {
-    return nil, false
+	if o == nil || o.Usage == nil {
+		return nil, false
 	}
 	return o.Usage, true
 }
 
 // HasUsage returns a boolean if a field has been set.
 func (o *SubscriptionCommonFields) HasUsage() bool {
-	if o != nil && !isNil(o.Usage) {
+	if o != nil && o.Usage != nil {
 		return true
 	}
 
@@ -1091,100 +1092,100 @@ func (o *SubscriptionCommonFields) SetUsage(v string) {
 
 func (o SubscriptionCommonFields) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Href) {
+	if o.Href != nil {
 		toSerialize["href"] = o.Href
 	}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.Kind) {
+	if o.Kind != nil {
 		toSerialize["kind"] = o.Kind
 	}
-	if !isNil(o.BillingExpirationDate) {
+	if o.BillingExpirationDate != nil {
 		toSerialize["billing_expiration_date"] = o.BillingExpirationDate
 	}
-	if !isNil(o.BillingMarketplaceAccount) {
+	if o.BillingMarketplaceAccount != nil {
 		toSerialize["billing_marketplace_account"] = o.BillingMarketplaceAccount
 	}
-	if !isNil(o.CloudAccountId) {
+	if o.CloudAccountId != nil {
 		toSerialize["cloud_account_id"] = o.CloudAccountId
 	}
-	if !isNil(o.CloudProviderId) {
+	if o.CloudProviderId != nil {
 		toSerialize["cloud_provider_id"] = o.CloudProviderId
 	}
-	if !isNil(o.ClusterBillingModel) {
+	if o.ClusterBillingModel != nil {
 		toSerialize["cluster_billing_model"] = o.ClusterBillingModel
 	}
-	if !isNil(o.ClusterId) {
+	if o.ClusterId != nil {
 		toSerialize["cluster_id"] = o.ClusterId
 	}
-	if !isNil(o.ConsoleUrl) {
+	if o.ConsoleUrl != nil {
 		toSerialize["console_url"] = o.ConsoleUrl
 	}
-	if !isNil(o.ConsumerUuid) {
+	if o.ConsumerUuid != nil {
 		toSerialize["consumer_uuid"] = o.ConsumerUuid
 	}
-	if !isNil(o.CpuTotal) {
+	if o.CpuTotal != nil {
 		toSerialize["cpu_total"] = o.CpuTotal
 	}
-	if !isNil(o.CreatorId) {
+	if o.CreatorId != nil {
 		toSerialize["creator_id"] = o.CreatorId
 	}
-	if !isNil(o.DisplayName) {
+	if o.DisplayName != nil {
 		toSerialize["display_name"] = o.DisplayName
 	}
-	if !isNil(o.ExternalClusterId) {
+	if o.ExternalClusterId != nil {
 		toSerialize["external_cluster_id"] = o.ExternalClusterId
 	}
-	if !isNil(o.LastReconcileDate) {
+	if o.LastReconcileDate != nil {
 		toSerialize["last_reconcile_date"] = o.LastReconcileDate
 	}
-	if !isNil(o.LastReleasedAt) {
+	if o.LastReleasedAt != nil {
 		toSerialize["last_released_at"] = o.LastReleasedAt
 	}
-	if !isNil(o.LastTelemetryDate) {
+	if o.LastTelemetryDate != nil {
 		toSerialize["last_telemetry_date"] = o.LastTelemetryDate
 	}
 	if true {
 		toSerialize["managed"] = o.Managed
 	}
-	if !isNil(o.OrganizationId) {
+	if o.OrganizationId != nil {
 		toSerialize["organization_id"] = o.OrganizationId
 	}
-	if !isNil(o.PlanId) {
+	if o.PlanId != nil {
 		toSerialize["plan_id"] = o.PlanId
 	}
-	if !isNil(o.ProductBundle) {
+	if o.ProductBundle != nil {
 		toSerialize["product_bundle"] = o.ProductBundle
 	}
-	if !isNil(o.Provenance) {
+	if o.Provenance != nil {
 		toSerialize["provenance"] = o.Provenance
 	}
-	if !isNil(o.RegionId) {
+	if o.RegionId != nil {
 		toSerialize["region_id"] = o.RegionId
 	}
-	if !isNil(o.Released) {
+	if o.Released != nil {
 		toSerialize["released"] = o.Released
 	}
-	if !isNil(o.ServiceLevel) {
+	if o.ServiceLevel != nil {
 		toSerialize["service_level"] = o.ServiceLevel
 	}
-	if !isNil(o.SocketTotal) {
+	if o.SocketTotal != nil {
 		toSerialize["socket_total"] = o.SocketTotal
 	}
-	if !isNil(o.Status) {
+	if o.Status != nil {
 		toSerialize["status"] = o.Status
 	}
-	if !isNil(o.SupportLevel) {
+	if o.SupportLevel != nil {
 		toSerialize["support_level"] = o.SupportLevel
 	}
-	if !isNil(o.SystemUnits) {
+	if o.SystemUnits != nil {
 		toSerialize["system_units"] = o.SystemUnits
 	}
-	if !isNil(o.TrialEndDate) {
+	if o.TrialEndDate != nil {
 		toSerialize["trial_end_date"] = o.TrialEndDate
 	}
-	if !isNil(o.Usage) {
+	if o.Usage != nil {
 		toSerialize["usage"] = o.Usage
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription_common_fields_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription_common_fields_all_of.go
index 889cccee..f1f8e374 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription_common_fields_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription_common_fields_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -73,7 +73,7 @@ func NewSubscriptionCommonFieldsAllOfWithDefaults() *SubscriptionCommonFieldsAll
 
 // GetBillingExpirationDate returns the BillingExpirationDate field value if set, zero value otherwise.
 func (o *SubscriptionCommonFieldsAllOf) GetBillingExpirationDate() time.Time {
-	if o == nil || isNil(o.BillingExpirationDate) {
+	if o == nil || o.BillingExpirationDate == nil {
 		var ret time.Time
 		return ret
 	}
@@ -83,15 +83,15 @@ func (o *SubscriptionCommonFieldsAllOf) GetBillingExpirationDate() time.Time {
 // GetBillingExpirationDateOk returns a tuple with the BillingExpirationDate field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCommonFieldsAllOf) GetBillingExpirationDateOk() (*time.Time, bool) {
-	if o == nil || isNil(o.BillingExpirationDate) {
-    return nil, false
+	if o == nil || o.BillingExpirationDate == nil {
+		return nil, false
 	}
 	return o.BillingExpirationDate, true
 }
 
 // HasBillingExpirationDate returns a boolean if a field has been set.
 func (o *SubscriptionCommonFieldsAllOf) HasBillingExpirationDate() bool {
-	if o != nil && !isNil(o.BillingExpirationDate) {
+	if o != nil && o.BillingExpirationDate != nil {
 		return true
 	}
 
@@ -105,7 +105,7 @@ func (o *SubscriptionCommonFieldsAllOf) SetBillingExpirationDate(v time.Time) {
 
 // GetBillingMarketplaceAccount returns the BillingMarketplaceAccount field value if set, zero value otherwise.
 func (o *SubscriptionCommonFieldsAllOf) GetBillingMarketplaceAccount() string {
-	if o == nil || isNil(o.BillingMarketplaceAccount) {
+	if o == nil || o.BillingMarketplaceAccount == nil {
 		var ret string
 		return ret
 	}
@@ -115,15 +115,15 @@ func (o *SubscriptionCommonFieldsAllOf) GetBillingMarketplaceAccount() string {
 // GetBillingMarketplaceAccountOk returns a tuple with the BillingMarketplaceAccount field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCommonFieldsAllOf) GetBillingMarketplaceAccountOk() (*string, bool) {
-	if o == nil || isNil(o.BillingMarketplaceAccount) {
-    return nil, false
+	if o == nil || o.BillingMarketplaceAccount == nil {
+		return nil, false
 	}
 	return o.BillingMarketplaceAccount, true
 }
 
 // HasBillingMarketplaceAccount returns a boolean if a field has been set.
 func (o *SubscriptionCommonFieldsAllOf) HasBillingMarketplaceAccount() bool {
-	if o != nil && !isNil(o.BillingMarketplaceAccount) {
+	if o != nil && o.BillingMarketplaceAccount != nil {
 		return true
 	}
 
@@ -137,7 +137,7 @@ func (o *SubscriptionCommonFieldsAllOf) SetBillingMarketplaceAccount(v string) {
 
 // GetCloudAccountId returns the CloudAccountId field value if set, zero value otherwise.
 func (o *SubscriptionCommonFieldsAllOf) GetCloudAccountId() string {
-	if o == nil || isNil(o.CloudAccountId) {
+	if o == nil || o.CloudAccountId == nil {
 		var ret string
 		return ret
 	}
@@ -147,15 +147,15 @@ func (o *SubscriptionCommonFieldsAllOf) GetCloudAccountId() string {
 // GetCloudAccountIdOk returns a tuple with the CloudAccountId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCommonFieldsAllOf) GetCloudAccountIdOk() (*string, bool) {
-	if o == nil || isNil(o.CloudAccountId) {
-    return nil, false
+	if o == nil || o.CloudAccountId == nil {
+		return nil, false
 	}
 	return o.CloudAccountId, true
 }
 
 // HasCloudAccountId returns a boolean if a field has been set.
 func (o *SubscriptionCommonFieldsAllOf) HasCloudAccountId() bool {
-	if o != nil && !isNil(o.CloudAccountId) {
+	if o != nil && o.CloudAccountId != nil {
 		return true
 	}
 
@@ -169,7 +169,7 @@ func (o *SubscriptionCommonFieldsAllOf) SetCloudAccountId(v string) {
 
 // GetCloudProviderId returns the CloudProviderId field value if set, zero value otherwise.
 func (o *SubscriptionCommonFieldsAllOf) GetCloudProviderId() string {
-	if o == nil || isNil(o.CloudProviderId) {
+	if o == nil || o.CloudProviderId == nil {
 		var ret string
 		return ret
 	}
@@ -179,15 +179,15 @@ func (o *SubscriptionCommonFieldsAllOf) GetCloudProviderId() string {
 // GetCloudProviderIdOk returns a tuple with the CloudProviderId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCommonFieldsAllOf) GetCloudProviderIdOk() (*string, bool) {
-	if o == nil || isNil(o.CloudProviderId) {
-    return nil, false
+	if o == nil || o.CloudProviderId == nil {
+		return nil, false
 	}
 	return o.CloudProviderId, true
 }
 
 // HasCloudProviderId returns a boolean if a field has been set.
 func (o *SubscriptionCommonFieldsAllOf) HasCloudProviderId() bool {
-	if o != nil && !isNil(o.CloudProviderId) {
+	if o != nil && o.CloudProviderId != nil {
 		return true
 	}
 
@@ -201,7 +201,7 @@ func (o *SubscriptionCommonFieldsAllOf) SetCloudProviderId(v string) {
 
 // GetClusterBillingModel returns the ClusterBillingModel field value if set, zero value otherwise.
 func (o *SubscriptionCommonFieldsAllOf) GetClusterBillingModel() string {
-	if o == nil || isNil(o.ClusterBillingModel) {
+	if o == nil || o.ClusterBillingModel == nil {
 		var ret string
 		return ret
 	}
@@ -211,15 +211,15 @@ func (o *SubscriptionCommonFieldsAllOf) GetClusterBillingModel() string {
 // GetClusterBillingModelOk returns a tuple with the ClusterBillingModel field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCommonFieldsAllOf) GetClusterBillingModelOk() (*string, bool) {
-	if o == nil || isNil(o.ClusterBillingModel) {
-    return nil, false
+	if o == nil || o.ClusterBillingModel == nil {
+		return nil, false
 	}
 	return o.ClusterBillingModel, true
 }
 
 // HasClusterBillingModel returns a boolean if a field has been set.
 func (o *SubscriptionCommonFieldsAllOf) HasClusterBillingModel() bool {
-	if o != nil && !isNil(o.ClusterBillingModel) {
+	if o != nil && o.ClusterBillingModel != nil {
 		return true
 	}
 
@@ -233,7 +233,7 @@ func (o *SubscriptionCommonFieldsAllOf) SetClusterBillingModel(v string) {
 
 // GetClusterId returns the ClusterId field value if set, zero value otherwise.
 func (o *SubscriptionCommonFieldsAllOf) GetClusterId() string {
-	if o == nil || isNil(o.ClusterId) {
+	if o == nil || o.ClusterId == nil {
 		var ret string
 		return ret
 	}
@@ -243,15 +243,15 @@ func (o *SubscriptionCommonFieldsAllOf) GetClusterId() string {
 // GetClusterIdOk returns a tuple with the ClusterId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCommonFieldsAllOf) GetClusterIdOk() (*string, bool) {
-	if o == nil || isNil(o.ClusterId) {
-    return nil, false
+	if o == nil || o.ClusterId == nil {
+		return nil, false
 	}
 	return o.ClusterId, true
 }
 
 // HasClusterId returns a boolean if a field has been set.
 func (o *SubscriptionCommonFieldsAllOf) HasClusterId() bool {
-	if o != nil && !isNil(o.ClusterId) {
+	if o != nil && o.ClusterId != nil {
 		return true
 	}
 
@@ -265,7 +265,7 @@ func (o *SubscriptionCommonFieldsAllOf) SetClusterId(v string) {
 
 // GetConsoleUrl returns the ConsoleUrl field value if set, zero value otherwise.
 func (o *SubscriptionCommonFieldsAllOf) GetConsoleUrl() string {
-	if o == nil || isNil(o.ConsoleUrl) {
+	if o == nil || o.ConsoleUrl == nil {
 		var ret string
 		return ret
 	}
@@ -275,15 +275,15 @@ func (o *SubscriptionCommonFieldsAllOf) GetConsoleUrl() string {
 // GetConsoleUrlOk returns a tuple with the ConsoleUrl field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCommonFieldsAllOf) GetConsoleUrlOk() (*string, bool) {
-	if o == nil || isNil(o.ConsoleUrl) {
-    return nil, false
+	if o == nil || o.ConsoleUrl == nil {
+		return nil, false
 	}
 	return o.ConsoleUrl, true
 }
 
 // HasConsoleUrl returns a boolean if a field has been set.
 func (o *SubscriptionCommonFieldsAllOf) HasConsoleUrl() bool {
-	if o != nil && !isNil(o.ConsoleUrl) {
+	if o != nil && o.ConsoleUrl != nil {
 		return true
 	}
 
@@ -297,7 +297,7 @@ func (o *SubscriptionCommonFieldsAllOf) SetConsoleUrl(v string) {
 
 // GetConsumerUuid returns the ConsumerUuid field value if set, zero value otherwise.
 func (o *SubscriptionCommonFieldsAllOf) GetConsumerUuid() string {
-	if o == nil || isNil(o.ConsumerUuid) {
+	if o == nil || o.ConsumerUuid == nil {
 		var ret string
 		return ret
 	}
@@ -307,15 +307,15 @@ func (o *SubscriptionCommonFieldsAllOf) GetConsumerUuid() string {
 // GetConsumerUuidOk returns a tuple with the ConsumerUuid field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCommonFieldsAllOf) GetConsumerUuidOk() (*string, bool) {
-	if o == nil || isNil(o.ConsumerUuid) {
-    return nil, false
+	if o == nil || o.ConsumerUuid == nil {
+		return nil, false
 	}
 	return o.ConsumerUuid, true
 }
 
 // HasConsumerUuid returns a boolean if a field has been set.
 func (o *SubscriptionCommonFieldsAllOf) HasConsumerUuid() bool {
-	if o != nil && !isNil(o.ConsumerUuid) {
+	if o != nil && o.ConsumerUuid != nil {
 		return true
 	}
 
@@ -329,7 +329,7 @@ func (o *SubscriptionCommonFieldsAllOf) SetConsumerUuid(v string) {
 
 // GetCpuTotal returns the CpuTotal field value if set, zero value otherwise.
 func (o *SubscriptionCommonFieldsAllOf) GetCpuTotal() int32 {
-	if o == nil || isNil(o.CpuTotal) {
+	if o == nil || o.CpuTotal == nil {
 		var ret int32
 		return ret
 	}
@@ -339,15 +339,15 @@ func (o *SubscriptionCommonFieldsAllOf) GetCpuTotal() int32 {
 // GetCpuTotalOk returns a tuple with the CpuTotal field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCommonFieldsAllOf) GetCpuTotalOk() (*int32, bool) {
-	if o == nil || isNil(o.CpuTotal) {
-    return nil, false
+	if o == nil || o.CpuTotal == nil {
+		return nil, false
 	}
 	return o.CpuTotal, true
 }
 
 // HasCpuTotal returns a boolean if a field has been set.
 func (o *SubscriptionCommonFieldsAllOf) HasCpuTotal() bool {
-	if o != nil && !isNil(o.CpuTotal) {
+	if o != nil && o.CpuTotal != nil {
 		return true
 	}
 
@@ -361,7 +361,7 @@ func (o *SubscriptionCommonFieldsAllOf) SetCpuTotal(v int32) {
 
 // GetCreatorId returns the CreatorId field value if set, zero value otherwise.
 func (o *SubscriptionCommonFieldsAllOf) GetCreatorId() string {
-	if o == nil || isNil(o.CreatorId) {
+	if o == nil || o.CreatorId == nil {
 		var ret string
 		return ret
 	}
@@ -371,15 +371,15 @@ func (o *SubscriptionCommonFieldsAllOf) GetCreatorId() string {
 // GetCreatorIdOk returns a tuple with the CreatorId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCommonFieldsAllOf) GetCreatorIdOk() (*string, bool) {
-	if o == nil || isNil(o.CreatorId) {
-    return nil, false
+	if o == nil || o.CreatorId == nil {
+		return nil, false
 	}
 	return o.CreatorId, true
 }
 
 // HasCreatorId returns a boolean if a field has been set.
 func (o *SubscriptionCommonFieldsAllOf) HasCreatorId() bool {
-	if o != nil && !isNil(o.CreatorId) {
+	if o != nil && o.CreatorId != nil {
 		return true
 	}
 
@@ -393,7 +393,7 @@ func (o *SubscriptionCommonFieldsAllOf) SetCreatorId(v string) {
 
 // GetDisplayName returns the DisplayName field value if set, zero value otherwise.
 func (o *SubscriptionCommonFieldsAllOf) GetDisplayName() string {
-	if o == nil || isNil(o.DisplayName) {
+	if o == nil || o.DisplayName == nil {
 		var ret string
 		return ret
 	}
@@ -403,15 +403,15 @@ func (o *SubscriptionCommonFieldsAllOf) GetDisplayName() string {
 // GetDisplayNameOk returns a tuple with the DisplayName field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCommonFieldsAllOf) GetDisplayNameOk() (*string, bool) {
-	if o == nil || isNil(o.DisplayName) {
-    return nil, false
+	if o == nil || o.DisplayName == nil {
+		return nil, false
 	}
 	return o.DisplayName, true
 }
 
 // HasDisplayName returns a boolean if a field has been set.
 func (o *SubscriptionCommonFieldsAllOf) HasDisplayName() bool {
-	if o != nil && !isNil(o.DisplayName) {
+	if o != nil && o.DisplayName != nil {
 		return true
 	}
 
@@ -425,7 +425,7 @@ func (o *SubscriptionCommonFieldsAllOf) SetDisplayName(v string) {
 
 // GetExternalClusterId returns the ExternalClusterId field value if set, zero value otherwise.
 func (o *SubscriptionCommonFieldsAllOf) GetExternalClusterId() string {
-	if o == nil || isNil(o.ExternalClusterId) {
+	if o == nil || o.ExternalClusterId == nil {
 		var ret string
 		return ret
 	}
@@ -435,15 +435,15 @@ func (o *SubscriptionCommonFieldsAllOf) GetExternalClusterId() string {
 // GetExternalClusterIdOk returns a tuple with the ExternalClusterId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCommonFieldsAllOf) GetExternalClusterIdOk() (*string, bool) {
-	if o == nil || isNil(o.ExternalClusterId) {
-    return nil, false
+	if o == nil || o.ExternalClusterId == nil {
+		return nil, false
 	}
 	return o.ExternalClusterId, true
 }
 
 // HasExternalClusterId returns a boolean if a field has been set.
 func (o *SubscriptionCommonFieldsAllOf) HasExternalClusterId() bool {
-	if o != nil && !isNil(o.ExternalClusterId) {
+	if o != nil && o.ExternalClusterId != nil {
 		return true
 	}
 
@@ -457,7 +457,7 @@ func (o *SubscriptionCommonFieldsAllOf) SetExternalClusterId(v string) {
 
 // GetLastReconcileDate returns the LastReconcileDate field value if set, zero value otherwise.
 func (o *SubscriptionCommonFieldsAllOf) GetLastReconcileDate() time.Time {
-	if o == nil || isNil(o.LastReconcileDate) {
+	if o == nil || o.LastReconcileDate == nil {
 		var ret time.Time
 		return ret
 	}
@@ -467,15 +467,15 @@ func (o *SubscriptionCommonFieldsAllOf) GetLastReconcileDate() time.Time {
 // GetLastReconcileDateOk returns a tuple with the LastReconcileDate field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCommonFieldsAllOf) GetLastReconcileDateOk() (*time.Time, bool) {
-	if o == nil || isNil(o.LastReconcileDate) {
-    return nil, false
+	if o == nil || o.LastReconcileDate == nil {
+		return nil, false
 	}
 	return o.LastReconcileDate, true
 }
 
 // HasLastReconcileDate returns a boolean if a field has been set.
 func (o *SubscriptionCommonFieldsAllOf) HasLastReconcileDate() bool {
-	if o != nil && !isNil(o.LastReconcileDate) {
+	if o != nil && o.LastReconcileDate != nil {
 		return true
 	}
 
@@ -489,7 +489,7 @@ func (o *SubscriptionCommonFieldsAllOf) SetLastReconcileDate(v time.Time) {
 
 // GetLastReleasedAt returns the LastReleasedAt field value if set, zero value otherwise.
 func (o *SubscriptionCommonFieldsAllOf) GetLastReleasedAt() time.Time {
-	if o == nil || isNil(o.LastReleasedAt) {
+	if o == nil || o.LastReleasedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -499,15 +499,15 @@ func (o *SubscriptionCommonFieldsAllOf) GetLastReleasedAt() time.Time {
 // GetLastReleasedAtOk returns a tuple with the LastReleasedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCommonFieldsAllOf) GetLastReleasedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.LastReleasedAt) {
-    return nil, false
+	if o == nil || o.LastReleasedAt == nil {
+		return nil, false
 	}
 	return o.LastReleasedAt, true
 }
 
 // HasLastReleasedAt returns a boolean if a field has been set.
 func (o *SubscriptionCommonFieldsAllOf) HasLastReleasedAt() bool {
-	if o != nil && !isNil(o.LastReleasedAt) {
+	if o != nil && o.LastReleasedAt != nil {
 		return true
 	}
 
@@ -521,7 +521,7 @@ func (o *SubscriptionCommonFieldsAllOf) SetLastReleasedAt(v time.Time) {
 
 // GetLastTelemetryDate returns the LastTelemetryDate field value if set, zero value otherwise.
 func (o *SubscriptionCommonFieldsAllOf) GetLastTelemetryDate() time.Time {
-	if o == nil || isNil(o.LastTelemetryDate) {
+	if o == nil || o.LastTelemetryDate == nil {
 		var ret time.Time
 		return ret
 	}
@@ -531,15 +531,15 @@ func (o *SubscriptionCommonFieldsAllOf) GetLastTelemetryDate() time.Time {
 // GetLastTelemetryDateOk returns a tuple with the LastTelemetryDate field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCommonFieldsAllOf) GetLastTelemetryDateOk() (*time.Time, bool) {
-	if o == nil || isNil(o.LastTelemetryDate) {
-    return nil, false
+	if o == nil || o.LastTelemetryDate == nil {
+		return nil, false
 	}
 	return o.LastTelemetryDate, true
 }
 
 // HasLastTelemetryDate returns a boolean if a field has been set.
 func (o *SubscriptionCommonFieldsAllOf) HasLastTelemetryDate() bool {
-	if o != nil && !isNil(o.LastTelemetryDate) {
+	if o != nil && o.LastTelemetryDate != nil {
 		return true
 	}
 
@@ -564,8 +564,8 @@ func (o *SubscriptionCommonFieldsAllOf) GetManaged() bool {
 // GetManagedOk returns a tuple with the Managed field value
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCommonFieldsAllOf) GetManagedOk() (*bool, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Managed, true
 }
@@ -577,7 +577,7 @@ func (o *SubscriptionCommonFieldsAllOf) SetManaged(v bool) {
 
 // GetOrganizationId returns the OrganizationId field value if set, zero value otherwise.
 func (o *SubscriptionCommonFieldsAllOf) GetOrganizationId() string {
-	if o == nil || isNil(o.OrganizationId) {
+	if o == nil || o.OrganizationId == nil {
 		var ret string
 		return ret
 	}
@@ -587,15 +587,15 @@ func (o *SubscriptionCommonFieldsAllOf) GetOrganizationId() string {
 // GetOrganizationIdOk returns a tuple with the OrganizationId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCommonFieldsAllOf) GetOrganizationIdOk() (*string, bool) {
-	if o == nil || isNil(o.OrganizationId) {
-    return nil, false
+	if o == nil || o.OrganizationId == nil {
+		return nil, false
 	}
 	return o.OrganizationId, true
 }
 
 // HasOrganizationId returns a boolean if a field has been set.
 func (o *SubscriptionCommonFieldsAllOf) HasOrganizationId() bool {
-	if o != nil && !isNil(o.OrganizationId) {
+	if o != nil && o.OrganizationId != nil {
 		return true
 	}
 
@@ -609,7 +609,7 @@ func (o *SubscriptionCommonFieldsAllOf) SetOrganizationId(v string) {
 
 // GetPlanId returns the PlanId field value if set, zero value otherwise.
 func (o *SubscriptionCommonFieldsAllOf) GetPlanId() string {
-	if o == nil || isNil(o.PlanId) {
+	if o == nil || o.PlanId == nil {
 		var ret string
 		return ret
 	}
@@ -619,15 +619,15 @@ func (o *SubscriptionCommonFieldsAllOf) GetPlanId() string {
 // GetPlanIdOk returns a tuple with the PlanId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCommonFieldsAllOf) GetPlanIdOk() (*string, bool) {
-	if o == nil || isNil(o.PlanId) {
-    return nil, false
+	if o == nil || o.PlanId == nil {
+		return nil, false
 	}
 	return o.PlanId, true
 }
 
 // HasPlanId returns a boolean if a field has been set.
 func (o *SubscriptionCommonFieldsAllOf) HasPlanId() bool {
-	if o != nil && !isNil(o.PlanId) {
+	if o != nil && o.PlanId != nil {
 		return true
 	}
 
@@ -641,7 +641,7 @@ func (o *SubscriptionCommonFieldsAllOf) SetPlanId(v string) {
 
 // GetProductBundle returns the ProductBundle field value if set, zero value otherwise.
 func (o *SubscriptionCommonFieldsAllOf) GetProductBundle() string {
-	if o == nil || isNil(o.ProductBundle) {
+	if o == nil || o.ProductBundle == nil {
 		var ret string
 		return ret
 	}
@@ -651,15 +651,15 @@ func (o *SubscriptionCommonFieldsAllOf) GetProductBundle() string {
 // GetProductBundleOk returns a tuple with the ProductBundle field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCommonFieldsAllOf) GetProductBundleOk() (*string, bool) {
-	if o == nil || isNil(o.ProductBundle) {
-    return nil, false
+	if o == nil || o.ProductBundle == nil {
+		return nil, false
 	}
 	return o.ProductBundle, true
 }
 
 // HasProductBundle returns a boolean if a field has been set.
 func (o *SubscriptionCommonFieldsAllOf) HasProductBundle() bool {
-	if o != nil && !isNil(o.ProductBundle) {
+	if o != nil && o.ProductBundle != nil {
 		return true
 	}
 
@@ -673,7 +673,7 @@ func (o *SubscriptionCommonFieldsAllOf) SetProductBundle(v string) {
 
 // GetProvenance returns the Provenance field value if set, zero value otherwise.
 func (o *SubscriptionCommonFieldsAllOf) GetProvenance() string {
-	if o == nil || isNil(o.Provenance) {
+	if o == nil || o.Provenance == nil {
 		var ret string
 		return ret
 	}
@@ -683,15 +683,15 @@ func (o *SubscriptionCommonFieldsAllOf) GetProvenance() string {
 // GetProvenanceOk returns a tuple with the Provenance field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCommonFieldsAllOf) GetProvenanceOk() (*string, bool) {
-	if o == nil || isNil(o.Provenance) {
-    return nil, false
+	if o == nil || o.Provenance == nil {
+		return nil, false
 	}
 	return o.Provenance, true
 }
 
 // HasProvenance returns a boolean if a field has been set.
 func (o *SubscriptionCommonFieldsAllOf) HasProvenance() bool {
-	if o != nil && !isNil(o.Provenance) {
+	if o != nil && o.Provenance != nil {
 		return true
 	}
 
@@ -705,7 +705,7 @@ func (o *SubscriptionCommonFieldsAllOf) SetProvenance(v string) {
 
 // GetRegionId returns the RegionId field value if set, zero value otherwise.
 func (o *SubscriptionCommonFieldsAllOf) GetRegionId() string {
-	if o == nil || isNil(o.RegionId) {
+	if o == nil || o.RegionId == nil {
 		var ret string
 		return ret
 	}
@@ -715,15 +715,15 @@ func (o *SubscriptionCommonFieldsAllOf) GetRegionId() string {
 // GetRegionIdOk returns a tuple with the RegionId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCommonFieldsAllOf) GetRegionIdOk() (*string, bool) {
-	if o == nil || isNil(o.RegionId) {
-    return nil, false
+	if o == nil || o.RegionId == nil {
+		return nil, false
 	}
 	return o.RegionId, true
 }
 
 // HasRegionId returns a boolean if a field has been set.
 func (o *SubscriptionCommonFieldsAllOf) HasRegionId() bool {
-	if o != nil && !isNil(o.RegionId) {
+	if o != nil && o.RegionId != nil {
 		return true
 	}
 
@@ -737,7 +737,7 @@ func (o *SubscriptionCommonFieldsAllOf) SetRegionId(v string) {
 
 // GetReleased returns the Released field value if set, zero value otherwise.
 func (o *SubscriptionCommonFieldsAllOf) GetReleased() bool {
-	if o == nil || isNil(o.Released) {
+	if o == nil || o.Released == nil {
 		var ret bool
 		return ret
 	}
@@ -747,15 +747,15 @@ func (o *SubscriptionCommonFieldsAllOf) GetReleased() bool {
 // GetReleasedOk returns a tuple with the Released field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCommonFieldsAllOf) GetReleasedOk() (*bool, bool) {
-	if o == nil || isNil(o.Released) {
-    return nil, false
+	if o == nil || o.Released == nil {
+		return nil, false
 	}
 	return o.Released, true
 }
 
 // HasReleased returns a boolean if a field has been set.
 func (o *SubscriptionCommonFieldsAllOf) HasReleased() bool {
-	if o != nil && !isNil(o.Released) {
+	if o != nil && o.Released != nil {
 		return true
 	}
 
@@ -769,7 +769,7 @@ func (o *SubscriptionCommonFieldsAllOf) SetReleased(v bool) {
 
 // GetServiceLevel returns the ServiceLevel field value if set, zero value otherwise.
 func (o *SubscriptionCommonFieldsAllOf) GetServiceLevel() string {
-	if o == nil || isNil(o.ServiceLevel) {
+	if o == nil || o.ServiceLevel == nil {
 		var ret string
 		return ret
 	}
@@ -779,15 +779,15 @@ func (o *SubscriptionCommonFieldsAllOf) GetServiceLevel() string {
 // GetServiceLevelOk returns a tuple with the ServiceLevel field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCommonFieldsAllOf) GetServiceLevelOk() (*string, bool) {
-	if o == nil || isNil(o.ServiceLevel) {
-    return nil, false
+	if o == nil || o.ServiceLevel == nil {
+		return nil, false
 	}
 	return o.ServiceLevel, true
 }
 
 // HasServiceLevel returns a boolean if a field has been set.
 func (o *SubscriptionCommonFieldsAllOf) HasServiceLevel() bool {
-	if o != nil && !isNil(o.ServiceLevel) {
+	if o != nil && o.ServiceLevel != nil {
 		return true
 	}
 
@@ -801,7 +801,7 @@ func (o *SubscriptionCommonFieldsAllOf) SetServiceLevel(v string) {
 
 // GetSocketTotal returns the SocketTotal field value if set, zero value otherwise.
 func (o *SubscriptionCommonFieldsAllOf) GetSocketTotal() int32 {
-	if o == nil || isNil(o.SocketTotal) {
+	if o == nil || o.SocketTotal == nil {
 		var ret int32
 		return ret
 	}
@@ -811,15 +811,15 @@ func (o *SubscriptionCommonFieldsAllOf) GetSocketTotal() int32 {
 // GetSocketTotalOk returns a tuple with the SocketTotal field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCommonFieldsAllOf) GetSocketTotalOk() (*int32, bool) {
-	if o == nil || isNil(o.SocketTotal) {
-    return nil, false
+	if o == nil || o.SocketTotal == nil {
+		return nil, false
 	}
 	return o.SocketTotal, true
 }
 
 // HasSocketTotal returns a boolean if a field has been set.
 func (o *SubscriptionCommonFieldsAllOf) HasSocketTotal() bool {
-	if o != nil && !isNil(o.SocketTotal) {
+	if o != nil && o.SocketTotal != nil {
 		return true
 	}
 
@@ -833,7 +833,7 @@ func (o *SubscriptionCommonFieldsAllOf) SetSocketTotal(v int32) {
 
 // GetStatus returns the Status field value if set, zero value otherwise.
 func (o *SubscriptionCommonFieldsAllOf) GetStatus() string {
-	if o == nil || isNil(o.Status) {
+	if o == nil || o.Status == nil {
 		var ret string
 		return ret
 	}
@@ -843,15 +843,15 @@ func (o *SubscriptionCommonFieldsAllOf) GetStatus() string {
 // GetStatusOk returns a tuple with the Status field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCommonFieldsAllOf) GetStatusOk() (*string, bool) {
-	if o == nil || isNil(o.Status) {
-    return nil, false
+	if o == nil || o.Status == nil {
+		return nil, false
 	}
 	return o.Status, true
 }
 
 // HasStatus returns a boolean if a field has been set.
 func (o *SubscriptionCommonFieldsAllOf) HasStatus() bool {
-	if o != nil && !isNil(o.Status) {
+	if o != nil && o.Status != nil {
 		return true
 	}
 
@@ -865,7 +865,7 @@ func (o *SubscriptionCommonFieldsAllOf) SetStatus(v string) {
 
 // GetSupportLevel returns the SupportLevel field value if set, zero value otherwise.
 func (o *SubscriptionCommonFieldsAllOf) GetSupportLevel() string {
-	if o == nil || isNil(o.SupportLevel) {
+	if o == nil || o.SupportLevel == nil {
 		var ret string
 		return ret
 	}
@@ -875,15 +875,15 @@ func (o *SubscriptionCommonFieldsAllOf) GetSupportLevel() string {
 // GetSupportLevelOk returns a tuple with the SupportLevel field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCommonFieldsAllOf) GetSupportLevelOk() (*string, bool) {
-	if o == nil || isNil(o.SupportLevel) {
-    return nil, false
+	if o == nil || o.SupportLevel == nil {
+		return nil, false
 	}
 	return o.SupportLevel, true
 }
 
 // HasSupportLevel returns a boolean if a field has been set.
 func (o *SubscriptionCommonFieldsAllOf) HasSupportLevel() bool {
-	if o != nil && !isNil(o.SupportLevel) {
+	if o != nil && o.SupportLevel != nil {
 		return true
 	}
 
@@ -897,7 +897,7 @@ func (o *SubscriptionCommonFieldsAllOf) SetSupportLevel(v string) {
 
 // GetSystemUnits returns the SystemUnits field value if set, zero value otherwise.
 func (o *SubscriptionCommonFieldsAllOf) GetSystemUnits() string {
-	if o == nil || isNil(o.SystemUnits) {
+	if o == nil || o.SystemUnits == nil {
 		var ret string
 		return ret
 	}
@@ -907,15 +907,15 @@ func (o *SubscriptionCommonFieldsAllOf) GetSystemUnits() string {
 // GetSystemUnitsOk returns a tuple with the SystemUnits field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCommonFieldsAllOf) GetSystemUnitsOk() (*string, bool) {
-	if o == nil || isNil(o.SystemUnits) {
-    return nil, false
+	if o == nil || o.SystemUnits == nil {
+		return nil, false
 	}
 	return o.SystemUnits, true
 }
 
 // HasSystemUnits returns a boolean if a field has been set.
 func (o *SubscriptionCommonFieldsAllOf) HasSystemUnits() bool {
-	if o != nil && !isNil(o.SystemUnits) {
+	if o != nil && o.SystemUnits != nil {
 		return true
 	}
 
@@ -929,7 +929,7 @@ func (o *SubscriptionCommonFieldsAllOf) SetSystemUnits(v string) {
 
 // GetTrialEndDate returns the TrialEndDate field value if set, zero value otherwise.
 func (o *SubscriptionCommonFieldsAllOf) GetTrialEndDate() time.Time {
-	if o == nil || isNil(o.TrialEndDate) {
+	if o == nil || o.TrialEndDate == nil {
 		var ret time.Time
 		return ret
 	}
@@ -939,15 +939,15 @@ func (o *SubscriptionCommonFieldsAllOf) GetTrialEndDate() time.Time {
 // GetTrialEndDateOk returns a tuple with the TrialEndDate field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCommonFieldsAllOf) GetTrialEndDateOk() (*time.Time, bool) {
-	if o == nil || isNil(o.TrialEndDate) {
-    return nil, false
+	if o == nil || o.TrialEndDate == nil {
+		return nil, false
 	}
 	return o.TrialEndDate, true
 }
 
 // HasTrialEndDate returns a boolean if a field has been set.
 func (o *SubscriptionCommonFieldsAllOf) HasTrialEndDate() bool {
-	if o != nil && !isNil(o.TrialEndDate) {
+	if o != nil && o.TrialEndDate != nil {
 		return true
 	}
 
@@ -961,7 +961,7 @@ func (o *SubscriptionCommonFieldsAllOf) SetTrialEndDate(v time.Time) {
 
 // GetUsage returns the Usage field value if set, zero value otherwise.
 func (o *SubscriptionCommonFieldsAllOf) GetUsage() string {
-	if o == nil || isNil(o.Usage) {
+	if o == nil || o.Usage == nil {
 		var ret string
 		return ret
 	}
@@ -971,15 +971,15 @@ func (o *SubscriptionCommonFieldsAllOf) GetUsage() string {
 // GetUsageOk returns a tuple with the Usage field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCommonFieldsAllOf) GetUsageOk() (*string, bool) {
-	if o == nil || isNil(o.Usage) {
-    return nil, false
+	if o == nil || o.Usage == nil {
+		return nil, false
 	}
 	return o.Usage, true
 }
 
 // HasUsage returns a boolean if a field has been set.
 func (o *SubscriptionCommonFieldsAllOf) HasUsage() bool {
-	if o != nil && !isNil(o.Usage) {
+	if o != nil && o.Usage != nil {
 		return true
 	}
 
@@ -993,91 +993,91 @@ func (o *SubscriptionCommonFieldsAllOf) SetUsage(v string) {
 
 func (o SubscriptionCommonFieldsAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.BillingExpirationDate) {
+	if o.BillingExpirationDate != nil {
 		toSerialize["billing_expiration_date"] = o.BillingExpirationDate
 	}
-	if !isNil(o.BillingMarketplaceAccount) {
+	if o.BillingMarketplaceAccount != nil {
 		toSerialize["billing_marketplace_account"] = o.BillingMarketplaceAccount
 	}
-	if !isNil(o.CloudAccountId) {
+	if o.CloudAccountId != nil {
 		toSerialize["cloud_account_id"] = o.CloudAccountId
 	}
-	if !isNil(o.CloudProviderId) {
+	if o.CloudProviderId != nil {
 		toSerialize["cloud_provider_id"] = o.CloudProviderId
 	}
-	if !isNil(o.ClusterBillingModel) {
+	if o.ClusterBillingModel != nil {
 		toSerialize["cluster_billing_model"] = o.ClusterBillingModel
 	}
-	if !isNil(o.ClusterId) {
+	if o.ClusterId != nil {
 		toSerialize["cluster_id"] = o.ClusterId
 	}
-	if !isNil(o.ConsoleUrl) {
+	if o.ConsoleUrl != nil {
 		toSerialize["console_url"] = o.ConsoleUrl
 	}
-	if !isNil(o.ConsumerUuid) {
+	if o.ConsumerUuid != nil {
 		toSerialize["consumer_uuid"] = o.ConsumerUuid
 	}
-	if !isNil(o.CpuTotal) {
+	if o.CpuTotal != nil {
 		toSerialize["cpu_total"] = o.CpuTotal
 	}
-	if !isNil(o.CreatorId) {
+	if o.CreatorId != nil {
 		toSerialize["creator_id"] = o.CreatorId
 	}
-	if !isNil(o.DisplayName) {
+	if o.DisplayName != nil {
 		toSerialize["display_name"] = o.DisplayName
 	}
-	if !isNil(o.ExternalClusterId) {
+	if o.ExternalClusterId != nil {
 		toSerialize["external_cluster_id"] = o.ExternalClusterId
 	}
-	if !isNil(o.LastReconcileDate) {
+	if o.LastReconcileDate != nil {
 		toSerialize["last_reconcile_date"] = o.LastReconcileDate
 	}
-	if !isNil(o.LastReleasedAt) {
+	if o.LastReleasedAt != nil {
 		toSerialize["last_released_at"] = o.LastReleasedAt
 	}
-	if !isNil(o.LastTelemetryDate) {
+	if o.LastTelemetryDate != nil {
 		toSerialize["last_telemetry_date"] = o.LastTelemetryDate
 	}
 	if true {
 		toSerialize["managed"] = o.Managed
 	}
-	if !isNil(o.OrganizationId) {
+	if o.OrganizationId != nil {
 		toSerialize["organization_id"] = o.OrganizationId
 	}
-	if !isNil(o.PlanId) {
+	if o.PlanId != nil {
 		toSerialize["plan_id"] = o.PlanId
 	}
-	if !isNil(o.ProductBundle) {
+	if o.ProductBundle != nil {
 		toSerialize["product_bundle"] = o.ProductBundle
 	}
-	if !isNil(o.Provenance) {
+	if o.Provenance != nil {
 		toSerialize["provenance"] = o.Provenance
 	}
-	if !isNil(o.RegionId) {
+	if o.RegionId != nil {
 		toSerialize["region_id"] = o.RegionId
 	}
-	if !isNil(o.Released) {
+	if o.Released != nil {
 		toSerialize["released"] = o.Released
 	}
-	if !isNil(o.ServiceLevel) {
+	if o.ServiceLevel != nil {
 		toSerialize["service_level"] = o.ServiceLevel
 	}
-	if !isNil(o.SocketTotal) {
+	if o.SocketTotal != nil {
 		toSerialize["socket_total"] = o.SocketTotal
 	}
-	if !isNil(o.Status) {
+	if o.Status != nil {
 		toSerialize["status"] = o.Status
 	}
-	if !isNil(o.SupportLevel) {
+	if o.SupportLevel != nil {
 		toSerialize["support_level"] = o.SupportLevel
 	}
-	if !isNil(o.SystemUnits) {
+	if o.SystemUnits != nil {
 		toSerialize["system_units"] = o.SystemUnits
 	}
-	if !isNil(o.TrialEndDate) {
+	if o.TrialEndDate != nil {
 		toSerialize["trial_end_date"] = o.TrialEndDate
 	}
-	if !isNil(o.Usage) {
+	if o.Usage != nil {
 		toSerialize["usage"] = o.Usage
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription_create_request.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription_create_request.go
index f93f4e47..c338ee0e 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription_create_request.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription_create_request.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -56,8 +56,8 @@ func (o *SubscriptionCreateRequest) GetClusterUuid() string {
 // GetClusterUuidOk returns a tuple with the ClusterUuid field value
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCreateRequest) GetClusterUuidOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.ClusterUuid, true
 }
@@ -69,7 +69,7 @@ func (o *SubscriptionCreateRequest) SetClusterUuid(v string) {
 
 // GetConsoleUrl returns the ConsoleUrl field value if set, zero value otherwise.
 func (o *SubscriptionCreateRequest) GetConsoleUrl() string {
-	if o == nil || isNil(o.ConsoleUrl) {
+	if o == nil || o.ConsoleUrl == nil {
 		var ret string
 		return ret
 	}
@@ -79,15 +79,15 @@ func (o *SubscriptionCreateRequest) GetConsoleUrl() string {
 // GetConsoleUrlOk returns a tuple with the ConsoleUrl field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCreateRequest) GetConsoleUrlOk() (*string, bool) {
-	if o == nil || isNil(o.ConsoleUrl) {
-    return nil, false
+	if o == nil || o.ConsoleUrl == nil {
+		return nil, false
 	}
 	return o.ConsoleUrl, true
 }
 
 // HasConsoleUrl returns a boolean if a field has been set.
 func (o *SubscriptionCreateRequest) HasConsoleUrl() bool {
-	if o != nil && !isNil(o.ConsoleUrl) {
+	if o != nil && o.ConsoleUrl != nil {
 		return true
 	}
 
@@ -101,7 +101,7 @@ func (o *SubscriptionCreateRequest) SetConsoleUrl(v string) {
 
 // GetDisplayName returns the DisplayName field value if set, zero value otherwise.
 func (o *SubscriptionCreateRequest) GetDisplayName() string {
-	if o == nil || isNil(o.DisplayName) {
+	if o == nil || o.DisplayName == nil {
 		var ret string
 		return ret
 	}
@@ -111,15 +111,15 @@ func (o *SubscriptionCreateRequest) GetDisplayName() string {
 // GetDisplayNameOk returns a tuple with the DisplayName field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCreateRequest) GetDisplayNameOk() (*string, bool) {
-	if o == nil || isNil(o.DisplayName) {
-    return nil, false
+	if o == nil || o.DisplayName == nil {
+		return nil, false
 	}
 	return o.DisplayName, true
 }
 
 // HasDisplayName returns a boolean if a field has been set.
 func (o *SubscriptionCreateRequest) HasDisplayName() bool {
-	if o != nil && !isNil(o.DisplayName) {
+	if o != nil && o.DisplayName != nil {
 		return true
 	}
 
@@ -144,8 +144,8 @@ func (o *SubscriptionCreateRequest) GetPlanId() string {
 // GetPlanIdOk returns a tuple with the PlanId field value
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCreateRequest) GetPlanIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.PlanId, true
 }
@@ -168,8 +168,8 @@ func (o *SubscriptionCreateRequest) GetStatus() string {
 // GetStatusOk returns a tuple with the Status field value
 // and a boolean to check if the value has been set.
 func (o *SubscriptionCreateRequest) GetStatusOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Status, true
 }
@@ -184,10 +184,10 @@ func (o SubscriptionCreateRequest) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["cluster_uuid"] = o.ClusterUuid
 	}
-	if !isNil(o.ConsoleUrl) {
+	if o.ConsoleUrl != nil {
 		toSerialize["console_url"] = o.ConsoleUrl
 	}
-	if !isNil(o.DisplayName) {
+	if o.DisplayName != nil {
 		toSerialize["display_name"] = o.DisplayName
 	}
 	if true {
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription_list.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription_list.go
index f0b490c1..0957a6a6 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription_list.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription_list.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -58,8 +58,8 @@ func (o *SubscriptionList) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *SubscriptionList) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -82,8 +82,8 @@ func (o *SubscriptionList) GetPage() int32 {
 // GetPageOk returns a tuple with the Page field value
 // and a boolean to check if the value has been set.
 func (o *SubscriptionList) GetPageOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Page, true
 }
@@ -106,8 +106,8 @@ func (o *SubscriptionList) GetSize() int32 {
 // GetSizeOk returns a tuple with the Size field value
 // and a boolean to check if the value has been set.
 func (o *SubscriptionList) GetSizeOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Size, true
 }
@@ -130,8 +130,8 @@ func (o *SubscriptionList) GetTotal() int32 {
 // GetTotalOk returns a tuple with the Total field value
 // and a boolean to check if the value has been set.
 func (o *SubscriptionList) GetTotalOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Total, true
 }
@@ -153,11 +153,11 @@ func (o *SubscriptionList) GetItems() []Subscription {
 
 // GetItemsOk returns a tuple with the Items field value
 // and a boolean to check if the value has been set.
-func (o *SubscriptionList) GetItemsOk() ([]Subscription, bool) {
-	if o == nil {
-    return nil, false
+func (o *SubscriptionList) GetItemsOk() (*[]Subscription, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Items, true
+	return &o.Items, true
 }
 
 // SetItems sets field value
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription_list_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription_list_all_of.go
index 89ce45cf..33976a2e 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription_list_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription_list_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -16,7 +16,7 @@ import (
 
 // SubscriptionListAllOf struct for SubscriptionListAllOf
 type SubscriptionListAllOf struct {
-	Items []Subscription `json:"items,omitempty"`
+	Items *[]Subscription `json:"items,omitempty"`
 }
 
 // NewSubscriptionListAllOf instantiates a new SubscriptionListAllOf object
@@ -38,25 +38,25 @@ func NewSubscriptionListAllOfWithDefaults() *SubscriptionListAllOf {
 
 // GetItems returns the Items field value if set, zero value otherwise.
 func (o *SubscriptionListAllOf) GetItems() []Subscription {
-	if o == nil || isNil(o.Items) {
+	if o == nil || o.Items == nil {
 		var ret []Subscription
 		return ret
 	}
-	return o.Items
+	return *o.Items
 }
 
 // GetItemsOk returns a tuple with the Items field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *SubscriptionListAllOf) GetItemsOk() ([]Subscription, bool) {
-	if o == nil || isNil(o.Items) {
-    return nil, false
+func (o *SubscriptionListAllOf) GetItemsOk() (*[]Subscription, bool) {
+	if o == nil || o.Items == nil {
+		return nil, false
 	}
 	return o.Items, true
 }
 
 // HasItems returns a boolean if a field has been set.
 func (o *SubscriptionListAllOf) HasItems() bool {
-	if o != nil && !isNil(o.Items) {
+	if o != nil && o.Items != nil {
 		return true
 	}
 
@@ -65,12 +65,12 @@ func (o *SubscriptionListAllOf) HasItems() bool {
 
 // SetItems gets a reference to the given []Subscription and assigns it to the Items field.
 func (o *SubscriptionListAllOf) SetItems(v []Subscription) {
-	o.Items = v
+	o.Items = &v
 }
 
 func (o SubscriptionListAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Items) {
+	if o.Items != nil {
 		toSerialize["items"] = o.Items
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription_metric.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription_metric.go
index afca0443..8edf26bd 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription_metric.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription_metric.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -38,7 +38,7 @@ func NewSubscriptionMetricWithDefaults() *SubscriptionMetric {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *SubscriptionMetric) GetId() string {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret string
 		return ret
 	}
@@ -48,15 +48,15 @@ func (o *SubscriptionMetric) GetId() string {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionMetric) GetIdOk() (*string, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *SubscriptionMetric) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -70,7 +70,7 @@ func (o *SubscriptionMetric) SetId(v string) {
 
 func (o SubscriptionMetric) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["_id"] = o.Id
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription_metric_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription_metric_all_of.go
index 5fab3cfb..ab74e36f 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription_metric_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription_metric_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -38,7 +38,7 @@ func NewSubscriptionMetricAllOfWithDefaults() *SubscriptionMetricAllOf {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *SubscriptionMetricAllOf) GetId() string {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret string
 		return ret
 	}
@@ -48,15 +48,15 @@ func (o *SubscriptionMetricAllOf) GetId() string {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionMetricAllOf) GetIdOk() (*string, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *SubscriptionMetricAllOf) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -70,7 +70,7 @@ func (o *SubscriptionMetricAllOf) SetId(v string) {
 
 func (o SubscriptionMetricAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["_id"] = o.Id
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription_metric_list.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription_metric_list.go
index c37db619..689a80dc 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription_metric_list.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription_metric_list.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -58,8 +58,8 @@ func (o *SubscriptionMetricList) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *SubscriptionMetricList) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -82,8 +82,8 @@ func (o *SubscriptionMetricList) GetPage() int32 {
 // GetPageOk returns a tuple with the Page field value
 // and a boolean to check if the value has been set.
 func (o *SubscriptionMetricList) GetPageOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Page, true
 }
@@ -106,8 +106,8 @@ func (o *SubscriptionMetricList) GetSize() int32 {
 // GetSizeOk returns a tuple with the Size field value
 // and a boolean to check if the value has been set.
 func (o *SubscriptionMetricList) GetSizeOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Size, true
 }
@@ -130,8 +130,8 @@ func (o *SubscriptionMetricList) GetTotal() int32 {
 // GetTotalOk returns a tuple with the Total field value
 // and a boolean to check if the value has been set.
 func (o *SubscriptionMetricList) GetTotalOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Total, true
 }
@@ -153,11 +153,11 @@ func (o *SubscriptionMetricList) GetItems() []SubscriptionMetric {
 
 // GetItemsOk returns a tuple with the Items field value
 // and a boolean to check if the value has been set.
-func (o *SubscriptionMetricList) GetItemsOk() ([]SubscriptionMetric, bool) {
-	if o == nil {
-    return nil, false
+func (o *SubscriptionMetricList) GetItemsOk() (*[]SubscriptionMetric, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Items, true
+	return &o.Items, true
 }
 
 // SetItems sets field value
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription_metric_list_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription_metric_list_all_of.go
index 7e0c7148..5d37807d 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription_metric_list_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription_metric_list_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -16,7 +16,7 @@ import (
 
 // SubscriptionMetricListAllOf struct for SubscriptionMetricListAllOf
 type SubscriptionMetricListAllOf struct {
-	Items []SubscriptionMetric `json:"items,omitempty"`
+	Items *[]SubscriptionMetric `json:"items,omitempty"`
 }
 
 // NewSubscriptionMetricListAllOf instantiates a new SubscriptionMetricListAllOf object
@@ -38,25 +38,25 @@ func NewSubscriptionMetricListAllOfWithDefaults() *SubscriptionMetricListAllOf {
 
 // GetItems returns the Items field value if set, zero value otherwise.
 func (o *SubscriptionMetricListAllOf) GetItems() []SubscriptionMetric {
-	if o == nil || isNil(o.Items) {
+	if o == nil || o.Items == nil {
 		var ret []SubscriptionMetric
 		return ret
 	}
-	return o.Items
+	return *o.Items
 }
 
 // GetItemsOk returns a tuple with the Items field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *SubscriptionMetricListAllOf) GetItemsOk() ([]SubscriptionMetric, bool) {
-	if o == nil || isNil(o.Items) {
-    return nil, false
+func (o *SubscriptionMetricListAllOf) GetItemsOk() (*[]SubscriptionMetric, bool) {
+	if o == nil || o.Items == nil {
+		return nil, false
 	}
 	return o.Items, true
 }
 
 // HasItems returns a boolean if a field has been set.
 func (o *SubscriptionMetricListAllOf) HasItems() bool {
-	if o != nil && !isNil(o.Items) {
+	if o != nil && o.Items != nil {
 		return true
 	}
 
@@ -65,12 +65,12 @@ func (o *SubscriptionMetricListAllOf) HasItems() bool {
 
 // SetItems gets a reference to the given []SubscriptionMetric and assigns it to the Items field.
 func (o *SubscriptionMetricListAllOf) SetItems(v []SubscriptionMetric) {
-	o.Items = v
+	o.Items = &v
 }
 
 func (o SubscriptionMetricListAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Items) {
+	if o.Items != nil {
 		toSerialize["items"] = o.Items
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription_patch_request.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription_patch_request.go
index fdab25eb..41750e73 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription_patch_request.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription_patch_request.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -63,7 +63,7 @@ func NewSubscriptionPatchRequestWithDefaults() *SubscriptionPatchRequest {
 
 // GetBillingExpirationDate returns the BillingExpirationDate field value if set, zero value otherwise.
 func (o *SubscriptionPatchRequest) GetBillingExpirationDate() time.Time {
-	if o == nil || isNil(o.BillingExpirationDate) {
+	if o == nil || o.BillingExpirationDate == nil {
 		var ret time.Time
 		return ret
 	}
@@ -73,15 +73,15 @@ func (o *SubscriptionPatchRequest) GetBillingExpirationDate() time.Time {
 // GetBillingExpirationDateOk returns a tuple with the BillingExpirationDate field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionPatchRequest) GetBillingExpirationDateOk() (*time.Time, bool) {
-	if o == nil || isNil(o.BillingExpirationDate) {
-    return nil, false
+	if o == nil || o.BillingExpirationDate == nil {
+		return nil, false
 	}
 	return o.BillingExpirationDate, true
 }
 
 // HasBillingExpirationDate returns a boolean if a field has been set.
 func (o *SubscriptionPatchRequest) HasBillingExpirationDate() bool {
-	if o != nil && !isNil(o.BillingExpirationDate) {
+	if o != nil && o.BillingExpirationDate != nil {
 		return true
 	}
 
@@ -95,7 +95,7 @@ func (o *SubscriptionPatchRequest) SetBillingExpirationDate(v time.Time) {
 
 // GetCloudAccountId returns the CloudAccountId field value if set, zero value otherwise.
 func (o *SubscriptionPatchRequest) GetCloudAccountId() string {
-	if o == nil || isNil(o.CloudAccountId) {
+	if o == nil || o.CloudAccountId == nil {
 		var ret string
 		return ret
 	}
@@ -105,15 +105,15 @@ func (o *SubscriptionPatchRequest) GetCloudAccountId() string {
 // GetCloudAccountIdOk returns a tuple with the CloudAccountId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionPatchRequest) GetCloudAccountIdOk() (*string, bool) {
-	if o == nil || isNil(o.CloudAccountId) {
-    return nil, false
+	if o == nil || o.CloudAccountId == nil {
+		return nil, false
 	}
 	return o.CloudAccountId, true
 }
 
 // HasCloudAccountId returns a boolean if a field has been set.
 func (o *SubscriptionPatchRequest) HasCloudAccountId() bool {
-	if o != nil && !isNil(o.CloudAccountId) {
+	if o != nil && o.CloudAccountId != nil {
 		return true
 	}
 
@@ -127,7 +127,7 @@ func (o *SubscriptionPatchRequest) SetCloudAccountId(v string) {
 
 // GetCloudProviderId returns the CloudProviderId field value if set, zero value otherwise.
 func (o *SubscriptionPatchRequest) GetCloudProviderId() string {
-	if o == nil || isNil(o.CloudProviderId) {
+	if o == nil || o.CloudProviderId == nil {
 		var ret string
 		return ret
 	}
@@ -137,15 +137,15 @@ func (o *SubscriptionPatchRequest) GetCloudProviderId() string {
 // GetCloudProviderIdOk returns a tuple with the CloudProviderId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionPatchRequest) GetCloudProviderIdOk() (*string, bool) {
-	if o == nil || isNil(o.CloudProviderId) {
-    return nil, false
+	if o == nil || o.CloudProviderId == nil {
+		return nil, false
 	}
 	return o.CloudProviderId, true
 }
 
 // HasCloudProviderId returns a boolean if a field has been set.
 func (o *SubscriptionPatchRequest) HasCloudProviderId() bool {
-	if o != nil && !isNil(o.CloudProviderId) {
+	if o != nil && o.CloudProviderId != nil {
 		return true
 	}
 
@@ -159,7 +159,7 @@ func (o *SubscriptionPatchRequest) SetCloudProviderId(v string) {
 
 // GetClusterBillingModel returns the ClusterBillingModel field value if set, zero value otherwise.
 func (o *SubscriptionPatchRequest) GetClusterBillingModel() string {
-	if o == nil || isNil(o.ClusterBillingModel) {
+	if o == nil || o.ClusterBillingModel == nil {
 		var ret string
 		return ret
 	}
@@ -169,15 +169,15 @@ func (o *SubscriptionPatchRequest) GetClusterBillingModel() string {
 // GetClusterBillingModelOk returns a tuple with the ClusterBillingModel field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionPatchRequest) GetClusterBillingModelOk() (*string, bool) {
-	if o == nil || isNil(o.ClusterBillingModel) {
-    return nil, false
+	if o == nil || o.ClusterBillingModel == nil {
+		return nil, false
 	}
 	return o.ClusterBillingModel, true
 }
 
 // HasClusterBillingModel returns a boolean if a field has been set.
 func (o *SubscriptionPatchRequest) HasClusterBillingModel() bool {
-	if o != nil && !isNil(o.ClusterBillingModel) {
+	if o != nil && o.ClusterBillingModel != nil {
 		return true
 	}
 
@@ -191,7 +191,7 @@ func (o *SubscriptionPatchRequest) SetClusterBillingModel(v string) {
 
 // GetClusterId returns the ClusterId field value if set, zero value otherwise.
 func (o *SubscriptionPatchRequest) GetClusterId() string {
-	if o == nil || isNil(o.ClusterId) {
+	if o == nil || o.ClusterId == nil {
 		var ret string
 		return ret
 	}
@@ -201,15 +201,15 @@ func (o *SubscriptionPatchRequest) GetClusterId() string {
 // GetClusterIdOk returns a tuple with the ClusterId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionPatchRequest) GetClusterIdOk() (*string, bool) {
-	if o == nil || isNil(o.ClusterId) {
-    return nil, false
+	if o == nil || o.ClusterId == nil {
+		return nil, false
 	}
 	return o.ClusterId, true
 }
 
 // HasClusterId returns a boolean if a field has been set.
 func (o *SubscriptionPatchRequest) HasClusterId() bool {
-	if o != nil && !isNil(o.ClusterId) {
+	if o != nil && o.ClusterId != nil {
 		return true
 	}
 
@@ -223,7 +223,7 @@ func (o *SubscriptionPatchRequest) SetClusterId(v string) {
 
 // GetConsoleUrl returns the ConsoleUrl field value if set, zero value otherwise.
 func (o *SubscriptionPatchRequest) GetConsoleUrl() string {
-	if o == nil || isNil(o.ConsoleUrl) {
+	if o == nil || o.ConsoleUrl == nil {
 		var ret string
 		return ret
 	}
@@ -233,15 +233,15 @@ func (o *SubscriptionPatchRequest) GetConsoleUrl() string {
 // GetConsoleUrlOk returns a tuple with the ConsoleUrl field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionPatchRequest) GetConsoleUrlOk() (*string, bool) {
-	if o == nil || isNil(o.ConsoleUrl) {
-    return nil, false
+	if o == nil || o.ConsoleUrl == nil {
+		return nil, false
 	}
 	return o.ConsoleUrl, true
 }
 
 // HasConsoleUrl returns a boolean if a field has been set.
 func (o *SubscriptionPatchRequest) HasConsoleUrl() bool {
-	if o != nil && !isNil(o.ConsoleUrl) {
+	if o != nil && o.ConsoleUrl != nil {
 		return true
 	}
 
@@ -255,7 +255,7 @@ func (o *SubscriptionPatchRequest) SetConsoleUrl(v string) {
 
 // GetConsumerUuid returns the ConsumerUuid field value if set, zero value otherwise.
 func (o *SubscriptionPatchRequest) GetConsumerUuid() string {
-	if o == nil || isNil(o.ConsumerUuid) {
+	if o == nil || o.ConsumerUuid == nil {
 		var ret string
 		return ret
 	}
@@ -265,15 +265,15 @@ func (o *SubscriptionPatchRequest) GetConsumerUuid() string {
 // GetConsumerUuidOk returns a tuple with the ConsumerUuid field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionPatchRequest) GetConsumerUuidOk() (*string, bool) {
-	if o == nil || isNil(o.ConsumerUuid) {
-    return nil, false
+	if o == nil || o.ConsumerUuid == nil {
+		return nil, false
 	}
 	return o.ConsumerUuid, true
 }
 
 // HasConsumerUuid returns a boolean if a field has been set.
 func (o *SubscriptionPatchRequest) HasConsumerUuid() bool {
-	if o != nil && !isNil(o.ConsumerUuid) {
+	if o != nil && o.ConsumerUuid != nil {
 		return true
 	}
 
@@ -287,7 +287,7 @@ func (o *SubscriptionPatchRequest) SetConsumerUuid(v string) {
 
 // GetCpuTotal returns the CpuTotal field value if set, zero value otherwise.
 func (o *SubscriptionPatchRequest) GetCpuTotal() int32 {
-	if o == nil || isNil(o.CpuTotal) {
+	if o == nil || o.CpuTotal == nil {
 		var ret int32
 		return ret
 	}
@@ -297,15 +297,15 @@ func (o *SubscriptionPatchRequest) GetCpuTotal() int32 {
 // GetCpuTotalOk returns a tuple with the CpuTotal field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionPatchRequest) GetCpuTotalOk() (*int32, bool) {
-	if o == nil || isNil(o.CpuTotal) {
-    return nil, false
+	if o == nil || o.CpuTotal == nil {
+		return nil, false
 	}
 	return o.CpuTotal, true
 }
 
 // HasCpuTotal returns a boolean if a field has been set.
 func (o *SubscriptionPatchRequest) HasCpuTotal() bool {
-	if o != nil && !isNil(o.CpuTotal) {
+	if o != nil && o.CpuTotal != nil {
 		return true
 	}
 
@@ -319,7 +319,7 @@ func (o *SubscriptionPatchRequest) SetCpuTotal(v int32) {
 
 // GetCreatorId returns the CreatorId field value if set, zero value otherwise.
 func (o *SubscriptionPatchRequest) GetCreatorId() string {
-	if o == nil || isNil(o.CreatorId) {
+	if o == nil || o.CreatorId == nil {
 		var ret string
 		return ret
 	}
@@ -329,15 +329,15 @@ func (o *SubscriptionPatchRequest) GetCreatorId() string {
 // GetCreatorIdOk returns a tuple with the CreatorId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionPatchRequest) GetCreatorIdOk() (*string, bool) {
-	if o == nil || isNil(o.CreatorId) {
-    return nil, false
+	if o == nil || o.CreatorId == nil {
+		return nil, false
 	}
 	return o.CreatorId, true
 }
 
 // HasCreatorId returns a boolean if a field has been set.
 func (o *SubscriptionPatchRequest) HasCreatorId() bool {
-	if o != nil && !isNil(o.CreatorId) {
+	if o != nil && o.CreatorId != nil {
 		return true
 	}
 
@@ -351,7 +351,7 @@ func (o *SubscriptionPatchRequest) SetCreatorId(v string) {
 
 // GetDisplayName returns the DisplayName field value if set, zero value otherwise.
 func (o *SubscriptionPatchRequest) GetDisplayName() string {
-	if o == nil || isNil(o.DisplayName) {
+	if o == nil || o.DisplayName == nil {
 		var ret string
 		return ret
 	}
@@ -361,15 +361,15 @@ func (o *SubscriptionPatchRequest) GetDisplayName() string {
 // GetDisplayNameOk returns a tuple with the DisplayName field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionPatchRequest) GetDisplayNameOk() (*string, bool) {
-	if o == nil || isNil(o.DisplayName) {
-    return nil, false
+	if o == nil || o.DisplayName == nil {
+		return nil, false
 	}
 	return o.DisplayName, true
 }
 
 // HasDisplayName returns a boolean if a field has been set.
 func (o *SubscriptionPatchRequest) HasDisplayName() bool {
-	if o != nil && !isNil(o.DisplayName) {
+	if o != nil && o.DisplayName != nil {
 		return true
 	}
 
@@ -383,7 +383,7 @@ func (o *SubscriptionPatchRequest) SetDisplayName(v string) {
 
 // GetExternalClusterId returns the ExternalClusterId field value if set, zero value otherwise.
 func (o *SubscriptionPatchRequest) GetExternalClusterId() string {
-	if o == nil || isNil(o.ExternalClusterId) {
+	if o == nil || o.ExternalClusterId == nil {
 		var ret string
 		return ret
 	}
@@ -393,15 +393,15 @@ func (o *SubscriptionPatchRequest) GetExternalClusterId() string {
 // GetExternalClusterIdOk returns a tuple with the ExternalClusterId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionPatchRequest) GetExternalClusterIdOk() (*string, bool) {
-	if o == nil || isNil(o.ExternalClusterId) {
-    return nil, false
+	if o == nil || o.ExternalClusterId == nil {
+		return nil, false
 	}
 	return o.ExternalClusterId, true
 }
 
 // HasExternalClusterId returns a boolean if a field has been set.
 func (o *SubscriptionPatchRequest) HasExternalClusterId() bool {
-	if o != nil && !isNil(o.ExternalClusterId) {
+	if o != nil && o.ExternalClusterId != nil {
 		return true
 	}
 
@@ -415,7 +415,7 @@ func (o *SubscriptionPatchRequest) SetExternalClusterId(v string) {
 
 // GetManaged returns the Managed field value if set, zero value otherwise.
 func (o *SubscriptionPatchRequest) GetManaged() bool {
-	if o == nil || isNil(o.Managed) {
+	if o == nil || o.Managed == nil {
 		var ret bool
 		return ret
 	}
@@ -425,15 +425,15 @@ func (o *SubscriptionPatchRequest) GetManaged() bool {
 // GetManagedOk returns a tuple with the Managed field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionPatchRequest) GetManagedOk() (*bool, bool) {
-	if o == nil || isNil(o.Managed) {
-    return nil, false
+	if o == nil || o.Managed == nil {
+		return nil, false
 	}
 	return o.Managed, true
 }
 
 // HasManaged returns a boolean if a field has been set.
 func (o *SubscriptionPatchRequest) HasManaged() bool {
-	if o != nil && !isNil(o.Managed) {
+	if o != nil && o.Managed != nil {
 		return true
 	}
 
@@ -447,7 +447,7 @@ func (o *SubscriptionPatchRequest) SetManaged(v bool) {
 
 // GetOrganizationId returns the OrganizationId field value if set, zero value otherwise.
 func (o *SubscriptionPatchRequest) GetOrganizationId() string {
-	if o == nil || isNil(o.OrganizationId) {
+	if o == nil || o.OrganizationId == nil {
 		var ret string
 		return ret
 	}
@@ -457,15 +457,15 @@ func (o *SubscriptionPatchRequest) GetOrganizationId() string {
 // GetOrganizationIdOk returns a tuple with the OrganizationId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionPatchRequest) GetOrganizationIdOk() (*string, bool) {
-	if o == nil || isNil(o.OrganizationId) {
-    return nil, false
+	if o == nil || o.OrganizationId == nil {
+		return nil, false
 	}
 	return o.OrganizationId, true
 }
 
 // HasOrganizationId returns a boolean if a field has been set.
 func (o *SubscriptionPatchRequest) HasOrganizationId() bool {
-	if o != nil && !isNil(o.OrganizationId) {
+	if o != nil && o.OrganizationId != nil {
 		return true
 	}
 
@@ -479,7 +479,7 @@ func (o *SubscriptionPatchRequest) SetOrganizationId(v string) {
 
 // GetPlanId returns the PlanId field value if set, zero value otherwise.
 func (o *SubscriptionPatchRequest) GetPlanId() string {
-	if o == nil || isNil(o.PlanId) {
+	if o == nil || o.PlanId == nil {
 		var ret string
 		return ret
 	}
@@ -489,15 +489,15 @@ func (o *SubscriptionPatchRequest) GetPlanId() string {
 // GetPlanIdOk returns a tuple with the PlanId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionPatchRequest) GetPlanIdOk() (*string, bool) {
-	if o == nil || isNil(o.PlanId) {
-    return nil, false
+	if o == nil || o.PlanId == nil {
+		return nil, false
 	}
 	return o.PlanId, true
 }
 
 // HasPlanId returns a boolean if a field has been set.
 func (o *SubscriptionPatchRequest) HasPlanId() bool {
-	if o != nil && !isNil(o.PlanId) {
+	if o != nil && o.PlanId != nil {
 		return true
 	}
 
@@ -511,7 +511,7 @@ func (o *SubscriptionPatchRequest) SetPlanId(v string) {
 
 // GetProductBundle returns the ProductBundle field value if set, zero value otherwise.
 func (o *SubscriptionPatchRequest) GetProductBundle() string {
-	if o == nil || isNil(o.ProductBundle) {
+	if o == nil || o.ProductBundle == nil {
 		var ret string
 		return ret
 	}
@@ -521,15 +521,15 @@ func (o *SubscriptionPatchRequest) GetProductBundle() string {
 // GetProductBundleOk returns a tuple with the ProductBundle field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionPatchRequest) GetProductBundleOk() (*string, bool) {
-	if o == nil || isNil(o.ProductBundle) {
-    return nil, false
+	if o == nil || o.ProductBundle == nil {
+		return nil, false
 	}
 	return o.ProductBundle, true
 }
 
 // HasProductBundle returns a boolean if a field has been set.
 func (o *SubscriptionPatchRequest) HasProductBundle() bool {
-	if o != nil && !isNil(o.ProductBundle) {
+	if o != nil && o.ProductBundle != nil {
 		return true
 	}
 
@@ -543,7 +543,7 @@ func (o *SubscriptionPatchRequest) SetProductBundle(v string) {
 
 // GetProvenance returns the Provenance field value if set, zero value otherwise.
 func (o *SubscriptionPatchRequest) GetProvenance() string {
-	if o == nil || isNil(o.Provenance) {
+	if o == nil || o.Provenance == nil {
 		var ret string
 		return ret
 	}
@@ -553,15 +553,15 @@ func (o *SubscriptionPatchRequest) GetProvenance() string {
 // GetProvenanceOk returns a tuple with the Provenance field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionPatchRequest) GetProvenanceOk() (*string, bool) {
-	if o == nil || isNil(o.Provenance) {
-    return nil, false
+	if o == nil || o.Provenance == nil {
+		return nil, false
 	}
 	return o.Provenance, true
 }
 
 // HasProvenance returns a boolean if a field has been set.
 func (o *SubscriptionPatchRequest) HasProvenance() bool {
-	if o != nil && !isNil(o.Provenance) {
+	if o != nil && o.Provenance != nil {
 		return true
 	}
 
@@ -575,7 +575,7 @@ func (o *SubscriptionPatchRequest) SetProvenance(v string) {
 
 // GetRegionId returns the RegionId field value if set, zero value otherwise.
 func (o *SubscriptionPatchRequest) GetRegionId() string {
-	if o == nil || isNil(o.RegionId) {
+	if o == nil || o.RegionId == nil {
 		var ret string
 		return ret
 	}
@@ -585,15 +585,15 @@ func (o *SubscriptionPatchRequest) GetRegionId() string {
 // GetRegionIdOk returns a tuple with the RegionId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionPatchRequest) GetRegionIdOk() (*string, bool) {
-	if o == nil || isNil(o.RegionId) {
-    return nil, false
+	if o == nil || o.RegionId == nil {
+		return nil, false
 	}
 	return o.RegionId, true
 }
 
 // HasRegionId returns a boolean if a field has been set.
 func (o *SubscriptionPatchRequest) HasRegionId() bool {
-	if o != nil && !isNil(o.RegionId) {
+	if o != nil && o.RegionId != nil {
 		return true
 	}
 
@@ -607,7 +607,7 @@ func (o *SubscriptionPatchRequest) SetRegionId(v string) {
 
 // GetReleased returns the Released field value if set, zero value otherwise.
 func (o *SubscriptionPatchRequest) GetReleased() bool {
-	if o == nil || isNil(o.Released) {
+	if o == nil || o.Released == nil {
 		var ret bool
 		return ret
 	}
@@ -617,15 +617,15 @@ func (o *SubscriptionPatchRequest) GetReleased() bool {
 // GetReleasedOk returns a tuple with the Released field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionPatchRequest) GetReleasedOk() (*bool, bool) {
-	if o == nil || isNil(o.Released) {
-    return nil, false
+	if o == nil || o.Released == nil {
+		return nil, false
 	}
 	return o.Released, true
 }
 
 // HasReleased returns a boolean if a field has been set.
 func (o *SubscriptionPatchRequest) HasReleased() bool {
-	if o != nil && !isNil(o.Released) {
+	if o != nil && o.Released != nil {
 		return true
 	}
 
@@ -639,7 +639,7 @@ func (o *SubscriptionPatchRequest) SetReleased(v bool) {
 
 // GetServiceLevel returns the ServiceLevel field value if set, zero value otherwise.
 func (o *SubscriptionPatchRequest) GetServiceLevel() string {
-	if o == nil || isNil(o.ServiceLevel) {
+	if o == nil || o.ServiceLevel == nil {
 		var ret string
 		return ret
 	}
@@ -649,15 +649,15 @@ func (o *SubscriptionPatchRequest) GetServiceLevel() string {
 // GetServiceLevelOk returns a tuple with the ServiceLevel field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionPatchRequest) GetServiceLevelOk() (*string, bool) {
-	if o == nil || isNil(o.ServiceLevel) {
-    return nil, false
+	if o == nil || o.ServiceLevel == nil {
+		return nil, false
 	}
 	return o.ServiceLevel, true
 }
 
 // HasServiceLevel returns a boolean if a field has been set.
 func (o *SubscriptionPatchRequest) HasServiceLevel() bool {
-	if o != nil && !isNil(o.ServiceLevel) {
+	if o != nil && o.ServiceLevel != nil {
 		return true
 	}
 
@@ -671,7 +671,7 @@ func (o *SubscriptionPatchRequest) SetServiceLevel(v string) {
 
 // GetSocketTotal returns the SocketTotal field value if set, zero value otherwise.
 func (o *SubscriptionPatchRequest) GetSocketTotal() int32 {
-	if o == nil || isNil(o.SocketTotal) {
+	if o == nil || o.SocketTotal == nil {
 		var ret int32
 		return ret
 	}
@@ -681,15 +681,15 @@ func (o *SubscriptionPatchRequest) GetSocketTotal() int32 {
 // GetSocketTotalOk returns a tuple with the SocketTotal field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionPatchRequest) GetSocketTotalOk() (*int32, bool) {
-	if o == nil || isNil(o.SocketTotal) {
-    return nil, false
+	if o == nil || o.SocketTotal == nil {
+		return nil, false
 	}
 	return o.SocketTotal, true
 }
 
 // HasSocketTotal returns a boolean if a field has been set.
 func (o *SubscriptionPatchRequest) HasSocketTotal() bool {
-	if o != nil && !isNil(o.SocketTotal) {
+	if o != nil && o.SocketTotal != nil {
 		return true
 	}
 
@@ -703,7 +703,7 @@ func (o *SubscriptionPatchRequest) SetSocketTotal(v int32) {
 
 // GetStatus returns the Status field value if set, zero value otherwise.
 func (o *SubscriptionPatchRequest) GetStatus() string {
-	if o == nil || isNil(o.Status) {
+	if o == nil || o.Status == nil {
 		var ret string
 		return ret
 	}
@@ -713,15 +713,15 @@ func (o *SubscriptionPatchRequest) GetStatus() string {
 // GetStatusOk returns a tuple with the Status field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionPatchRequest) GetStatusOk() (*string, bool) {
-	if o == nil || isNil(o.Status) {
-    return nil, false
+	if o == nil || o.Status == nil {
+		return nil, false
 	}
 	return o.Status, true
 }
 
 // HasStatus returns a boolean if a field has been set.
 func (o *SubscriptionPatchRequest) HasStatus() bool {
-	if o != nil && !isNil(o.Status) {
+	if o != nil && o.Status != nil {
 		return true
 	}
 
@@ -735,7 +735,7 @@ func (o *SubscriptionPatchRequest) SetStatus(v string) {
 
 // GetSupportLevel returns the SupportLevel field value if set, zero value otherwise.
 func (o *SubscriptionPatchRequest) GetSupportLevel() string {
-	if o == nil || isNil(o.SupportLevel) {
+	if o == nil || o.SupportLevel == nil {
 		var ret string
 		return ret
 	}
@@ -745,15 +745,15 @@ func (o *SubscriptionPatchRequest) GetSupportLevel() string {
 // GetSupportLevelOk returns a tuple with the SupportLevel field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionPatchRequest) GetSupportLevelOk() (*string, bool) {
-	if o == nil || isNil(o.SupportLevel) {
-    return nil, false
+	if o == nil || o.SupportLevel == nil {
+		return nil, false
 	}
 	return o.SupportLevel, true
 }
 
 // HasSupportLevel returns a boolean if a field has been set.
 func (o *SubscriptionPatchRequest) HasSupportLevel() bool {
-	if o != nil && !isNil(o.SupportLevel) {
+	if o != nil && o.SupportLevel != nil {
 		return true
 	}
 
@@ -767,7 +767,7 @@ func (o *SubscriptionPatchRequest) SetSupportLevel(v string) {
 
 // GetSystemUnits returns the SystemUnits field value if set, zero value otherwise.
 func (o *SubscriptionPatchRequest) GetSystemUnits() string {
-	if o == nil || isNil(o.SystemUnits) {
+	if o == nil || o.SystemUnits == nil {
 		var ret string
 		return ret
 	}
@@ -777,15 +777,15 @@ func (o *SubscriptionPatchRequest) GetSystemUnits() string {
 // GetSystemUnitsOk returns a tuple with the SystemUnits field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionPatchRequest) GetSystemUnitsOk() (*string, bool) {
-	if o == nil || isNil(o.SystemUnits) {
-    return nil, false
+	if o == nil || o.SystemUnits == nil {
+		return nil, false
 	}
 	return o.SystemUnits, true
 }
 
 // HasSystemUnits returns a boolean if a field has been set.
 func (o *SubscriptionPatchRequest) HasSystemUnits() bool {
-	if o != nil && !isNil(o.SystemUnits) {
+	if o != nil && o.SystemUnits != nil {
 		return true
 	}
 
@@ -799,7 +799,7 @@ func (o *SubscriptionPatchRequest) SetSystemUnits(v string) {
 
 // GetTrialEndDate returns the TrialEndDate field value if set, zero value otherwise.
 func (o *SubscriptionPatchRequest) GetTrialEndDate() time.Time {
-	if o == nil || isNil(o.TrialEndDate) {
+	if o == nil || o.TrialEndDate == nil {
 		var ret time.Time
 		return ret
 	}
@@ -809,15 +809,15 @@ func (o *SubscriptionPatchRequest) GetTrialEndDate() time.Time {
 // GetTrialEndDateOk returns a tuple with the TrialEndDate field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionPatchRequest) GetTrialEndDateOk() (*time.Time, bool) {
-	if o == nil || isNil(o.TrialEndDate) {
-    return nil, false
+	if o == nil || o.TrialEndDate == nil {
+		return nil, false
 	}
 	return o.TrialEndDate, true
 }
 
 // HasTrialEndDate returns a boolean if a field has been set.
 func (o *SubscriptionPatchRequest) HasTrialEndDate() bool {
-	if o != nil && !isNil(o.TrialEndDate) {
+	if o != nil && o.TrialEndDate != nil {
 		return true
 	}
 
@@ -831,7 +831,7 @@ func (o *SubscriptionPatchRequest) SetTrialEndDate(v time.Time) {
 
 // GetUsage returns the Usage field value if set, zero value otherwise.
 func (o *SubscriptionPatchRequest) GetUsage() string {
-	if o == nil || isNil(o.Usage) {
+	if o == nil || o.Usage == nil {
 		var ret string
 		return ret
 	}
@@ -841,15 +841,15 @@ func (o *SubscriptionPatchRequest) GetUsage() string {
 // GetUsageOk returns a tuple with the Usage field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionPatchRequest) GetUsageOk() (*string, bool) {
-	if o == nil || isNil(o.Usage) {
-    return nil, false
+	if o == nil || o.Usage == nil {
+		return nil, false
 	}
 	return o.Usage, true
 }
 
 // HasUsage returns a boolean if a field has been set.
 func (o *SubscriptionPatchRequest) HasUsage() bool {
-	if o != nil && !isNil(o.Usage) {
+	if o != nil && o.Usage != nil {
 		return true
 	}
 
@@ -863,79 +863,79 @@ func (o *SubscriptionPatchRequest) SetUsage(v string) {
 
 func (o SubscriptionPatchRequest) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.BillingExpirationDate) {
+	if o.BillingExpirationDate != nil {
 		toSerialize["billing_expiration_date"] = o.BillingExpirationDate
 	}
-	if !isNil(o.CloudAccountId) {
+	if o.CloudAccountId != nil {
 		toSerialize["cloud_account_id"] = o.CloudAccountId
 	}
-	if !isNil(o.CloudProviderId) {
+	if o.CloudProviderId != nil {
 		toSerialize["cloud_provider_id"] = o.CloudProviderId
 	}
-	if !isNil(o.ClusterBillingModel) {
+	if o.ClusterBillingModel != nil {
 		toSerialize["cluster_billing_model"] = o.ClusterBillingModel
 	}
-	if !isNil(o.ClusterId) {
+	if o.ClusterId != nil {
 		toSerialize["cluster_id"] = o.ClusterId
 	}
-	if !isNil(o.ConsoleUrl) {
+	if o.ConsoleUrl != nil {
 		toSerialize["console_url"] = o.ConsoleUrl
 	}
-	if !isNil(o.ConsumerUuid) {
+	if o.ConsumerUuid != nil {
 		toSerialize["consumer_uuid"] = o.ConsumerUuid
 	}
-	if !isNil(o.CpuTotal) {
+	if o.CpuTotal != nil {
 		toSerialize["cpu_total"] = o.CpuTotal
 	}
-	if !isNil(o.CreatorId) {
+	if o.CreatorId != nil {
 		toSerialize["creator_id"] = o.CreatorId
 	}
-	if !isNil(o.DisplayName) {
+	if o.DisplayName != nil {
 		toSerialize["display_name"] = o.DisplayName
 	}
-	if !isNil(o.ExternalClusterId) {
+	if o.ExternalClusterId != nil {
 		toSerialize["external_cluster_id"] = o.ExternalClusterId
 	}
-	if !isNil(o.Managed) {
+	if o.Managed != nil {
 		toSerialize["managed"] = o.Managed
 	}
-	if !isNil(o.OrganizationId) {
+	if o.OrganizationId != nil {
 		toSerialize["organization_id"] = o.OrganizationId
 	}
-	if !isNil(o.PlanId) {
+	if o.PlanId != nil {
 		toSerialize["plan_id"] = o.PlanId
 	}
-	if !isNil(o.ProductBundle) {
+	if o.ProductBundle != nil {
 		toSerialize["product_bundle"] = o.ProductBundle
 	}
-	if !isNil(o.Provenance) {
+	if o.Provenance != nil {
 		toSerialize["provenance"] = o.Provenance
 	}
-	if !isNil(o.RegionId) {
+	if o.RegionId != nil {
 		toSerialize["region_id"] = o.RegionId
 	}
-	if !isNil(o.Released) {
+	if o.Released != nil {
 		toSerialize["released"] = o.Released
 	}
-	if !isNil(o.ServiceLevel) {
+	if o.ServiceLevel != nil {
 		toSerialize["service_level"] = o.ServiceLevel
 	}
-	if !isNil(o.SocketTotal) {
+	if o.SocketTotal != nil {
 		toSerialize["socket_total"] = o.SocketTotal
 	}
-	if !isNil(o.Status) {
+	if o.Status != nil {
 		toSerialize["status"] = o.Status
 	}
-	if !isNil(o.SupportLevel) {
+	if o.SupportLevel != nil {
 		toSerialize["support_level"] = o.SupportLevel
 	}
-	if !isNil(o.SystemUnits) {
+	if o.SystemUnits != nil {
 		toSerialize["system_units"] = o.SystemUnits
 	}
-	if !isNil(o.TrialEndDate) {
+	if o.TrialEndDate != nil {
 		toSerialize["trial_end_date"] = o.TrialEndDate
 	}
-	if !isNil(o.Usage) {
+	if o.Usage != nil {
 		toSerialize["usage"] = o.Usage
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription_role_binding.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription_role_binding.go
index ceaf4181..803fcef9 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription_role_binding.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription_role_binding.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -12,6 +12,7 @@ package accountmgmtclient
 
 import (
 	"encoding/json"
+	"time"
 )
 
 // SubscriptionRoleBinding struct for SubscriptionRoleBinding
@@ -47,7 +48,7 @@ func NewSubscriptionRoleBindingWithDefaults() *SubscriptionRoleBinding {
 
 // GetHref returns the Href field value if set, zero value otherwise.
 func (o *SubscriptionRoleBinding) GetHref() string {
-	if o == nil || isNil(o.Href) {
+	if o == nil || o.Href == nil {
 		var ret string
 		return ret
 	}
@@ -57,15 +58,15 @@ func (o *SubscriptionRoleBinding) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionRoleBinding) GetHrefOk() (*string, bool) {
-	if o == nil || isNil(o.Href) {
-    return nil, false
+	if o == nil || o.Href == nil {
+		return nil, false
 	}
 	return o.Href, true
 }
 
 // HasHref returns a boolean if a field has been set.
 func (o *SubscriptionRoleBinding) HasHref() bool {
-	if o != nil && !isNil(o.Href) {
+	if o != nil && o.Href != nil {
 		return true
 	}
 
@@ -79,7 +80,7 @@ func (o *SubscriptionRoleBinding) SetHref(v string) {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *SubscriptionRoleBinding) GetId() string {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret string
 		return ret
 	}
@@ -89,15 +90,15 @@ func (o *SubscriptionRoleBinding) GetId() string {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionRoleBinding) GetIdOk() (*string, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *SubscriptionRoleBinding) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -111,7 +112,7 @@ func (o *SubscriptionRoleBinding) SetId(v string) {
 
 // GetKind returns the Kind field value if set, zero value otherwise.
 func (o *SubscriptionRoleBinding) GetKind() string {
-	if o == nil || isNil(o.Kind) {
+	if o == nil || o.Kind == nil {
 		var ret string
 		return ret
 	}
@@ -121,15 +122,15 @@ func (o *SubscriptionRoleBinding) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionRoleBinding) GetKindOk() (*string, bool) {
-	if o == nil || isNil(o.Kind) {
-    return nil, false
+	if o == nil || o.Kind == nil {
+		return nil, false
 	}
 	return o.Kind, true
 }
 
 // HasKind returns a boolean if a field has been set.
 func (o *SubscriptionRoleBinding) HasKind() bool {
-	if o != nil && !isNil(o.Kind) {
+	if o != nil && o.Kind != nil {
 		return true
 	}
 
@@ -143,7 +144,7 @@ func (o *SubscriptionRoleBinding) SetKind(v string) {
 
 // GetAccount returns the Account field value if set, zero value otherwise.
 func (o *SubscriptionRoleBinding) GetAccount() AccountReference {
-	if o == nil || isNil(o.Account) {
+	if o == nil || o.Account == nil {
 		var ret AccountReference
 		return ret
 	}
@@ -153,15 +154,15 @@ func (o *SubscriptionRoleBinding) GetAccount() AccountReference {
 // GetAccountOk returns a tuple with the Account field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionRoleBinding) GetAccountOk() (*AccountReference, bool) {
-	if o == nil || isNil(o.Account) {
-    return nil, false
+	if o == nil || o.Account == nil {
+		return nil, false
 	}
 	return o.Account, true
 }
 
 // HasAccount returns a boolean if a field has been set.
 func (o *SubscriptionRoleBinding) HasAccount() bool {
-	if o != nil && !isNil(o.Account) {
+	if o != nil && o.Account != nil {
 		return true
 	}
 
@@ -175,7 +176,7 @@ func (o *SubscriptionRoleBinding) SetAccount(v AccountReference) {
 
 // GetAccountEmail returns the AccountEmail field value if set, zero value otherwise.
 func (o *SubscriptionRoleBinding) GetAccountEmail() string {
-	if o == nil || isNil(o.AccountEmail) {
+	if o == nil || o.AccountEmail == nil {
 		var ret string
 		return ret
 	}
@@ -185,15 +186,15 @@ func (o *SubscriptionRoleBinding) GetAccountEmail() string {
 // GetAccountEmailOk returns a tuple with the AccountEmail field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionRoleBinding) GetAccountEmailOk() (*string, bool) {
-	if o == nil || isNil(o.AccountEmail) {
-    return nil, false
+	if o == nil || o.AccountEmail == nil {
+		return nil, false
 	}
 	return o.AccountEmail, true
 }
 
 // HasAccountEmail returns a boolean if a field has been set.
 func (o *SubscriptionRoleBinding) HasAccountEmail() bool {
-	if o != nil && !isNil(o.AccountEmail) {
+	if o != nil && o.AccountEmail != nil {
 		return true
 	}
 
@@ -207,7 +208,7 @@ func (o *SubscriptionRoleBinding) SetAccountEmail(v string) {
 
 // GetAccountUsername returns the AccountUsername field value if set, zero value otherwise.
 func (o *SubscriptionRoleBinding) GetAccountUsername() string {
-	if o == nil || isNil(o.AccountUsername) {
+	if o == nil || o.AccountUsername == nil {
 		var ret string
 		return ret
 	}
@@ -217,15 +218,15 @@ func (o *SubscriptionRoleBinding) GetAccountUsername() string {
 // GetAccountUsernameOk returns a tuple with the AccountUsername field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionRoleBinding) GetAccountUsernameOk() (*string, bool) {
-	if o == nil || isNil(o.AccountUsername) {
-    return nil, false
+	if o == nil || o.AccountUsername == nil {
+		return nil, false
 	}
 	return o.AccountUsername, true
 }
 
 // HasAccountUsername returns a boolean if a field has been set.
 func (o *SubscriptionRoleBinding) HasAccountUsername() bool {
-	if o != nil && !isNil(o.AccountUsername) {
+	if o != nil && o.AccountUsername != nil {
 		return true
 	}
 
@@ -239,7 +240,7 @@ func (o *SubscriptionRoleBinding) SetAccountUsername(v string) {
 
 // GetCreatedAt returns the CreatedAt field value if set, zero value otherwise.
 func (o *SubscriptionRoleBinding) GetCreatedAt() time.Time {
-	if o == nil || isNil(o.CreatedAt) {
+	if o == nil || o.CreatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -249,15 +250,15 @@ func (o *SubscriptionRoleBinding) GetCreatedAt() time.Time {
 // GetCreatedAtOk returns a tuple with the CreatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionRoleBinding) GetCreatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.CreatedAt) {
-    return nil, false
+	if o == nil || o.CreatedAt == nil {
+		return nil, false
 	}
 	return o.CreatedAt, true
 }
 
 // HasCreatedAt returns a boolean if a field has been set.
 func (o *SubscriptionRoleBinding) HasCreatedAt() bool {
-	if o != nil && !isNil(o.CreatedAt) {
+	if o != nil && o.CreatedAt != nil {
 		return true
 	}
 
@@ -271,7 +272,7 @@ func (o *SubscriptionRoleBinding) SetCreatedAt(v time.Time) {
 
 // GetRole returns the Role field value if set, zero value otherwise.
 func (o *SubscriptionRoleBinding) GetRole() ObjectReference {
-	if o == nil || isNil(o.Role) {
+	if o == nil || o.Role == nil {
 		var ret ObjectReference
 		return ret
 	}
@@ -281,15 +282,15 @@ func (o *SubscriptionRoleBinding) GetRole() ObjectReference {
 // GetRoleOk returns a tuple with the Role field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionRoleBinding) GetRoleOk() (*ObjectReference, bool) {
-	if o == nil || isNil(o.Role) {
-    return nil, false
+	if o == nil || o.Role == nil {
+		return nil, false
 	}
 	return o.Role, true
 }
 
 // HasRole returns a boolean if a field has been set.
 func (o *SubscriptionRoleBinding) HasRole() bool {
-	if o != nil && !isNil(o.Role) {
+	if o != nil && o.Role != nil {
 		return true
 	}
 
@@ -303,7 +304,7 @@ func (o *SubscriptionRoleBinding) SetRole(v ObjectReference) {
 
 // GetSubscription returns the Subscription field value if set, zero value otherwise.
 func (o *SubscriptionRoleBinding) GetSubscription() ObjectReference {
-	if o == nil || isNil(o.Subscription) {
+	if o == nil || o.Subscription == nil {
 		var ret ObjectReference
 		return ret
 	}
@@ -313,15 +314,15 @@ func (o *SubscriptionRoleBinding) GetSubscription() ObjectReference {
 // GetSubscriptionOk returns a tuple with the Subscription field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionRoleBinding) GetSubscriptionOk() (*ObjectReference, bool) {
-	if o == nil || isNil(o.Subscription) {
-    return nil, false
+	if o == nil || o.Subscription == nil {
+		return nil, false
 	}
 	return o.Subscription, true
 }
 
 // HasSubscription returns a boolean if a field has been set.
 func (o *SubscriptionRoleBinding) HasSubscription() bool {
-	if o != nil && !isNil(o.Subscription) {
+	if o != nil && o.Subscription != nil {
 		return true
 	}
 
@@ -335,7 +336,7 @@ func (o *SubscriptionRoleBinding) SetSubscription(v ObjectReference) {
 
 // GetUpdatedAt returns the UpdatedAt field value if set, zero value otherwise.
 func (o *SubscriptionRoleBinding) GetUpdatedAt() time.Time {
-	if o == nil || isNil(o.UpdatedAt) {
+	if o == nil || o.UpdatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -345,15 +346,15 @@ func (o *SubscriptionRoleBinding) GetUpdatedAt() time.Time {
 // GetUpdatedAtOk returns a tuple with the UpdatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionRoleBinding) GetUpdatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.UpdatedAt) {
-    return nil, false
+	if o == nil || o.UpdatedAt == nil {
+		return nil, false
 	}
 	return o.UpdatedAt, true
 }
 
 // HasUpdatedAt returns a boolean if a field has been set.
 func (o *SubscriptionRoleBinding) HasUpdatedAt() bool {
-	if o != nil && !isNil(o.UpdatedAt) {
+	if o != nil && o.UpdatedAt != nil {
 		return true
 	}
 
@@ -367,34 +368,34 @@ func (o *SubscriptionRoleBinding) SetUpdatedAt(v time.Time) {
 
 func (o SubscriptionRoleBinding) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Href) {
+	if o.Href != nil {
 		toSerialize["href"] = o.Href
 	}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.Kind) {
+	if o.Kind != nil {
 		toSerialize["kind"] = o.Kind
 	}
-	if !isNil(o.Account) {
+	if o.Account != nil {
 		toSerialize["account"] = o.Account
 	}
-	if !isNil(o.AccountEmail) {
+	if o.AccountEmail != nil {
 		toSerialize["account_email"] = o.AccountEmail
 	}
-	if !isNil(o.AccountUsername) {
+	if o.AccountUsername != nil {
 		toSerialize["account_username"] = o.AccountUsername
 	}
-	if !isNil(o.CreatedAt) {
+	if o.CreatedAt != nil {
 		toSerialize["created_at"] = o.CreatedAt
 	}
-	if !isNil(o.Role) {
+	if o.Role != nil {
 		toSerialize["role"] = o.Role
 	}
-	if !isNil(o.Subscription) {
+	if o.Subscription != nil {
 		toSerialize["subscription"] = o.Subscription
 	}
-	if !isNil(o.UpdatedAt) {
+	if o.UpdatedAt != nil {
 		toSerialize["updated_at"] = o.UpdatedAt
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription_role_binding_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription_role_binding_all_of.go
index 8121373b..a37610ce 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription_role_binding_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription_role_binding_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -45,7 +45,7 @@ func NewSubscriptionRoleBindingAllOfWithDefaults() *SubscriptionRoleBindingAllOf
 
 // GetAccount returns the Account field value if set, zero value otherwise.
 func (o *SubscriptionRoleBindingAllOf) GetAccount() AccountReference {
-	if o == nil || isNil(o.Account) {
+	if o == nil || o.Account == nil {
 		var ret AccountReference
 		return ret
 	}
@@ -55,15 +55,15 @@ func (o *SubscriptionRoleBindingAllOf) GetAccount() AccountReference {
 // GetAccountOk returns a tuple with the Account field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionRoleBindingAllOf) GetAccountOk() (*AccountReference, bool) {
-	if o == nil || isNil(o.Account) {
-    return nil, false
+	if o == nil || o.Account == nil {
+		return nil, false
 	}
 	return o.Account, true
 }
 
 // HasAccount returns a boolean if a field has been set.
 func (o *SubscriptionRoleBindingAllOf) HasAccount() bool {
-	if o != nil && !isNil(o.Account) {
+	if o != nil && o.Account != nil {
 		return true
 	}
 
@@ -77,7 +77,7 @@ func (o *SubscriptionRoleBindingAllOf) SetAccount(v AccountReference) {
 
 // GetAccountEmail returns the AccountEmail field value if set, zero value otherwise.
 func (o *SubscriptionRoleBindingAllOf) GetAccountEmail() string {
-	if o == nil || isNil(o.AccountEmail) {
+	if o == nil || o.AccountEmail == nil {
 		var ret string
 		return ret
 	}
@@ -87,15 +87,15 @@ func (o *SubscriptionRoleBindingAllOf) GetAccountEmail() string {
 // GetAccountEmailOk returns a tuple with the AccountEmail field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionRoleBindingAllOf) GetAccountEmailOk() (*string, bool) {
-	if o == nil || isNil(o.AccountEmail) {
-    return nil, false
+	if o == nil || o.AccountEmail == nil {
+		return nil, false
 	}
 	return o.AccountEmail, true
 }
 
 // HasAccountEmail returns a boolean if a field has been set.
 func (o *SubscriptionRoleBindingAllOf) HasAccountEmail() bool {
-	if o != nil && !isNil(o.AccountEmail) {
+	if o != nil && o.AccountEmail != nil {
 		return true
 	}
 
@@ -109,7 +109,7 @@ func (o *SubscriptionRoleBindingAllOf) SetAccountEmail(v string) {
 
 // GetAccountUsername returns the AccountUsername field value if set, zero value otherwise.
 func (o *SubscriptionRoleBindingAllOf) GetAccountUsername() string {
-	if o == nil || isNil(o.AccountUsername) {
+	if o == nil || o.AccountUsername == nil {
 		var ret string
 		return ret
 	}
@@ -119,15 +119,15 @@ func (o *SubscriptionRoleBindingAllOf) GetAccountUsername() string {
 // GetAccountUsernameOk returns a tuple with the AccountUsername field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionRoleBindingAllOf) GetAccountUsernameOk() (*string, bool) {
-	if o == nil || isNil(o.AccountUsername) {
-    return nil, false
+	if o == nil || o.AccountUsername == nil {
+		return nil, false
 	}
 	return o.AccountUsername, true
 }
 
 // HasAccountUsername returns a boolean if a field has been set.
 func (o *SubscriptionRoleBindingAllOf) HasAccountUsername() bool {
-	if o != nil && !isNil(o.AccountUsername) {
+	if o != nil && o.AccountUsername != nil {
 		return true
 	}
 
@@ -141,7 +141,7 @@ func (o *SubscriptionRoleBindingAllOf) SetAccountUsername(v string) {
 
 // GetCreatedAt returns the CreatedAt field value if set, zero value otherwise.
 func (o *SubscriptionRoleBindingAllOf) GetCreatedAt() time.Time {
-	if o == nil || isNil(o.CreatedAt) {
+	if o == nil || o.CreatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -151,15 +151,15 @@ func (o *SubscriptionRoleBindingAllOf) GetCreatedAt() time.Time {
 // GetCreatedAtOk returns a tuple with the CreatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionRoleBindingAllOf) GetCreatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.CreatedAt) {
-    return nil, false
+	if o == nil || o.CreatedAt == nil {
+		return nil, false
 	}
 	return o.CreatedAt, true
 }
 
 // HasCreatedAt returns a boolean if a field has been set.
 func (o *SubscriptionRoleBindingAllOf) HasCreatedAt() bool {
-	if o != nil && !isNil(o.CreatedAt) {
+	if o != nil && o.CreatedAt != nil {
 		return true
 	}
 
@@ -173,7 +173,7 @@ func (o *SubscriptionRoleBindingAllOf) SetCreatedAt(v time.Time) {
 
 // GetRole returns the Role field value if set, zero value otherwise.
 func (o *SubscriptionRoleBindingAllOf) GetRole() ObjectReference {
-	if o == nil || isNil(o.Role) {
+	if o == nil || o.Role == nil {
 		var ret ObjectReference
 		return ret
 	}
@@ -183,15 +183,15 @@ func (o *SubscriptionRoleBindingAllOf) GetRole() ObjectReference {
 // GetRoleOk returns a tuple with the Role field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionRoleBindingAllOf) GetRoleOk() (*ObjectReference, bool) {
-	if o == nil || isNil(o.Role) {
-    return nil, false
+	if o == nil || o.Role == nil {
+		return nil, false
 	}
 	return o.Role, true
 }
 
 // HasRole returns a boolean if a field has been set.
 func (o *SubscriptionRoleBindingAllOf) HasRole() bool {
-	if o != nil && !isNil(o.Role) {
+	if o != nil && o.Role != nil {
 		return true
 	}
 
@@ -205,7 +205,7 @@ func (o *SubscriptionRoleBindingAllOf) SetRole(v ObjectReference) {
 
 // GetSubscription returns the Subscription field value if set, zero value otherwise.
 func (o *SubscriptionRoleBindingAllOf) GetSubscription() ObjectReference {
-	if o == nil || isNil(o.Subscription) {
+	if o == nil || o.Subscription == nil {
 		var ret ObjectReference
 		return ret
 	}
@@ -215,15 +215,15 @@ func (o *SubscriptionRoleBindingAllOf) GetSubscription() ObjectReference {
 // GetSubscriptionOk returns a tuple with the Subscription field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionRoleBindingAllOf) GetSubscriptionOk() (*ObjectReference, bool) {
-	if o == nil || isNil(o.Subscription) {
-    return nil, false
+	if o == nil || o.Subscription == nil {
+		return nil, false
 	}
 	return o.Subscription, true
 }
 
 // HasSubscription returns a boolean if a field has been set.
 func (o *SubscriptionRoleBindingAllOf) HasSubscription() bool {
-	if o != nil && !isNil(o.Subscription) {
+	if o != nil && o.Subscription != nil {
 		return true
 	}
 
@@ -237,7 +237,7 @@ func (o *SubscriptionRoleBindingAllOf) SetSubscription(v ObjectReference) {
 
 // GetUpdatedAt returns the UpdatedAt field value if set, zero value otherwise.
 func (o *SubscriptionRoleBindingAllOf) GetUpdatedAt() time.Time {
-	if o == nil || isNil(o.UpdatedAt) {
+	if o == nil || o.UpdatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -247,15 +247,15 @@ func (o *SubscriptionRoleBindingAllOf) GetUpdatedAt() time.Time {
 // GetUpdatedAtOk returns a tuple with the UpdatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SubscriptionRoleBindingAllOf) GetUpdatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.UpdatedAt) {
-    return nil, false
+	if o == nil || o.UpdatedAt == nil {
+		return nil, false
 	}
 	return o.UpdatedAt, true
 }
 
 // HasUpdatedAt returns a boolean if a field has been set.
 func (o *SubscriptionRoleBindingAllOf) HasUpdatedAt() bool {
-	if o != nil && !isNil(o.UpdatedAt) {
+	if o != nil && o.UpdatedAt != nil {
 		return true
 	}
 
@@ -269,25 +269,25 @@ func (o *SubscriptionRoleBindingAllOf) SetUpdatedAt(v time.Time) {
 
 func (o SubscriptionRoleBindingAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Account) {
+	if o.Account != nil {
 		toSerialize["account"] = o.Account
 	}
-	if !isNil(o.AccountEmail) {
+	if o.AccountEmail != nil {
 		toSerialize["account_email"] = o.AccountEmail
 	}
-	if !isNil(o.AccountUsername) {
+	if o.AccountUsername != nil {
 		toSerialize["account_username"] = o.AccountUsername
 	}
-	if !isNil(o.CreatedAt) {
+	if o.CreatedAt != nil {
 		toSerialize["created_at"] = o.CreatedAt
 	}
-	if !isNil(o.Role) {
+	if o.Role != nil {
 		toSerialize["role"] = o.Role
 	}
-	if !isNil(o.Subscription) {
+	if o.Subscription != nil {
 		toSerialize["subscription"] = o.Subscription
 	}
-	if !isNil(o.UpdatedAt) {
+	if o.UpdatedAt != nil {
 		toSerialize["updated_at"] = o.UpdatedAt
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription_role_binding_create_request.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription_role_binding_create_request.go
index 121456c1..be0dcc0c 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription_role_binding_create_request.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription_role_binding_create_request.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -52,8 +52,8 @@ func (o *SubscriptionRoleBindingCreateRequest) GetAccountUsername() string {
 // GetAccountUsernameOk returns a tuple with the AccountUsername field value
 // and a boolean to check if the value has been set.
 func (o *SubscriptionRoleBindingCreateRequest) GetAccountUsernameOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.AccountUsername, true
 }
@@ -76,8 +76,8 @@ func (o *SubscriptionRoleBindingCreateRequest) GetRoleId() string {
 // GetRoleIdOk returns a tuple with the RoleId field value
 // and a boolean to check if the value has been set.
 func (o *SubscriptionRoleBindingCreateRequest) GetRoleIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.RoleId, true
 }
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription_role_binding_list.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription_role_binding_list.go
index 80d3d249..094f93db 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription_role_binding_list.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription_role_binding_list.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -58,8 +58,8 @@ func (o *SubscriptionRoleBindingList) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *SubscriptionRoleBindingList) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -82,8 +82,8 @@ func (o *SubscriptionRoleBindingList) GetPage() int32 {
 // GetPageOk returns a tuple with the Page field value
 // and a boolean to check if the value has been set.
 func (o *SubscriptionRoleBindingList) GetPageOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Page, true
 }
@@ -106,8 +106,8 @@ func (o *SubscriptionRoleBindingList) GetSize() int32 {
 // GetSizeOk returns a tuple with the Size field value
 // and a boolean to check if the value has been set.
 func (o *SubscriptionRoleBindingList) GetSizeOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Size, true
 }
@@ -130,8 +130,8 @@ func (o *SubscriptionRoleBindingList) GetTotal() int32 {
 // GetTotalOk returns a tuple with the Total field value
 // and a boolean to check if the value has been set.
 func (o *SubscriptionRoleBindingList) GetTotalOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Total, true
 }
@@ -153,11 +153,11 @@ func (o *SubscriptionRoleBindingList) GetItems() []SubscriptionRoleBinding {
 
 // GetItemsOk returns a tuple with the Items field value
 // and a boolean to check if the value has been set.
-func (o *SubscriptionRoleBindingList) GetItemsOk() ([]SubscriptionRoleBinding, bool) {
-	if o == nil {
-    return nil, false
+func (o *SubscriptionRoleBindingList) GetItemsOk() (*[]SubscriptionRoleBinding, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Items, true
+	return &o.Items, true
 }
 
 // SetItems sets field value
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription_role_binding_list_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription_role_binding_list_all_of.go
index 90fbe0b4..94258896 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription_role_binding_list_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_subscription_role_binding_list_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -16,7 +16,7 @@ import (
 
 // SubscriptionRoleBindingListAllOf struct for SubscriptionRoleBindingListAllOf
 type SubscriptionRoleBindingListAllOf struct {
-	Items []SubscriptionRoleBinding `json:"items,omitempty"`
+	Items *[]SubscriptionRoleBinding `json:"items,omitempty"`
 }
 
 // NewSubscriptionRoleBindingListAllOf instantiates a new SubscriptionRoleBindingListAllOf object
@@ -38,25 +38,25 @@ func NewSubscriptionRoleBindingListAllOfWithDefaults() *SubscriptionRoleBindingL
 
 // GetItems returns the Items field value if set, zero value otherwise.
 func (o *SubscriptionRoleBindingListAllOf) GetItems() []SubscriptionRoleBinding {
-	if o == nil || isNil(o.Items) {
+	if o == nil || o.Items == nil {
 		var ret []SubscriptionRoleBinding
 		return ret
 	}
-	return o.Items
+	return *o.Items
 }
 
 // GetItemsOk returns a tuple with the Items field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *SubscriptionRoleBindingListAllOf) GetItemsOk() ([]SubscriptionRoleBinding, bool) {
-	if o == nil || isNil(o.Items) {
-    return nil, false
+func (o *SubscriptionRoleBindingListAllOf) GetItemsOk() (*[]SubscriptionRoleBinding, bool) {
+	if o == nil || o.Items == nil {
+		return nil, false
 	}
 	return o.Items, true
 }
 
 // HasItems returns a boolean if a field has been set.
 func (o *SubscriptionRoleBindingListAllOf) HasItems() bool {
-	if o != nil && !isNil(o.Items) {
+	if o != nil && o.Items != nil {
 		return true
 	}
 
@@ -65,12 +65,12 @@ func (o *SubscriptionRoleBindingListAllOf) HasItems() bool {
 
 // SetItems gets a reference to the given []SubscriptionRoleBinding and assigns it to the Items field.
 func (o *SubscriptionRoleBindingListAllOf) SetItems(v []SubscriptionRoleBinding) {
-	o.Items = v
+	o.Items = &v
 }
 
 func (o SubscriptionRoleBindingListAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Items) {
+	if o.Items != nil {
 		toSerialize["items"] = o.Items
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_summary.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_summary.go
index 2e831f65..d7ab8b52 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_summary.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_summary.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -43,7 +43,7 @@ func NewSummaryWithDefaults() *Summary {
 
 // GetHref returns the Href field value if set, zero value otherwise.
 func (o *Summary) GetHref() string {
-	if o == nil || isNil(o.Href) {
+	if o == nil || o.Href == nil {
 		var ret string
 		return ret
 	}
@@ -53,15 +53,15 @@ func (o *Summary) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Summary) GetHrefOk() (*string, bool) {
-	if o == nil || isNil(o.Href) {
-    return nil, false
+	if o == nil || o.Href == nil {
+		return nil, false
 	}
 	return o.Href, true
 }
 
 // HasHref returns a boolean if a field has been set.
 func (o *Summary) HasHref() bool {
-	if o != nil && !isNil(o.Href) {
+	if o != nil && o.Href != nil {
 		return true
 	}
 
@@ -75,7 +75,7 @@ func (o *Summary) SetHref(v string) {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *Summary) GetId() string {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret string
 		return ret
 	}
@@ -85,15 +85,15 @@ func (o *Summary) GetId() string {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Summary) GetIdOk() (*string, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *Summary) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -107,7 +107,7 @@ func (o *Summary) SetId(v string) {
 
 // GetKind returns the Kind field value if set, zero value otherwise.
 func (o *Summary) GetKind() string {
-	if o == nil || isNil(o.Kind) {
+	if o == nil || o.Kind == nil {
 		var ret string
 		return ret
 	}
@@ -117,15 +117,15 @@ func (o *Summary) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Summary) GetKindOk() (*string, bool) {
-	if o == nil || isNil(o.Kind) {
-    return nil, false
+	if o == nil || o.Kind == nil {
+		return nil, false
 	}
 	return o.Kind, true
 }
 
 // HasKind returns a boolean if a field has been set.
 func (o *Summary) HasKind() bool {
-	if o != nil && !isNil(o.Kind) {
+	if o != nil && o.Kind != nil {
 		return true
 	}
 
@@ -149,11 +149,11 @@ func (o *Summary) GetMetrics() []SummaryMetrics {
 
 // GetMetricsOk returns a tuple with the Metrics field value
 // and a boolean to check if the value has been set.
-func (o *Summary) GetMetricsOk() ([]SummaryMetrics, bool) {
-	if o == nil {
-    return nil, false
+func (o *Summary) GetMetricsOk() (*[]SummaryMetrics, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Metrics, true
+	return &o.Metrics, true
 }
 
 // SetMetrics sets field value
@@ -163,7 +163,7 @@ func (o *Summary) SetMetrics(v []SummaryMetrics) {
 
 // GetName returns the Name field value if set, zero value otherwise.
 func (o *Summary) GetName() string {
-	if o == nil || isNil(o.Name) {
+	if o == nil || o.Name == nil {
 		var ret string
 		return ret
 	}
@@ -173,15 +173,15 @@ func (o *Summary) GetName() string {
 // GetNameOk returns a tuple with the Name field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Summary) GetNameOk() (*string, bool) {
-	if o == nil || isNil(o.Name) {
-    return nil, false
+	if o == nil || o.Name == nil {
+		return nil, false
 	}
 	return o.Name, true
 }
 
 // HasName returns a boolean if a field has been set.
 func (o *Summary) HasName() bool {
-	if o != nil && !isNil(o.Name) {
+	if o != nil && o.Name != nil {
 		return true
 	}
 
@@ -195,19 +195,19 @@ func (o *Summary) SetName(v string) {
 
 func (o Summary) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Href) {
+	if o.Href != nil {
 		toSerialize["href"] = o.Href
 	}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.Kind) {
+	if o.Kind != nil {
 		toSerialize["kind"] = o.Kind
 	}
 	if true {
 		toSerialize["metrics"] = o.Metrics
 	}
-	if !isNil(o.Name) {
+	if o.Name != nil {
 		toSerialize["name"] = o.Name
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_summary_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_summary_all_of.go
index cd3de2e8..04cee143 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_summary_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_summary_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -50,11 +50,11 @@ func (o *SummaryAllOf) GetMetrics() []SummaryMetrics {
 
 // GetMetricsOk returns a tuple with the Metrics field value
 // and a boolean to check if the value has been set.
-func (o *SummaryAllOf) GetMetricsOk() ([]SummaryMetrics, bool) {
-	if o == nil {
-    return nil, false
+func (o *SummaryAllOf) GetMetricsOk() (*[]SummaryMetrics, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Metrics, true
+	return &o.Metrics, true
 }
 
 // SetMetrics sets field value
@@ -64,7 +64,7 @@ func (o *SummaryAllOf) SetMetrics(v []SummaryMetrics) {
 
 // GetName returns the Name field value if set, zero value otherwise.
 func (o *SummaryAllOf) GetName() string {
-	if o == nil || isNil(o.Name) {
+	if o == nil || o.Name == nil {
 		var ret string
 		return ret
 	}
@@ -74,15 +74,15 @@ func (o *SummaryAllOf) GetName() string {
 // GetNameOk returns a tuple with the Name field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SummaryAllOf) GetNameOk() (*string, bool) {
-	if o == nil || isNil(o.Name) {
-    return nil, false
+	if o == nil || o.Name == nil {
+		return nil, false
 	}
 	return o.Name, true
 }
 
 // HasName returns a boolean if a field has been set.
 func (o *SummaryAllOf) HasName() bool {
-	if o != nil && !isNil(o.Name) {
+	if o != nil && o.Name != nil {
 		return true
 	}
 
@@ -99,7 +99,7 @@ func (o SummaryAllOf) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["metrics"] = o.Metrics
 	}
-	if !isNil(o.Name) {
+	if o.Name != nil {
 		toSerialize["name"] = o.Name
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_summary_metrics.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_summary_metrics.go
index dcca1814..505f27b8 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_summary_metrics.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_summary_metrics.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -17,7 +17,7 @@ import (
 // SummaryMetrics struct for SummaryMetrics
 type SummaryMetrics struct {
 	Name *string `json:"name,omitempty"`
-	Vector []SummaryVector `json:"vector,omitempty"`
+	Vector *[]SummaryVector `json:"vector,omitempty"`
 }
 
 // NewSummaryMetrics instantiates a new SummaryMetrics object
@@ -39,7 +39,7 @@ func NewSummaryMetricsWithDefaults() *SummaryMetrics {
 
 // GetName returns the Name field value if set, zero value otherwise.
 func (o *SummaryMetrics) GetName() string {
-	if o == nil || isNil(o.Name) {
+	if o == nil || o.Name == nil {
 		var ret string
 		return ret
 	}
@@ -49,15 +49,15 @@ func (o *SummaryMetrics) GetName() string {
 // GetNameOk returns a tuple with the Name field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SummaryMetrics) GetNameOk() (*string, bool) {
-	if o == nil || isNil(o.Name) {
-    return nil, false
+	if o == nil || o.Name == nil {
+		return nil, false
 	}
 	return o.Name, true
 }
 
 // HasName returns a boolean if a field has been set.
 func (o *SummaryMetrics) HasName() bool {
-	if o != nil && !isNil(o.Name) {
+	if o != nil && o.Name != nil {
 		return true
 	}
 
@@ -71,25 +71,25 @@ func (o *SummaryMetrics) SetName(v string) {
 
 // GetVector returns the Vector field value if set, zero value otherwise.
 func (o *SummaryMetrics) GetVector() []SummaryVector {
-	if o == nil || isNil(o.Vector) {
+	if o == nil || o.Vector == nil {
 		var ret []SummaryVector
 		return ret
 	}
-	return o.Vector
+	return *o.Vector
 }
 
 // GetVectorOk returns a tuple with the Vector field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *SummaryMetrics) GetVectorOk() ([]SummaryVector, bool) {
-	if o == nil || isNil(o.Vector) {
-    return nil, false
+func (o *SummaryMetrics) GetVectorOk() (*[]SummaryVector, bool) {
+	if o == nil || o.Vector == nil {
+		return nil, false
 	}
 	return o.Vector, true
 }
 
 // HasVector returns a boolean if a field has been set.
 func (o *SummaryMetrics) HasVector() bool {
-	if o != nil && !isNil(o.Vector) {
+	if o != nil && o.Vector != nil {
 		return true
 	}
 
@@ -98,15 +98,15 @@ func (o *SummaryMetrics) HasVector() bool {
 
 // SetVector gets a reference to the given []SummaryVector and assigns it to the Vector field.
 func (o *SummaryMetrics) SetVector(v []SummaryVector) {
-	o.Vector = v
+	o.Vector = &v
 }
 
 func (o SummaryMetrics) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Name) {
+	if o.Name != nil {
 		toSerialize["name"] = o.Name
 	}
-	if !isNil(o.Vector) {
+	if o.Vector != nil {
 		toSerialize["vector"] = o.Vector
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_summary_metrics_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_summary_metrics_all_of.go
index 905cc8b2..a3f35254 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_summary_metrics_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_summary_metrics_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -17,7 +17,7 @@ import (
 // SummaryMetricsAllOf struct for SummaryMetricsAllOf
 type SummaryMetricsAllOf struct {
 	Name *string `json:"name,omitempty"`
-	Vector []SummaryVector `json:"vector,omitempty"`
+	Vector *[]SummaryVector `json:"vector,omitempty"`
 }
 
 // NewSummaryMetricsAllOf instantiates a new SummaryMetricsAllOf object
@@ -39,7 +39,7 @@ func NewSummaryMetricsAllOfWithDefaults() *SummaryMetricsAllOf {
 
 // GetName returns the Name field value if set, zero value otherwise.
 func (o *SummaryMetricsAllOf) GetName() string {
-	if o == nil || isNil(o.Name) {
+	if o == nil || o.Name == nil {
 		var ret string
 		return ret
 	}
@@ -49,15 +49,15 @@ func (o *SummaryMetricsAllOf) GetName() string {
 // GetNameOk returns a tuple with the Name field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SummaryMetricsAllOf) GetNameOk() (*string, bool) {
-	if o == nil || isNil(o.Name) {
-    return nil, false
+	if o == nil || o.Name == nil {
+		return nil, false
 	}
 	return o.Name, true
 }
 
 // HasName returns a boolean if a field has been set.
 func (o *SummaryMetricsAllOf) HasName() bool {
-	if o != nil && !isNil(o.Name) {
+	if o != nil && o.Name != nil {
 		return true
 	}
 
@@ -71,25 +71,25 @@ func (o *SummaryMetricsAllOf) SetName(v string) {
 
 // GetVector returns the Vector field value if set, zero value otherwise.
 func (o *SummaryMetricsAllOf) GetVector() []SummaryVector {
-	if o == nil || isNil(o.Vector) {
+	if o == nil || o.Vector == nil {
 		var ret []SummaryVector
 		return ret
 	}
-	return o.Vector
+	return *o.Vector
 }
 
 // GetVectorOk returns a tuple with the Vector field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *SummaryMetricsAllOf) GetVectorOk() ([]SummaryVector, bool) {
-	if o == nil || isNil(o.Vector) {
-    return nil, false
+func (o *SummaryMetricsAllOf) GetVectorOk() (*[]SummaryVector, bool) {
+	if o == nil || o.Vector == nil {
+		return nil, false
 	}
 	return o.Vector, true
 }
 
 // HasVector returns a boolean if a field has been set.
 func (o *SummaryMetricsAllOf) HasVector() bool {
-	if o != nil && !isNil(o.Vector) {
+	if o != nil && o.Vector != nil {
 		return true
 	}
 
@@ -98,15 +98,15 @@ func (o *SummaryMetricsAllOf) HasVector() bool {
 
 // SetVector gets a reference to the given []SummaryVector and assigns it to the Vector field.
 func (o *SummaryMetricsAllOf) SetVector(v []SummaryVector) {
-	o.Vector = v
+	o.Vector = &v
 }
 
 func (o SummaryMetricsAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Name) {
+	if o.Name != nil {
 		toSerialize["name"] = o.Name
 	}
-	if !isNil(o.Vector) {
+	if o.Vector != nil {
 		toSerialize["vector"] = o.Vector
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_summary_vector.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_summary_vector.go
index a397d3e2..fb844ece 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_summary_vector.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_summary_vector.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -12,6 +12,7 @@ package accountmgmtclient
 
 import (
 	"encoding/json"
+	"time"
 )
 
 // SummaryVector struct for SummaryVector
@@ -39,7 +40,7 @@ func NewSummaryVectorWithDefaults() *SummaryVector {
 
 // GetTime returns the Time field value if set, zero value otherwise.
 func (o *SummaryVector) GetTime() time.Time {
-	if o == nil || isNil(o.Time) {
+	if o == nil || o.Time == nil {
 		var ret time.Time
 		return ret
 	}
@@ -49,15 +50,15 @@ func (o *SummaryVector) GetTime() time.Time {
 // GetTimeOk returns a tuple with the Time field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SummaryVector) GetTimeOk() (*time.Time, bool) {
-	if o == nil || isNil(o.Time) {
-    return nil, false
+	if o == nil || o.Time == nil {
+		return nil, false
 	}
 	return o.Time, true
 }
 
 // HasTime returns a boolean if a field has been set.
 func (o *SummaryVector) HasTime() bool {
-	if o != nil && !isNil(o.Time) {
+	if o != nil && o.Time != nil {
 		return true
 	}
 
@@ -71,7 +72,7 @@ func (o *SummaryVector) SetTime(v time.Time) {
 
 // GetValue returns the Value field value if set, zero value otherwise.
 func (o *SummaryVector) GetValue() float64 {
-	if o == nil || isNil(o.Value) {
+	if o == nil || o.Value == nil {
 		var ret float64
 		return ret
 	}
@@ -81,15 +82,15 @@ func (o *SummaryVector) GetValue() float64 {
 // GetValueOk returns a tuple with the Value field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SummaryVector) GetValueOk() (*float64, bool) {
-	if o == nil || isNil(o.Value) {
-    return nil, false
+	if o == nil || o.Value == nil {
+		return nil, false
 	}
 	return o.Value, true
 }
 
 // HasValue returns a boolean if a field has been set.
 func (o *SummaryVector) HasValue() bool {
-	if o != nil && !isNil(o.Value) {
+	if o != nil && o.Value != nil {
 		return true
 	}
 
@@ -103,10 +104,10 @@ func (o *SummaryVector) SetValue(v float64) {
 
 func (o SummaryVector) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Time) {
+	if o.Time != nil {
 		toSerialize["time"] = o.Time
 	}
-	if !isNil(o.Value) {
+	if o.Value != nil {
 		toSerialize["value"] = o.Value
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_summary_vector_all_of.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_summary_vector_all_of.go
index dd6fdf9c..df61df42 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_summary_vector_all_of.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_summary_vector_all_of.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -40,7 +40,7 @@ func NewSummaryVectorAllOfWithDefaults() *SummaryVectorAllOf {
 
 // GetTime returns the Time field value if set, zero value otherwise.
 func (o *SummaryVectorAllOf) GetTime() time.Time {
-	if o == nil || isNil(o.Time) {
+	if o == nil || o.Time == nil {
 		var ret time.Time
 		return ret
 	}
@@ -50,15 +50,15 @@ func (o *SummaryVectorAllOf) GetTime() time.Time {
 // GetTimeOk returns a tuple with the Time field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SummaryVectorAllOf) GetTimeOk() (*time.Time, bool) {
-	if o == nil || isNil(o.Time) {
-    return nil, false
+	if o == nil || o.Time == nil {
+		return nil, false
 	}
 	return o.Time, true
 }
 
 // HasTime returns a boolean if a field has been set.
 func (o *SummaryVectorAllOf) HasTime() bool {
-	if o != nil && !isNil(o.Time) {
+	if o != nil && o.Time != nil {
 		return true
 	}
 
@@ -72,7 +72,7 @@ func (o *SummaryVectorAllOf) SetTime(v time.Time) {
 
 // GetValue returns the Value field value if set, zero value otherwise.
 func (o *SummaryVectorAllOf) GetValue() float64 {
-	if o == nil || isNil(o.Value) {
+	if o == nil || o.Value == nil {
 		var ret float64
 		return ret
 	}
@@ -82,15 +82,15 @@ func (o *SummaryVectorAllOf) GetValue() float64 {
 // GetValueOk returns a tuple with the Value field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SummaryVectorAllOf) GetValueOk() (*float64, bool) {
-	if o == nil || isNil(o.Value) {
-    return nil, false
+	if o == nil || o.Value == nil {
+		return nil, false
 	}
 	return o.Value, true
 }
 
 // HasValue returns a boolean if a field has been set.
 func (o *SummaryVectorAllOf) HasValue() bool {
-	if o != nil && !isNil(o.Value) {
+	if o != nil && o.Value != nil {
 		return true
 	}
 
@@ -104,10 +104,10 @@ func (o *SummaryVectorAllOf) SetValue(v float64) {
 
 func (o SummaryVectorAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Time) {
+	if o.Time != nil {
 		toSerialize["time"] = o.Time
 	}
-	if !isNil(o.Value) {
+	if o.Value != nil {
 		toSerialize["value"] = o.Value
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_support_cases_created_response.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_support_cases_created_response.go
index f0f577f8..923a2132 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_support_cases_created_response.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_support_cases_created_response.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -46,7 +46,7 @@ func NewSupportCasesCreatedResponseWithDefaults() *SupportCasesCreatedResponse {
 
 // GetCaseNumber returns the CaseNumber field value if set, zero value otherwise.
 func (o *SupportCasesCreatedResponse) GetCaseNumber() string {
-	if o == nil || isNil(o.CaseNumber) {
+	if o == nil || o.CaseNumber == nil {
 		var ret string
 		return ret
 	}
@@ -56,15 +56,15 @@ func (o *SupportCasesCreatedResponse) GetCaseNumber() string {
 // GetCaseNumberOk returns a tuple with the CaseNumber field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SupportCasesCreatedResponse) GetCaseNumberOk() (*string, bool) {
-	if o == nil || isNil(o.CaseNumber) {
-    return nil, false
+	if o == nil || o.CaseNumber == nil {
+		return nil, false
 	}
 	return o.CaseNumber, true
 }
 
 // HasCaseNumber returns a boolean if a field has been set.
 func (o *SupportCasesCreatedResponse) HasCaseNumber() bool {
-	if o != nil && !isNil(o.CaseNumber) {
+	if o != nil && o.CaseNumber != nil {
 		return true
 	}
 
@@ -78,7 +78,7 @@ func (o *SupportCasesCreatedResponse) SetCaseNumber(v string) {
 
 // GetClusterId returns the ClusterId field value if set, zero value otherwise.
 func (o *SupportCasesCreatedResponse) GetClusterId() string {
-	if o == nil || isNil(o.ClusterId) {
+	if o == nil || o.ClusterId == nil {
 		var ret string
 		return ret
 	}
@@ -88,15 +88,15 @@ func (o *SupportCasesCreatedResponse) GetClusterId() string {
 // GetClusterIdOk returns a tuple with the ClusterId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SupportCasesCreatedResponse) GetClusterIdOk() (*string, bool) {
-	if o == nil || isNil(o.ClusterId) {
-    return nil, false
+	if o == nil || o.ClusterId == nil {
+		return nil, false
 	}
 	return o.ClusterId, true
 }
 
 // HasClusterId returns a boolean if a field has been set.
 func (o *SupportCasesCreatedResponse) HasClusterId() bool {
-	if o != nil && !isNil(o.ClusterId) {
+	if o != nil && o.ClusterId != nil {
 		return true
 	}
 
@@ -110,7 +110,7 @@ func (o *SupportCasesCreatedResponse) SetClusterId(v string) {
 
 // GetClusterUuid returns the ClusterUuid field value if set, zero value otherwise.
 func (o *SupportCasesCreatedResponse) GetClusterUuid() string {
-	if o == nil || isNil(o.ClusterUuid) {
+	if o == nil || o.ClusterUuid == nil {
 		var ret string
 		return ret
 	}
@@ -120,15 +120,15 @@ func (o *SupportCasesCreatedResponse) GetClusterUuid() string {
 // GetClusterUuidOk returns a tuple with the ClusterUuid field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SupportCasesCreatedResponse) GetClusterUuidOk() (*string, bool) {
-	if o == nil || isNil(o.ClusterUuid) {
-    return nil, false
+	if o == nil || o.ClusterUuid == nil {
+		return nil, false
 	}
 	return o.ClusterUuid, true
 }
 
 // HasClusterUuid returns a boolean if a field has been set.
 func (o *SupportCasesCreatedResponse) HasClusterUuid() bool {
-	if o != nil && !isNil(o.ClusterUuid) {
+	if o != nil && o.ClusterUuid != nil {
 		return true
 	}
 
@@ -142,7 +142,7 @@ func (o *SupportCasesCreatedResponse) SetClusterUuid(v string) {
 
 // GetDescription returns the Description field value if set, zero value otherwise.
 func (o *SupportCasesCreatedResponse) GetDescription() string {
-	if o == nil || isNil(o.Description) {
+	if o == nil || o.Description == nil {
 		var ret string
 		return ret
 	}
@@ -152,15 +152,15 @@ func (o *SupportCasesCreatedResponse) GetDescription() string {
 // GetDescriptionOk returns a tuple with the Description field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SupportCasesCreatedResponse) GetDescriptionOk() (*string, bool) {
-	if o == nil || isNil(o.Description) {
-    return nil, false
+	if o == nil || o.Description == nil {
+		return nil, false
 	}
 	return o.Description, true
 }
 
 // HasDescription returns a boolean if a field has been set.
 func (o *SupportCasesCreatedResponse) HasDescription() bool {
-	if o != nil && !isNil(o.Description) {
+	if o != nil && o.Description != nil {
 		return true
 	}
 
@@ -174,7 +174,7 @@ func (o *SupportCasesCreatedResponse) SetDescription(v string) {
 
 // GetSeverity returns the Severity field value if set, zero value otherwise.
 func (o *SupportCasesCreatedResponse) GetSeverity() string {
-	if o == nil || isNil(o.Severity) {
+	if o == nil || o.Severity == nil {
 		var ret string
 		return ret
 	}
@@ -184,15 +184,15 @@ func (o *SupportCasesCreatedResponse) GetSeverity() string {
 // GetSeverityOk returns a tuple with the Severity field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SupportCasesCreatedResponse) GetSeverityOk() (*string, bool) {
-	if o == nil || isNil(o.Severity) {
-    return nil, false
+	if o == nil || o.Severity == nil {
+		return nil, false
 	}
 	return o.Severity, true
 }
 
 // HasSeverity returns a boolean if a field has been set.
 func (o *SupportCasesCreatedResponse) HasSeverity() bool {
-	if o != nil && !isNil(o.Severity) {
+	if o != nil && o.Severity != nil {
 		return true
 	}
 
@@ -206,7 +206,7 @@ func (o *SupportCasesCreatedResponse) SetSeverity(v string) {
 
 // GetStatus returns the Status field value if set, zero value otherwise.
 func (o *SupportCasesCreatedResponse) GetStatus() string {
-	if o == nil || isNil(o.Status) {
+	if o == nil || o.Status == nil {
 		var ret string
 		return ret
 	}
@@ -216,15 +216,15 @@ func (o *SupportCasesCreatedResponse) GetStatus() string {
 // GetStatusOk returns a tuple with the Status field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SupportCasesCreatedResponse) GetStatusOk() (*string, bool) {
-	if o == nil || isNil(o.Status) {
-    return nil, false
+	if o == nil || o.Status == nil {
+		return nil, false
 	}
 	return o.Status, true
 }
 
 // HasStatus returns a boolean if a field has been set.
 func (o *SupportCasesCreatedResponse) HasStatus() bool {
-	if o != nil && !isNil(o.Status) {
+	if o != nil && o.Status != nil {
 		return true
 	}
 
@@ -238,7 +238,7 @@ func (o *SupportCasesCreatedResponse) SetStatus(v string) {
 
 // GetSubscriptionId returns the SubscriptionId field value if set, zero value otherwise.
 func (o *SupportCasesCreatedResponse) GetSubscriptionId() string {
-	if o == nil || isNil(o.SubscriptionId) {
+	if o == nil || o.SubscriptionId == nil {
 		var ret string
 		return ret
 	}
@@ -248,15 +248,15 @@ func (o *SupportCasesCreatedResponse) GetSubscriptionId() string {
 // GetSubscriptionIdOk returns a tuple with the SubscriptionId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SupportCasesCreatedResponse) GetSubscriptionIdOk() (*string, bool) {
-	if o == nil || isNil(o.SubscriptionId) {
-    return nil, false
+	if o == nil || o.SubscriptionId == nil {
+		return nil, false
 	}
 	return o.SubscriptionId, true
 }
 
 // HasSubscriptionId returns a boolean if a field has been set.
 func (o *SupportCasesCreatedResponse) HasSubscriptionId() bool {
-	if o != nil && !isNil(o.SubscriptionId) {
+	if o != nil && o.SubscriptionId != nil {
 		return true
 	}
 
@@ -270,7 +270,7 @@ func (o *SupportCasesCreatedResponse) SetSubscriptionId(v string) {
 
 // GetSummary returns the Summary field value if set, zero value otherwise.
 func (o *SupportCasesCreatedResponse) GetSummary() string {
-	if o == nil || isNil(o.Summary) {
+	if o == nil || o.Summary == nil {
 		var ret string
 		return ret
 	}
@@ -280,15 +280,15 @@ func (o *SupportCasesCreatedResponse) GetSummary() string {
 // GetSummaryOk returns a tuple with the Summary field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SupportCasesCreatedResponse) GetSummaryOk() (*string, bool) {
-	if o == nil || isNil(o.Summary) {
-    return nil, false
+	if o == nil || o.Summary == nil {
+		return nil, false
 	}
 	return o.Summary, true
 }
 
 // HasSummary returns a boolean if a field has been set.
 func (o *SupportCasesCreatedResponse) HasSummary() bool {
-	if o != nil && !isNil(o.Summary) {
+	if o != nil && o.Summary != nil {
 		return true
 	}
 
@@ -302,7 +302,7 @@ func (o *SupportCasesCreatedResponse) SetSummary(v string) {
 
 // GetUri returns the Uri field value if set, zero value otherwise.
 func (o *SupportCasesCreatedResponse) GetUri() string {
-	if o == nil || isNil(o.Uri) {
+	if o == nil || o.Uri == nil {
 		var ret string
 		return ret
 	}
@@ -312,15 +312,15 @@ func (o *SupportCasesCreatedResponse) GetUri() string {
 // GetUriOk returns a tuple with the Uri field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SupportCasesCreatedResponse) GetUriOk() (*string, bool) {
-	if o == nil || isNil(o.Uri) {
-    return nil, false
+	if o == nil || o.Uri == nil {
+		return nil, false
 	}
 	return o.Uri, true
 }
 
 // HasUri returns a boolean if a field has been set.
 func (o *SupportCasesCreatedResponse) HasUri() bool {
-	if o != nil && !isNil(o.Uri) {
+	if o != nil && o.Uri != nil {
 		return true
 	}
 
@@ -334,31 +334,31 @@ func (o *SupportCasesCreatedResponse) SetUri(v string) {
 
 func (o SupportCasesCreatedResponse) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.CaseNumber) {
+	if o.CaseNumber != nil {
 		toSerialize["caseNumber"] = o.CaseNumber
 	}
-	if !isNil(o.ClusterId) {
+	if o.ClusterId != nil {
 		toSerialize["cluster_id"] = o.ClusterId
 	}
-	if !isNil(o.ClusterUuid) {
+	if o.ClusterUuid != nil {
 		toSerialize["cluster_uuid"] = o.ClusterUuid
 	}
-	if !isNil(o.Description) {
+	if o.Description != nil {
 		toSerialize["description"] = o.Description
 	}
-	if !isNil(o.Severity) {
+	if o.Severity != nil {
 		toSerialize["severity"] = o.Severity
 	}
-	if !isNil(o.Status) {
+	if o.Status != nil {
 		toSerialize["status"] = o.Status
 	}
-	if !isNil(o.SubscriptionId) {
+	if o.SubscriptionId != nil {
 		toSerialize["subscription_id"] = o.SubscriptionId
 	}
-	if !isNil(o.Summary) {
+	if o.Summary != nil {
 		toSerialize["summary"] = o.Summary
 	}
-	if !isNil(o.Uri) {
+	if o.Uri != nil {
 		toSerialize["uri"] = o.Uri
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_support_cases_request.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_support_cases_request.go
index 7c941c33..d9e2a9ac 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_support_cases_request.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_support_cases_request.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -61,7 +61,7 @@ func NewSupportCasesRequestWithDefaults() *SupportCasesRequest {
 
 // GetAccountNumber returns the AccountNumber field value if set, zero value otherwise.
 func (o *SupportCasesRequest) GetAccountNumber() string {
-	if o == nil || isNil(o.AccountNumber) {
+	if o == nil || o.AccountNumber == nil {
 		var ret string
 		return ret
 	}
@@ -71,15 +71,15 @@ func (o *SupportCasesRequest) GetAccountNumber() string {
 // GetAccountNumberOk returns a tuple with the AccountNumber field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SupportCasesRequest) GetAccountNumberOk() (*string, bool) {
-	if o == nil || isNil(o.AccountNumber) {
-    return nil, false
+	if o == nil || o.AccountNumber == nil {
+		return nil, false
 	}
 	return o.AccountNumber, true
 }
 
 // HasAccountNumber returns a boolean if a field has been set.
 func (o *SupportCasesRequest) HasAccountNumber() bool {
-	if o != nil && !isNil(o.AccountNumber) {
+	if o != nil && o.AccountNumber != nil {
 		return true
 	}
 
@@ -93,7 +93,7 @@ func (o *SupportCasesRequest) SetAccountNumber(v string) {
 
 // GetCaseLanguage returns the CaseLanguage field value if set, zero value otherwise.
 func (o *SupportCasesRequest) GetCaseLanguage() string {
-	if o == nil || isNil(o.CaseLanguage) {
+	if o == nil || o.CaseLanguage == nil {
 		var ret string
 		return ret
 	}
@@ -103,15 +103,15 @@ func (o *SupportCasesRequest) GetCaseLanguage() string {
 // GetCaseLanguageOk returns a tuple with the CaseLanguage field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SupportCasesRequest) GetCaseLanguageOk() (*string, bool) {
-	if o == nil || isNil(o.CaseLanguage) {
-    return nil, false
+	if o == nil || o.CaseLanguage == nil {
+		return nil, false
 	}
 	return o.CaseLanguage, true
 }
 
 // HasCaseLanguage returns a boolean if a field has been set.
 func (o *SupportCasesRequest) HasCaseLanguage() bool {
-	if o != nil && !isNil(o.CaseLanguage) {
+	if o != nil && o.CaseLanguage != nil {
 		return true
 	}
 
@@ -125,7 +125,7 @@ func (o *SupportCasesRequest) SetCaseLanguage(v string) {
 
 // GetClusterId returns the ClusterId field value if set, zero value otherwise.
 func (o *SupportCasesRequest) GetClusterId() string {
-	if o == nil || isNil(o.ClusterId) {
+	if o == nil || o.ClusterId == nil {
 		var ret string
 		return ret
 	}
@@ -135,15 +135,15 @@ func (o *SupportCasesRequest) GetClusterId() string {
 // GetClusterIdOk returns a tuple with the ClusterId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SupportCasesRequest) GetClusterIdOk() (*string, bool) {
-	if o == nil || isNil(o.ClusterId) {
-    return nil, false
+	if o == nil || o.ClusterId == nil {
+		return nil, false
 	}
 	return o.ClusterId, true
 }
 
 // HasClusterId returns a boolean if a field has been set.
 func (o *SupportCasesRequest) HasClusterId() bool {
-	if o != nil && !isNil(o.ClusterId) {
+	if o != nil && o.ClusterId != nil {
 		return true
 	}
 
@@ -157,7 +157,7 @@ func (o *SupportCasesRequest) SetClusterId(v string) {
 
 // GetClusterUuid returns the ClusterUuid field value if set, zero value otherwise.
 func (o *SupportCasesRequest) GetClusterUuid() string {
-	if o == nil || isNil(o.ClusterUuid) {
+	if o == nil || o.ClusterUuid == nil {
 		var ret string
 		return ret
 	}
@@ -167,15 +167,15 @@ func (o *SupportCasesRequest) GetClusterUuid() string {
 // GetClusterUuidOk returns a tuple with the ClusterUuid field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SupportCasesRequest) GetClusterUuidOk() (*string, bool) {
-	if o == nil || isNil(o.ClusterUuid) {
-    return nil, false
+	if o == nil || o.ClusterUuid == nil {
+		return nil, false
 	}
 	return o.ClusterUuid, true
 }
 
 // HasClusterUuid returns a boolean if a field has been set.
 func (o *SupportCasesRequest) HasClusterUuid() bool {
-	if o != nil && !isNil(o.ClusterUuid) {
+	if o != nil && o.ClusterUuid != nil {
 		return true
 	}
 
@@ -189,7 +189,7 @@ func (o *SupportCasesRequest) SetClusterUuid(v string) {
 
 // GetContactSsoName returns the ContactSsoName field value if set, zero value otherwise.
 func (o *SupportCasesRequest) GetContactSsoName() string {
-	if o == nil || isNil(o.ContactSsoName) {
+	if o == nil || o.ContactSsoName == nil {
 		var ret string
 		return ret
 	}
@@ -199,15 +199,15 @@ func (o *SupportCasesRequest) GetContactSsoName() string {
 // GetContactSsoNameOk returns a tuple with the ContactSsoName field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SupportCasesRequest) GetContactSsoNameOk() (*string, bool) {
-	if o == nil || isNil(o.ContactSsoName) {
-    return nil, false
+	if o == nil || o.ContactSsoName == nil {
+		return nil, false
 	}
 	return o.ContactSsoName, true
 }
 
 // HasContactSsoName returns a boolean if a field has been set.
 func (o *SupportCasesRequest) HasContactSsoName() bool {
-	if o != nil && !isNil(o.ContactSsoName) {
+	if o != nil && o.ContactSsoName != nil {
 		return true
 	}
 
@@ -232,8 +232,8 @@ func (o *SupportCasesRequest) GetDescription() string {
 // GetDescriptionOk returns a tuple with the Description field value
 // and a boolean to check if the value has been set.
 func (o *SupportCasesRequest) GetDescriptionOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Description, true
 }
@@ -245,7 +245,7 @@ func (o *SupportCasesRequest) SetDescription(v string) {
 
 // GetEventStreamId returns the EventStreamId field value if set, zero value otherwise.
 func (o *SupportCasesRequest) GetEventStreamId() string {
-	if o == nil || isNil(o.EventStreamId) {
+	if o == nil || o.EventStreamId == nil {
 		var ret string
 		return ret
 	}
@@ -255,15 +255,15 @@ func (o *SupportCasesRequest) GetEventStreamId() string {
 // GetEventStreamIdOk returns a tuple with the EventStreamId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SupportCasesRequest) GetEventStreamIdOk() (*string, bool) {
-	if o == nil || isNil(o.EventStreamId) {
-    return nil, false
+	if o == nil || o.EventStreamId == nil {
+		return nil, false
 	}
 	return o.EventStreamId, true
 }
 
 // HasEventStreamId returns a boolean if a field has been set.
 func (o *SupportCasesRequest) HasEventStreamId() bool {
-	if o != nil && !isNil(o.EventStreamId) {
+	if o != nil && o.EventStreamId != nil {
 		return true
 	}
 
@@ -277,7 +277,7 @@ func (o *SupportCasesRequest) SetEventStreamId(v string) {
 
 // GetOpenshiftClusterId returns the OpenshiftClusterId field value if set, zero value otherwise.
 func (o *SupportCasesRequest) GetOpenshiftClusterId() string {
-	if o == nil || isNil(o.OpenshiftClusterId) {
+	if o == nil || o.OpenshiftClusterId == nil {
 		var ret string
 		return ret
 	}
@@ -287,15 +287,15 @@ func (o *SupportCasesRequest) GetOpenshiftClusterId() string {
 // GetOpenshiftClusterIdOk returns a tuple with the OpenshiftClusterId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SupportCasesRequest) GetOpenshiftClusterIdOk() (*string, bool) {
-	if o == nil || isNil(o.OpenshiftClusterId) {
-    return nil, false
+	if o == nil || o.OpenshiftClusterId == nil {
+		return nil, false
 	}
 	return o.OpenshiftClusterId, true
 }
 
 // HasOpenshiftClusterId returns a boolean if a field has been set.
 func (o *SupportCasesRequest) HasOpenshiftClusterId() bool {
-	if o != nil && !isNil(o.OpenshiftClusterId) {
+	if o != nil && o.OpenshiftClusterId != nil {
 		return true
 	}
 
@@ -309,7 +309,7 @@ func (o *SupportCasesRequest) SetOpenshiftClusterId(v string) {
 
 // GetProduct returns the Product field value if set, zero value otherwise.
 func (o *SupportCasesRequest) GetProduct() string {
-	if o == nil || isNil(o.Product) {
+	if o == nil || o.Product == nil {
 		var ret string
 		return ret
 	}
@@ -319,15 +319,15 @@ func (o *SupportCasesRequest) GetProduct() string {
 // GetProductOk returns a tuple with the Product field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SupportCasesRequest) GetProductOk() (*string, bool) {
-	if o == nil || isNil(o.Product) {
-    return nil, false
+	if o == nil || o.Product == nil {
+		return nil, false
 	}
 	return o.Product, true
 }
 
 // HasProduct returns a boolean if a field has been set.
 func (o *SupportCasesRequest) HasProduct() bool {
-	if o != nil && !isNil(o.Product) {
+	if o != nil && o.Product != nil {
 		return true
 	}
 
@@ -352,8 +352,8 @@ func (o *SupportCasesRequest) GetSeverity() string {
 // GetSeverityOk returns a tuple with the Severity field value
 // and a boolean to check if the value has been set.
 func (o *SupportCasesRequest) GetSeverityOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Severity, true
 }
@@ -365,7 +365,7 @@ func (o *SupportCasesRequest) SetSeverity(v string) {
 
 // GetSubscriptionId returns the SubscriptionId field value if set, zero value otherwise.
 func (o *SupportCasesRequest) GetSubscriptionId() string {
-	if o == nil || isNil(o.SubscriptionId) {
+	if o == nil || o.SubscriptionId == nil {
 		var ret string
 		return ret
 	}
@@ -375,15 +375,15 @@ func (o *SupportCasesRequest) GetSubscriptionId() string {
 // GetSubscriptionIdOk returns a tuple with the SubscriptionId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SupportCasesRequest) GetSubscriptionIdOk() (*string, bool) {
-	if o == nil || isNil(o.SubscriptionId) {
-    return nil, false
+	if o == nil || o.SubscriptionId == nil {
+		return nil, false
 	}
 	return o.SubscriptionId, true
 }
 
 // HasSubscriptionId returns a boolean if a field has been set.
 func (o *SupportCasesRequest) HasSubscriptionId() bool {
-	if o != nil && !isNil(o.SubscriptionId) {
+	if o != nil && o.SubscriptionId != nil {
 		return true
 	}
 
@@ -408,8 +408,8 @@ func (o *SupportCasesRequest) GetSummary() string {
 // GetSummaryOk returns a tuple with the Summary field value
 // and a boolean to check if the value has been set.
 func (o *SupportCasesRequest) GetSummaryOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Summary, true
 }
@@ -421,7 +421,7 @@ func (o *SupportCasesRequest) SetSummary(v string) {
 
 // GetVersion returns the Version field value if set, zero value otherwise.
 func (o *SupportCasesRequest) GetVersion() string {
-	if o == nil || isNil(o.Version) {
+	if o == nil || o.Version == nil {
 		var ret string
 		return ret
 	}
@@ -431,15 +431,15 @@ func (o *SupportCasesRequest) GetVersion() string {
 // GetVersionOk returns a tuple with the Version field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SupportCasesRequest) GetVersionOk() (*string, bool) {
-	if o == nil || isNil(o.Version) {
-    return nil, false
+	if o == nil || o.Version == nil {
+		return nil, false
 	}
 	return o.Version, true
 }
 
 // HasVersion returns a boolean if a field has been set.
 func (o *SupportCasesRequest) HasVersion() bool {
-	if o != nil && !isNil(o.Version) {
+	if o != nil && o.Version != nil {
 		return true
 	}
 
@@ -453,43 +453,43 @@ func (o *SupportCasesRequest) SetVersion(v string) {
 
 func (o SupportCasesRequest) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.AccountNumber) {
+	if o.AccountNumber != nil {
 		toSerialize["account_number"] = o.AccountNumber
 	}
-	if !isNil(o.CaseLanguage) {
+	if o.CaseLanguage != nil {
 		toSerialize["case_language"] = o.CaseLanguage
 	}
-	if !isNil(o.ClusterId) {
+	if o.ClusterId != nil {
 		toSerialize["cluster_id"] = o.ClusterId
 	}
-	if !isNil(o.ClusterUuid) {
+	if o.ClusterUuid != nil {
 		toSerialize["cluster_uuid"] = o.ClusterUuid
 	}
-	if !isNil(o.ContactSsoName) {
+	if o.ContactSsoName != nil {
 		toSerialize["contact_sso_name"] = o.ContactSsoName
 	}
 	if true {
 		toSerialize["description"] = o.Description
 	}
-	if !isNil(o.EventStreamId) {
+	if o.EventStreamId != nil {
 		toSerialize["event_stream_id"] = o.EventStreamId
 	}
-	if !isNil(o.OpenshiftClusterId) {
+	if o.OpenshiftClusterId != nil {
 		toSerialize["openshift_cluster_id"] = o.OpenshiftClusterId
 	}
-	if !isNil(o.Product) {
+	if o.Product != nil {
 		toSerialize["product"] = o.Product
 	}
 	if true {
 		toSerialize["severity"] = o.Severity
 	}
-	if !isNil(o.SubscriptionId) {
+	if o.SubscriptionId != nil {
 		toSerialize["subscription_id"] = o.SubscriptionId
 	}
 	if true {
 		toSerialize["summary"] = o.Summary
 	}
-	if !isNil(o.Version) {
+	if o.Version != nil {
 		toSerialize["version"] = o.Version
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_template_parameter.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_template_parameter.go
index c7e83631..219af678 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_template_parameter.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_template_parameter.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -52,8 +52,8 @@ func (o *TemplateParameter) GetContent() string {
 // GetContentOk returns a tuple with the Content field value
 // and a boolean to check if the value has been set.
 func (o *TemplateParameter) GetContentOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Content, true
 }
@@ -76,8 +76,8 @@ func (o *TemplateParameter) GetName() string {
 // GetNameOk returns a tuple with the Name field value
 // and a boolean to check if the value has been set.
 func (o *TemplateParameter) GetNameOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Name, true
 }
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_terms_review.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_terms_review.go
index d6ec9e9f..aa308365 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_terms_review.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_terms_review.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -57,8 +57,8 @@ func (o *TermsReview) GetAccountUsername() string {
 // GetAccountUsernameOk returns a tuple with the AccountUsername field value
 // and a boolean to check if the value has been set.
 func (o *TermsReview) GetAccountUsernameOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.AccountUsername, true
 }
@@ -70,7 +70,7 @@ func (o *TermsReview) SetAccountUsername(v string) {
 
 // GetCheckOptionalTerms returns the CheckOptionalTerms field value if set, zero value otherwise.
 func (o *TermsReview) GetCheckOptionalTerms() bool {
-	if o == nil || isNil(o.CheckOptionalTerms) {
+	if o == nil || o.CheckOptionalTerms == nil {
 		var ret bool
 		return ret
 	}
@@ -80,15 +80,15 @@ func (o *TermsReview) GetCheckOptionalTerms() bool {
 // GetCheckOptionalTermsOk returns a tuple with the CheckOptionalTerms field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *TermsReview) GetCheckOptionalTermsOk() (*bool, bool) {
-	if o == nil || isNil(o.CheckOptionalTerms) {
-    return nil, false
+	if o == nil || o.CheckOptionalTerms == nil {
+		return nil, false
 	}
 	return o.CheckOptionalTerms, true
 }
 
 // HasCheckOptionalTerms returns a boolean if a field has been set.
 func (o *TermsReview) HasCheckOptionalTerms() bool {
-	if o != nil && !isNil(o.CheckOptionalTerms) {
+	if o != nil && o.CheckOptionalTerms != nil {
 		return true
 	}
 
@@ -102,7 +102,7 @@ func (o *TermsReview) SetCheckOptionalTerms(v bool) {
 
 // GetEventCode returns the EventCode field value if set, zero value otherwise.
 func (o *TermsReview) GetEventCode() string {
-	if o == nil || isNil(o.EventCode) {
+	if o == nil || o.EventCode == nil {
 		var ret string
 		return ret
 	}
@@ -112,15 +112,15 @@ func (o *TermsReview) GetEventCode() string {
 // GetEventCodeOk returns a tuple with the EventCode field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *TermsReview) GetEventCodeOk() (*string, bool) {
-	if o == nil || isNil(o.EventCode) {
-    return nil, false
+	if o == nil || o.EventCode == nil {
+		return nil, false
 	}
 	return o.EventCode, true
 }
 
 // HasEventCode returns a boolean if a field has been set.
 func (o *TermsReview) HasEventCode() bool {
-	if o != nil && !isNil(o.EventCode) {
+	if o != nil && o.EventCode != nil {
 		return true
 	}
 
@@ -134,7 +134,7 @@ func (o *TermsReview) SetEventCode(v string) {
 
 // GetSiteCode returns the SiteCode field value if set, zero value otherwise.
 func (o *TermsReview) GetSiteCode() string {
-	if o == nil || isNil(o.SiteCode) {
+	if o == nil || o.SiteCode == nil {
 		var ret string
 		return ret
 	}
@@ -144,15 +144,15 @@ func (o *TermsReview) GetSiteCode() string {
 // GetSiteCodeOk returns a tuple with the SiteCode field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *TermsReview) GetSiteCodeOk() (*string, bool) {
-	if o == nil || isNil(o.SiteCode) {
-    return nil, false
+	if o == nil || o.SiteCode == nil {
+		return nil, false
 	}
 	return o.SiteCode, true
 }
 
 // HasSiteCode returns a boolean if a field has been set.
 func (o *TermsReview) HasSiteCode() bool {
-	if o != nil && !isNil(o.SiteCode) {
+	if o != nil && o.SiteCode != nil {
 		return true
 	}
 
@@ -169,13 +169,13 @@ func (o TermsReview) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["account_username"] = o.AccountUsername
 	}
-	if !isNil(o.CheckOptionalTerms) {
+	if o.CheckOptionalTerms != nil {
 		toSerialize["check_optional_terms"] = o.CheckOptionalTerms
 	}
-	if !isNil(o.EventCode) {
+	if o.EventCode != nil {
 		toSerialize["event_code"] = o.EventCode
 	}
-	if !isNil(o.SiteCode) {
+	if o.SiteCode != nil {
 		toSerialize["site_code"] = o.SiteCode
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_terms_review_response.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_terms_review_response.go
index 00e6f500..51f2ac80 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_terms_review_response.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_terms_review_response.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -57,8 +57,8 @@ func (o *TermsReviewResponse) GetAccountId() string {
 // GetAccountIdOk returns a tuple with the AccountId field value
 // and a boolean to check if the value has been set.
 func (o *TermsReviewResponse) GetAccountIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.AccountId, true
 }
@@ -81,8 +81,8 @@ func (o *TermsReviewResponse) GetOrganizationId() string {
 // GetOrganizationIdOk returns a tuple with the OrganizationId field value
 // and a boolean to check if the value has been set.
 func (o *TermsReviewResponse) GetOrganizationIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.OrganizationId, true
 }
@@ -94,7 +94,7 @@ func (o *TermsReviewResponse) SetOrganizationId(v string) {
 
 // GetRedirectUrl returns the RedirectUrl field value if set, zero value otherwise.
 func (o *TermsReviewResponse) GetRedirectUrl() string {
-	if o == nil || isNil(o.RedirectUrl) {
+	if o == nil || o.RedirectUrl == nil {
 		var ret string
 		return ret
 	}
@@ -104,15 +104,15 @@ func (o *TermsReviewResponse) GetRedirectUrl() string {
 // GetRedirectUrlOk returns a tuple with the RedirectUrl field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *TermsReviewResponse) GetRedirectUrlOk() (*string, bool) {
-	if o == nil || isNil(o.RedirectUrl) {
-    return nil, false
+	if o == nil || o.RedirectUrl == nil {
+		return nil, false
 	}
 	return o.RedirectUrl, true
 }
 
 // HasRedirectUrl returns a boolean if a field has been set.
 func (o *TermsReviewResponse) HasRedirectUrl() bool {
-	if o != nil && !isNil(o.RedirectUrl) {
+	if o != nil && o.RedirectUrl != nil {
 		return true
 	}
 
@@ -137,8 +137,8 @@ func (o *TermsReviewResponse) GetTermsAvailable() bool {
 // GetTermsAvailableOk returns a tuple with the TermsAvailable field value
 // and a boolean to check if the value has been set.
 func (o *TermsReviewResponse) GetTermsAvailableOk() (*bool, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.TermsAvailable, true
 }
@@ -161,8 +161,8 @@ func (o *TermsReviewResponse) GetTermsRequired() bool {
 // GetTermsRequiredOk returns a tuple with the TermsRequired field value
 // and a boolean to check if the value has been set.
 func (o *TermsReviewResponse) GetTermsRequiredOk() (*bool, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.TermsRequired, true
 }
@@ -180,7 +180,7 @@ func (o TermsReviewResponse) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["organization_id"] = o.OrganizationId
 	}
-	if !isNil(o.RedirectUrl) {
+	if o.RedirectUrl != nil {
 		toSerialize["redirect_url"] = o.RedirectUrl
 	}
 	if true {
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_token_authorization_request.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_token_authorization_request.go
index 1a6fb1bd..dd091572 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_token_authorization_request.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_token_authorization_request.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -38,7 +38,7 @@ func NewTokenAuthorizationRequestWithDefaults() *TokenAuthorizationRequest {
 
 // GetAuthorizationToken returns the AuthorizationToken field value if set, zero value otherwise.
 func (o *TokenAuthorizationRequest) GetAuthorizationToken() string {
-	if o == nil || isNil(o.AuthorizationToken) {
+	if o == nil || o.AuthorizationToken == nil {
 		var ret string
 		return ret
 	}
@@ -48,15 +48,15 @@ func (o *TokenAuthorizationRequest) GetAuthorizationToken() string {
 // GetAuthorizationTokenOk returns a tuple with the AuthorizationToken field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *TokenAuthorizationRequest) GetAuthorizationTokenOk() (*string, bool) {
-	if o == nil || isNil(o.AuthorizationToken) {
-    return nil, false
+	if o == nil || o.AuthorizationToken == nil {
+		return nil, false
 	}
 	return o.AuthorizationToken, true
 }
 
 // HasAuthorizationToken returns a boolean if a field has been set.
 func (o *TokenAuthorizationRequest) HasAuthorizationToken() bool {
-	if o != nil && !isNil(o.AuthorizationToken) {
+	if o != nil && o.AuthorizationToken != nil {
 		return true
 	}
 
@@ -70,7 +70,7 @@ func (o *TokenAuthorizationRequest) SetAuthorizationToken(v string) {
 
 func (o TokenAuthorizationRequest) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.AuthorizationToken) {
+	if o.AuthorizationToken != nil {
 		toSerialize["authorization_token"] = o.AuthorizationToken
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/model_token_authorization_response.go b/app-services-sdk-go/accountmgmt/apiv1/client/model_token_authorization_response.go
index 01177649..f3b9903d 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/model_token_authorization_response.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/model_token_authorization_response.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -38,7 +38,7 @@ func NewTokenAuthorizationResponseWithDefaults() *TokenAuthorizationResponse {
 
 // GetAccount returns the Account field value if set, zero value otherwise.
 func (o *TokenAuthorizationResponse) GetAccount() Account {
-	if o == nil || isNil(o.Account) {
+	if o == nil || o.Account == nil {
 		var ret Account
 		return ret
 	}
@@ -48,15 +48,15 @@ func (o *TokenAuthorizationResponse) GetAccount() Account {
 // GetAccountOk returns a tuple with the Account field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *TokenAuthorizationResponse) GetAccountOk() (*Account, bool) {
-	if o == nil || isNil(o.Account) {
-    return nil, false
+	if o == nil || o.Account == nil {
+		return nil, false
 	}
 	return o.Account, true
 }
 
 // HasAccount returns a boolean if a field has been set.
 func (o *TokenAuthorizationResponse) HasAccount() bool {
-	if o != nil && !isNil(o.Account) {
+	if o != nil && o.Account != nil {
 		return true
 	}
 
@@ -70,7 +70,7 @@ func (o *TokenAuthorizationResponse) SetAccount(v Account) {
 
 func (o TokenAuthorizationResponse) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Account) {
+	if o.Account != nil {
 		toSerialize["account"] = o.Account
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/response.go b/app-services-sdk-go/accountmgmt/apiv1/client/response.go
index f0114c39..e0638e3a 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/response.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/response.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/test/api_app_services_test.go b/app-services-sdk-go/accountmgmt/apiv1/client/test/api_app_services_test.go
deleted file mode 100644
index ac488ba3..00000000
--- a/app-services-sdk-go/accountmgmt/apiv1/client/test/api_app_services_test.go
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-Account Management Service API
-
-Testing AppServicesApiService
-
-*/
-
-// Code generated by OpenAPI Generator (https://openapi-generator.tech);
-
-package accountmgmtclient
-
-import (
-    "context"
-    "github.com/stretchr/testify/assert"
-    "github.com/stretchr/testify/require"
-    "testing"
-    openapiclient "./openapi"
-)
-
-func Test_accountmgmtclient_AppServicesApiService(t *testing.T) {
-
-    configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-
-    t.Run("Test AppServicesApiService ApiAccountsMgmtV1AccessTokenPost", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.AppServicesApi.ApiAccountsMgmtV1AccessTokenPost(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test AppServicesApiService ApiAccountsMgmtV1CurrentAccountGet", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.AppServicesApi.ApiAccountsMgmtV1CurrentAccountGet(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test AppServicesApiService ApiAccountsMgmtV1OrganizationsOrgIdQuotaCostGet", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var orgId string
-
-        resp, httpRes, err := apiClient.AppServicesApi.ApiAccountsMgmtV1OrganizationsOrgIdQuotaCostGet(context.Background(), orgId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test AppServicesApiService ApiAuthorizationsV1SelfTermsReviewPost", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.AppServicesApi.ApiAuthorizationsV1SelfTermsReviewPost(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-}
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/test/api_default_test.go b/app-services-sdk-go/accountmgmt/apiv1/client/test/api_default_test.go
deleted file mode 100644
index 950ebb8a..00000000
--- a/app-services-sdk-go/accountmgmt/apiv1/client/test/api_default_test.go
+++ /dev/null
@@ -1,1757 +0,0 @@
-/*
-Account Management Service API
-
-Testing DefaultApiService
-
-*/
-
-// Code generated by OpenAPI Generator (https://openapi-generator.tech);
-
-package accountmgmtclient
-
-import (
-    "context"
-    "github.com/stretchr/testify/assert"
-    "github.com/stretchr/testify/require"
-    "testing"
-    openapiclient "./openapi"
-)
-
-func Test_accountmgmtclient_DefaultApiService(t *testing.T) {
-
-    configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1AccountsGet", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1AccountsGet(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1AccountsIdGet", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1AccountsIdGet(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1AccountsIdLabelsGet", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1AccountsIdLabelsGet(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1AccountsIdLabelsKeyDelete", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-        var key string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1AccountsIdLabelsKeyDelete(context.Background(), id, key).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1AccountsIdLabelsKeyGet", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-        var key string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1AccountsIdLabelsKeyGet(context.Background(), id, key).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1AccountsIdLabelsKeyPatch", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-        var key string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1AccountsIdLabelsKeyPatch(context.Background(), id, key).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1AccountsIdLabelsPost", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1AccountsIdLabelsPost(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1AccountsIdPatch", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1AccountsIdPatch(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1AccountsPost", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1AccountsPost(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1CertificatesPost", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1CertificatesPost(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1CloudResourcesGet", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1CloudResourcesGet(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1CloudResourcesIdDelete", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1CloudResourcesIdDelete(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1CloudResourcesIdGet", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1CloudResourcesIdGet(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1CloudResourcesIdPatch", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1CloudResourcesIdPatch(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1CloudResourcesPost", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1CloudResourcesPost(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1ClusterAuthorizationsPost", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1ClusterAuthorizationsPost(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1ClusterRegistrationsPost", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1ClusterRegistrationsPost(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1ClusterTransfersGet", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1ClusterTransfersGet(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1ClusterTransfersIdPatch", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1ClusterTransfersIdPatch(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1ClusterTransfersPost", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1ClusterTransfersPost(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1ConfigSkusGet", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1ConfigSkusGet(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1ConfigSkusIdDelete", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1ConfigSkusIdDelete(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1ConfigSkusIdGet", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1ConfigSkusIdGet(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1ConfigSkusIdPatch", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1ConfigSkusIdPatch(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1ConfigSkusPost", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1ConfigSkusPost(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1DeletedSubscriptionsGet", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1DeletedSubscriptionsGet(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1ErrorsGet", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1ErrorsGet(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1ErrorsIdGet", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1ErrorsIdGet(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1FeatureTogglesIdQueryPost", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1FeatureTogglesIdQueryPost(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1LabelsGet", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1LabelsGet(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1LandingPageSelfServiceGet", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1LandingPageSelfServiceGet(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1MetricsGet", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1MetricsGet(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1NotifyPost", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1NotifyPost(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1OrganizationsGet", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1OrganizationsGet(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1OrganizationsIdGet", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1OrganizationsIdGet(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1OrganizationsIdLabelsGet", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1OrganizationsIdLabelsGet(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1OrganizationsIdLabelsKeyDelete", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-        var key string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1OrganizationsIdLabelsKeyDelete(context.Background(), id, key).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1OrganizationsIdLabelsKeyGet", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-        var key string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1OrganizationsIdLabelsKeyGet(context.Background(), id, key).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1OrganizationsIdLabelsKeyPatch", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-        var key string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1OrganizationsIdLabelsKeyPatch(context.Background(), id, key).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1OrganizationsIdLabelsPost", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1OrganizationsIdLabelsPost(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1OrganizationsIdPatch", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1OrganizationsIdPatch(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1OrganizationsIdSummaryDashboardGet", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1OrganizationsIdSummaryDashboardGet(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdDelete", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var orgId string
-        var acctGrpAsgnId string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdDelete(context.Background(), orgId, acctGrpAsgnId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdGet", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var orgId string
-        var acctGrpAsgnId string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsAcctGrpAsgnIdGet(context.Background(), orgId, acctGrpAsgnId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsGet", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var orgId string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsGet(context.Background(), orgId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsPost", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var orgId string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupAssignmentsPost(context.Background(), orgId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdDelete", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var orgId string
-        var acctGrpId string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdDelete(context.Background(), orgId, acctGrpId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdGet", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var orgId string
-        var acctGrpId string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdGet(context.Background(), orgId, acctGrpId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdPatch", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var orgId string
-        var acctGrpId string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsAcctGrpIdPatch(context.Background(), orgId, acctGrpId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsGet", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var orgId string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsGet(context.Background(), orgId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsPost", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var orgId string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1OrganizationsOrgIdAccountGroupsPost(context.Background(), orgId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1OrganizationsOrgIdConsumedQuotaGet", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var orgId string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1OrganizationsOrgIdConsumedQuotaGet(context.Background(), orgId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaGet", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var orgId string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaGet(context.Background(), orgId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaPost", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var orgId string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaPost(context.Background(), orgId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdDelete", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var orgId string
-        var quotaId string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdDelete(context.Background(), orgId, quotaId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdGet", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var orgId string
-        var quotaId string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdGet(context.Background(), orgId, quotaId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdPatch", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var orgId string
-        var quotaId string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1OrganizationsOrgIdResourceQuotaQuotaIdPatch(context.Background(), orgId, quotaId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1OrganizationsPost", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1OrganizationsPost(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1PlansGet", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1PlansGet(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1PlansIdGet", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1PlansIdGet(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1PullSecretsExternalResourceIdDelete", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var externalResourceId string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1PullSecretsExternalResourceIdDelete(context.Background(), externalResourceId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1PullSecretsPost", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1PullSecretsPost(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1QuotaCostGet", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1QuotaCostGet(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1QuotaRulesGet", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1QuotaRulesGet(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1QuotasGet", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1QuotasGet(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1QuotasIdDelete", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1QuotasIdDelete(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1QuotasIdGet", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1QuotasIdGet(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1QuotasIdPatch", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1QuotasIdPatch(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1QuotasPost", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1QuotasPost(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1RegistriesGet", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1RegistriesGet(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1RegistriesIdGet", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1RegistriesIdGet(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1RegistryCredentialsGet", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1RegistryCredentialsGet(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1RegistryCredentialsIdDelete", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1RegistryCredentialsIdDelete(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1RegistryCredentialsIdGet", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1RegistryCredentialsIdGet(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1RegistryCredentialsIdPatch", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1RegistryCredentialsIdPatch(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1RegistryCredentialsPost", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1RegistryCredentialsPost(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1ReservedResourcesGet", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1ReservedResourcesGet(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1ResourceQuotaGet", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1ResourceQuotaGet(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1RoleBindingsGet", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1RoleBindingsGet(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1RoleBindingsIdDelete", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1RoleBindingsIdDelete(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1RoleBindingsIdGet", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1RoleBindingsIdGet(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1RoleBindingsIdPatch", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1RoleBindingsIdPatch(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1RoleBindingsPost", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1RoleBindingsPost(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1RolesGet", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1RolesGet(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1RolesIdGet", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1RolesIdGet(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1SelfEntitlementProductPost", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var product string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1SelfEntitlementProductPost(context.Background(), product).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1SkuRulesGet", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1SkuRulesGet(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1SkuRulesIdDelete", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1SkuRulesIdDelete(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1SkuRulesIdGet", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1SkuRulesIdGet(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1SkuRulesIdPatch", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1SkuRulesIdPatch(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1SkuRulesPost", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1SkuRulesPost(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1SkusGet", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1SkusGet(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1SkusIdGet", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1SkusIdGet(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1SubscriptionsGet", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1SubscriptionsGet(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1SubscriptionsIdDelete", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1SubscriptionsIdDelete(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1SubscriptionsIdGet", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1SubscriptionsIdGet(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1SubscriptionsIdLabelsGet", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1SubscriptionsIdLabelsGet(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1SubscriptionsIdLabelsKeyDelete", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-        var key string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1SubscriptionsIdLabelsKeyDelete(context.Background(), id, key).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1SubscriptionsIdLabelsKeyGet", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-        var key string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1SubscriptionsIdLabelsKeyGet(context.Background(), id, key).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1SubscriptionsIdLabelsKeyPatch", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-        var key string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1SubscriptionsIdLabelsKeyPatch(context.Background(), id, key).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1SubscriptionsIdLabelsPost", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1SubscriptionsIdLabelsPost(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1SubscriptionsIdMetricsMetricNameGet", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-        var metricName string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1SubscriptionsIdMetricsMetricNameGet(context.Background(), id, metricName).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1SubscriptionsIdNotifyPost", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1SubscriptionsIdNotifyPost(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1SubscriptionsIdPatch", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1SubscriptionsIdPatch(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1SubscriptionsIdReservedResourcesGet", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1SubscriptionsIdReservedResourcesGet(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1SubscriptionsIdSupportCasesGet", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1SubscriptionsIdSupportCasesGet(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1SubscriptionsPost", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1SubscriptionsPost(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsAccountIdDelete", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var subId string
-        var accountId string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsAccountIdDelete(context.Background(), subId, accountId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsGet", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var subId string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsGet(context.Background(), subId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsPost", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var subId string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1SubscriptionsSubIdNotificationContactsPost(context.Background(), subId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdDelete", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var subId string
-        var reservedResourceId string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdDelete(context.Background(), subId, reservedResourceId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdGet", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var subId string
-        var reservedResourceId string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdGet(context.Background(), subId, reservedResourceId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdPatch", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var subId string
-        var reservedResourceId string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1SubscriptionsSubIdReservedResourcesReservedResourceIdPatch(context.Background(), subId, reservedResourceId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsGet", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var subId string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsGet(context.Background(), subId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdDelete", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-        var subId string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdDelete(context.Background(), id, subId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdGet", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-        var subId string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsIdGet(context.Background(), id, subId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsPost", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var subId string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1SubscriptionsSubIdRoleBindingsPost(context.Background(), subId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1SupportCasesCaseIdDelete", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var caseId string
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1SupportCasesCaseIdDelete(context.Background(), caseId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1SupportCasesPost", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1SupportCasesPost(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAccountsMgmtV1TokenAuthorizationPost", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAccountsMgmtV1TokenAuthorizationPost(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAuthorizationsV1AccessReviewPost", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAuthorizationsV1AccessReviewPost(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAuthorizationsV1CapabilityReviewPost", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAuthorizationsV1CapabilityReviewPost(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAuthorizationsV1ExportControlReviewPost", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAuthorizationsV1ExportControlReviewPost(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAuthorizationsV1FeatureReviewPost", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAuthorizationsV1FeatureReviewPost(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAuthorizationsV1ResourceReviewPost", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAuthorizationsV1ResourceReviewPost(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAuthorizationsV1SelfAccessReviewPost", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAuthorizationsV1SelfAccessReviewPost(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAuthorizationsV1SelfFeatureReviewPost", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAuthorizationsV1SelfFeatureReviewPost(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAuthorizationsV1SelfResourceReviewPost", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAuthorizationsV1SelfResourceReviewPost(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService ApiAuthorizationsV1TermsReviewPost", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.DefaultApi.ApiAuthorizationsV1TermsReviewPost(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-}
diff --git a/app-services-sdk-go/accountmgmt/apiv1/client/utils.go b/app-services-sdk-go/accountmgmt/apiv1/client/utils.go
index 067fdf4d..e53ac6e1 100644
--- a/app-services-sdk-go/accountmgmt/apiv1/client/utils.go
+++ b/app-services-sdk-go/accountmgmt/apiv1/client/utils.go
@@ -1,10 +1,10 @@
 /*
-Account Management Service API
-
-Manage user subscriptions and clusters
-
-API version: 0.0.1
-*/
+ * Account Management Service API
+ *
+ * Manage user subscriptions and clusters
+ *
+ * API version: 0.0.1
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -12,7 +12,6 @@ package accountmgmtclient
 
 import (
 	"encoding/json"
-    "reflect"
 	"time"
 )
 
@@ -327,17 +326,3 @@ func (v *NullableTime) UnmarshalJSON(src []byte) error {
 	v.isSet = true
 	return json.Unmarshal(src, &v.value)
 }
-
-// isNil checks if an input is nil
-func isNil(i interface{}) bool {
-    if i == nil {
-        return true
-    }
-    switch reflect.TypeOf(i).Kind() {
-    case reflect.Chan, reflect.Func, reflect.Map, reflect.Ptr, reflect.UnsafePointer, reflect.Interface, reflect.Slice:
-        return reflect.ValueOf(i).IsNil()
-    case reflect.Array:
-        return reflect.ValueOf(i).IsZero()
-    }
-    return false
-}
\ No newline at end of file
diff --git a/app-services-sdk-go/accountmgmt/go.mod b/app-services-sdk-go/accountmgmt/go.mod
index d4f9fffe..5e3d7b95 100644
--- a/app-services-sdk-go/accountmgmt/go.mod
+++ b/app-services-sdk-go/accountmgmt/go.mod
@@ -1,8 +1,8 @@
-module github.com/redhat-developer/app-services-sdk-go/accountmgmt
+module github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go/accountmgmt
 
 go 1.15
 
 require (
-	github.com/redhat-developer/app-services-sdk-go v0.10.0
+	github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go v0.1.0
 	golang.org/x/oauth2 v0.0.0-20220630143837-2104d58473e0
 )
diff --git a/app-services-sdk-go/auth/go.mod b/app-services-sdk-go/auth/go.mod
index 854b0f94..cf1ed3c4 100644
--- a/app-services-sdk-go/auth/go.mod
+++ b/app-services-sdk-go/auth/go.mod
@@ -1,8 +1,8 @@
-module github.com/redhat-developer/app-services-sdk-go/auth
+module github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go/auth
 
 go 1.15
 
 require (
-	github.com/redhat-developer/app-services-sdk-go v0.10.0
+	github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go v0.1.0
 	golang.org/x/oauth2 v0.0.0-20220630143837-2104d58473e0
 )
diff --git a/app-services-sdk-go/connectormgmt/apiv1/api_client.go b/app-services-sdk-go/connectormgmt/apiv1/api_client.go
index 42a97f3b..7d4b2198 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/api_client.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/api_client.go
@@ -1,9 +1,9 @@
 package connectormgmt
 
 import (
-	"github.com/redhat-developer/app-services-sdk-go/core"
+	"github.com/jackdelahunt/app-services-sdk-core/app-services-sdk-go/core"
 
-	apiv1 "github.com/redhat-developer/app-services-sdk-go/connectormgmt/apiv1/client"
+	apiv1 "github.com/jackdelahunt/app-services-sdk-core/app-services-sdk-go/connectormgmt/apiv1/client"
 )
 
 // Config defines the available configuration options
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/.openapi-generator/FILES b/app-services-sdk-go/connectormgmt/apiv1/client/.openapi-generator/FILES
index ad121270..f18ba47d 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/.openapi-generator/FILES
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/.openapi-generator/FILES
@@ -66,8 +66,6 @@ docs/ServiceAccount.md
 docs/ServiceConnectionSettings.md
 docs/VersionMetadata.md
 docs/VersionMetadataAllOf.md
-go.mod
-go.sum
 model_addon_parameter.go
 model_channel.go
 model_connector.go
@@ -124,9 +122,4 @@ model_service_connection_settings.go
 model_version_metadata.go
 model_version_metadata_all_of.go
 response.go
-test/api_connector_clusters_test.go
-test/api_connector_namespaces_test.go
-test/api_connector_service_test.go
-test/api_connector_types_test.go
-test/api_connectors_test.go
 utils.go
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/.openapi-generator/VERSION b/app-services-sdk-go/connectormgmt/apiv1/client/.openapi-generator/VERSION
index 0df17dd0..7cbea073 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/.openapi-generator/VERSION
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/.openapi-generator/VERSION
@@ -1 +1 @@
-6.2.1
\ No newline at end of file
+5.2.0
\ No newline at end of file
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/api/openapi.yaml b/app-services-sdk-go/connectormgmt/apiv1/client/api/openapi.yaml
index 64aca4b1..6d6cea68 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/api/openapi.yaml
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/api/openapi.yaml
@@ -19,16 +19,11 @@ servers:
 - description: current domain
   url: /
 tags:
-- description: ""
-  name: Connector Types
-- description: ""
-  name: Connectors
-- description: ""
-  name: Connector Clusters
-- description: ""
-  name: Connector Service
-- description: ""
-  name: Connector Namespaces
+- name: Connector Types
+- name: Connectors
+- name: Connector Clusters
+- name: Connector Service
+- name: Connector Namespaces
 paths:
   /api/connector_mgmt/v1:
     get:
@@ -692,7 +687,7 @@ paths:
               type: object
           application/json-patch+json:
             schema:
-              description: "A JSON Patch, RFC 6902 - https://tools.ietf.org/html/rfc6902"
+              description: A JSON Patch, RFC 6902 - https://tools.ietf.org/html/rfc6902
               type: object
           application/json:
             schema:
@@ -1712,7 +1707,7 @@ components:
           common:
             show_all: true
             multi_lines: true
-          topics: "foo,bar"
+          topics: foo,bar
           data_shape:
             key:
               format: STRING
@@ -1746,7 +1741,7 @@ components:
         kind: Error
         href: /api/connector_mgmt/v1/errors/103
         code: CONNECTOR-MGMT-103
-        reason: "Synchronous action is not supported, use async=true parameter"
+        reason: Synchronous action is not supported, use async=true parameter
         operation_id: 1iWIimqGcrDuL61aUxIZqBTqNRa
     "400InvalidQueryExample":
       value:
@@ -1787,7 +1782,7 @@ components:
         kind: Error
         href: /api/connector_mgmt/v1/errors/11
         code: CONNECTOR-MGMT-11
-        reason: "Unable to verify JWT token: Required authorization token not found"
+        reason: 'Unable to verify JWT token: Required authorization token not found'
         operation_id: 1iY3UhEhwmXBpWPfI2lNekpd4ZD
     "409NameConflictExample":
       value:
@@ -2222,9 +2217,9 @@ components:
     ConnectorNamespaceRequestMeta:
       properties:
         name:
-          description: "Namespace name must match pattern `^(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])?$`,\
-            \ or it may be empty to be auto-generated."
-          pattern: "^(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])?$"
+          description: Namespace name must match pattern `^(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])?$`,
+            or it may be empty to be auto-generated.
+          pattern: ^(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])?$
           type: string
         annotations:
           additionalProperties:
@@ -2239,19 +2234,19 @@ components:
           type: integer
         memory_requests:
           description: Memory quota for limits or requests
-          pattern: "^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$"
+          pattern: ^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$
           type: string
         memory_limits:
           description: Memory quota for limits or requests
-          pattern: "^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$"
+          pattern: ^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$
           type: string
         cpu_requests:
           description: CPU quota for limits or requests
-          pattern: "^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$"
+          pattern: ^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$
           type: string
         cpu_limits:
           description: CPU quota for limits or requests
-          pattern: "^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$"
+          pattern: ^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$
           type: string
       type: object
     ConnectorNamespaceMeta:
@@ -2327,16 +2322,21 @@ components:
       description: A connector namespace
     MemoryQuota:
       description: Memory quota for limits or requests
-      pattern: "^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$"
+      pattern: ^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$
       type: string
     CpuQuota:
       description: CPU quota for limits or requests
-      pattern: "^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$"
+      pattern: ^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$
       type: string
     VersionMetadata_allOf:
-      example: "{\"kind\":\"APIVersion\",\"id\":\"v1\",\"href\":\"/api/connector_mgmt/v1\"\
-        ,\"collections\":[{\"id\":\"kafkas\",\"href\":\"/api/connector_mgmt/v1/kafka_connectors\"\
-        ,\"kind\":\"ConnectorList\"}]}"
+      example:
+        kind: APIVersion
+        id: v1
+        href: /api/connector_mgmt/v1
+        collections:
+        - id: kafkas
+          href: /api/connector_mgmt/v1/kafka_connectors
+          kind: ConnectorList
       properties:
         collections:
           items:
@@ -2358,14 +2358,12 @@ components:
             $ref: '#/components/schemas/ConnectorCluster'
           type: array
       type: object
-      example: null
     ConnectorMeta_allOf:
       properties:
         resource_version:
           format: int64
           type: integer
       type: object
-      example: null
     ConnectorStatus_status:
       properties:
         state:
@@ -2380,7 +2378,6 @@ components:
             $ref: '#/components/schemas/Connector'
           type: array
       type: object
-      example: null
     ConnectorType_allOf:
       properties:
         name:
@@ -2424,7 +2421,6 @@ components:
             connector field.
           type: object
       type: object
-      example: null
     ConnectorTypeList_allOf:
       properties:
         items:
@@ -2432,7 +2428,6 @@ components:
             $ref: '#/components/schemas/ConnectorType'
           type: array
       type: object
-      example: null
     ConnectorNamespaceMeta_allOf:
       properties:
         resource_version:
@@ -2441,7 +2436,6 @@ components:
         quota:
           $ref: '#/components/schemas/ConnectorNamespaceQuota'
       type: object
-      example: null
     ConnectorNamespaceRequest_allOf:
       properties:
         cluster_id:
@@ -2449,7 +2443,6 @@ components:
         kind:
           $ref: '#/components/schemas/ConnectorNamespaceTenantKind'
       type: object
-      example: null
     ConnectorNamespaceList_allOf:
       properties:
         items:
@@ -2457,7 +2450,6 @@ components:
             $ref: '#/components/schemas/ConnectorNamespace'
           type: array
       type: object
-      example: null
     ConnectorNamespace_allOf:
       properties:
         name:
@@ -2479,7 +2471,6 @@ components:
       - status
       - tenant
       type: object
-      example: null
   securitySchemes:
     Bearer:
       bearerFormat: JWT
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/api_connector_clusters.go b/app-services-sdk-go/connectormgmt/apiv1/client/api_connector_clusters.go
index 4d6c3834..79b1fd9a 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/api_connector_clusters.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/api_connector_clusters.go
@@ -1,11 +1,11 @@
 /*
-Connector Management API
-
-Connector Management API is a REST API to manage connectors.
-
-API version: 0.1.0
-Contact: rhosak-support@redhat.com
-*/
+ * Connector Management API
+ *
+ * Connector Management API is a REST API to manage connectors.
+ *
+ * API version: 0.1.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -13,180 +13,183 @@ package connectormgmtclient
 
 import (
 	"bytes"
-	"context"
-	"io/ioutil"
-	"net/http"
-	"net/url"
+	_context "context"
+	_ioutil "io/ioutil"
+	_nethttp "net/http"
+	_neturl "net/url"
 	"strings"
 )
 
+// Linger please
+var (
+	_ _context.Context
+)
 
 type ConnectorClustersApi interface {
 
 	/*
-	CreateConnectorCluster Create a new connector cluster
-
-	Create a new connector cluster
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiCreateConnectorClusterRequest
-	*/
-	CreateConnectorCluster(ctx context.Context) ApiCreateConnectorClusterRequest
-
-	// CreateConnectorClusterExecute executes the request
-	//  @return ConnectorCluster
-	CreateConnectorClusterExecute(r ApiCreateConnectorClusterRequest) (*ConnectorCluster, *http.Response, error)
+	 * CreateConnectorCluster Create a new connector cluster
+	 * Create a new connector cluster
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiCreateConnectorClusterRequest
+	 */
+	CreateConnectorCluster(ctx _context.Context) ApiCreateConnectorClusterRequest
 
 	/*
-	DeleteConnectorCluster Delete a connector cluster
-
-	Delete a connector cluster
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param connectorClusterId The id of the connector cluster
-	@return ApiDeleteConnectorClusterRequest
-	*/
-	DeleteConnectorCluster(ctx context.Context, connectorClusterId string) ApiDeleteConnectorClusterRequest
-
-	// DeleteConnectorClusterExecute executes the request
-	//  @return Error
-	DeleteConnectorClusterExecute(r ApiDeleteConnectorClusterRequest) (*Error, *http.Response, error)
+	 * CreateConnectorClusterExecute executes the request
+	 * @return ConnectorCluster
+	 */
+	CreateConnectorClusterExecute(r ApiCreateConnectorClusterRequest) (ConnectorCluster, *_nethttp.Response, error)
 
 	/*
-	GetConnectorCluster Get a connector cluster
-
-	Get a connector cluster
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param connectorClusterId The id of the connector cluster
-	@return ApiGetConnectorClusterRequest
-	*/
-	GetConnectorCluster(ctx context.Context, connectorClusterId string) ApiGetConnectorClusterRequest
-
-	// GetConnectorClusterExecute executes the request
-	//  @return ConnectorCluster
-	GetConnectorClusterExecute(r ApiGetConnectorClusterRequest) (*ConnectorCluster, *http.Response, error)
+	 * DeleteConnectorCluster Delete a connector cluster
+	 * Delete a connector cluster
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param connectorClusterId The id of the connector cluster
+	 * @return ApiDeleteConnectorClusterRequest
+	 */
+	DeleteConnectorCluster(ctx _context.Context, connectorClusterId string) ApiDeleteConnectorClusterRequest
 
 	/*
-	GetConnectorClusterAddonParameters Get a connector cluster's addon parameters
-
-	Get a connector cluster's addon parameters
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param connectorClusterId The id of the connector cluster
-	@return ApiGetConnectorClusterAddonParametersRequest
-	*/
-	GetConnectorClusterAddonParameters(ctx context.Context, connectorClusterId string) ApiGetConnectorClusterAddonParametersRequest
-
-	// GetConnectorClusterAddonParametersExecute executes the request
-	//  @return []AddonParameter
-	GetConnectorClusterAddonParametersExecute(r ApiGetConnectorClusterAddonParametersRequest) ([]AddonParameter, *http.Response, error)
+	 * DeleteConnectorClusterExecute executes the request
+	 * @return Error
+	 */
+	DeleteConnectorClusterExecute(r ApiDeleteConnectorClusterRequest) (Error, *_nethttp.Response, error)
 
 	/*
-	GetConnectorClusterNamespaces Get a connector cluster's namespaces
-
-	Get a connector cluster's namespaces
+	 * GetConnectorCluster Get a connector cluster
+	 * Get a connector cluster
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param connectorClusterId The id of the connector cluster
+	 * @return ApiGetConnectorClusterRequest
+	 */
+	GetConnectorCluster(ctx _context.Context, connectorClusterId string) ApiGetConnectorClusterRequest
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param connectorClusterId The id of the connector cluster
-	@return ApiGetConnectorClusterNamespacesRequest
-	*/
-	GetConnectorClusterNamespaces(ctx context.Context, connectorClusterId string) ApiGetConnectorClusterNamespacesRequest
-
-	// GetConnectorClusterNamespacesExecute executes the request
-	//  @return ConnectorNamespaceList
-	GetConnectorClusterNamespacesExecute(r ApiGetConnectorClusterNamespacesRequest) (*ConnectorNamespaceList, *http.Response, error)
+	/*
+	 * GetConnectorClusterExecute executes the request
+	 * @return ConnectorCluster
+	 */
+	GetConnectorClusterExecute(r ApiGetConnectorClusterRequest) (ConnectorCluster, *_nethttp.Response, error)
 
 	/*
-	ListConnectorClusters Returns a list of connector clusters
+	 * GetConnectorClusterAddonParameters Get a connector cluster's addon parameters
+	 * Get a connector cluster's addon parameters
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param connectorClusterId The id of the connector cluster
+	 * @return ApiGetConnectorClusterAddonParametersRequest
+	 */
+	GetConnectorClusterAddonParameters(ctx _context.Context, connectorClusterId string) ApiGetConnectorClusterAddonParametersRequest
 
-	Returns a list of connector clusters
+	/*
+	 * GetConnectorClusterAddonParametersExecute executes the request
+	 * @return []AddonParameter
+	 */
+	GetConnectorClusterAddonParametersExecute(r ApiGetConnectorClusterAddonParametersRequest) ([]AddonParameter, *_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiListConnectorClustersRequest
-	*/
-	ListConnectorClusters(ctx context.Context) ApiListConnectorClustersRequest
+	/*
+	 * GetConnectorClusterNamespaces Get a connector cluster's namespaces
+	 * Get a connector cluster's namespaces
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param connectorClusterId The id of the connector cluster
+	 * @return ApiGetConnectorClusterNamespacesRequest
+	 */
+	GetConnectorClusterNamespaces(ctx _context.Context, connectorClusterId string) ApiGetConnectorClusterNamespacesRequest
 
-	// ListConnectorClustersExecute executes the request
-	//  @return ConnectorClusterList
-	ListConnectorClustersExecute(r ApiListConnectorClustersRequest) (*ConnectorClusterList, *http.Response, error)
+	/*
+	 * GetConnectorClusterNamespacesExecute executes the request
+	 * @return ConnectorNamespaceList
+	 */
+	GetConnectorClusterNamespacesExecute(r ApiGetConnectorClusterNamespacesRequest) (ConnectorNamespaceList, *_nethttp.Response, error)
 
 	/*
-	UpdateConnectorClusterById udpate a connector cluster
+	 * ListConnectorClusters Returns a list of connector clusters
+	 * Returns a list of connector clusters
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiListConnectorClustersRequest
+	 */
+	ListConnectorClusters(ctx _context.Context) ApiListConnectorClustersRequest
 
-	udpate a connector cluster
+	/*
+	 * ListConnectorClustersExecute executes the request
+	 * @return ConnectorClusterList
+	 */
+	ListConnectorClustersExecute(r ApiListConnectorClustersRequest) (ConnectorClusterList, *_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param connectorClusterId The id of the connector cluster
-	@return ApiUpdateConnectorClusterByIdRequest
-	*/
-	UpdateConnectorClusterById(ctx context.Context, connectorClusterId string) ApiUpdateConnectorClusterByIdRequest
+	/*
+	 * UpdateConnectorClusterById udpate a connector cluster
+	 * udpate a connector cluster
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param connectorClusterId The id of the connector cluster
+	 * @return ApiUpdateConnectorClusterByIdRequest
+	 */
+	UpdateConnectorClusterById(ctx _context.Context, connectorClusterId string) ApiUpdateConnectorClusterByIdRequest
 
-	// UpdateConnectorClusterByIdExecute executes the request
-	UpdateConnectorClusterByIdExecute(r ApiUpdateConnectorClusterByIdRequest) (*http.Response, error)
+	/*
+	 * UpdateConnectorClusterByIdExecute executes the request
+	 */
+	UpdateConnectorClusterByIdExecute(r ApiUpdateConnectorClusterByIdRequest) (*_nethttp.Response, error)
 }
 
 // ConnectorClustersApiService ConnectorClustersApi service
 type ConnectorClustersApiService service
 
 type ApiCreateConnectorClusterRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService ConnectorClustersApi
 	async *bool
 	connectorClusterRequest *ConnectorClusterRequest
 }
 
-// Perform the action in an asynchronous manner
 func (r ApiCreateConnectorClusterRequest) Async(async bool) ApiCreateConnectorClusterRequest {
 	r.async = &async
 	return r
 }
-
-// Connector cluster data
 func (r ApiCreateConnectorClusterRequest) ConnectorClusterRequest(connectorClusterRequest ConnectorClusterRequest) ApiCreateConnectorClusterRequest {
 	r.connectorClusterRequest = &connectorClusterRequest
 	return r
 }
 
-func (r ApiCreateConnectorClusterRequest) Execute() (*ConnectorCluster, *http.Response, error) {
+func (r ApiCreateConnectorClusterRequest) Execute() (ConnectorCluster, *_nethttp.Response, error) {
 	return r.ApiService.CreateConnectorClusterExecute(r)
 }
 
 /*
-CreateConnectorCluster Create a new connector cluster
-
-Create a new connector cluster
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiCreateConnectorClusterRequest
-*/
-func (a *ConnectorClustersApiService) CreateConnectorCluster(ctx context.Context) ApiCreateConnectorClusterRequest {
+ * CreateConnectorCluster Create a new connector cluster
+ * Create a new connector cluster
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiCreateConnectorClusterRequest
+ */
+func (a *ConnectorClustersApiService) CreateConnectorCluster(ctx _context.Context) ApiCreateConnectorClusterRequest {
 	return ApiCreateConnectorClusterRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return ConnectorCluster
-func (a *ConnectorClustersApiService) CreateConnectorClusterExecute(r ApiCreateConnectorClusterRequest) (*ConnectorCluster, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return ConnectorCluster
+ */
+func (a *ConnectorClustersApiService) CreateConnectorClusterExecute(r ApiCreateConnectorClusterRequest) (ConnectorCluster, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *ConnectorCluster
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  ConnectorCluster
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "ConnectorClustersApiService.CreateConnectorCluster")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/connector_mgmt/v1/kafka_connector_clusters"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.async == nil {
 		return localVarReturnValue, nil, reportError("async is required and must be specified")
 	}
@@ -214,7 +217,7 @@ func (a *ConnectorClustersApiService) CreateConnectorClusterExecute(r ApiCreateC
 	}
 	// body params
 	localVarPostBody = r.connectorClusterRequest
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -224,15 +227,15 @@ func (a *ConnectorClustersApiService) CreateConnectorClusterExecute(r ApiCreateC
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -243,8 +246,7 @@ func (a *ConnectorClustersApiService) CreateConnectorClusterExecute(r ApiCreateC
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -254,8 +256,7 @@ func (a *ConnectorClustersApiService) CreateConnectorClusterExecute(r ApiCreateC
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -265,8 +266,7 @@ func (a *ConnectorClustersApiService) CreateConnectorClusterExecute(r ApiCreateC
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -276,15 +276,14 @@ func (a *ConnectorClustersApiService) CreateConnectorClusterExecute(r ApiCreateC
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -295,25 +294,24 @@ func (a *ConnectorClustersApiService) CreateConnectorClusterExecute(r ApiCreateC
 }
 
 type ApiDeleteConnectorClusterRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService ConnectorClustersApi
 	connectorClusterId string
 }
 
-func (r ApiDeleteConnectorClusterRequest) Execute() (*Error, *http.Response, error) {
+
+func (r ApiDeleteConnectorClusterRequest) Execute() (Error, *_nethttp.Response, error) {
 	return r.ApiService.DeleteConnectorClusterExecute(r)
 }
 
 /*
-DeleteConnectorCluster Delete a connector cluster
-
-Delete a connector cluster
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param connectorClusterId The id of the connector cluster
- @return ApiDeleteConnectorClusterRequest
-*/
-func (a *ConnectorClustersApiService) DeleteConnectorCluster(ctx context.Context, connectorClusterId string) ApiDeleteConnectorClusterRequest {
+ * DeleteConnectorCluster Delete a connector cluster
+ * Delete a connector cluster
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param connectorClusterId The id of the connector cluster
+ * @return ApiDeleteConnectorClusterRequest
+ */
+func (a *ConnectorClustersApiService) DeleteConnectorCluster(ctx _context.Context, connectorClusterId string) ApiDeleteConnectorClusterRequest {
 	return ApiDeleteConnectorClusterRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -321,27 +319,31 @@ func (a *ConnectorClustersApiService) DeleteConnectorCluster(ctx context.Context
 	}
 }
 
-// Execute executes the request
-//  @return Error
-func (a *ConnectorClustersApiService) DeleteConnectorClusterExecute(r ApiDeleteConnectorClusterRequest) (*Error, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return Error
+ */
+func (a *ConnectorClustersApiService) DeleteConnectorClusterExecute(r ApiDeleteConnectorClusterRequest) (Error, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodDelete
+		localVarHTTPMethod   = _nethttp.MethodDelete
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *Error
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  Error
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "ConnectorClustersApiService.DeleteConnectorCluster")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/connector_mgmt/v1/kafka_connector_clusters/{connector_cluster_id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"connector_cluster_id"+"}", url.PathEscape(parameterToString(r.connectorClusterId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"connector_cluster_id"+"}", _neturl.PathEscape(parameterToString(r.connectorClusterId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -360,7 +362,7 @@ func (a *ConnectorClustersApiService) DeleteConnectorClusterExecute(r ApiDeleteC
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -370,15 +372,15 @@ func (a *ConnectorClustersApiService) DeleteConnectorClusterExecute(r ApiDeleteC
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -389,8 +391,7 @@ func (a *ConnectorClustersApiService) DeleteConnectorClusterExecute(r ApiDeleteC
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -400,8 +401,7 @@ func (a *ConnectorClustersApiService) DeleteConnectorClusterExecute(r ApiDeleteC
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -411,15 +411,14 @@ func (a *ConnectorClustersApiService) DeleteConnectorClusterExecute(r ApiDeleteC
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -430,25 +429,24 @@ func (a *ConnectorClustersApiService) DeleteConnectorClusterExecute(r ApiDeleteC
 }
 
 type ApiGetConnectorClusterRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService ConnectorClustersApi
 	connectorClusterId string
 }
 
-func (r ApiGetConnectorClusterRequest) Execute() (*ConnectorCluster, *http.Response, error) {
+
+func (r ApiGetConnectorClusterRequest) Execute() (ConnectorCluster, *_nethttp.Response, error) {
 	return r.ApiService.GetConnectorClusterExecute(r)
 }
 
 /*
-GetConnectorCluster Get a connector cluster
-
-Get a connector cluster
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param connectorClusterId The id of the connector cluster
- @return ApiGetConnectorClusterRequest
-*/
-func (a *ConnectorClustersApiService) GetConnectorCluster(ctx context.Context, connectorClusterId string) ApiGetConnectorClusterRequest {
+ * GetConnectorCluster Get a connector cluster
+ * Get a connector cluster
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param connectorClusterId The id of the connector cluster
+ * @return ApiGetConnectorClusterRequest
+ */
+func (a *ConnectorClustersApiService) GetConnectorCluster(ctx _context.Context, connectorClusterId string) ApiGetConnectorClusterRequest {
 	return ApiGetConnectorClusterRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -456,27 +454,31 @@ func (a *ConnectorClustersApiService) GetConnectorCluster(ctx context.Context, c
 	}
 }
 
-// Execute executes the request
-//  @return ConnectorCluster
-func (a *ConnectorClustersApiService) GetConnectorClusterExecute(r ApiGetConnectorClusterRequest) (*ConnectorCluster, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return ConnectorCluster
+ */
+func (a *ConnectorClustersApiService) GetConnectorClusterExecute(r ApiGetConnectorClusterRequest) (ConnectorCluster, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *ConnectorCluster
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  ConnectorCluster
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "ConnectorClustersApiService.GetConnectorCluster")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/connector_mgmt/v1/kafka_connector_clusters/{connector_cluster_id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"connector_cluster_id"+"}", url.PathEscape(parameterToString(r.connectorClusterId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"connector_cluster_id"+"}", _neturl.PathEscape(parameterToString(r.connectorClusterId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -495,7 +497,7 @@ func (a *ConnectorClustersApiService) GetConnectorClusterExecute(r ApiGetConnect
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -505,15 +507,15 @@ func (a *ConnectorClustersApiService) GetConnectorClusterExecute(r ApiGetConnect
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -524,8 +526,7 @@ func (a *ConnectorClustersApiService) GetConnectorClusterExecute(r ApiGetConnect
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -535,8 +536,7 @@ func (a *ConnectorClustersApiService) GetConnectorClusterExecute(r ApiGetConnect
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 410 {
@@ -546,8 +546,7 @@ func (a *ConnectorClustersApiService) GetConnectorClusterExecute(r ApiGetConnect
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -557,15 +556,14 @@ func (a *ConnectorClustersApiService) GetConnectorClusterExecute(r ApiGetConnect
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -576,32 +574,29 @@ func (a *ConnectorClustersApiService) GetConnectorClusterExecute(r ApiGetConnect
 }
 
 type ApiGetConnectorClusterAddonParametersRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService ConnectorClustersApi
 	connectorClusterId string
 	resetCredentials *bool
 }
 
-// Resets cluster service account credentials when true
 func (r ApiGetConnectorClusterAddonParametersRequest) ResetCredentials(resetCredentials bool) ApiGetConnectorClusterAddonParametersRequest {
 	r.resetCredentials = &resetCredentials
 	return r
 }
 
-func (r ApiGetConnectorClusterAddonParametersRequest) Execute() ([]AddonParameter, *http.Response, error) {
+func (r ApiGetConnectorClusterAddonParametersRequest) Execute() ([]AddonParameter, *_nethttp.Response, error) {
 	return r.ApiService.GetConnectorClusterAddonParametersExecute(r)
 }
 
 /*
-GetConnectorClusterAddonParameters Get a connector cluster's addon parameters
-
-Get a connector cluster's addon parameters
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param connectorClusterId The id of the connector cluster
- @return ApiGetConnectorClusterAddonParametersRequest
-*/
-func (a *ConnectorClustersApiService) GetConnectorClusterAddonParameters(ctx context.Context, connectorClusterId string) ApiGetConnectorClusterAddonParametersRequest {
+ * GetConnectorClusterAddonParameters Get a connector cluster's addon parameters
+ * Get a connector cluster's addon parameters
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param connectorClusterId The id of the connector cluster
+ * @return ApiGetConnectorClusterAddonParametersRequest
+ */
+func (a *ConnectorClustersApiService) GetConnectorClusterAddonParameters(ctx _context.Context, connectorClusterId string) ApiGetConnectorClusterAddonParametersRequest {
 	return ApiGetConnectorClusterAddonParametersRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -609,27 +604,31 @@ func (a *ConnectorClustersApiService) GetConnectorClusterAddonParameters(ctx con
 	}
 }
 
-// Execute executes the request
-//  @return []AddonParameter
-func (a *ConnectorClustersApiService) GetConnectorClusterAddonParametersExecute(r ApiGetConnectorClusterAddonParametersRequest) ([]AddonParameter, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return []AddonParameter
+ */
+func (a *ConnectorClustersApiService) GetConnectorClusterAddonParametersExecute(r ApiGetConnectorClusterAddonParametersRequest) ([]AddonParameter, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 		localVarReturnValue  []AddonParameter
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "ConnectorClustersApiService.GetConnectorClusterAddonParameters")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/connector_mgmt/v1/kafka_connector_clusters/{connector_cluster_id}/addon_parameters"
-	localVarPath = strings.Replace(localVarPath, "{"+"connector_cluster_id"+"}", url.PathEscape(parameterToString(r.connectorClusterId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"connector_cluster_id"+"}", _neturl.PathEscape(parameterToString(r.connectorClusterId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.resetCredentials != nil {
 		localVarQueryParams.Add("reset_credentials", parameterToString(*r.resetCredentials, ""))
@@ -651,7 +650,7 @@ func (a *ConnectorClustersApiService) GetConnectorClusterAddonParametersExecute(
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -661,15 +660,15 @@ func (a *ConnectorClustersApiService) GetConnectorClusterAddonParametersExecute(
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -680,8 +679,7 @@ func (a *ConnectorClustersApiService) GetConnectorClusterAddonParametersExecute(
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -691,8 +689,7 @@ func (a *ConnectorClustersApiService) GetConnectorClusterAddonParametersExecute(
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 410 {
@@ -702,8 +699,7 @@ func (a *ConnectorClustersApiService) GetConnectorClusterAddonParametersExecute(
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -713,15 +709,14 @@ func (a *ConnectorClustersApiService) GetConnectorClusterAddonParametersExecute(
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -732,7 +727,7 @@ func (a *ConnectorClustersApiService) GetConnectorClusterAddonParametersExecute(
 }
 
 type ApiGetConnectorClusterNamespacesRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService ConnectorClustersApi
 	connectorClusterId string
 	page *string
@@ -741,44 +736,35 @@ type ApiGetConnectorClusterNamespacesRequest struct {
 	search *string
 }
 
-// Page index
 func (r ApiGetConnectorClusterNamespacesRequest) Page(page string) ApiGetConnectorClusterNamespacesRequest {
 	r.page = &page
 	return r
 }
-
-// Number of items in each page
 func (r ApiGetConnectorClusterNamespacesRequest) Size(size string) ApiGetConnectorClusterNamespacesRequest {
 	r.size = &size
 	return r
 }
-
-// Specifies the order by criteria. The syntax of this parameter is similar to the syntax of the &#x60;order by&#x60; clause of an SQL statement. Each query can be ordered by any of the underlying resource fields supported in the search parameter. For example, to return all Connector types ordered by their name, use the following syntax:  &#x60;&#x60;&#x60;sql name asc &#x60;&#x60;&#x60;  To return all Connector types ordered by their name _and_ version, use the following syntax:  &#x60;&#x60;&#x60;sql name asc, version asc &#x60;&#x60;&#x60;  If the parameter isn&#39;t provided, or if the value is empty, then the results are ordered by name.
 func (r ApiGetConnectorClusterNamespacesRequest) OrderBy(orderBy string) ApiGetConnectorClusterNamespacesRequest {
 	r.orderBy = &orderBy
 	return r
 }
-
-// Search criteria.  The syntax of this parameter is similar to the syntax of the &#x60;where&#x60; clause of a SQL statement.  Allowed fields in the search depend on the resource type:  * Cluster: id, created_at, updated_at, owner, organisation_id, name, state, client_id * Namespace: id, created_at, updated_at, name, cluster_id, owner, expiration, tenant_user_id, tenant_organisation_id, state * Connector Types: id, created_at, updated_at, version, name, description, label, channel, featured_rank, pricing_tier * Connectors: id, created_at, updated_at, name, owner, organisation_id, connector_type_id, desired_state, state, channel, namespace_id, kafka_id, kafka_bootstrap_server, service_account_client_id, schema_registry_id, schema_registry_url  Allowed operators are &#x60;&lt;&gt;&#x60;, &#x60;&#x3D;&#x60;, &#x60;LIKE&#x60;, or &#x60;ILIKE&#x60;. Allowed conjunctive operators are &#x60;AND&#x60; and &#x60;OR&#x60;. However, you can use a maximum of 10 conjunctions in a search query.  Examples:  To return a Connector Type with the name &#x60;aws-sqs-source&#x60; and the channel &#x60;stable&#x60;, use the following syntax:  &#x60;&#x60;&#x60; name &#x3D; aws-sqs-source and channel &#x3D; stable &#x60;&#x60;&#x60;[p-]  To return a connector instance with a name that starts with &#x60;aws&#x60;, use the following syntax:  &#x60;&#x60;&#x60; name like aws%25 &#x60;&#x60;&#x60;  To return a connector type with a name containing &#x60;aws&#x60; matching any character case combination, use the following syntax:  &#x60;&#x60;&#x60; name ilike %25aws%25 &#x60;&#x60;&#x60;  If the parameter isn&#39;t provided, or if the value is empty, then all the resources that the user has permission to see are returned.  Note. If the query is invalid, an error is returned. 
 func (r ApiGetConnectorClusterNamespacesRequest) Search(search string) ApiGetConnectorClusterNamespacesRequest {
 	r.search = &search
 	return r
 }
 
-func (r ApiGetConnectorClusterNamespacesRequest) Execute() (*ConnectorNamespaceList, *http.Response, error) {
+func (r ApiGetConnectorClusterNamespacesRequest) Execute() (ConnectorNamespaceList, *_nethttp.Response, error) {
 	return r.ApiService.GetConnectorClusterNamespacesExecute(r)
 }
 
 /*
-GetConnectorClusterNamespaces Get a connector cluster's namespaces
-
-Get a connector cluster's namespaces
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param connectorClusterId The id of the connector cluster
- @return ApiGetConnectorClusterNamespacesRequest
-*/
-func (a *ConnectorClustersApiService) GetConnectorClusterNamespaces(ctx context.Context, connectorClusterId string) ApiGetConnectorClusterNamespacesRequest {
+ * GetConnectorClusterNamespaces Get a connector cluster's namespaces
+ * Get a connector cluster's namespaces
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param connectorClusterId The id of the connector cluster
+ * @return ApiGetConnectorClusterNamespacesRequest
+ */
+func (a *ConnectorClustersApiService) GetConnectorClusterNamespaces(ctx _context.Context, connectorClusterId string) ApiGetConnectorClusterNamespacesRequest {
 	return ApiGetConnectorClusterNamespacesRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -786,27 +772,31 @@ func (a *ConnectorClustersApiService) GetConnectorClusterNamespaces(ctx context.
 	}
 }
 
-// Execute executes the request
-//  @return ConnectorNamespaceList
-func (a *ConnectorClustersApiService) GetConnectorClusterNamespacesExecute(r ApiGetConnectorClusterNamespacesRequest) (*ConnectorNamespaceList, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return ConnectorNamespaceList
+ */
+func (a *ConnectorClustersApiService) GetConnectorClusterNamespacesExecute(r ApiGetConnectorClusterNamespacesRequest) (ConnectorNamespaceList, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *ConnectorNamespaceList
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  ConnectorNamespaceList
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "ConnectorClustersApiService.GetConnectorClusterNamespaces")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/connector_mgmt/v1/kafka_connector_clusters/{connector_cluster_id}/namespaces"
-	localVarPath = strings.Replace(localVarPath, "{"+"connector_cluster_id"+"}", url.PathEscape(parameterToString(r.connectorClusterId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"connector_cluster_id"+"}", _neturl.PathEscape(parameterToString(r.connectorClusterId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.page != nil {
 		localVarQueryParams.Add("page", parameterToString(*r.page, ""))
@@ -837,7 +827,7 @@ func (a *ConnectorClustersApiService) GetConnectorClusterNamespacesExecute(r Api
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -847,15 +837,15 @@ func (a *ConnectorClustersApiService) GetConnectorClusterNamespacesExecute(r Api
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -866,8 +856,7 @@ func (a *ConnectorClustersApiService) GetConnectorClusterNamespacesExecute(r Api
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -877,8 +866,7 @@ func (a *ConnectorClustersApiService) GetConnectorClusterNamespacesExecute(r Api
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -888,15 +876,14 @@ func (a *ConnectorClustersApiService) GetConnectorClusterNamespacesExecute(r Api
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -907,7 +894,7 @@ func (a *ConnectorClustersApiService) GetConnectorClusterNamespacesExecute(r Api
 }
 
 type ApiListConnectorClustersRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService ConnectorClustersApi
 	page *string
 	size *string
@@ -915,69 +902,64 @@ type ApiListConnectorClustersRequest struct {
 	search *string
 }
 
-// Page index
 func (r ApiListConnectorClustersRequest) Page(page string) ApiListConnectorClustersRequest {
 	r.page = &page
 	return r
 }
-
-// Number of items in each page
 func (r ApiListConnectorClustersRequest) Size(size string) ApiListConnectorClustersRequest {
 	r.size = &size
 	return r
 }
-
-// Specifies the order by criteria. The syntax of this parameter is similar to the syntax of the &#x60;order by&#x60; clause of an SQL statement. Each query can be ordered by any of the underlying resource fields supported in the search parameter. For example, to return all Connector types ordered by their name, use the following syntax:  &#x60;&#x60;&#x60;sql name asc &#x60;&#x60;&#x60;  To return all Connector types ordered by their name _and_ version, use the following syntax:  &#x60;&#x60;&#x60;sql name asc, version asc &#x60;&#x60;&#x60;  If the parameter isn&#39;t provided, or if the value is empty, then the results are ordered by name.
 func (r ApiListConnectorClustersRequest) OrderBy(orderBy string) ApiListConnectorClustersRequest {
 	r.orderBy = &orderBy
 	return r
 }
-
-// Search criteria.  The syntax of this parameter is similar to the syntax of the &#x60;where&#x60; clause of a SQL statement.  Allowed fields in the search depend on the resource type:  * Cluster: id, created_at, updated_at, owner, organisation_id, name, state, client_id * Namespace: id, created_at, updated_at, name, cluster_id, owner, expiration, tenant_user_id, tenant_organisation_id, state * Connector Types: id, created_at, updated_at, version, name, description, label, channel, featured_rank, pricing_tier * Connectors: id, created_at, updated_at, name, owner, organisation_id, connector_type_id, desired_state, state, channel, namespace_id, kafka_id, kafka_bootstrap_server, service_account_client_id, schema_registry_id, schema_registry_url  Allowed operators are &#x60;&lt;&gt;&#x60;, &#x60;&#x3D;&#x60;, &#x60;LIKE&#x60;, or &#x60;ILIKE&#x60;. Allowed conjunctive operators are &#x60;AND&#x60; and &#x60;OR&#x60;. However, you can use a maximum of 10 conjunctions in a search query.  Examples:  To return a Connector Type with the name &#x60;aws-sqs-source&#x60; and the channel &#x60;stable&#x60;, use the following syntax:  &#x60;&#x60;&#x60; name &#x3D; aws-sqs-source and channel &#x3D; stable &#x60;&#x60;&#x60;[p-]  To return a connector instance with a name that starts with &#x60;aws&#x60;, use the following syntax:  &#x60;&#x60;&#x60; name like aws%25 &#x60;&#x60;&#x60;  To return a connector type with a name containing &#x60;aws&#x60; matching any character case combination, use the following syntax:  &#x60;&#x60;&#x60; name ilike %25aws%25 &#x60;&#x60;&#x60;  If the parameter isn&#39;t provided, or if the value is empty, then all the resources that the user has permission to see are returned.  Note. If the query is invalid, an error is returned. 
 func (r ApiListConnectorClustersRequest) Search(search string) ApiListConnectorClustersRequest {
 	r.search = &search
 	return r
 }
 
-func (r ApiListConnectorClustersRequest) Execute() (*ConnectorClusterList, *http.Response, error) {
+func (r ApiListConnectorClustersRequest) Execute() (ConnectorClusterList, *_nethttp.Response, error) {
 	return r.ApiService.ListConnectorClustersExecute(r)
 }
 
 /*
-ListConnectorClusters Returns a list of connector clusters
-
-Returns a list of connector clusters
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiListConnectorClustersRequest
-*/
-func (a *ConnectorClustersApiService) ListConnectorClusters(ctx context.Context) ApiListConnectorClustersRequest {
+ * ListConnectorClusters Returns a list of connector clusters
+ * Returns a list of connector clusters
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiListConnectorClustersRequest
+ */
+func (a *ConnectorClustersApiService) ListConnectorClusters(ctx _context.Context) ApiListConnectorClustersRequest {
 	return ApiListConnectorClustersRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return ConnectorClusterList
-func (a *ConnectorClustersApiService) ListConnectorClustersExecute(r ApiListConnectorClustersRequest) (*ConnectorClusterList, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return ConnectorClusterList
+ */
+func (a *ConnectorClustersApiService) ListConnectorClustersExecute(r ApiListConnectorClustersRequest) (ConnectorClusterList, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *ConnectorClusterList
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  ConnectorClusterList
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "ConnectorClustersApiService.ListConnectorClusters")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/connector_mgmt/v1/kafka_connector_clusters"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.page != nil {
 		localVarQueryParams.Add("page", parameterToString(*r.page, ""))
@@ -1008,7 +990,7 @@ func (a *ConnectorClustersApiService) ListConnectorClustersExecute(r ApiListConn
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -1018,15 +1000,15 @@ func (a *ConnectorClustersApiService) ListConnectorClustersExecute(r ApiListConn
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -1037,8 +1019,7 @@ func (a *ConnectorClustersApiService) ListConnectorClustersExecute(r ApiListConn
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -1048,15 +1029,14 @@ func (a *ConnectorClustersApiService) ListConnectorClustersExecute(r ApiListConn
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -1067,32 +1047,29 @@ func (a *ConnectorClustersApiService) ListConnectorClustersExecute(r ApiListConn
 }
 
 type ApiUpdateConnectorClusterByIdRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService ConnectorClustersApi
 	connectorClusterId string
 	connectorClusterRequest *ConnectorClusterRequest
 }
 
-// Data to updated connector with
 func (r ApiUpdateConnectorClusterByIdRequest) ConnectorClusterRequest(connectorClusterRequest ConnectorClusterRequest) ApiUpdateConnectorClusterByIdRequest {
 	r.connectorClusterRequest = &connectorClusterRequest
 	return r
 }
 
-func (r ApiUpdateConnectorClusterByIdRequest) Execute() (*http.Response, error) {
+func (r ApiUpdateConnectorClusterByIdRequest) Execute() (*_nethttp.Response, error) {
 	return r.ApiService.UpdateConnectorClusterByIdExecute(r)
 }
 
 /*
-UpdateConnectorClusterById udpate a connector cluster
-
-udpate a connector cluster
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param connectorClusterId The id of the connector cluster
- @return ApiUpdateConnectorClusterByIdRequest
-*/
-func (a *ConnectorClustersApiService) UpdateConnectorClusterById(ctx context.Context, connectorClusterId string) ApiUpdateConnectorClusterByIdRequest {
+ * UpdateConnectorClusterById udpate a connector cluster
+ * udpate a connector cluster
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param connectorClusterId The id of the connector cluster
+ * @return ApiUpdateConnectorClusterByIdRequest
+ */
+func (a *ConnectorClustersApiService) UpdateConnectorClusterById(ctx _context.Context, connectorClusterId string) ApiUpdateConnectorClusterByIdRequest {
 	return ApiUpdateConnectorClusterByIdRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -1100,25 +1077,29 @@ func (a *ConnectorClustersApiService) UpdateConnectorClusterById(ctx context.Con
 	}
 }
 
-// Execute executes the request
-func (a *ConnectorClustersApiService) UpdateConnectorClusterByIdExecute(r ApiUpdateConnectorClusterByIdRequest) (*http.Response, error) {
+/*
+ * Execute executes the request
+ */
+func (a *ConnectorClustersApiService) UpdateConnectorClusterByIdExecute(r ApiUpdateConnectorClusterByIdRequest) (*_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPut
+		localVarHTTPMethod   = _nethttp.MethodPut
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "ConnectorClustersApiService.UpdateConnectorClusterById")
 	if err != nil {
-		return nil, &GenericOpenAPIError{error: err.Error()}
+		return nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/connector_mgmt/v1/kafka_connector_clusters/{connector_cluster_id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"connector_cluster_id"+"}", url.PathEscape(parameterToString(r.connectorClusterId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"connector_cluster_id"+"}", _neturl.PathEscape(parameterToString(r.connectorClusterId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.connectorClusterRequest == nil {
 		return nil, reportError("connectorClusterRequest is required and must be specified")
 	}
@@ -1142,7 +1123,7 @@ func (a *ConnectorClustersApiService) UpdateConnectorClusterByIdExecute(r ApiUpd
 	}
 	// body params
 	localVarPostBody = r.connectorClusterRequest
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return nil, err
 	}
@@ -1152,15 +1133,15 @@ func (a *ConnectorClustersApiService) UpdateConnectorClusterByIdExecute(r ApiUpd
 		return localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -1171,8 +1152,7 @@ func (a *ConnectorClustersApiService) UpdateConnectorClusterByIdExecute(r ApiUpd
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -1182,8 +1162,7 @@ func (a *ConnectorClustersApiService) UpdateConnectorClusterByIdExecute(r ApiUpd
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -1193,8 +1172,7 @@ func (a *ConnectorClustersApiService) UpdateConnectorClusterByIdExecute(r ApiUpd
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarHTTPResponse, newErr
 	}
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/api_connector_namespaces.go b/app-services-sdk-go/connectormgmt/apiv1/client/api_connector_namespaces.go
index e2355814..6e0f93e5 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/api_connector_namespaces.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/api_connector_namespaces.go
@@ -1,11 +1,11 @@
 /*
-Connector Management API
-
-Connector Management API is a REST API to manage connectors.
-
-API version: 0.1.0
-Contact: rhosak-support@redhat.com
-*/
+ * Connector Management API
+ *
+ * Connector Management API is a REST API to manage connectors.
+ *
+ * API version: 0.1.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -13,114 +13,119 @@ package connectormgmtclient
 
 import (
 	"bytes"
-	"context"
-	"io/ioutil"
-	"net/http"
-	"net/url"
+	_context "context"
+	_ioutil "io/ioutil"
+	_nethttp "net/http"
+	_neturl "net/url"
 	"strings"
 )
 
+// Linger please
+var (
+	_ _context.Context
+)
 
 type ConnectorNamespacesApi interface {
 
 	/*
-	CreateEvaluationNamespace Create a new short lived evaluation connector namespace
-
-	Create a new evaluation connector namespace
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiCreateEvaluationNamespaceRequest
-	*/
-	CreateEvaluationNamespace(ctx context.Context) ApiCreateEvaluationNamespaceRequest
-
-	// CreateEvaluationNamespaceExecute executes the request
-	//  @return ConnectorNamespace
-	CreateEvaluationNamespaceExecute(r ApiCreateEvaluationNamespaceRequest) (*ConnectorNamespace, *http.Response, error)
+	 * CreateEvaluationNamespace Create a new short lived evaluation connector namespace
+	 * Create a new evaluation connector namespace
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiCreateEvaluationNamespaceRequest
+	 */
+	CreateEvaluationNamespace(ctx _context.Context) ApiCreateEvaluationNamespaceRequest
 
 	/*
-	GetConnectorNamespace Get a connector namespace
-
-	Get a connector namespace
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param connectorNamespaceId The id of the connector namespace
-	@return ApiGetConnectorNamespaceRequest
-	*/
-	GetConnectorNamespace(ctx context.Context, connectorNamespaceId string) ApiGetConnectorNamespaceRequest
-
-	// GetConnectorNamespaceExecute executes the request
-	//  @return ConnectorNamespace
-	GetConnectorNamespaceExecute(r ApiGetConnectorNamespaceRequest) (*ConnectorNamespace, *http.Response, error)
+	 * CreateEvaluationNamespaceExecute executes the request
+	 * @return ConnectorNamespace
+	 */
+	CreateEvaluationNamespaceExecute(r ApiCreateEvaluationNamespaceRequest) (ConnectorNamespace, *_nethttp.Response, error)
 
 	/*
-	ListConnectorNamespaces Returns a list of connector namespaces
+	 * GetConnectorNamespace Get a connector namespace
+	 * Get a connector namespace
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param connectorNamespaceId The id of the connector namespace
+	 * @return ApiGetConnectorNamespaceRequest
+	 */
+	GetConnectorNamespace(ctx _context.Context, connectorNamespaceId string) ApiGetConnectorNamespaceRequest
 
-	Returns a list of connector namespaces
+	/*
+	 * GetConnectorNamespaceExecute executes the request
+	 * @return ConnectorNamespace
+	 */
+	GetConnectorNamespaceExecute(r ApiGetConnectorNamespaceRequest) (ConnectorNamespace, *_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiListConnectorNamespacesRequest
-	*/
-	ListConnectorNamespaces(ctx context.Context) ApiListConnectorNamespacesRequest
+	/*
+	 * ListConnectorNamespaces Returns a list of connector namespaces
+	 * Returns a list of connector namespaces
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiListConnectorNamespacesRequest
+	 */
+	ListConnectorNamespaces(ctx _context.Context) ApiListConnectorNamespacesRequest
 
-	// ListConnectorNamespacesExecute executes the request
-	//  @return ConnectorNamespaceList
-	ListConnectorNamespacesExecute(r ApiListConnectorNamespacesRequest) (*ConnectorNamespaceList, *http.Response, error)
+	/*
+	 * ListConnectorNamespacesExecute executes the request
+	 * @return ConnectorNamespaceList
+	 */
+	ListConnectorNamespacesExecute(r ApiListConnectorNamespacesRequest) (ConnectorNamespaceList, *_nethttp.Response, error)
 }
 
 // ConnectorNamespacesApiService ConnectorNamespacesApi service
 type ConnectorNamespacesApiService service
 
 type ApiCreateEvaluationNamespaceRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService ConnectorNamespacesApi
 	connectorNamespaceEvalRequest *ConnectorNamespaceEvalRequest
 }
 
-// Connector namespace data
 func (r ApiCreateEvaluationNamespaceRequest) ConnectorNamespaceEvalRequest(connectorNamespaceEvalRequest ConnectorNamespaceEvalRequest) ApiCreateEvaluationNamespaceRequest {
 	r.connectorNamespaceEvalRequest = &connectorNamespaceEvalRequest
 	return r
 }
 
-func (r ApiCreateEvaluationNamespaceRequest) Execute() (*ConnectorNamespace, *http.Response, error) {
+func (r ApiCreateEvaluationNamespaceRequest) Execute() (ConnectorNamespace, *_nethttp.Response, error) {
 	return r.ApiService.CreateEvaluationNamespaceExecute(r)
 }
 
 /*
-CreateEvaluationNamespace Create a new short lived evaluation connector namespace
-
-Create a new evaluation connector namespace
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiCreateEvaluationNamespaceRequest
-*/
-func (a *ConnectorNamespacesApiService) CreateEvaluationNamespace(ctx context.Context) ApiCreateEvaluationNamespaceRequest {
+ * CreateEvaluationNamespace Create a new short lived evaluation connector namespace
+ * Create a new evaluation connector namespace
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiCreateEvaluationNamespaceRequest
+ */
+func (a *ConnectorNamespacesApiService) CreateEvaluationNamespace(ctx _context.Context) ApiCreateEvaluationNamespaceRequest {
 	return ApiCreateEvaluationNamespaceRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return ConnectorNamespace
-func (a *ConnectorNamespacesApiService) CreateEvaluationNamespaceExecute(r ApiCreateEvaluationNamespaceRequest) (*ConnectorNamespace, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return ConnectorNamespace
+ */
+func (a *ConnectorNamespacesApiService) CreateEvaluationNamespaceExecute(r ApiCreateEvaluationNamespaceRequest) (ConnectorNamespace, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *ConnectorNamespace
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  ConnectorNamespace
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "ConnectorNamespacesApiService.CreateEvaluationNamespace")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/connector_mgmt/v1/kafka_connector_namespaces/eval"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.connectorNamespaceEvalRequest == nil {
 		return localVarReturnValue, nil, reportError("connectorNamespaceEvalRequest is required and must be specified")
 	}
@@ -144,7 +149,7 @@ func (a *ConnectorNamespacesApiService) CreateEvaluationNamespaceExecute(r ApiCr
 	}
 	// body params
 	localVarPostBody = r.connectorNamespaceEvalRequest
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -154,15 +159,15 @@ func (a *ConnectorNamespacesApiService) CreateEvaluationNamespaceExecute(r ApiCr
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -173,8 +178,7 @@ func (a *ConnectorNamespacesApiService) CreateEvaluationNamespaceExecute(r ApiCr
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -184,8 +188,7 @@ func (a *ConnectorNamespacesApiService) CreateEvaluationNamespaceExecute(r ApiCr
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -195,8 +198,7 @@ func (a *ConnectorNamespacesApiService) CreateEvaluationNamespaceExecute(r ApiCr
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -206,15 +208,14 @@ func (a *ConnectorNamespacesApiService) CreateEvaluationNamespaceExecute(r ApiCr
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -225,25 +226,24 @@ func (a *ConnectorNamespacesApiService) CreateEvaluationNamespaceExecute(r ApiCr
 }
 
 type ApiGetConnectorNamespaceRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService ConnectorNamespacesApi
 	connectorNamespaceId string
 }
 
-func (r ApiGetConnectorNamespaceRequest) Execute() (*ConnectorNamespace, *http.Response, error) {
+
+func (r ApiGetConnectorNamespaceRequest) Execute() (ConnectorNamespace, *_nethttp.Response, error) {
 	return r.ApiService.GetConnectorNamespaceExecute(r)
 }
 
 /*
-GetConnectorNamespace Get a connector namespace
-
-Get a connector namespace
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param connectorNamespaceId The id of the connector namespace
- @return ApiGetConnectorNamespaceRequest
-*/
-func (a *ConnectorNamespacesApiService) GetConnectorNamespace(ctx context.Context, connectorNamespaceId string) ApiGetConnectorNamespaceRequest {
+ * GetConnectorNamespace Get a connector namespace
+ * Get a connector namespace
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param connectorNamespaceId The id of the connector namespace
+ * @return ApiGetConnectorNamespaceRequest
+ */
+func (a *ConnectorNamespacesApiService) GetConnectorNamespace(ctx _context.Context, connectorNamespaceId string) ApiGetConnectorNamespaceRequest {
 	return ApiGetConnectorNamespaceRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -251,27 +251,31 @@ func (a *ConnectorNamespacesApiService) GetConnectorNamespace(ctx context.Contex
 	}
 }
 
-// Execute executes the request
-//  @return ConnectorNamespace
-func (a *ConnectorNamespacesApiService) GetConnectorNamespaceExecute(r ApiGetConnectorNamespaceRequest) (*ConnectorNamespace, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return ConnectorNamespace
+ */
+func (a *ConnectorNamespacesApiService) GetConnectorNamespaceExecute(r ApiGetConnectorNamespaceRequest) (ConnectorNamespace, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *ConnectorNamespace
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  ConnectorNamespace
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "ConnectorNamespacesApiService.GetConnectorNamespace")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/connector_mgmt/v1/kafka_connector_namespaces/{connector_namespace_id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"connector_namespace_id"+"}", url.PathEscape(parameterToString(r.connectorNamespaceId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"connector_namespace_id"+"}", _neturl.PathEscape(parameterToString(r.connectorNamespaceId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -290,7 +294,7 @@ func (a *ConnectorNamespacesApiService) GetConnectorNamespaceExecute(r ApiGetCon
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -300,15 +304,15 @@ func (a *ConnectorNamespacesApiService) GetConnectorNamespaceExecute(r ApiGetCon
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -319,8 +323,7 @@ func (a *ConnectorNamespacesApiService) GetConnectorNamespaceExecute(r ApiGetCon
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -330,8 +333,7 @@ func (a *ConnectorNamespacesApiService) GetConnectorNamespaceExecute(r ApiGetCon
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -341,15 +343,14 @@ func (a *ConnectorNamespacesApiService) GetConnectorNamespaceExecute(r ApiGetCon
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -360,7 +361,7 @@ func (a *ConnectorNamespacesApiService) GetConnectorNamespaceExecute(r ApiGetCon
 }
 
 type ApiListConnectorNamespacesRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService ConnectorNamespacesApi
 	page *string
 	size *string
@@ -368,69 +369,64 @@ type ApiListConnectorNamespacesRequest struct {
 	search *string
 }
 
-// Page index
 func (r ApiListConnectorNamespacesRequest) Page(page string) ApiListConnectorNamespacesRequest {
 	r.page = &page
 	return r
 }
-
-// Number of items in each page
 func (r ApiListConnectorNamespacesRequest) Size(size string) ApiListConnectorNamespacesRequest {
 	r.size = &size
 	return r
 }
-
-// Specifies the order by criteria. The syntax of this parameter is similar to the syntax of the &#x60;order by&#x60; clause of an SQL statement. Each query can be ordered by any of the underlying resource fields supported in the search parameter. For example, to return all Connector types ordered by their name, use the following syntax:  &#x60;&#x60;&#x60;sql name asc &#x60;&#x60;&#x60;  To return all Connector types ordered by their name _and_ version, use the following syntax:  &#x60;&#x60;&#x60;sql name asc, version asc &#x60;&#x60;&#x60;  If the parameter isn&#39;t provided, or if the value is empty, then the results are ordered by name.
 func (r ApiListConnectorNamespacesRequest) OrderBy(orderBy string) ApiListConnectorNamespacesRequest {
 	r.orderBy = &orderBy
 	return r
 }
-
-// Search criteria.  The syntax of this parameter is similar to the syntax of the &#x60;where&#x60; clause of a SQL statement.  Allowed fields in the search depend on the resource type:  * Cluster: id, created_at, updated_at, owner, organisation_id, name, state, client_id * Namespace: id, created_at, updated_at, name, cluster_id, owner, expiration, tenant_user_id, tenant_organisation_id, state * Connector Types: id, created_at, updated_at, version, name, description, label, channel, featured_rank, pricing_tier * Connectors: id, created_at, updated_at, name, owner, organisation_id, connector_type_id, desired_state, state, channel, namespace_id, kafka_id, kafka_bootstrap_server, service_account_client_id, schema_registry_id, schema_registry_url  Allowed operators are &#x60;&lt;&gt;&#x60;, &#x60;&#x3D;&#x60;, &#x60;LIKE&#x60;, or &#x60;ILIKE&#x60;. Allowed conjunctive operators are &#x60;AND&#x60; and &#x60;OR&#x60;. However, you can use a maximum of 10 conjunctions in a search query.  Examples:  To return a Connector Type with the name &#x60;aws-sqs-source&#x60; and the channel &#x60;stable&#x60;, use the following syntax:  &#x60;&#x60;&#x60; name &#x3D; aws-sqs-source and channel &#x3D; stable &#x60;&#x60;&#x60;[p-]  To return a connector instance with a name that starts with &#x60;aws&#x60;, use the following syntax:  &#x60;&#x60;&#x60; name like aws%25 &#x60;&#x60;&#x60;  To return a connector type with a name containing &#x60;aws&#x60; matching any character case combination, use the following syntax:  &#x60;&#x60;&#x60; name ilike %25aws%25 &#x60;&#x60;&#x60;  If the parameter isn&#39;t provided, or if the value is empty, then all the resources that the user has permission to see are returned.  Note. If the query is invalid, an error is returned. 
 func (r ApiListConnectorNamespacesRequest) Search(search string) ApiListConnectorNamespacesRequest {
 	r.search = &search
 	return r
 }
 
-func (r ApiListConnectorNamespacesRequest) Execute() (*ConnectorNamespaceList, *http.Response, error) {
+func (r ApiListConnectorNamespacesRequest) Execute() (ConnectorNamespaceList, *_nethttp.Response, error) {
 	return r.ApiService.ListConnectorNamespacesExecute(r)
 }
 
 /*
-ListConnectorNamespaces Returns a list of connector namespaces
-
-Returns a list of connector namespaces
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiListConnectorNamespacesRequest
-*/
-func (a *ConnectorNamespacesApiService) ListConnectorNamespaces(ctx context.Context) ApiListConnectorNamespacesRequest {
+ * ListConnectorNamespaces Returns a list of connector namespaces
+ * Returns a list of connector namespaces
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiListConnectorNamespacesRequest
+ */
+func (a *ConnectorNamespacesApiService) ListConnectorNamespaces(ctx _context.Context) ApiListConnectorNamespacesRequest {
 	return ApiListConnectorNamespacesRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return ConnectorNamespaceList
-func (a *ConnectorNamespacesApiService) ListConnectorNamespacesExecute(r ApiListConnectorNamespacesRequest) (*ConnectorNamespaceList, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return ConnectorNamespaceList
+ */
+func (a *ConnectorNamespacesApiService) ListConnectorNamespacesExecute(r ApiListConnectorNamespacesRequest) (ConnectorNamespaceList, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *ConnectorNamespaceList
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  ConnectorNamespaceList
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "ConnectorNamespacesApiService.ListConnectorNamespaces")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/connector_mgmt/v1/kafka_connector_namespaces"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.page != nil {
 		localVarQueryParams.Add("page", parameterToString(*r.page, ""))
@@ -461,7 +457,7 @@ func (a *ConnectorNamespacesApiService) ListConnectorNamespacesExecute(r ApiList
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -471,15 +467,15 @@ func (a *ConnectorNamespacesApiService) ListConnectorNamespacesExecute(r ApiList
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -490,8 +486,7 @@ func (a *ConnectorNamespacesApiService) ListConnectorNamespacesExecute(r ApiList
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -501,15 +496,14 @@ func (a *ConnectorNamespacesApiService) ListConnectorNamespacesExecute(r ApiList
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/api_connector_service.go b/app-services-sdk-go/connectormgmt/apiv1/client/api_connector_service.go
index 3d6d7a53..1ded3fc8 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/api_connector_service.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/api_connector_service.go
@@ -1,11 +1,11 @@
 /*
-Connector Management API
-
-Connector Management API is a REST API to manage connectors.
-
-API version: 0.1.0
-Contact: rhosak-support@redhat.com
-*/
+ * Connector Management API
+ *
+ * Connector Management API is a REST API to manage connectors.
+ *
+ * API version: 0.1.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -13,77 +13,84 @@ package connectormgmtclient
 
 import (
 	"bytes"
-	"context"
-	"io/ioutil"
-	"net/http"
-	"net/url"
+	_context "context"
+	_ioutil "io/ioutil"
+	_nethttp "net/http"
+	_neturl "net/url"
 )
 
+// Linger please
+var (
+	_ _context.Context
+)
 
 type ConnectorServiceApi interface {
 
 	/*
-	GetVersionMetadata Returns the version metadata
-
-	Returns the version metadata
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiGetVersionMetadataRequest
-	*/
-	GetVersionMetadata(ctx context.Context) ApiGetVersionMetadataRequest
+	 * GetVersionMetadata Returns the version metadata
+	 * Returns the version metadata
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiGetVersionMetadataRequest
+	 */
+	GetVersionMetadata(ctx _context.Context) ApiGetVersionMetadataRequest
 
-	// GetVersionMetadataExecute executes the request
-	//  @return VersionMetadata
-	GetVersionMetadataExecute(r ApiGetVersionMetadataRequest) (*VersionMetadata, *http.Response, error)
+	/*
+	 * GetVersionMetadataExecute executes the request
+	 * @return VersionMetadata
+	 */
+	GetVersionMetadataExecute(r ApiGetVersionMetadataRequest) (VersionMetadata, *_nethttp.Response, error)
 }
 
 // ConnectorServiceApiService ConnectorServiceApi service
 type ConnectorServiceApiService service
 
 type ApiGetVersionMetadataRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService ConnectorServiceApi
 }
 
-func (r ApiGetVersionMetadataRequest) Execute() (*VersionMetadata, *http.Response, error) {
+
+func (r ApiGetVersionMetadataRequest) Execute() (VersionMetadata, *_nethttp.Response, error) {
 	return r.ApiService.GetVersionMetadataExecute(r)
 }
 
 /*
-GetVersionMetadata Returns the version metadata
-
-Returns the version metadata
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiGetVersionMetadataRequest
-*/
-func (a *ConnectorServiceApiService) GetVersionMetadata(ctx context.Context) ApiGetVersionMetadataRequest {
+ * GetVersionMetadata Returns the version metadata
+ * Returns the version metadata
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiGetVersionMetadataRequest
+ */
+func (a *ConnectorServiceApiService) GetVersionMetadata(ctx _context.Context) ApiGetVersionMetadataRequest {
 	return ApiGetVersionMetadataRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return VersionMetadata
-func (a *ConnectorServiceApiService) GetVersionMetadataExecute(r ApiGetVersionMetadataRequest) (*VersionMetadata, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return VersionMetadata
+ */
+func (a *ConnectorServiceApiService) GetVersionMetadataExecute(r ApiGetVersionMetadataRequest) (VersionMetadata, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *VersionMetadata
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  VersionMetadata
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "ConnectorServiceApiService.GetVersionMetadata")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/connector_mgmt/v1"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -102,7 +109,7 @@ func (a *ConnectorServiceApiService) GetVersionMetadataExecute(r ApiGetVersionMe
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -112,15 +119,15 @@ func (a *ConnectorServiceApiService) GetVersionMetadataExecute(r ApiGetVersionMe
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -129,7 +136,7 @@ func (a *ConnectorServiceApiService) GetVersionMetadataExecute(r ApiGetVersionMe
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/api_connector_types.go b/app-services-sdk-go/connectormgmt/apiv1/client/api_connector_types.go
index f1dc9de4..8013c9f4 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/api_connector_types.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/api_connector_types.go
@@ -1,11 +1,11 @@
 /*
-Connector Management API
-
-Connector Management API is a REST API to manage connectors.
-
-API version: 0.1.0
-Contact: rhosak-support@redhat.com
-*/
+ * Connector Management API
+ *
+ * Connector Management API is a REST API to manage connectors.
+ *
+ * API version: 0.1.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -13,83 +13,86 @@ package connectormgmtclient
 
 import (
 	"bytes"
-	"context"
-	"io/ioutil"
-	"net/http"
-	"net/url"
+	_context "context"
+	_ioutil "io/ioutil"
+	_nethttp "net/http"
+	_neturl "net/url"
 	"strings"
 )
 
+// Linger please
+var (
+	_ _context.Context
+)
 
 type ConnectorTypesApi interface {
 
 	/*
-	GetConnectorTypeByID Get a connector type by id
-
-	Get a connector type by id
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param connectorTypeId The id of the connector type
-	@return ApiGetConnectorTypeByIDRequest
-	*/
-	GetConnectorTypeByID(ctx context.Context, connectorTypeId string) ApiGetConnectorTypeByIDRequest
-
-	// GetConnectorTypeByIDExecute executes the request
-	//  @return ConnectorType
-	GetConnectorTypeByIDExecute(r ApiGetConnectorTypeByIDRequest) (*ConnectorType, *http.Response, error)
+	 * GetConnectorTypeByID Get a connector type by id
+	 * Get a connector type by id
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param connectorTypeId The id of the connector type
+	 * @return ApiGetConnectorTypeByIDRequest
+	 */
+	GetConnectorTypeByID(ctx _context.Context, connectorTypeId string) ApiGetConnectorTypeByIDRequest
 
 	/*
-	GetConnectorTypeLabels Returns a list of connector type labels
-
-	Returns a list of connector type labels
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiGetConnectorTypeLabelsRequest
-	*/
-	GetConnectorTypeLabels(ctx context.Context) ApiGetConnectorTypeLabelsRequest
-
-	// GetConnectorTypeLabelsExecute executes the request
-	//  @return ConnectorTypeLabelCountList
-	GetConnectorTypeLabelsExecute(r ApiGetConnectorTypeLabelsRequest) (*ConnectorTypeLabelCountList, *http.Response, error)
+	 * GetConnectorTypeByIDExecute executes the request
+	 * @return ConnectorType
+	 */
+	GetConnectorTypeByIDExecute(r ApiGetConnectorTypeByIDRequest) (ConnectorType, *_nethttp.Response, error)
 
 	/*
-	GetConnectorTypes Returns a list of connector types
+	 * GetConnectorTypeLabels Returns a list of connector type labels
+	 * Returns a list of connector type labels
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiGetConnectorTypeLabelsRequest
+	 */
+	GetConnectorTypeLabels(ctx _context.Context) ApiGetConnectorTypeLabelsRequest
 
-	Returns a list of connector types
+	/*
+	 * GetConnectorTypeLabelsExecute executes the request
+	 * @return ConnectorTypeLabelCountList
+	 */
+	GetConnectorTypeLabelsExecute(r ApiGetConnectorTypeLabelsRequest) (ConnectorTypeLabelCountList, *_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiGetConnectorTypesRequest
-	*/
-	GetConnectorTypes(ctx context.Context) ApiGetConnectorTypesRequest
+	/*
+	 * GetConnectorTypes Returns a list of connector types
+	 * Returns a list of connector types
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiGetConnectorTypesRequest
+	 */
+	GetConnectorTypes(ctx _context.Context) ApiGetConnectorTypesRequest
 
-	// GetConnectorTypesExecute executes the request
-	//  @return ConnectorTypeList
-	GetConnectorTypesExecute(r ApiGetConnectorTypesRequest) (*ConnectorTypeList, *http.Response, error)
+	/*
+	 * GetConnectorTypesExecute executes the request
+	 * @return ConnectorTypeList
+	 */
+	GetConnectorTypesExecute(r ApiGetConnectorTypesRequest) (ConnectorTypeList, *_nethttp.Response, error)
 }
 
 // ConnectorTypesApiService ConnectorTypesApi service
 type ConnectorTypesApiService service
 
 type ApiGetConnectorTypeByIDRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService ConnectorTypesApi
 	connectorTypeId string
 }
 
-func (r ApiGetConnectorTypeByIDRequest) Execute() (*ConnectorType, *http.Response, error) {
+
+func (r ApiGetConnectorTypeByIDRequest) Execute() (ConnectorType, *_nethttp.Response, error) {
 	return r.ApiService.GetConnectorTypeByIDExecute(r)
 }
 
 /*
-GetConnectorTypeByID Get a connector type by id
-
-Get a connector type by id
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param connectorTypeId The id of the connector type
- @return ApiGetConnectorTypeByIDRequest
-*/
-func (a *ConnectorTypesApiService) GetConnectorTypeByID(ctx context.Context, connectorTypeId string) ApiGetConnectorTypeByIDRequest {
+ * GetConnectorTypeByID Get a connector type by id
+ * Get a connector type by id
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param connectorTypeId The id of the connector type
+ * @return ApiGetConnectorTypeByIDRequest
+ */
+func (a *ConnectorTypesApiService) GetConnectorTypeByID(ctx _context.Context, connectorTypeId string) ApiGetConnectorTypeByIDRequest {
 	return ApiGetConnectorTypeByIDRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -97,27 +100,31 @@ func (a *ConnectorTypesApiService) GetConnectorTypeByID(ctx context.Context, con
 	}
 }
 
-// Execute executes the request
-//  @return ConnectorType
-func (a *ConnectorTypesApiService) GetConnectorTypeByIDExecute(r ApiGetConnectorTypeByIDRequest) (*ConnectorType, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return ConnectorType
+ */
+func (a *ConnectorTypesApiService) GetConnectorTypeByIDExecute(r ApiGetConnectorTypeByIDRequest) (ConnectorType, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *ConnectorType
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  ConnectorType
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "ConnectorTypesApiService.GetConnectorTypeByID")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/connector_mgmt/v1/kafka_connector_types/{connector_type_id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"connector_type_id"+"}", url.PathEscape(parameterToString(r.connectorTypeId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"connector_type_id"+"}", _neturl.PathEscape(parameterToString(r.connectorTypeId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -136,7 +143,7 @@ func (a *ConnectorTypesApiService) GetConnectorTypeByIDExecute(r ApiGetConnector
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -146,15 +153,15 @@ func (a *ConnectorTypesApiService) GetConnectorTypeByIDExecute(r ApiGetConnector
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -165,8 +172,7 @@ func (a *ConnectorTypesApiService) GetConnectorTypeByIDExecute(r ApiGetConnector
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -176,8 +182,7 @@ func (a *ConnectorTypesApiService) GetConnectorTypeByIDExecute(r ApiGetConnector
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 410 {
@@ -187,8 +192,7 @@ func (a *ConnectorTypesApiService) GetConnectorTypeByIDExecute(r ApiGetConnector
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -198,15 +202,14 @@ func (a *ConnectorTypesApiService) GetConnectorTypeByIDExecute(r ApiGetConnector
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -217,63 +220,62 @@ func (a *ConnectorTypesApiService) GetConnectorTypeByIDExecute(r ApiGetConnector
 }
 
 type ApiGetConnectorTypeLabelsRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService ConnectorTypesApi
 	orderBy *string
 	search *string
 }
 
-// Specifies the order by criteria. The syntax of this parameter is similar to the syntax of the &#x60;order by&#x60; clause of an SQL statement. Each query can be ordered by any of the underlying resource fields supported in the search parameter. For example, to return all Connector types ordered by their name, use the following syntax:  &#x60;&#x60;&#x60;sql name asc &#x60;&#x60;&#x60;  To return all Connector types ordered by their name _and_ version, use the following syntax:  &#x60;&#x60;&#x60;sql name asc, version asc &#x60;&#x60;&#x60;  If the parameter isn&#39;t provided, or if the value is empty, then the results are ordered by name.
 func (r ApiGetConnectorTypeLabelsRequest) OrderBy(orderBy string) ApiGetConnectorTypeLabelsRequest {
 	r.orderBy = &orderBy
 	return r
 }
-
-// Search criteria.  The syntax of this parameter is similar to the syntax of the &#x60;where&#x60; clause of a SQL statement.  Allowed fields in the search depend on the resource type:  * Cluster: id, created_at, updated_at, owner, organisation_id, name, state, client_id * Namespace: id, created_at, updated_at, name, cluster_id, owner, expiration, tenant_user_id, tenant_organisation_id, state * Connector Types: id, created_at, updated_at, version, name, description, label, channel, featured_rank, pricing_tier * Connectors: id, created_at, updated_at, name, owner, organisation_id, connector_type_id, desired_state, state, channel, namespace_id, kafka_id, kafka_bootstrap_server, service_account_client_id, schema_registry_id, schema_registry_url  Allowed operators are &#x60;&lt;&gt;&#x60;, &#x60;&#x3D;&#x60;, &#x60;LIKE&#x60;, or &#x60;ILIKE&#x60;. Allowed conjunctive operators are &#x60;AND&#x60; and &#x60;OR&#x60;. However, you can use a maximum of 10 conjunctions in a search query.  Examples:  To return a Connector Type with the name &#x60;aws-sqs-source&#x60; and the channel &#x60;stable&#x60;, use the following syntax:  &#x60;&#x60;&#x60; name &#x3D; aws-sqs-source and channel &#x3D; stable &#x60;&#x60;&#x60;[p-]  To return a connector instance with a name that starts with &#x60;aws&#x60;, use the following syntax:  &#x60;&#x60;&#x60; name like aws%25 &#x60;&#x60;&#x60;  To return a connector type with a name containing &#x60;aws&#x60; matching any character case combination, use the following syntax:  &#x60;&#x60;&#x60; name ilike %25aws%25 &#x60;&#x60;&#x60;  If the parameter isn&#39;t provided, or if the value is empty, then all the resources that the user has permission to see are returned.  Note. If the query is invalid, an error is returned. 
 func (r ApiGetConnectorTypeLabelsRequest) Search(search string) ApiGetConnectorTypeLabelsRequest {
 	r.search = &search
 	return r
 }
 
-func (r ApiGetConnectorTypeLabelsRequest) Execute() (*ConnectorTypeLabelCountList, *http.Response, error) {
+func (r ApiGetConnectorTypeLabelsRequest) Execute() (ConnectorTypeLabelCountList, *_nethttp.Response, error) {
 	return r.ApiService.GetConnectorTypeLabelsExecute(r)
 }
 
 /*
-GetConnectorTypeLabels Returns a list of connector type labels
-
-Returns a list of connector type labels
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiGetConnectorTypeLabelsRequest
-*/
-func (a *ConnectorTypesApiService) GetConnectorTypeLabels(ctx context.Context) ApiGetConnectorTypeLabelsRequest {
+ * GetConnectorTypeLabels Returns a list of connector type labels
+ * Returns a list of connector type labels
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiGetConnectorTypeLabelsRequest
+ */
+func (a *ConnectorTypesApiService) GetConnectorTypeLabels(ctx _context.Context) ApiGetConnectorTypeLabelsRequest {
 	return ApiGetConnectorTypeLabelsRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return ConnectorTypeLabelCountList
-func (a *ConnectorTypesApiService) GetConnectorTypeLabelsExecute(r ApiGetConnectorTypeLabelsRequest) (*ConnectorTypeLabelCountList, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return ConnectorTypeLabelCountList
+ */
+func (a *ConnectorTypesApiService) GetConnectorTypeLabelsExecute(r ApiGetConnectorTypeLabelsRequest) (ConnectorTypeLabelCountList, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *ConnectorTypeLabelCountList
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  ConnectorTypeLabelCountList
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "ConnectorTypesApiService.GetConnectorTypeLabels")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/connector_mgmt/v1/kafka_connector_types/labels"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.orderBy != nil {
 		localVarQueryParams.Add("orderBy", parameterToString(*r.orderBy, ""))
@@ -298,7 +300,7 @@ func (a *ConnectorTypesApiService) GetConnectorTypeLabelsExecute(r ApiGetConnect
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -308,15 +310,15 @@ func (a *ConnectorTypesApiService) GetConnectorTypeLabelsExecute(r ApiGetConnect
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -327,8 +329,7 @@ func (a *ConnectorTypesApiService) GetConnectorTypeLabelsExecute(r ApiGetConnect
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -338,15 +339,14 @@ func (a *ConnectorTypesApiService) GetConnectorTypeLabelsExecute(r ApiGetConnect
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -357,7 +357,7 @@ func (a *ConnectorTypesApiService) GetConnectorTypeLabelsExecute(r ApiGetConnect
 }
 
 type ApiGetConnectorTypesRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService ConnectorTypesApi
 	page *string
 	size *string
@@ -365,69 +365,64 @@ type ApiGetConnectorTypesRequest struct {
 	search *string
 }
 
-// Page index
 func (r ApiGetConnectorTypesRequest) Page(page string) ApiGetConnectorTypesRequest {
 	r.page = &page
 	return r
 }
-
-// Number of items in each page
 func (r ApiGetConnectorTypesRequest) Size(size string) ApiGetConnectorTypesRequest {
 	r.size = &size
 	return r
 }
-
-// Specifies the order by criteria. The syntax of this parameter is similar to the syntax of the &#x60;order by&#x60; clause of an SQL statement. Each query can be ordered by any of the underlying resource fields supported in the search parameter. For example, to return all Connector types ordered by their name, use the following syntax:  &#x60;&#x60;&#x60;sql name asc &#x60;&#x60;&#x60;  To return all Connector types ordered by their name _and_ version, use the following syntax:  &#x60;&#x60;&#x60;sql name asc, version asc &#x60;&#x60;&#x60;  If the parameter isn&#39;t provided, or if the value is empty, then the results are ordered by name.
 func (r ApiGetConnectorTypesRequest) OrderBy(orderBy string) ApiGetConnectorTypesRequest {
 	r.orderBy = &orderBy
 	return r
 }
-
-// Search criteria.  The syntax of this parameter is similar to the syntax of the &#x60;where&#x60; clause of a SQL statement.  Allowed fields in the search depend on the resource type:  * Cluster: id, created_at, updated_at, owner, organisation_id, name, state, client_id * Namespace: id, created_at, updated_at, name, cluster_id, owner, expiration, tenant_user_id, tenant_organisation_id, state * Connector Types: id, created_at, updated_at, version, name, description, label, channel, featured_rank, pricing_tier * Connectors: id, created_at, updated_at, name, owner, organisation_id, connector_type_id, desired_state, state, channel, namespace_id, kafka_id, kafka_bootstrap_server, service_account_client_id, schema_registry_id, schema_registry_url  Allowed operators are &#x60;&lt;&gt;&#x60;, &#x60;&#x3D;&#x60;, &#x60;LIKE&#x60;, or &#x60;ILIKE&#x60;. Allowed conjunctive operators are &#x60;AND&#x60; and &#x60;OR&#x60;. However, you can use a maximum of 10 conjunctions in a search query.  Examples:  To return a Connector Type with the name &#x60;aws-sqs-source&#x60; and the channel &#x60;stable&#x60;, use the following syntax:  &#x60;&#x60;&#x60; name &#x3D; aws-sqs-source and channel &#x3D; stable &#x60;&#x60;&#x60;[p-]  To return a connector instance with a name that starts with &#x60;aws&#x60;, use the following syntax:  &#x60;&#x60;&#x60; name like aws%25 &#x60;&#x60;&#x60;  To return a connector type with a name containing &#x60;aws&#x60; matching any character case combination, use the following syntax:  &#x60;&#x60;&#x60; name ilike %25aws%25 &#x60;&#x60;&#x60;  If the parameter isn&#39;t provided, or if the value is empty, then all the resources that the user has permission to see are returned.  Note. If the query is invalid, an error is returned. 
 func (r ApiGetConnectorTypesRequest) Search(search string) ApiGetConnectorTypesRequest {
 	r.search = &search
 	return r
 }
 
-func (r ApiGetConnectorTypesRequest) Execute() (*ConnectorTypeList, *http.Response, error) {
+func (r ApiGetConnectorTypesRequest) Execute() (ConnectorTypeList, *_nethttp.Response, error) {
 	return r.ApiService.GetConnectorTypesExecute(r)
 }
 
 /*
-GetConnectorTypes Returns a list of connector types
-
-Returns a list of connector types
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiGetConnectorTypesRequest
-*/
-func (a *ConnectorTypesApiService) GetConnectorTypes(ctx context.Context) ApiGetConnectorTypesRequest {
+ * GetConnectorTypes Returns a list of connector types
+ * Returns a list of connector types
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiGetConnectorTypesRequest
+ */
+func (a *ConnectorTypesApiService) GetConnectorTypes(ctx _context.Context) ApiGetConnectorTypesRequest {
 	return ApiGetConnectorTypesRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return ConnectorTypeList
-func (a *ConnectorTypesApiService) GetConnectorTypesExecute(r ApiGetConnectorTypesRequest) (*ConnectorTypeList, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return ConnectorTypeList
+ */
+func (a *ConnectorTypesApiService) GetConnectorTypesExecute(r ApiGetConnectorTypesRequest) (ConnectorTypeList, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *ConnectorTypeList
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  ConnectorTypeList
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "ConnectorTypesApiService.GetConnectorTypes")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/connector_mgmt/v1/kafka_connector_types"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.page != nil {
 		localVarQueryParams.Add("page", parameterToString(*r.page, ""))
@@ -458,7 +453,7 @@ func (a *ConnectorTypesApiService) GetConnectorTypesExecute(r ApiGetConnectorTyp
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -468,15 +463,15 @@ func (a *ConnectorTypesApiService) GetConnectorTypesExecute(r ApiGetConnectorTyp
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -487,8 +482,7 @@ func (a *ConnectorTypesApiService) GetConnectorTypesExecute(r ApiGetConnectorTyp
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -498,15 +492,14 @@ func (a *ConnectorTypesApiService) GetConnectorTypesExecute(r ApiGetConnectorTyp
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/api_connectors.go b/app-services-sdk-go/connectormgmt/apiv1/client/api_connectors.go
index b41aa6b0..bb1f0c54 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/api_connectors.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/api_connectors.go
@@ -1,11 +1,11 @@
 /*
-Connector Management API
-
-Connector Management API is a REST API to manage connectors.
-
-API version: 0.1.0
-Contact: rhosak-support@redhat.com
-*/
+ * Connector Management API
+ *
+ * Connector Management API is a REST API to manage connectors.
+ *
+ * API version: 0.1.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -13,151 +13,154 @@ package connectormgmtclient
 
 import (
 	"bytes"
-	"context"
-	"io/ioutil"
-	"net/http"
-	"net/url"
+	_context "context"
+	_ioutil "io/ioutil"
+	_nethttp "net/http"
+	_neturl "net/url"
 	"strings"
 )
 
+// Linger please
+var (
+	_ _context.Context
+)
 
 type ConnectorsApi interface {
 
 	/*
-	CreateConnector Create a new connector
-
-	Create a new connector
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiCreateConnectorRequest
-	*/
-	CreateConnector(ctx context.Context) ApiCreateConnectorRequest
-
-	// CreateConnectorExecute executes the request
-	//  @return Connector
-	CreateConnectorExecute(r ApiCreateConnectorRequest) (*Connector, *http.Response, error)
+	 * CreateConnector Create a new connector
+	 * Create a new connector
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiCreateConnectorRequest
+	 */
+	CreateConnector(ctx _context.Context) ApiCreateConnectorRequest
 
 	/*
-	DeleteConnector Delete a connector
-
-	Delete a connector
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The ID of record
-	@return ApiDeleteConnectorRequest
-	*/
-	DeleteConnector(ctx context.Context, id string) ApiDeleteConnectorRequest
-
-	// DeleteConnectorExecute executes the request
-	//  @return Error
-	DeleteConnectorExecute(r ApiDeleteConnectorRequest) (*Error, *http.Response, error)
+	 * CreateConnectorExecute executes the request
+	 * @return Connector
+	 */
+	CreateConnectorExecute(r ApiCreateConnectorRequest) (Connector, *_nethttp.Response, error)
 
 	/*
-	GetConnector Get a connector
-
-	Get a connector
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The ID of record
-	@return ApiGetConnectorRequest
-	*/
-	GetConnector(ctx context.Context, id string) ApiGetConnectorRequest
-
-	// GetConnectorExecute executes the request
-	//  @return Connector
-	GetConnectorExecute(r ApiGetConnectorRequest) (*Connector, *http.Response, error)
+	 * DeleteConnector Delete a connector
+	 * Delete a connector
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The ID of record
+	 * @return ApiDeleteConnectorRequest
+	 */
+	DeleteConnector(ctx _context.Context, id string) ApiDeleteConnectorRequest
 
 	/*
-	ListConnectors Returns a list of connector types
-
-	Returns a list of connector types
+	 * DeleteConnectorExecute executes the request
+	 * @return Error
+	 */
+	DeleteConnectorExecute(r ApiDeleteConnectorRequest) (Error, *_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiListConnectorsRequest
-	*/
-	ListConnectors(ctx context.Context) ApiListConnectorsRequest
+	/*
+	 * GetConnector Get a connector
+	 * Get a connector
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The ID of record
+	 * @return ApiGetConnectorRequest
+	 */
+	GetConnector(ctx _context.Context, id string) ApiGetConnectorRequest
 
-	// ListConnectorsExecute executes the request
-	//  @return ConnectorList
-	ListConnectorsExecute(r ApiListConnectorsRequest) (*ConnectorList, *http.Response, error)
+	/*
+	 * GetConnectorExecute executes the request
+	 * @return Connector
+	 */
+	GetConnectorExecute(r ApiGetConnectorRequest) (Connector, *_nethttp.Response, error)
 
 	/*
-	PatchConnector Patch a connector
+	 * ListConnectors Returns a list of connector types
+	 * Returns a list of connector types
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiListConnectorsRequest
+	 */
+	ListConnectors(ctx _context.Context) ApiListConnectorsRequest
 
-	Patch a connector
+	/*
+	 * ListConnectorsExecute executes the request
+	 * @return ConnectorList
+	 */
+	ListConnectorsExecute(r ApiListConnectorsRequest) (ConnectorList, *_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The ID of record
-	@return ApiPatchConnectorRequest
-	*/
-	PatchConnector(ctx context.Context, id string) ApiPatchConnectorRequest
+	/*
+	 * PatchConnector Patch a connector
+	 * Patch a connector
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The ID of record
+	 * @return ApiPatchConnectorRequest
+	 */
+	PatchConnector(ctx _context.Context, id string) ApiPatchConnectorRequest
 
-	// PatchConnectorExecute executes the request
-	//  @return Connector
-	PatchConnectorExecute(r ApiPatchConnectorRequest) (*Connector, *http.Response, error)
+	/*
+	 * PatchConnectorExecute executes the request
+	 * @return Connector
+	 */
+	PatchConnectorExecute(r ApiPatchConnectorRequest) (Connector, *_nethttp.Response, error)
 }
 
 // ConnectorsApiService ConnectorsApi service
 type ConnectorsApiService service
 
 type ApiCreateConnectorRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService ConnectorsApi
 	async *bool
 	connectorRequest *ConnectorRequest
 }
 
-// Perform the action in an asynchronous manner
 func (r ApiCreateConnectorRequest) Async(async bool) ApiCreateConnectorRequest {
 	r.async = &async
 	return r
 }
-
-// Connector data
 func (r ApiCreateConnectorRequest) ConnectorRequest(connectorRequest ConnectorRequest) ApiCreateConnectorRequest {
 	r.connectorRequest = &connectorRequest
 	return r
 }
 
-func (r ApiCreateConnectorRequest) Execute() (*Connector, *http.Response, error) {
+func (r ApiCreateConnectorRequest) Execute() (Connector, *_nethttp.Response, error) {
 	return r.ApiService.CreateConnectorExecute(r)
 }
 
 /*
-CreateConnector Create a new connector
-
-Create a new connector
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiCreateConnectorRequest
-*/
-func (a *ConnectorsApiService) CreateConnector(ctx context.Context) ApiCreateConnectorRequest {
+ * CreateConnector Create a new connector
+ * Create a new connector
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiCreateConnectorRequest
+ */
+func (a *ConnectorsApiService) CreateConnector(ctx _context.Context) ApiCreateConnectorRequest {
 	return ApiCreateConnectorRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return Connector
-func (a *ConnectorsApiService) CreateConnectorExecute(r ApiCreateConnectorRequest) (*Connector, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return Connector
+ */
+func (a *ConnectorsApiService) CreateConnectorExecute(r ApiCreateConnectorRequest) (Connector, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *Connector
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  Connector
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "ConnectorsApiService.CreateConnector")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/connector_mgmt/v1/kafka_connectors"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.async == nil {
 		return localVarReturnValue, nil, reportError("async is required and must be specified")
 	}
@@ -185,7 +188,7 @@ func (a *ConnectorsApiService) CreateConnectorExecute(r ApiCreateConnectorReques
 	}
 	// body params
 	localVarPostBody = r.connectorRequest
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -195,15 +198,15 @@ func (a *ConnectorsApiService) CreateConnectorExecute(r ApiCreateConnectorReques
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -214,8 +217,7 @@ func (a *ConnectorsApiService) CreateConnectorExecute(r ApiCreateConnectorReques
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -225,8 +227,7 @@ func (a *ConnectorsApiService) CreateConnectorExecute(r ApiCreateConnectorReques
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -236,8 +237,7 @@ func (a *ConnectorsApiService) CreateConnectorExecute(r ApiCreateConnectorReques
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -247,15 +247,14 @@ func (a *ConnectorsApiService) CreateConnectorExecute(r ApiCreateConnectorReques
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -266,25 +265,24 @@ func (a *ConnectorsApiService) CreateConnectorExecute(r ApiCreateConnectorReques
 }
 
 type ApiDeleteConnectorRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService ConnectorsApi
 	id string
 }
 
-func (r ApiDeleteConnectorRequest) Execute() (*Error, *http.Response, error) {
+
+func (r ApiDeleteConnectorRequest) Execute() (Error, *_nethttp.Response, error) {
 	return r.ApiService.DeleteConnectorExecute(r)
 }
 
 /*
-DeleteConnector Delete a connector
-
-Delete a connector
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The ID of record
- @return ApiDeleteConnectorRequest
-*/
-func (a *ConnectorsApiService) DeleteConnector(ctx context.Context, id string) ApiDeleteConnectorRequest {
+ * DeleteConnector Delete a connector
+ * Delete a connector
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The ID of record
+ * @return ApiDeleteConnectorRequest
+ */
+func (a *ConnectorsApiService) DeleteConnector(ctx _context.Context, id string) ApiDeleteConnectorRequest {
 	return ApiDeleteConnectorRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -292,27 +290,31 @@ func (a *ConnectorsApiService) DeleteConnector(ctx context.Context, id string) A
 	}
 }
 
-// Execute executes the request
-//  @return Error
-func (a *ConnectorsApiService) DeleteConnectorExecute(r ApiDeleteConnectorRequest) (*Error, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return Error
+ */
+func (a *ConnectorsApiService) DeleteConnectorExecute(r ApiDeleteConnectorRequest) (Error, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodDelete
+		localVarHTTPMethod   = _nethttp.MethodDelete
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *Error
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  Error
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "ConnectorsApiService.DeleteConnector")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/connector_mgmt/v1/kafka_connectors/{id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -331,7 +333,7 @@ func (a *ConnectorsApiService) DeleteConnectorExecute(r ApiDeleteConnectorReques
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -341,15 +343,15 @@ func (a *ConnectorsApiService) DeleteConnectorExecute(r ApiDeleteConnectorReques
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -360,8 +362,7 @@ func (a *ConnectorsApiService) DeleteConnectorExecute(r ApiDeleteConnectorReques
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -371,8 +372,7 @@ func (a *ConnectorsApiService) DeleteConnectorExecute(r ApiDeleteConnectorReques
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -382,15 +382,14 @@ func (a *ConnectorsApiService) DeleteConnectorExecute(r ApiDeleteConnectorReques
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -401,25 +400,24 @@ func (a *ConnectorsApiService) DeleteConnectorExecute(r ApiDeleteConnectorReques
 }
 
 type ApiGetConnectorRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService ConnectorsApi
 	id string
 }
 
-func (r ApiGetConnectorRequest) Execute() (*Connector, *http.Response, error) {
+
+func (r ApiGetConnectorRequest) Execute() (Connector, *_nethttp.Response, error) {
 	return r.ApiService.GetConnectorExecute(r)
 }
 
 /*
-GetConnector Get a connector
-
-Get a connector
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The ID of record
- @return ApiGetConnectorRequest
-*/
-func (a *ConnectorsApiService) GetConnector(ctx context.Context, id string) ApiGetConnectorRequest {
+ * GetConnector Get a connector
+ * Get a connector
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The ID of record
+ * @return ApiGetConnectorRequest
+ */
+func (a *ConnectorsApiService) GetConnector(ctx _context.Context, id string) ApiGetConnectorRequest {
 	return ApiGetConnectorRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -427,27 +425,31 @@ func (a *ConnectorsApiService) GetConnector(ctx context.Context, id string) ApiG
 	}
 }
 
-// Execute executes the request
-//  @return Connector
-func (a *ConnectorsApiService) GetConnectorExecute(r ApiGetConnectorRequest) (*Connector, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return Connector
+ */
+func (a *ConnectorsApiService) GetConnectorExecute(r ApiGetConnectorRequest) (Connector, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *Connector
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  Connector
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "ConnectorsApiService.GetConnector")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/connector_mgmt/v1/kafka_connectors/{id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -466,7 +468,7 @@ func (a *ConnectorsApiService) GetConnectorExecute(r ApiGetConnectorRequest) (*C
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -476,15 +478,15 @@ func (a *ConnectorsApiService) GetConnectorExecute(r ApiGetConnectorRequest) (*C
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -495,8 +497,7 @@ func (a *ConnectorsApiService) GetConnectorExecute(r ApiGetConnectorRequest) (*C
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -506,8 +507,7 @@ func (a *ConnectorsApiService) GetConnectorExecute(r ApiGetConnectorRequest) (*C
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 410 {
@@ -517,8 +517,7 @@ func (a *ConnectorsApiService) GetConnectorExecute(r ApiGetConnectorRequest) (*C
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -528,15 +527,14 @@ func (a *ConnectorsApiService) GetConnectorExecute(r ApiGetConnectorRequest) (*C
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -547,7 +545,7 @@ func (a *ConnectorsApiService) GetConnectorExecute(r ApiGetConnectorRequest) (*C
 }
 
 type ApiListConnectorsRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService ConnectorsApi
 	page *string
 	size *string
@@ -555,69 +553,64 @@ type ApiListConnectorsRequest struct {
 	search *string
 }
 
-// Page index
 func (r ApiListConnectorsRequest) Page(page string) ApiListConnectorsRequest {
 	r.page = &page
 	return r
 }
-
-// Number of items in each page
 func (r ApiListConnectorsRequest) Size(size string) ApiListConnectorsRequest {
 	r.size = &size
 	return r
 }
-
-// Specifies the order by criteria. The syntax of this parameter is similar to the syntax of the &#x60;order by&#x60; clause of an SQL statement. Each query can be ordered by any of the underlying resource fields supported in the search parameter. For example, to return all Connector types ordered by their name, use the following syntax:  &#x60;&#x60;&#x60;sql name asc &#x60;&#x60;&#x60;  To return all Connector types ordered by their name _and_ version, use the following syntax:  &#x60;&#x60;&#x60;sql name asc, version asc &#x60;&#x60;&#x60;  If the parameter isn&#39;t provided, or if the value is empty, then the results are ordered by name.
 func (r ApiListConnectorsRequest) OrderBy(orderBy string) ApiListConnectorsRequest {
 	r.orderBy = &orderBy
 	return r
 }
-
-// Search criteria.  The syntax of this parameter is similar to the syntax of the &#x60;where&#x60; clause of a SQL statement.  Allowed fields in the search depend on the resource type:  * Cluster: id, created_at, updated_at, owner, organisation_id, name, state, client_id * Namespace: id, created_at, updated_at, name, cluster_id, owner, expiration, tenant_user_id, tenant_organisation_id, state * Connector Types: id, created_at, updated_at, version, name, description, label, channel, featured_rank, pricing_tier * Connectors: id, created_at, updated_at, name, owner, organisation_id, connector_type_id, desired_state, state, channel, namespace_id, kafka_id, kafka_bootstrap_server, service_account_client_id, schema_registry_id, schema_registry_url  Allowed operators are &#x60;&lt;&gt;&#x60;, &#x60;&#x3D;&#x60;, &#x60;LIKE&#x60;, or &#x60;ILIKE&#x60;. Allowed conjunctive operators are &#x60;AND&#x60; and &#x60;OR&#x60;. However, you can use a maximum of 10 conjunctions in a search query.  Examples:  To return a Connector Type with the name &#x60;aws-sqs-source&#x60; and the channel &#x60;stable&#x60;, use the following syntax:  &#x60;&#x60;&#x60; name &#x3D; aws-sqs-source and channel &#x3D; stable &#x60;&#x60;&#x60;[p-]  To return a connector instance with a name that starts with &#x60;aws&#x60;, use the following syntax:  &#x60;&#x60;&#x60; name like aws%25 &#x60;&#x60;&#x60;  To return a connector type with a name containing &#x60;aws&#x60; matching any character case combination, use the following syntax:  &#x60;&#x60;&#x60; name ilike %25aws%25 &#x60;&#x60;&#x60;  If the parameter isn&#39;t provided, or if the value is empty, then all the resources that the user has permission to see are returned.  Note. If the query is invalid, an error is returned. 
 func (r ApiListConnectorsRequest) Search(search string) ApiListConnectorsRequest {
 	r.search = &search
 	return r
 }
 
-func (r ApiListConnectorsRequest) Execute() (*ConnectorList, *http.Response, error) {
+func (r ApiListConnectorsRequest) Execute() (ConnectorList, *_nethttp.Response, error) {
 	return r.ApiService.ListConnectorsExecute(r)
 }
 
 /*
-ListConnectors Returns a list of connector types
-
-Returns a list of connector types
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiListConnectorsRequest
-*/
-func (a *ConnectorsApiService) ListConnectors(ctx context.Context) ApiListConnectorsRequest {
+ * ListConnectors Returns a list of connector types
+ * Returns a list of connector types
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiListConnectorsRequest
+ */
+func (a *ConnectorsApiService) ListConnectors(ctx _context.Context) ApiListConnectorsRequest {
 	return ApiListConnectorsRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return ConnectorList
-func (a *ConnectorsApiService) ListConnectorsExecute(r ApiListConnectorsRequest) (*ConnectorList, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return ConnectorList
+ */
+func (a *ConnectorsApiService) ListConnectorsExecute(r ApiListConnectorsRequest) (ConnectorList, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *ConnectorList
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  ConnectorList
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "ConnectorsApiService.ListConnectors")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/connector_mgmt/v1/kafka_connectors"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.page != nil {
 		localVarQueryParams.Add("page", parameterToString(*r.page, ""))
@@ -648,7 +641,7 @@ func (a *ConnectorsApiService) ListConnectorsExecute(r ApiListConnectorsRequest)
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -658,15 +651,15 @@ func (a *ConnectorsApiService) ListConnectorsExecute(r ApiListConnectorsRequest)
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -677,8 +670,7 @@ func (a *ConnectorsApiService) ListConnectorsExecute(r ApiListConnectorsRequest)
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -688,15 +680,14 @@ func (a *ConnectorsApiService) ListConnectorsExecute(r ApiListConnectorsRequest)
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -707,32 +698,29 @@ func (a *ConnectorsApiService) ListConnectorsExecute(r ApiListConnectorsRequest)
 }
 
 type ApiPatchConnectorRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService ConnectorsApi
 	id string
 	body *map[string]interface{}
 }
 
-// Data to patch the connector with
 func (r ApiPatchConnectorRequest) Body(body map[string]interface{}) ApiPatchConnectorRequest {
 	r.body = &body
 	return r
 }
 
-func (r ApiPatchConnectorRequest) Execute() (*Connector, *http.Response, error) {
+func (r ApiPatchConnectorRequest) Execute() (Connector, *_nethttp.Response, error) {
 	return r.ApiService.PatchConnectorExecute(r)
 }
 
 /*
-PatchConnector Patch a connector
-
-Patch a connector
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The ID of record
- @return ApiPatchConnectorRequest
-*/
-func (a *ConnectorsApiService) PatchConnector(ctx context.Context, id string) ApiPatchConnectorRequest {
+ * PatchConnector Patch a connector
+ * Patch a connector
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The ID of record
+ * @return ApiPatchConnectorRequest
+ */
+func (a *ConnectorsApiService) PatchConnector(ctx _context.Context, id string) ApiPatchConnectorRequest {
 	return ApiPatchConnectorRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -740,27 +728,31 @@ func (a *ConnectorsApiService) PatchConnector(ctx context.Context, id string) Ap
 	}
 }
 
-// Execute executes the request
-//  @return Connector
-func (a *ConnectorsApiService) PatchConnectorExecute(r ApiPatchConnectorRequest) (*Connector, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return Connector
+ */
+func (a *ConnectorsApiService) PatchConnectorExecute(r ApiPatchConnectorRequest) (Connector, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPatch
+		localVarHTTPMethod   = _nethttp.MethodPatch
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *Connector
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  Connector
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "ConnectorsApiService.PatchConnector")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/connector_mgmt/v1/kafka_connectors/{id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.body == nil {
 		return localVarReturnValue, nil, reportError("body is required and must be specified")
 	}
@@ -784,7 +776,7 @@ func (a *ConnectorsApiService) PatchConnectorExecute(r ApiPatchConnectorRequest)
 	}
 	// body params
 	localVarPostBody = r.body
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -794,15 +786,15 @@ func (a *ConnectorsApiService) PatchConnectorExecute(r ApiPatchConnectorRequest)
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -813,8 +805,7 @@ func (a *ConnectorsApiService) PatchConnectorExecute(r ApiPatchConnectorRequest)
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -824,8 +815,7 @@ func (a *ConnectorsApiService) PatchConnectorExecute(r ApiPatchConnectorRequest)
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 410 {
@@ -835,8 +825,7 @@ func (a *ConnectorsApiService) PatchConnectorExecute(r ApiPatchConnectorRequest)
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -846,15 +835,14 @@ func (a *ConnectorsApiService) PatchConnectorExecute(r ApiPatchConnectorRequest)
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/client.go b/app-services-sdk-go/connectormgmt/apiv1/client/client.go
index 8184c454..b7750eb4 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/client.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/client.go
@@ -1,11 +1,11 @@
 /*
-Connector Management API
-
-Connector Management API is a REST API to manage connectors.
-
-API version: 0.1.0
-Contact: rhosak-support@redhat.com
-*/
+ * Connector Management API
+ *
+ * Connector Management API is a REST API to manage connectors.
+ *
+ * API version: 0.1.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -117,7 +117,7 @@ func selectHeaderAccept(accepts []string) string {
 // contains is a case insensitive match, finding needle in a haystack
 func contains(haystack []string, needle string) bool {
 	for _, a := range haystack {
-		if strings.EqualFold(a, needle) {
+		if strings.ToLower(a) == strings.ToLower(needle) {
 			return true
 		}
 	}
@@ -133,7 +133,7 @@ func typeCheckParameter(obj interface{}, expected string, name string) error {
 
 	// Check the type is as expected.
 	if reflect.TypeOf(obj).String() != expected {
-		return fmt.Errorf("expected %s to be of type %s but received %s", name, expected, reflect.TypeOf(obj).String())
+		return fmt.Errorf("Expected %s to be of type %s but received %s.", name, expected, reflect.TypeOf(obj).String())
 	}
 	return nil
 }
@@ -202,12 +202,6 @@ func (c *APIClient) GetConfig() *Configuration {
 	return c.cfg
 }
 
-type formFile struct {
-		fileBytes []byte
-		fileName string
-		formFileName string
-}
-
 // prepareRequest build the request
 func (c *APIClient) prepareRequest(
 	ctx context.Context,
@@ -216,7 +210,9 @@ func (c *APIClient) prepareRequest(
 	headerParams map[string]string,
 	queryParams url.Values,
 	formParams url.Values,
-	formFiles []formFile) (localVarRequest *http.Request, err error) {
+	formFileName string,
+	fileName string,
+	fileBytes []byte) (localVarRequest *http.Request, err error) {
 
 	var body *bytes.Buffer
 
@@ -235,7 +231,7 @@ func (c *APIClient) prepareRequest(
 	}
 
 	// add form parameters and file if available.
-	if strings.HasPrefix(headerParams["Content-Type"], "multipart/form-data") && len(formParams) > 0 || (len(formFiles) > 0) {
+	if strings.HasPrefix(headerParams["Content-Type"], "multipart/form-data") && len(formParams) > 0 || (len(fileBytes) > 0 && fileName != "") {
 		if body != nil {
 			return nil, errors.New("Cannot specify postBody and multipart form at the same time.")
 		}
@@ -254,17 +250,16 @@ func (c *APIClient) prepareRequest(
 				}
 			}
 		}
-		for _, formFile := range formFiles {
-			if len(formFile.fileBytes) > 0 && formFile.fileName != "" {
-				w.Boundary()
-				part, err := w.CreateFormFile(formFile.formFileName, filepath.Base(formFile.fileName))
-				if err != nil {
-						return nil, err
-				}
-				_, err = part.Write(formFile.fileBytes)
-				if err != nil {
-						return nil, err
-				}
+		if len(fileBytes) > 0 && fileName != "" {
+			w.Boundary()
+			//_, fileNm := filepath.Split(fileName)
+			part, err := w.CreateFormFile(formFileName, filepath.Base(fileName))
+			if err != nil {
+				return nil, err
+			}
+			_, err = part.Write(fileBytes)
+			if err != nil {
+				return nil, err
 			}
 		}
 
@@ -327,7 +322,7 @@ func (c *APIClient) prepareRequest(
 	if len(headerParams) > 0 {
 		headers := http.Header{}
 		for h, v := range headerParams {
-			headers[h] = []string{v}
+			headers.Set(h, v)
 		}
 		localVarRequest.Header = headers
 	}
@@ -384,9 +379,6 @@ func (c *APIClient) decode(v interface{}, b []byte, contentType string) (err err
 			return
 		}
 		_, err = (*f).Write(b)
-		if err != nil {
-			return
-		}
 		_, err = (*f).Seek(0, io.SeekStart)
 		return
 	}
@@ -415,14 +407,11 @@ func (c *APIClient) decode(v interface{}, b []byte, contentType string) (err err
 
 // Add a file to the multipart request
 func addFile(w *multipart.Writer, fieldName, path string) error {
-	file, err := os.Open(filepath.Clean(path))
-	if err != nil {
-		return err
-	}
-	err = file.Close()
+	file, err := os.Open(path)
 	if err != nil {
 		return err
 	}
+	defer file.Close()
 
 	part, err := w.CreateFormFile(fieldName, filepath.Base(path))
 	if err != nil {
@@ -438,13 +427,6 @@ func reportError(format string, a ...interface{}) error {
 	return fmt.Errorf(format, a...)
 }
 
-// A wrapper for strict JSON decoding
-func newStrictDecoder(data []byte) *json.Decoder {
-	dec := json.NewDecoder(bytes.NewBuffer(data))
-	dec.DisallowUnknownFields()
-	return dec
-}
-
 // Set request body from an interface{}
 func setBody(body interface{}, contentType string) (bodyBuf *bytes.Buffer, err error) {
 	if bodyBuf == nil {
@@ -472,7 +454,7 @@ func setBody(body interface{}, contentType string) (bodyBuf *bytes.Buffer, err e
 	}
 
 	if bodyBuf.Len() == 0 {
-		err = fmt.Errorf("invalid body type %s\n", contentType)
+		err = fmt.Errorf("Invalid body type %s\n", contentType)
 		return nil, err
 	}
 	return bodyBuf, nil
@@ -574,23 +556,3 @@ func (e GenericOpenAPIError) Body() []byte {
 func (e GenericOpenAPIError) Model() interface{} {
 	return e.model
 }
-
-// format error message using title and detail when model implements rfc7807
-func formatErrorMessage(status string, v interface{}) string {
-
-    str := ""
-    metaValue := reflect.ValueOf(v).Elem()
-
-    field := metaValue.FieldByName("Title")
-    if field != (reflect.Value{}) {
-        str = fmt.Sprintf("%s", field.Interface())
-    }
-
-    field = metaValue.FieldByName("Detail")
-    if field != (reflect.Value{}) {
-        str = fmt.Sprintf("%s (%s)", str, field.Interface())
-    }
-
-    // status title (detail)
-    return fmt.Sprintf("%s %s", status, str)
-}
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/configuration.go b/app-services-sdk-go/connectormgmt/apiv1/client/configuration.go
index 28cfbe8b..d73d0b77 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/configuration.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/configuration.go
@@ -1,11 +1,11 @@
 /*
-Connector Management API
-
-Connector Management API is a REST API to manage connectors.
-
-API version: 0.1.0
-Contact: rhosak-support@redhat.com
-*/
+ * Connector Management API
+ *
+ * Connector Management API is a REST API to manage connectors.
+ *
+ * API version: 0.1.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -136,7 +136,7 @@ func (c *Configuration) AddDefaultHeader(key string, value string) {
 // URL formats template on a index using given variables
 func (sc ServerConfigurations) URL(index int, variables map[string]string) (string, error) {
 	if index < 0 || len(sc) <= index {
-		return "", fmt.Errorf("index %v out of range %v", index, len(sc)-1)
+		return "", fmt.Errorf("Index %v out of range %v", index, len(sc)-1)
 	}
 	server := sc[index]
 	url := server.URL
@@ -151,7 +151,7 @@ func (sc ServerConfigurations) URL(index int, variables map[string]string) (stri
 				}
 			}
 			if !found {
-				return "", fmt.Errorf("the variable %s in the server URL has invalid value %v. Must be %v", name, value, variable.EnumValues)
+				return "", fmt.Errorf("The variable %s in the server URL has invalid value %v. Must be %v", name, value, variable.EnumValues)
 			}
 			url = strings.Replace(url, "{"+name+"}", value, -1)
 		} else {
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/docs/ConnectorClustersApi.md b/app-services-sdk-go/connectormgmt/apiv1/client/docs/ConnectorClustersApi.md
index 8427d90b..d41d4639 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/docs/ConnectorClustersApi.md
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/docs/ConnectorClustersApi.md
@@ -39,8 +39,8 @@ func main() {
     connectorClusterRequest := *openapiclient.NewConnectorClusterRequest() // ConnectorClusterRequest | Connector cluster data
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.ConnectorClustersApi.CreateConnectorCluster(context.Background()).Async(async).ConnectorClusterRequest(connectorClusterRequest).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.ConnectorClustersApi.CreateConnectorCluster(context.Background()).Async(async).ConnectorClusterRequest(connectorClusterRequest).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `ConnectorClustersApi.CreateConnectorCluster``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -106,8 +106,8 @@ func main() {
     connectorClusterId := "connectorClusterId_example" // string | The id of the connector cluster
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.ConnectorClustersApi.DeleteConnectorCluster(context.Background(), connectorClusterId).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.ConnectorClustersApi.DeleteConnectorCluster(context.Background(), connectorClusterId).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `ConnectorClustersApi.DeleteConnectorCluster``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -176,8 +176,8 @@ func main() {
     connectorClusterId := "connectorClusterId_example" // string | The id of the connector cluster
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.ConnectorClustersApi.GetConnectorCluster(context.Background(), connectorClusterId).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.ConnectorClustersApi.GetConnectorCluster(context.Background(), connectorClusterId).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `ConnectorClustersApi.GetConnectorCluster``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -247,8 +247,8 @@ func main() {
     resetCredentials := true // bool | Resets cluster service account credentials when true (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.ConnectorClustersApi.GetConnectorClusterAddonParameters(context.Background(), connectorClusterId).ResetCredentials(resetCredentials).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.ConnectorClustersApi.GetConnectorClusterAddonParameters(context.Background(), connectorClusterId).ResetCredentials(resetCredentials).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `ConnectorClustersApi.GetConnectorClusterAddonParameters``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -322,8 +322,8 @@ func main() {
     search := "name = aws-sqs-source and channel = stable" // string | Search criteria.  The syntax of this parameter is similar to the syntax of the `where` clause of a SQL statement.  Allowed fields in the search depend on the resource type:  * Cluster: id, created_at, updated_at, owner, organisation_id, name, state, client_id * Namespace: id, created_at, updated_at, name, cluster_id, owner, expiration, tenant_user_id, tenant_organisation_id, state * Connector Types: id, created_at, updated_at, version, name, description, label, channel, featured_rank, pricing_tier * Connectors: id, created_at, updated_at, name, owner, organisation_id, connector_type_id, desired_state, state, channel, namespace_id, kafka_id, kafka_bootstrap_server, service_account_client_id, schema_registry_id, schema_registry_url  Allowed operators are `<>`, `=`, `LIKE`, or `ILIKE`. Allowed conjunctive operators are `AND` and `OR`. However, you can use a maximum of 10 conjunctions in a search query.  Examples:  To return a Connector Type with the name `aws-sqs-source` and the channel `stable`, use the following syntax:  ``` name = aws-sqs-source and channel = stable ```[p-]  To return a connector instance with a name that starts with `aws`, use the following syntax:  ``` name like aws%25 ```  To return a connector type with a name containing `aws` matching any character case combination, use the following syntax:  ``` name ilike %25aws%25 ```  If the parameter isn't provided, or if the value is empty, then all the resources that the user has permission to see are returned.  Note. If the query is invalid, an error is returned.  (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.ConnectorClustersApi.GetConnectorClusterNamespaces(context.Background(), connectorClusterId).Page(page).Size(size).OrderBy(orderBy).Search(search).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.ConnectorClustersApi.GetConnectorClusterNamespaces(context.Background(), connectorClusterId).Page(page).Size(size).OrderBy(orderBy).Search(search).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `ConnectorClustersApi.GetConnectorClusterNamespaces``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -399,8 +399,8 @@ func main() {
     search := "name = aws-sqs-source and channel = stable" // string | Search criteria.  The syntax of this parameter is similar to the syntax of the `where` clause of a SQL statement.  Allowed fields in the search depend on the resource type:  * Cluster: id, created_at, updated_at, owner, organisation_id, name, state, client_id * Namespace: id, created_at, updated_at, name, cluster_id, owner, expiration, tenant_user_id, tenant_organisation_id, state * Connector Types: id, created_at, updated_at, version, name, description, label, channel, featured_rank, pricing_tier * Connectors: id, created_at, updated_at, name, owner, organisation_id, connector_type_id, desired_state, state, channel, namespace_id, kafka_id, kafka_bootstrap_server, service_account_client_id, schema_registry_id, schema_registry_url  Allowed operators are `<>`, `=`, `LIKE`, or `ILIKE`. Allowed conjunctive operators are `AND` and `OR`. However, you can use a maximum of 10 conjunctions in a search query.  Examples:  To return a Connector Type with the name `aws-sqs-source` and the channel `stable`, use the following syntax:  ``` name = aws-sqs-source and channel = stable ```[p-]  To return a connector instance with a name that starts with `aws`, use the following syntax:  ``` name like aws%25 ```  To return a connector type with a name containing `aws` matching any character case combination, use the following syntax:  ``` name ilike %25aws%25 ```  If the parameter isn't provided, or if the value is empty, then all the resources that the user has permission to see are returned.  Note. If the query is invalid, an error is returned.  (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.ConnectorClustersApi.ListConnectorClusters(context.Background()).Page(page).Size(size).OrderBy(orderBy).Search(search).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.ConnectorClustersApi.ListConnectorClusters(context.Background()).Page(page).Size(size).OrderBy(orderBy).Search(search).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `ConnectorClustersApi.ListConnectorClusters``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -469,8 +469,8 @@ func main() {
     connectorClusterRequest := *openapiclient.NewConnectorClusterRequest() // ConnectorClusterRequest | Data to updated connector with
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.ConnectorClustersApi.UpdateConnectorClusterById(context.Background(), connectorClusterId).ConnectorClusterRequest(connectorClusterRequest).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.ConnectorClustersApi.UpdateConnectorClusterById(context.Background(), connectorClusterId).ConnectorClusterRequest(connectorClusterRequest).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `ConnectorClustersApi.UpdateConnectorClusterById``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/docs/ConnectorNamespacesApi.md b/app-services-sdk-go/connectormgmt/apiv1/client/docs/ConnectorNamespacesApi.md
index 457fec04..fc52b185 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/docs/ConnectorNamespacesApi.md
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/docs/ConnectorNamespacesApi.md
@@ -34,8 +34,8 @@ func main() {
     connectorNamespaceEvalRequest := *openapiclient.NewConnectorNamespaceEvalRequest() // ConnectorNamespaceEvalRequest | Connector namespace data
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.ConnectorNamespacesApi.CreateEvaluationNamespace(context.Background()).ConnectorNamespaceEvalRequest(connectorNamespaceEvalRequest).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.ConnectorNamespacesApi.CreateEvaluationNamespace(context.Background()).ConnectorNamespaceEvalRequest(connectorNamespaceEvalRequest).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `ConnectorNamespacesApi.CreateEvaluationNamespace``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -100,8 +100,8 @@ func main() {
     connectorNamespaceId := "connectorNamespaceId_example" // string | The id of the connector namespace
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.ConnectorNamespacesApi.GetConnectorNamespace(context.Background(), connectorNamespaceId).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.ConnectorNamespacesApi.GetConnectorNamespace(context.Background(), connectorNamespaceId).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `ConnectorNamespacesApi.GetConnectorNamespace``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -173,8 +173,8 @@ func main() {
     search := "name = aws-sqs-source and channel = stable" // string | Search criteria.  The syntax of this parameter is similar to the syntax of the `where` clause of a SQL statement.  Allowed fields in the search depend on the resource type:  * Cluster: id, created_at, updated_at, owner, organisation_id, name, state, client_id * Namespace: id, created_at, updated_at, name, cluster_id, owner, expiration, tenant_user_id, tenant_organisation_id, state * Connector Types: id, created_at, updated_at, version, name, description, label, channel, featured_rank, pricing_tier * Connectors: id, created_at, updated_at, name, owner, organisation_id, connector_type_id, desired_state, state, channel, namespace_id, kafka_id, kafka_bootstrap_server, service_account_client_id, schema_registry_id, schema_registry_url  Allowed operators are `<>`, `=`, `LIKE`, or `ILIKE`. Allowed conjunctive operators are `AND` and `OR`. However, you can use a maximum of 10 conjunctions in a search query.  Examples:  To return a Connector Type with the name `aws-sqs-source` and the channel `stable`, use the following syntax:  ``` name = aws-sqs-source and channel = stable ```[p-]  To return a connector instance with a name that starts with `aws`, use the following syntax:  ``` name like aws%25 ```  To return a connector type with a name containing `aws` matching any character case combination, use the following syntax:  ``` name ilike %25aws%25 ```  If the parameter isn't provided, or if the value is empty, then all the resources that the user has permission to see are returned.  Note. If the query is invalid, an error is returned.  (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.ConnectorNamespacesApi.ListConnectorNamespaces(context.Background()).Page(page).Size(size).OrderBy(orderBy).Search(search).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.ConnectorNamespacesApi.ListConnectorNamespaces(context.Background()).Page(page).Size(size).OrderBy(orderBy).Search(search).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `ConnectorNamespacesApi.ListConnectorNamespaces``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/docs/ConnectorServiceApi.md b/app-services-sdk-go/connectormgmt/apiv1/client/docs/ConnectorServiceApi.md
index 49649776..df6f2d88 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/docs/ConnectorServiceApi.md
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/docs/ConnectorServiceApi.md
@@ -31,8 +31,8 @@ import (
 func main() {
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.ConnectorServiceApi.GetVersionMetadata(context.Background()).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.ConnectorServiceApi.GetVersionMetadata(context.Background()).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `ConnectorServiceApi.GetVersionMetadata``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/docs/ConnectorTypesApi.md b/app-services-sdk-go/connectormgmt/apiv1/client/docs/ConnectorTypesApi.md
index fdf91011..bad109e1 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/docs/ConnectorTypesApi.md
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/docs/ConnectorTypesApi.md
@@ -34,8 +34,8 @@ func main() {
     connectorTypeId := "connectorTypeId_example" // string | The id of the connector type
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.ConnectorTypesApi.GetConnectorTypeByID(context.Background(), connectorTypeId).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.ConnectorTypesApi.GetConnectorTypeByID(context.Background(), connectorTypeId).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `ConnectorTypesApi.GetConnectorTypeByID``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -105,8 +105,8 @@ func main() {
     search := "name = aws-sqs-source and channel = stable" // string | Search criteria.  The syntax of this parameter is similar to the syntax of the `where` clause of a SQL statement.  Allowed fields in the search depend on the resource type:  * Cluster: id, created_at, updated_at, owner, organisation_id, name, state, client_id * Namespace: id, created_at, updated_at, name, cluster_id, owner, expiration, tenant_user_id, tenant_organisation_id, state * Connector Types: id, created_at, updated_at, version, name, description, label, channel, featured_rank, pricing_tier * Connectors: id, created_at, updated_at, name, owner, organisation_id, connector_type_id, desired_state, state, channel, namespace_id, kafka_id, kafka_bootstrap_server, service_account_client_id, schema_registry_id, schema_registry_url  Allowed operators are `<>`, `=`, `LIKE`, or `ILIKE`. Allowed conjunctive operators are `AND` and `OR`. However, you can use a maximum of 10 conjunctions in a search query.  Examples:  To return a Connector Type with the name `aws-sqs-source` and the channel `stable`, use the following syntax:  ``` name = aws-sqs-source and channel = stable ```[p-]  To return a connector instance with a name that starts with `aws`, use the following syntax:  ``` name like aws%25 ```  To return a connector type with a name containing `aws` matching any character case combination, use the following syntax:  ``` name ilike %25aws%25 ```  If the parameter isn't provided, or if the value is empty, then all the resources that the user has permission to see are returned.  Note. If the query is invalid, an error is returned.  (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.ConnectorTypesApi.GetConnectorTypeLabels(context.Background()).OrderBy(orderBy).Search(search).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.ConnectorTypesApi.GetConnectorTypeLabels(context.Background()).OrderBy(orderBy).Search(search).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `ConnectorTypesApi.GetConnectorTypeLabels``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -175,8 +175,8 @@ func main() {
     search := "name = aws-sqs-source and channel = stable" // string | Search criteria.  The syntax of this parameter is similar to the syntax of the `where` clause of a SQL statement.  Allowed fields in the search depend on the resource type:  * Cluster: id, created_at, updated_at, owner, organisation_id, name, state, client_id * Namespace: id, created_at, updated_at, name, cluster_id, owner, expiration, tenant_user_id, tenant_organisation_id, state * Connector Types: id, created_at, updated_at, version, name, description, label, channel, featured_rank, pricing_tier * Connectors: id, created_at, updated_at, name, owner, organisation_id, connector_type_id, desired_state, state, channel, namespace_id, kafka_id, kafka_bootstrap_server, service_account_client_id, schema_registry_id, schema_registry_url  Allowed operators are `<>`, `=`, `LIKE`, or `ILIKE`. Allowed conjunctive operators are `AND` and `OR`. However, you can use a maximum of 10 conjunctions in a search query.  Examples:  To return a Connector Type with the name `aws-sqs-source` and the channel `stable`, use the following syntax:  ``` name = aws-sqs-source and channel = stable ```[p-]  To return a connector instance with a name that starts with `aws`, use the following syntax:  ``` name like aws%25 ```  To return a connector type with a name containing `aws` matching any character case combination, use the following syntax:  ``` name ilike %25aws%25 ```  If the parameter isn't provided, or if the value is empty, then all the resources that the user has permission to see are returned.  Note. If the query is invalid, an error is returned.  (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.ConnectorTypesApi.GetConnectorTypes(context.Background()).Page(page).Size(size).OrderBy(orderBy).Search(search).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.ConnectorTypesApi.GetConnectorTypes(context.Background()).Page(page).Size(size).OrderBy(orderBy).Search(search).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `ConnectorTypesApi.GetConnectorTypes``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/docs/ConnectorsApi.md b/app-services-sdk-go/connectormgmt/apiv1/client/docs/ConnectorsApi.md
index d16d3251..6b801194 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/docs/ConnectorsApi.md
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/docs/ConnectorsApi.md
@@ -37,8 +37,8 @@ func main() {
     connectorRequest := *openapiclient.NewConnectorRequest("Name_example", "ConnectorTypeId_example", "NamespaceId_example", openapiclient.ConnectorDesiredState("unassigned"), *openapiclient.NewKafkaConnectionSettings("Id_example", "Url_example"), *openapiclient.NewServiceAccount("ClientId_example", "ClientSecret_example"), map[string]interface{}(123)) // ConnectorRequest | Connector data
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.ConnectorsApi.CreateConnector(context.Background()).Async(async).ConnectorRequest(connectorRequest).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.ConnectorsApi.CreateConnector(context.Background()).Async(async).ConnectorRequest(connectorRequest).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `ConnectorsApi.CreateConnector``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -104,8 +104,8 @@ func main() {
     id := "id_example" // string | The ID of record
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.ConnectorsApi.DeleteConnector(context.Background(), id).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.ConnectorsApi.DeleteConnector(context.Background(), id).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `ConnectorsApi.DeleteConnector``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -174,8 +174,8 @@ func main() {
     id := "id_example" // string | The ID of record
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.ConnectorsApi.GetConnector(context.Background(), id).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.ConnectorsApi.GetConnector(context.Background(), id).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `ConnectorsApi.GetConnector``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -247,8 +247,8 @@ func main() {
     search := "name = aws-sqs-source and channel = stable" // string | Search criteria.  The syntax of this parameter is similar to the syntax of the `where` clause of a SQL statement.  Allowed fields in the search depend on the resource type:  * Cluster: id, created_at, updated_at, owner, organisation_id, name, state, client_id * Namespace: id, created_at, updated_at, name, cluster_id, owner, expiration, tenant_user_id, tenant_organisation_id, state * Connector Types: id, created_at, updated_at, version, name, description, label, channel, featured_rank, pricing_tier * Connectors: id, created_at, updated_at, name, owner, organisation_id, connector_type_id, desired_state, state, channel, namespace_id, kafka_id, kafka_bootstrap_server, service_account_client_id, schema_registry_id, schema_registry_url  Allowed operators are `<>`, `=`, `LIKE`, or `ILIKE`. Allowed conjunctive operators are `AND` and `OR`. However, you can use a maximum of 10 conjunctions in a search query.  Examples:  To return a Connector Type with the name `aws-sqs-source` and the channel `stable`, use the following syntax:  ``` name = aws-sqs-source and channel = stable ```[p-]  To return a connector instance with a name that starts with `aws`, use the following syntax:  ``` name like aws%25 ```  To return a connector type with a name containing `aws` matching any character case combination, use the following syntax:  ``` name ilike %25aws%25 ```  If the parameter isn't provided, or if the value is empty, then all the resources that the user has permission to see are returned.  Note. If the query is invalid, an error is returned.  (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.ConnectorsApi.ListConnectors(context.Background()).Page(page).Size(size).OrderBy(orderBy).Search(search).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.ConnectorsApi.ListConnectors(context.Background()).Page(page).Size(size).OrderBy(orderBy).Search(search).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `ConnectorsApi.ListConnectors``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -314,11 +314,11 @@ import (
 
 func main() {
     id := "id_example" // string | The ID of record
-    body := map[string]interface{}{ ... } // map[string]interface{} | Data to patch the connector with
+    body := map[string]interface{}(Object) // map[string]interface{} | Data to patch the connector with
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.ConnectorsApi.PatchConnector(context.Background(), id).Body(body).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.ConnectorsApi.PatchConnector(context.Background(), id).Body(body).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `ConnectorsApi.PatchConnector``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/go.mod b/app-services-sdk-go/connectormgmt/apiv1/client/go.mod
deleted file mode 100644
index ead32606..00000000
--- a/app-services-sdk-go/connectormgmt/apiv1/client/go.mod
+++ /dev/null
@@ -1,7 +0,0 @@
-module github.com/GIT_USER_ID/GIT_REPO_ID
-
-go 1.13
-
-require (
-	golang.org/x/oauth2 v0.0.0-20210323180902-22b0adad7558
-)
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/go.sum b/app-services-sdk-go/connectormgmt/apiv1/client/go.sum
deleted file mode 100644
index 734252e6..00000000
--- a/app-services-sdk-go/connectormgmt/apiv1/client/go.sum
+++ /dev/null
@@ -1,13 +0,0 @@
-cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
-github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e h1:bRhVy7zSSasaqNksaRZiA5EEI+Ei4I1nO5Jh72wfHlg=
-golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 h1:SVwTIAaPC2U/AvvLNZ2a7OVsmBpC8L5BlwK1whH3hm0=
-golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 h1:YUO/7uOKsKeq9UokNS62b8FYywz3ker1l1vDZRCRefw=
-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508=
-google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/model_addon_parameter.go b/app-services-sdk-go/connectormgmt/apiv1/client/model_addon_parameter.go
index e269fe69..2ef7e282 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/model_addon_parameter.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/model_addon_parameter.go
@@ -1,11 +1,11 @@
 /*
-Connector Management API
-
-Connector Management API is a REST API to manage connectors.
-
-API version: 0.1.0
-Contact: rhosak-support@redhat.com
-*/
+ * Connector Management API
+ *
+ * Connector Management API is a REST API to manage connectors.
+ *
+ * API version: 0.1.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -40,7 +40,7 @@ func NewAddonParameterWithDefaults() *AddonParameter {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *AddonParameter) GetId() string {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret string
 		return ret
 	}
@@ -50,15 +50,15 @@ func (o *AddonParameter) GetId() string {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AddonParameter) GetIdOk() (*string, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *AddonParameter) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -72,7 +72,7 @@ func (o *AddonParameter) SetId(v string) {
 
 // GetValue returns the Value field value if set, zero value otherwise.
 func (o *AddonParameter) GetValue() string {
-	if o == nil || isNil(o.Value) {
+	if o == nil || o.Value == nil {
 		var ret string
 		return ret
 	}
@@ -82,15 +82,15 @@ func (o *AddonParameter) GetValue() string {
 // GetValueOk returns a tuple with the Value field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AddonParameter) GetValueOk() (*string, bool) {
-	if o == nil || isNil(o.Value) {
-    return nil, false
+	if o == nil || o.Value == nil {
+		return nil, false
 	}
 	return o.Value, true
 }
 
 // HasValue returns a boolean if a field has been set.
 func (o *AddonParameter) HasValue() bool {
-	if o != nil && !isNil(o.Value) {
+	if o != nil && o.Value != nil {
 		return true
 	}
 
@@ -104,10 +104,10 @@ func (o *AddonParameter) SetValue(v string) {
 
 func (o AddonParameter) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.Value) {
+	if o.Value != nil {
 		toSerialize["value"] = o.Value
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/model_channel.go b/app-services-sdk-go/connectormgmt/apiv1/client/model_channel.go
index 14474165..b9fac509 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/model_channel.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/model_channel.go
@@ -1,11 +1,11 @@
 /*
-Connector Management API
-
-Connector Management API is a REST API to manage connectors.
-
-API version: 0.1.0
-Contact: rhosak-support@redhat.com
-*/
+ * Connector Management API
+ *
+ * Connector Management API is a REST API to manage connectors.
+ *
+ * API version: 0.1.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -24,8 +24,7 @@ const (
 	CHANNEL_STABLE Channel = "stable"
 )
 
-// All allowed values of Channel enum
-var AllowedChannelEnumValues = []Channel{
+var allowedChannelEnumValues = []Channel{
 	"stable",
 }
 
@@ -36,7 +35,7 @@ func (v *Channel) UnmarshalJSON(src []byte) error {
 		return err
 	}
 	enumTypeValue := Channel(value)
-	for _, existing := range AllowedChannelEnumValues {
+	for _, existing := range allowedChannelEnumValues {
 		if existing == enumTypeValue {
 			*v = enumTypeValue
 			return nil
@@ -53,13 +52,13 @@ func NewChannelFromValue(v string) (*Channel, error) {
 	if ev.IsValid() {
 		return &ev, nil
 	} else {
-		return nil, fmt.Errorf("invalid value '%v' for Channel: valid values are %v", v, AllowedChannelEnumValues)
+		return nil, fmt.Errorf("invalid value '%v' for Channel: valid values are %v", v, allowedChannelEnumValues)
 	}
 }
 
 // IsValid return true if the value is valid for the enum, false otherwise
 func (v Channel) IsValid() bool {
-	for _, existing := range AllowedChannelEnumValues {
+	for _, existing := range allowedChannelEnumValues {
 		if existing == v {
 			return true
 		}
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector.go b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector.go
index ea6ce62d..93f9ba7f 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector.go
@@ -1,11 +1,11 @@
 /*
-Connector Management API
-
-Connector Management API is a REST API to manage connectors.
-
-API version: 0.1.0
-Contact: rhosak-support@redhat.com
-*/
+ * Connector Management API
+ *
+ * Connector Management API is a REST API to manage connectors.
+ *
+ * API version: 0.1.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -13,6 +13,7 @@ package connectormgmtclient
 
 import (
 	"encoding/json"
+	"time"
 )
 
 // Connector struct for Connector
@@ -68,7 +69,7 @@ func NewConnectorWithDefaults() *Connector {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *Connector) GetId() string {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret string
 		return ret
 	}
@@ -78,15 +79,15 @@ func (o *Connector) GetId() string {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Connector) GetIdOk() (*string, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *Connector) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -100,7 +101,7 @@ func (o *Connector) SetId(v string) {
 
 // GetKind returns the Kind field value if set, zero value otherwise.
 func (o *Connector) GetKind() string {
-	if o == nil || isNil(o.Kind) {
+	if o == nil || o.Kind == nil {
 		var ret string
 		return ret
 	}
@@ -110,15 +111,15 @@ func (o *Connector) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Connector) GetKindOk() (*string, bool) {
-	if o == nil || isNil(o.Kind) {
-    return nil, false
+	if o == nil || o.Kind == nil {
+		return nil, false
 	}
 	return o.Kind, true
 }
 
 // HasKind returns a boolean if a field has been set.
 func (o *Connector) HasKind() bool {
-	if o != nil && !isNil(o.Kind) {
+	if o != nil && o.Kind != nil {
 		return true
 	}
 
@@ -132,7 +133,7 @@ func (o *Connector) SetKind(v string) {
 
 // GetHref returns the Href field value if set, zero value otherwise.
 func (o *Connector) GetHref() string {
-	if o == nil || isNil(o.Href) {
+	if o == nil || o.Href == nil {
 		var ret string
 		return ret
 	}
@@ -142,15 +143,15 @@ func (o *Connector) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Connector) GetHrefOk() (*string, bool) {
-	if o == nil || isNil(o.Href) {
-    return nil, false
+	if o == nil || o.Href == nil {
+		return nil, false
 	}
 	return o.Href, true
 }
 
 // HasHref returns a boolean if a field has been set.
 func (o *Connector) HasHref() bool {
-	if o != nil && !isNil(o.Href) {
+	if o != nil && o.Href != nil {
 		return true
 	}
 
@@ -164,7 +165,7 @@ func (o *Connector) SetHref(v string) {
 
 // GetOwner returns the Owner field value if set, zero value otherwise.
 func (o *Connector) GetOwner() string {
-	if o == nil || isNil(o.Owner) {
+	if o == nil || o.Owner == nil {
 		var ret string
 		return ret
 	}
@@ -174,15 +175,15 @@ func (o *Connector) GetOwner() string {
 // GetOwnerOk returns a tuple with the Owner field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Connector) GetOwnerOk() (*string, bool) {
-	if o == nil || isNil(o.Owner) {
-    return nil, false
+	if o == nil || o.Owner == nil {
+		return nil, false
 	}
 	return o.Owner, true
 }
 
 // HasOwner returns a boolean if a field has been set.
 func (o *Connector) HasOwner() bool {
-	if o != nil && !isNil(o.Owner) {
+	if o != nil && o.Owner != nil {
 		return true
 	}
 
@@ -196,7 +197,7 @@ func (o *Connector) SetOwner(v string) {
 
 // GetCreatedAt returns the CreatedAt field value if set, zero value otherwise.
 func (o *Connector) GetCreatedAt() time.Time {
-	if o == nil || isNil(o.CreatedAt) {
+	if o == nil || o.CreatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -206,15 +207,15 @@ func (o *Connector) GetCreatedAt() time.Time {
 // GetCreatedAtOk returns a tuple with the CreatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Connector) GetCreatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.CreatedAt) {
-    return nil, false
+	if o == nil || o.CreatedAt == nil {
+		return nil, false
 	}
 	return o.CreatedAt, true
 }
 
 // HasCreatedAt returns a boolean if a field has been set.
 func (o *Connector) HasCreatedAt() bool {
-	if o != nil && !isNil(o.CreatedAt) {
+	if o != nil && o.CreatedAt != nil {
 		return true
 	}
 
@@ -228,7 +229,7 @@ func (o *Connector) SetCreatedAt(v time.Time) {
 
 // GetModifiedAt returns the ModifiedAt field value if set, zero value otherwise.
 func (o *Connector) GetModifiedAt() time.Time {
-	if o == nil || isNil(o.ModifiedAt) {
+	if o == nil || o.ModifiedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -238,15 +239,15 @@ func (o *Connector) GetModifiedAt() time.Time {
 // GetModifiedAtOk returns a tuple with the ModifiedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Connector) GetModifiedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.ModifiedAt) {
-    return nil, false
+	if o == nil || o.ModifiedAt == nil {
+		return nil, false
 	}
 	return o.ModifiedAt, true
 }
 
 // HasModifiedAt returns a boolean if a field has been set.
 func (o *Connector) HasModifiedAt() bool {
-	if o != nil && !isNil(o.ModifiedAt) {
+	if o != nil && o.ModifiedAt != nil {
 		return true
 	}
 
@@ -271,8 +272,8 @@ func (o *Connector) GetName() string {
 // GetNameOk returns a tuple with the Name field value
 // and a boolean to check if the value has been set.
 func (o *Connector) GetNameOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Name, true
 }
@@ -295,8 +296,8 @@ func (o *Connector) GetConnectorTypeId() string {
 // GetConnectorTypeIdOk returns a tuple with the ConnectorTypeId field value
 // and a boolean to check if the value has been set.
 func (o *Connector) GetConnectorTypeIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.ConnectorTypeId, true
 }
@@ -319,8 +320,8 @@ func (o *Connector) GetNamespaceId() string {
 // GetNamespaceIdOk returns a tuple with the NamespaceId field value
 // and a boolean to check if the value has been set.
 func (o *Connector) GetNamespaceIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.NamespaceId, true
 }
@@ -332,7 +333,7 @@ func (o *Connector) SetNamespaceId(v string) {
 
 // GetChannel returns the Channel field value if set, zero value otherwise.
 func (o *Connector) GetChannel() Channel {
-	if o == nil || isNil(o.Channel) {
+	if o == nil || o.Channel == nil {
 		var ret Channel
 		return ret
 	}
@@ -342,15 +343,15 @@ func (o *Connector) GetChannel() Channel {
 // GetChannelOk returns a tuple with the Channel field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Connector) GetChannelOk() (*Channel, bool) {
-	if o == nil || isNil(o.Channel) {
-    return nil, false
+	if o == nil || o.Channel == nil {
+		return nil, false
 	}
 	return o.Channel, true
 }
 
 // HasChannel returns a boolean if a field has been set.
 func (o *Connector) HasChannel() bool {
-	if o != nil && !isNil(o.Channel) {
+	if o != nil && o.Channel != nil {
 		return true
 	}
 
@@ -375,8 +376,8 @@ func (o *Connector) GetDesiredState() ConnectorDesiredState {
 // GetDesiredStateOk returns a tuple with the DesiredState field value
 // and a boolean to check if the value has been set.
 func (o *Connector) GetDesiredStateOk() (*ConnectorDesiredState, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.DesiredState, true
 }
@@ -388,7 +389,7 @@ func (o *Connector) SetDesiredState(v ConnectorDesiredState) {
 
 // GetAnnotations returns the Annotations field value if set, zero value otherwise.
 func (o *Connector) GetAnnotations() map[string]string {
-	if o == nil || isNil(o.Annotations) {
+	if o == nil || o.Annotations == nil {
 		var ret map[string]string
 		return ret
 	}
@@ -398,15 +399,15 @@ func (o *Connector) GetAnnotations() map[string]string {
 // GetAnnotationsOk returns a tuple with the Annotations field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Connector) GetAnnotationsOk() (*map[string]string, bool) {
-	if o == nil || isNil(o.Annotations) {
-    return nil, false
+	if o == nil || o.Annotations == nil {
+		return nil, false
 	}
 	return o.Annotations, true
 }
 
 // HasAnnotations returns a boolean if a field has been set.
 func (o *Connector) HasAnnotations() bool {
-	if o != nil && !isNil(o.Annotations) {
+	if o != nil && o.Annotations != nil {
 		return true
 	}
 
@@ -420,7 +421,7 @@ func (o *Connector) SetAnnotations(v map[string]string) {
 
 // GetResourceVersion returns the ResourceVersion field value if set, zero value otherwise.
 func (o *Connector) GetResourceVersion() int64 {
-	if o == nil || isNil(o.ResourceVersion) {
+	if o == nil || o.ResourceVersion == nil {
 		var ret int64
 		return ret
 	}
@@ -430,15 +431,15 @@ func (o *Connector) GetResourceVersion() int64 {
 // GetResourceVersionOk returns a tuple with the ResourceVersion field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Connector) GetResourceVersionOk() (*int64, bool) {
-	if o == nil || isNil(o.ResourceVersion) {
-    return nil, false
+	if o == nil || o.ResourceVersion == nil {
+		return nil, false
 	}
 	return o.ResourceVersion, true
 }
 
 // HasResourceVersion returns a boolean if a field has been set.
 func (o *Connector) HasResourceVersion() bool {
-	if o != nil && !isNil(o.ResourceVersion) {
+	if o != nil && o.ResourceVersion != nil {
 		return true
 	}
 
@@ -463,8 +464,8 @@ func (o *Connector) GetKafka() KafkaConnectionSettings {
 // GetKafkaOk returns a tuple with the Kafka field value
 // and a boolean to check if the value has been set.
 func (o *Connector) GetKafkaOk() (*KafkaConnectionSettings, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kafka, true
 }
@@ -487,8 +488,8 @@ func (o *Connector) GetServiceAccount() ServiceAccount {
 // GetServiceAccountOk returns a tuple with the ServiceAccount field value
 // and a boolean to check if the value has been set.
 func (o *Connector) GetServiceAccountOk() (*ServiceAccount, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.ServiceAccount, true
 }
@@ -500,7 +501,7 @@ func (o *Connector) SetServiceAccount(v ServiceAccount) {
 
 // GetSchemaRegistry returns the SchemaRegistry field value if set, zero value otherwise.
 func (o *Connector) GetSchemaRegistry() SchemaRegistryConnectionSettings {
-	if o == nil || isNil(o.SchemaRegistry) {
+	if o == nil || o.SchemaRegistry == nil {
 		var ret SchemaRegistryConnectionSettings
 		return ret
 	}
@@ -510,15 +511,15 @@ func (o *Connector) GetSchemaRegistry() SchemaRegistryConnectionSettings {
 // GetSchemaRegistryOk returns a tuple with the SchemaRegistry field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Connector) GetSchemaRegistryOk() (*SchemaRegistryConnectionSettings, bool) {
-	if o == nil || isNil(o.SchemaRegistry) {
-    return nil, false
+	if o == nil || o.SchemaRegistry == nil {
+		return nil, false
 	}
 	return o.SchemaRegistry, true
 }
 
 // HasSchemaRegistry returns a boolean if a field has been set.
 func (o *Connector) HasSchemaRegistry() bool {
-	if o != nil && !isNil(o.SchemaRegistry) {
+	if o != nil && o.SchemaRegistry != nil {
 		return true
 	}
 
@@ -542,11 +543,11 @@ func (o *Connector) GetConnector() map[string]interface{} {
 
 // GetConnectorOk returns a tuple with the Connector field value
 // and a boolean to check if the value has been set.
-func (o *Connector) GetConnectorOk() (map[string]interface{}, bool) {
-	if o == nil {
-    return map[string]interface{}{}, false
+func (o *Connector) GetConnectorOk() (*map[string]interface{}, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Connector, true
+	return &o.Connector, true
 }
 
 // SetConnector sets field value
@@ -556,7 +557,7 @@ func (o *Connector) SetConnector(v map[string]interface{}) {
 
 // GetStatus returns the Status field value if set, zero value otherwise.
 func (o *Connector) GetStatus() ConnectorStatusStatus {
-	if o == nil || isNil(o.Status) {
+	if o == nil || o.Status == nil {
 		var ret ConnectorStatusStatus
 		return ret
 	}
@@ -566,15 +567,15 @@ func (o *Connector) GetStatus() ConnectorStatusStatus {
 // GetStatusOk returns a tuple with the Status field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Connector) GetStatusOk() (*ConnectorStatusStatus, bool) {
-	if o == nil || isNil(o.Status) {
-    return nil, false
+	if o == nil || o.Status == nil {
+		return nil, false
 	}
 	return o.Status, true
 }
 
 // HasStatus returns a boolean if a field has been set.
 func (o *Connector) HasStatus() bool {
-	if o != nil && !isNil(o.Status) {
+	if o != nil && o.Status != nil {
 		return true
 	}
 
@@ -588,22 +589,22 @@ func (o *Connector) SetStatus(v ConnectorStatusStatus) {
 
 func (o Connector) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.Kind) {
+	if o.Kind != nil {
 		toSerialize["kind"] = o.Kind
 	}
-	if !isNil(o.Href) {
+	if o.Href != nil {
 		toSerialize["href"] = o.Href
 	}
-	if !isNil(o.Owner) {
+	if o.Owner != nil {
 		toSerialize["owner"] = o.Owner
 	}
-	if !isNil(o.CreatedAt) {
+	if o.CreatedAt != nil {
 		toSerialize["created_at"] = o.CreatedAt
 	}
-	if !isNil(o.ModifiedAt) {
+	if o.ModifiedAt != nil {
 		toSerialize["modified_at"] = o.ModifiedAt
 	}
 	if true {
@@ -615,16 +616,16 @@ func (o Connector) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["namespace_id"] = o.NamespaceId
 	}
-	if !isNil(o.Channel) {
+	if o.Channel != nil {
 		toSerialize["channel"] = o.Channel
 	}
 	if true {
 		toSerialize["desired_state"] = o.DesiredState
 	}
-	if !isNil(o.Annotations) {
+	if o.Annotations != nil {
 		toSerialize["annotations"] = o.Annotations
 	}
-	if !isNil(o.ResourceVersion) {
+	if o.ResourceVersion != nil {
 		toSerialize["resource_version"] = o.ResourceVersion
 	}
 	if true {
@@ -633,13 +634,13 @@ func (o Connector) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["service_account"] = o.ServiceAccount
 	}
-	if !isNil(o.SchemaRegistry) {
+	if o.SchemaRegistry != nil {
 		toSerialize["schema_registry"] = o.SchemaRegistry
 	}
 	if true {
 		toSerialize["connector"] = o.Connector
 	}
-	if !isNil(o.Status) {
+	if o.Status != nil {
 		toSerialize["status"] = o.Status
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_cluster.go b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_cluster.go
index 9f7d0355..cb485de5 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_cluster.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_cluster.go
@@ -1,11 +1,11 @@
 /*
-Connector Management API
-
-Connector Management API is a REST API to manage connectors.
-
-API version: 0.1.0
-Contact: rhosak-support@redhat.com
-*/
+ * Connector Management API
+ *
+ * Connector Management API is a REST API to manage connectors.
+ *
+ * API version: 0.1.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -13,6 +13,7 @@ package connectormgmtclient
 
 import (
 	"encoding/json"
+	"time"
 )
 
 // ConnectorCluster struct for ConnectorCluster
@@ -48,7 +49,7 @@ func NewConnectorClusterWithDefaults() *ConnectorCluster {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *ConnectorCluster) GetId() string {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret string
 		return ret
 	}
@@ -58,15 +59,15 @@ func (o *ConnectorCluster) GetId() string {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorCluster) GetIdOk() (*string, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *ConnectorCluster) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -80,7 +81,7 @@ func (o *ConnectorCluster) SetId(v string) {
 
 // GetKind returns the Kind field value if set, zero value otherwise.
 func (o *ConnectorCluster) GetKind() string {
-	if o == nil || isNil(o.Kind) {
+	if o == nil || o.Kind == nil {
 		var ret string
 		return ret
 	}
@@ -90,15 +91,15 @@ func (o *ConnectorCluster) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorCluster) GetKindOk() (*string, bool) {
-	if o == nil || isNil(o.Kind) {
-    return nil, false
+	if o == nil || o.Kind == nil {
+		return nil, false
 	}
 	return o.Kind, true
 }
 
 // HasKind returns a boolean if a field has been set.
 func (o *ConnectorCluster) HasKind() bool {
-	if o != nil && !isNil(o.Kind) {
+	if o != nil && o.Kind != nil {
 		return true
 	}
 
@@ -112,7 +113,7 @@ func (o *ConnectorCluster) SetKind(v string) {
 
 // GetHref returns the Href field value if set, zero value otherwise.
 func (o *ConnectorCluster) GetHref() string {
-	if o == nil || isNil(o.Href) {
+	if o == nil || o.Href == nil {
 		var ret string
 		return ret
 	}
@@ -122,15 +123,15 @@ func (o *ConnectorCluster) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorCluster) GetHrefOk() (*string, bool) {
-	if o == nil || isNil(o.Href) {
-    return nil, false
+	if o == nil || o.Href == nil {
+		return nil, false
 	}
 	return o.Href, true
 }
 
 // HasHref returns a boolean if a field has been set.
 func (o *ConnectorCluster) HasHref() bool {
-	if o != nil && !isNil(o.Href) {
+	if o != nil && o.Href != nil {
 		return true
 	}
 
@@ -144,7 +145,7 @@ func (o *ConnectorCluster) SetHref(v string) {
 
 // GetOwner returns the Owner field value if set, zero value otherwise.
 func (o *ConnectorCluster) GetOwner() string {
-	if o == nil || isNil(o.Owner) {
+	if o == nil || o.Owner == nil {
 		var ret string
 		return ret
 	}
@@ -154,15 +155,15 @@ func (o *ConnectorCluster) GetOwner() string {
 // GetOwnerOk returns a tuple with the Owner field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorCluster) GetOwnerOk() (*string, bool) {
-	if o == nil || isNil(o.Owner) {
-    return nil, false
+	if o == nil || o.Owner == nil {
+		return nil, false
 	}
 	return o.Owner, true
 }
 
 // HasOwner returns a boolean if a field has been set.
 func (o *ConnectorCluster) HasOwner() bool {
-	if o != nil && !isNil(o.Owner) {
+	if o != nil && o.Owner != nil {
 		return true
 	}
 
@@ -176,7 +177,7 @@ func (o *ConnectorCluster) SetOwner(v string) {
 
 // GetCreatedAt returns the CreatedAt field value if set, zero value otherwise.
 func (o *ConnectorCluster) GetCreatedAt() time.Time {
-	if o == nil || isNil(o.CreatedAt) {
+	if o == nil || o.CreatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -186,15 +187,15 @@ func (o *ConnectorCluster) GetCreatedAt() time.Time {
 // GetCreatedAtOk returns a tuple with the CreatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorCluster) GetCreatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.CreatedAt) {
-    return nil, false
+	if o == nil || o.CreatedAt == nil {
+		return nil, false
 	}
 	return o.CreatedAt, true
 }
 
 // HasCreatedAt returns a boolean if a field has been set.
 func (o *ConnectorCluster) HasCreatedAt() bool {
-	if o != nil && !isNil(o.CreatedAt) {
+	if o != nil && o.CreatedAt != nil {
 		return true
 	}
 
@@ -208,7 +209,7 @@ func (o *ConnectorCluster) SetCreatedAt(v time.Time) {
 
 // GetModifiedAt returns the ModifiedAt field value if set, zero value otherwise.
 func (o *ConnectorCluster) GetModifiedAt() time.Time {
-	if o == nil || isNil(o.ModifiedAt) {
+	if o == nil || o.ModifiedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -218,15 +219,15 @@ func (o *ConnectorCluster) GetModifiedAt() time.Time {
 // GetModifiedAtOk returns a tuple with the ModifiedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorCluster) GetModifiedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.ModifiedAt) {
-    return nil, false
+	if o == nil || o.ModifiedAt == nil {
+		return nil, false
 	}
 	return o.ModifiedAt, true
 }
 
 // HasModifiedAt returns a boolean if a field has been set.
 func (o *ConnectorCluster) HasModifiedAt() bool {
-	if o != nil && !isNil(o.ModifiedAt) {
+	if o != nil && o.ModifiedAt != nil {
 		return true
 	}
 
@@ -240,7 +241,7 @@ func (o *ConnectorCluster) SetModifiedAt(v time.Time) {
 
 // GetName returns the Name field value if set, zero value otherwise.
 func (o *ConnectorCluster) GetName() string {
-	if o == nil || isNil(o.Name) {
+	if o == nil || o.Name == nil {
 		var ret string
 		return ret
 	}
@@ -250,15 +251,15 @@ func (o *ConnectorCluster) GetName() string {
 // GetNameOk returns a tuple with the Name field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorCluster) GetNameOk() (*string, bool) {
-	if o == nil || isNil(o.Name) {
-    return nil, false
+	if o == nil || o.Name == nil {
+		return nil, false
 	}
 	return o.Name, true
 }
 
 // HasName returns a boolean if a field has been set.
 func (o *ConnectorCluster) HasName() bool {
-	if o != nil && !isNil(o.Name) {
+	if o != nil && o.Name != nil {
 		return true
 	}
 
@@ -272,7 +273,7 @@ func (o *ConnectorCluster) SetName(v string) {
 
 // GetAnnotations returns the Annotations field value if set, zero value otherwise.
 func (o *ConnectorCluster) GetAnnotations() map[string]string {
-	if o == nil || isNil(o.Annotations) {
+	if o == nil || o.Annotations == nil {
 		var ret map[string]string
 		return ret
 	}
@@ -282,15 +283,15 @@ func (o *ConnectorCluster) GetAnnotations() map[string]string {
 // GetAnnotationsOk returns a tuple with the Annotations field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorCluster) GetAnnotationsOk() (*map[string]string, bool) {
-	if o == nil || isNil(o.Annotations) {
-    return nil, false
+	if o == nil || o.Annotations == nil {
+		return nil, false
 	}
 	return o.Annotations, true
 }
 
 // HasAnnotations returns a boolean if a field has been set.
 func (o *ConnectorCluster) HasAnnotations() bool {
-	if o != nil && !isNil(o.Annotations) {
+	if o != nil && o.Annotations != nil {
 		return true
 	}
 
@@ -304,7 +305,7 @@ func (o *ConnectorCluster) SetAnnotations(v map[string]string) {
 
 // GetStatus returns the Status field value if set, zero value otherwise.
 func (o *ConnectorCluster) GetStatus() ConnectorClusterStatusStatus {
-	if o == nil || isNil(o.Status) {
+	if o == nil || o.Status == nil {
 		var ret ConnectorClusterStatusStatus
 		return ret
 	}
@@ -314,15 +315,15 @@ func (o *ConnectorCluster) GetStatus() ConnectorClusterStatusStatus {
 // GetStatusOk returns a tuple with the Status field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorCluster) GetStatusOk() (*ConnectorClusterStatusStatus, bool) {
-	if o == nil || isNil(o.Status) {
-    return nil, false
+	if o == nil || o.Status == nil {
+		return nil, false
 	}
 	return o.Status, true
 }
 
 // HasStatus returns a boolean if a field has been set.
 func (o *ConnectorCluster) HasStatus() bool {
-	if o != nil && !isNil(o.Status) {
+	if o != nil && o.Status != nil {
 		return true
 	}
 
@@ -336,31 +337,31 @@ func (o *ConnectorCluster) SetStatus(v ConnectorClusterStatusStatus) {
 
 func (o ConnectorCluster) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.Kind) {
+	if o.Kind != nil {
 		toSerialize["kind"] = o.Kind
 	}
-	if !isNil(o.Href) {
+	if o.Href != nil {
 		toSerialize["href"] = o.Href
 	}
-	if !isNil(o.Owner) {
+	if o.Owner != nil {
 		toSerialize["owner"] = o.Owner
 	}
-	if !isNil(o.CreatedAt) {
+	if o.CreatedAt != nil {
 		toSerialize["created_at"] = o.CreatedAt
 	}
-	if !isNil(o.ModifiedAt) {
+	if o.ModifiedAt != nil {
 		toSerialize["modified_at"] = o.ModifiedAt
 	}
-	if !isNil(o.Name) {
+	if o.Name != nil {
 		toSerialize["name"] = o.Name
 	}
-	if !isNil(o.Annotations) {
+	if o.Annotations != nil {
 		toSerialize["annotations"] = o.Annotations
 	}
-	if !isNil(o.Status) {
+	if o.Status != nil {
 		toSerialize["status"] = o.Status
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_cluster_list.go b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_cluster_list.go
index 115c138c..08b09be4 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_cluster_list.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_cluster_list.go
@@ -1,11 +1,11 @@
 /*
-Connector Management API
-
-Connector Management API is a REST API to manage connectors.
-
-API version: 0.1.0
-Contact: rhosak-support@redhat.com
-*/
+ * Connector Management API
+ *
+ * Connector Management API is a REST API to manage connectors.
+ *
+ * API version: 0.1.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -59,8 +59,8 @@ func (o *ConnectorClusterList) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *ConnectorClusterList) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -83,8 +83,8 @@ func (o *ConnectorClusterList) GetPage() int32 {
 // GetPageOk returns a tuple with the Page field value
 // and a boolean to check if the value has been set.
 func (o *ConnectorClusterList) GetPageOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Page, true
 }
@@ -107,8 +107,8 @@ func (o *ConnectorClusterList) GetSize() int32 {
 // GetSizeOk returns a tuple with the Size field value
 // and a boolean to check if the value has been set.
 func (o *ConnectorClusterList) GetSizeOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Size, true
 }
@@ -131,8 +131,8 @@ func (o *ConnectorClusterList) GetTotal() int32 {
 // GetTotalOk returns a tuple with the Total field value
 // and a boolean to check if the value has been set.
 func (o *ConnectorClusterList) GetTotalOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Total, true
 }
@@ -154,11 +154,11 @@ func (o *ConnectorClusterList) GetItems() []ConnectorCluster {
 
 // GetItemsOk returns a tuple with the Items field value
 // and a boolean to check if the value has been set.
-func (o *ConnectorClusterList) GetItemsOk() ([]ConnectorCluster, bool) {
-	if o == nil {
-    return nil, false
+func (o *ConnectorClusterList) GetItemsOk() (*[]ConnectorCluster, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Items, true
+	return &o.Items, true
 }
 
 // SetItems sets field value
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_cluster_list_all_of.go b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_cluster_list_all_of.go
index 37d7a478..21f92eea 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_cluster_list_all_of.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_cluster_list_all_of.go
@@ -1,11 +1,11 @@
 /*
-Connector Management API
-
-Connector Management API is a REST API to manage connectors.
-
-API version: 0.1.0
-Contact: rhosak-support@redhat.com
-*/
+ * Connector Management API
+ *
+ * Connector Management API is a REST API to manage connectors.
+ *
+ * API version: 0.1.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -17,7 +17,7 @@ import (
 
 // ConnectorClusterListAllOf struct for ConnectorClusterListAllOf
 type ConnectorClusterListAllOf struct {
-	Items []ConnectorCluster `json:"items,omitempty"`
+	Items *[]ConnectorCluster `json:"items,omitempty"`
 }
 
 // NewConnectorClusterListAllOf instantiates a new ConnectorClusterListAllOf object
@@ -39,25 +39,25 @@ func NewConnectorClusterListAllOfWithDefaults() *ConnectorClusterListAllOf {
 
 // GetItems returns the Items field value if set, zero value otherwise.
 func (o *ConnectorClusterListAllOf) GetItems() []ConnectorCluster {
-	if o == nil || isNil(o.Items) {
+	if o == nil || o.Items == nil {
 		var ret []ConnectorCluster
 		return ret
 	}
-	return o.Items
+	return *o.Items
 }
 
 // GetItemsOk returns a tuple with the Items field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *ConnectorClusterListAllOf) GetItemsOk() ([]ConnectorCluster, bool) {
-	if o == nil || isNil(o.Items) {
-    return nil, false
+func (o *ConnectorClusterListAllOf) GetItemsOk() (*[]ConnectorCluster, bool) {
+	if o == nil || o.Items == nil {
+		return nil, false
 	}
 	return o.Items, true
 }
 
 // HasItems returns a boolean if a field has been set.
 func (o *ConnectorClusterListAllOf) HasItems() bool {
-	if o != nil && !isNil(o.Items) {
+	if o != nil && o.Items != nil {
 		return true
 	}
 
@@ -66,12 +66,12 @@ func (o *ConnectorClusterListAllOf) HasItems() bool {
 
 // SetItems gets a reference to the given []ConnectorCluster and assigns it to the Items field.
 func (o *ConnectorClusterListAllOf) SetItems(v []ConnectorCluster) {
-	o.Items = v
+	o.Items = &v
 }
 
 func (o ConnectorClusterListAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Items) {
+	if o.Items != nil {
 		toSerialize["items"] = o.Items
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_cluster_meta.go b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_cluster_meta.go
index 55f8604f..1f55fb87 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_cluster_meta.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_cluster_meta.go
@@ -1,11 +1,11 @@
 /*
-Connector Management API
-
-Connector Management API is a REST API to manage connectors.
-
-API version: 0.1.0
-Contact: rhosak-support@redhat.com
-*/
+ * Connector Management API
+ *
+ * Connector Management API is a REST API to manage connectors.
+ *
+ * API version: 0.1.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -13,6 +13,7 @@ package connectormgmtclient
 
 import (
 	"encoding/json"
+	"time"
 )
 
 // ConnectorClusterMeta struct for ConnectorClusterMeta
@@ -44,7 +45,7 @@ func NewConnectorClusterMetaWithDefaults() *ConnectorClusterMeta {
 
 // GetOwner returns the Owner field value if set, zero value otherwise.
 func (o *ConnectorClusterMeta) GetOwner() string {
-	if o == nil || isNil(o.Owner) {
+	if o == nil || o.Owner == nil {
 		var ret string
 		return ret
 	}
@@ -54,15 +55,15 @@ func (o *ConnectorClusterMeta) GetOwner() string {
 // GetOwnerOk returns a tuple with the Owner field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorClusterMeta) GetOwnerOk() (*string, bool) {
-	if o == nil || isNil(o.Owner) {
-    return nil, false
+	if o == nil || o.Owner == nil {
+		return nil, false
 	}
 	return o.Owner, true
 }
 
 // HasOwner returns a boolean if a field has been set.
 func (o *ConnectorClusterMeta) HasOwner() bool {
-	if o != nil && !isNil(o.Owner) {
+	if o != nil && o.Owner != nil {
 		return true
 	}
 
@@ -76,7 +77,7 @@ func (o *ConnectorClusterMeta) SetOwner(v string) {
 
 // GetCreatedAt returns the CreatedAt field value if set, zero value otherwise.
 func (o *ConnectorClusterMeta) GetCreatedAt() time.Time {
-	if o == nil || isNil(o.CreatedAt) {
+	if o == nil || o.CreatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -86,15 +87,15 @@ func (o *ConnectorClusterMeta) GetCreatedAt() time.Time {
 // GetCreatedAtOk returns a tuple with the CreatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorClusterMeta) GetCreatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.CreatedAt) {
-    return nil, false
+	if o == nil || o.CreatedAt == nil {
+		return nil, false
 	}
 	return o.CreatedAt, true
 }
 
 // HasCreatedAt returns a boolean if a field has been set.
 func (o *ConnectorClusterMeta) HasCreatedAt() bool {
-	if o != nil && !isNil(o.CreatedAt) {
+	if o != nil && o.CreatedAt != nil {
 		return true
 	}
 
@@ -108,7 +109,7 @@ func (o *ConnectorClusterMeta) SetCreatedAt(v time.Time) {
 
 // GetModifiedAt returns the ModifiedAt field value if set, zero value otherwise.
 func (o *ConnectorClusterMeta) GetModifiedAt() time.Time {
-	if o == nil || isNil(o.ModifiedAt) {
+	if o == nil || o.ModifiedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -118,15 +119,15 @@ func (o *ConnectorClusterMeta) GetModifiedAt() time.Time {
 // GetModifiedAtOk returns a tuple with the ModifiedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorClusterMeta) GetModifiedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.ModifiedAt) {
-    return nil, false
+	if o == nil || o.ModifiedAt == nil {
+		return nil, false
 	}
 	return o.ModifiedAt, true
 }
 
 // HasModifiedAt returns a boolean if a field has been set.
 func (o *ConnectorClusterMeta) HasModifiedAt() bool {
-	if o != nil && !isNil(o.ModifiedAt) {
+	if o != nil && o.ModifiedAt != nil {
 		return true
 	}
 
@@ -140,7 +141,7 @@ func (o *ConnectorClusterMeta) SetModifiedAt(v time.Time) {
 
 // GetName returns the Name field value if set, zero value otherwise.
 func (o *ConnectorClusterMeta) GetName() string {
-	if o == nil || isNil(o.Name) {
+	if o == nil || o.Name == nil {
 		var ret string
 		return ret
 	}
@@ -150,15 +151,15 @@ func (o *ConnectorClusterMeta) GetName() string {
 // GetNameOk returns a tuple with the Name field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorClusterMeta) GetNameOk() (*string, bool) {
-	if o == nil || isNil(o.Name) {
-    return nil, false
+	if o == nil || o.Name == nil {
+		return nil, false
 	}
 	return o.Name, true
 }
 
 // HasName returns a boolean if a field has been set.
 func (o *ConnectorClusterMeta) HasName() bool {
-	if o != nil && !isNil(o.Name) {
+	if o != nil && o.Name != nil {
 		return true
 	}
 
@@ -172,7 +173,7 @@ func (o *ConnectorClusterMeta) SetName(v string) {
 
 // GetAnnotations returns the Annotations field value if set, zero value otherwise.
 func (o *ConnectorClusterMeta) GetAnnotations() map[string]string {
-	if o == nil || isNil(o.Annotations) {
+	if o == nil || o.Annotations == nil {
 		var ret map[string]string
 		return ret
 	}
@@ -182,15 +183,15 @@ func (o *ConnectorClusterMeta) GetAnnotations() map[string]string {
 // GetAnnotationsOk returns a tuple with the Annotations field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorClusterMeta) GetAnnotationsOk() (*map[string]string, bool) {
-	if o == nil || isNil(o.Annotations) {
-    return nil, false
+	if o == nil || o.Annotations == nil {
+		return nil, false
 	}
 	return o.Annotations, true
 }
 
 // HasAnnotations returns a boolean if a field has been set.
 func (o *ConnectorClusterMeta) HasAnnotations() bool {
-	if o != nil && !isNil(o.Annotations) {
+	if o != nil && o.Annotations != nil {
 		return true
 	}
 
@@ -204,19 +205,19 @@ func (o *ConnectorClusterMeta) SetAnnotations(v map[string]string) {
 
 func (o ConnectorClusterMeta) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Owner) {
+	if o.Owner != nil {
 		toSerialize["owner"] = o.Owner
 	}
-	if !isNil(o.CreatedAt) {
+	if o.CreatedAt != nil {
 		toSerialize["created_at"] = o.CreatedAt
 	}
-	if !isNil(o.ModifiedAt) {
+	if o.ModifiedAt != nil {
 		toSerialize["modified_at"] = o.ModifiedAt
 	}
-	if !isNil(o.Name) {
+	if o.Name != nil {
 		toSerialize["name"] = o.Name
 	}
-	if !isNil(o.Annotations) {
+	if o.Annotations != nil {
 		toSerialize["annotations"] = o.Annotations
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_cluster_request.go b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_cluster_request.go
index 16b6b8d6..cf38895a 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_cluster_request.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_cluster_request.go
@@ -1,11 +1,11 @@
 /*
-Connector Management API
-
-Connector Management API is a REST API to manage connectors.
-
-API version: 0.1.0
-Contact: rhosak-support@redhat.com
-*/
+ * Connector Management API
+ *
+ * Connector Management API is a REST API to manage connectors.
+ *
+ * API version: 0.1.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -41,7 +41,7 @@ func NewConnectorClusterRequestWithDefaults() *ConnectorClusterRequest {
 
 // GetName returns the Name field value if set, zero value otherwise.
 func (o *ConnectorClusterRequest) GetName() string {
-	if o == nil || isNil(o.Name) {
+	if o == nil || o.Name == nil {
 		var ret string
 		return ret
 	}
@@ -51,15 +51,15 @@ func (o *ConnectorClusterRequest) GetName() string {
 // GetNameOk returns a tuple with the Name field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorClusterRequest) GetNameOk() (*string, bool) {
-	if o == nil || isNil(o.Name) {
-    return nil, false
+	if o == nil || o.Name == nil {
+		return nil, false
 	}
 	return o.Name, true
 }
 
 // HasName returns a boolean if a field has been set.
 func (o *ConnectorClusterRequest) HasName() bool {
-	if o != nil && !isNil(o.Name) {
+	if o != nil && o.Name != nil {
 		return true
 	}
 
@@ -73,7 +73,7 @@ func (o *ConnectorClusterRequest) SetName(v string) {
 
 // GetAnnotations returns the Annotations field value if set, zero value otherwise.
 func (o *ConnectorClusterRequest) GetAnnotations() map[string]string {
-	if o == nil || isNil(o.Annotations) {
+	if o == nil || o.Annotations == nil {
 		var ret map[string]string
 		return ret
 	}
@@ -83,15 +83,15 @@ func (o *ConnectorClusterRequest) GetAnnotations() map[string]string {
 // GetAnnotationsOk returns a tuple with the Annotations field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorClusterRequest) GetAnnotationsOk() (*map[string]string, bool) {
-	if o == nil || isNil(o.Annotations) {
-    return nil, false
+	if o == nil || o.Annotations == nil {
+		return nil, false
 	}
 	return o.Annotations, true
 }
 
 // HasAnnotations returns a boolean if a field has been set.
 func (o *ConnectorClusterRequest) HasAnnotations() bool {
-	if o != nil && !isNil(o.Annotations) {
+	if o != nil && o.Annotations != nil {
 		return true
 	}
 
@@ -105,10 +105,10 @@ func (o *ConnectorClusterRequest) SetAnnotations(v map[string]string) {
 
 func (o ConnectorClusterRequest) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Name) {
+	if o.Name != nil {
 		toSerialize["name"] = o.Name
 	}
-	if !isNil(o.Annotations) {
+	if o.Annotations != nil {
 		toSerialize["annotations"] = o.Annotations
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_cluster_request_meta.go b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_cluster_request_meta.go
index fdcfe808..2e99a986 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_cluster_request_meta.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_cluster_request_meta.go
@@ -1,11 +1,11 @@
 /*
-Connector Management API
-
-Connector Management API is a REST API to manage connectors.
-
-API version: 0.1.0
-Contact: rhosak-support@redhat.com
-*/
+ * Connector Management API
+ *
+ * Connector Management API is a REST API to manage connectors.
+ *
+ * API version: 0.1.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -41,7 +41,7 @@ func NewConnectorClusterRequestMetaWithDefaults() *ConnectorClusterRequestMeta {
 
 // GetName returns the Name field value if set, zero value otherwise.
 func (o *ConnectorClusterRequestMeta) GetName() string {
-	if o == nil || isNil(o.Name) {
+	if o == nil || o.Name == nil {
 		var ret string
 		return ret
 	}
@@ -51,15 +51,15 @@ func (o *ConnectorClusterRequestMeta) GetName() string {
 // GetNameOk returns a tuple with the Name field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorClusterRequestMeta) GetNameOk() (*string, bool) {
-	if o == nil || isNil(o.Name) {
-    return nil, false
+	if o == nil || o.Name == nil {
+		return nil, false
 	}
 	return o.Name, true
 }
 
 // HasName returns a boolean if a field has been set.
 func (o *ConnectorClusterRequestMeta) HasName() bool {
-	if o != nil && !isNil(o.Name) {
+	if o != nil && o.Name != nil {
 		return true
 	}
 
@@ -73,7 +73,7 @@ func (o *ConnectorClusterRequestMeta) SetName(v string) {
 
 // GetAnnotations returns the Annotations field value if set, zero value otherwise.
 func (o *ConnectorClusterRequestMeta) GetAnnotations() map[string]string {
-	if o == nil || isNil(o.Annotations) {
+	if o == nil || o.Annotations == nil {
 		var ret map[string]string
 		return ret
 	}
@@ -83,15 +83,15 @@ func (o *ConnectorClusterRequestMeta) GetAnnotations() map[string]string {
 // GetAnnotationsOk returns a tuple with the Annotations field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorClusterRequestMeta) GetAnnotationsOk() (*map[string]string, bool) {
-	if o == nil || isNil(o.Annotations) {
-    return nil, false
+	if o == nil || o.Annotations == nil {
+		return nil, false
 	}
 	return o.Annotations, true
 }
 
 // HasAnnotations returns a boolean if a field has been set.
 func (o *ConnectorClusterRequestMeta) HasAnnotations() bool {
-	if o != nil && !isNil(o.Annotations) {
+	if o != nil && o.Annotations != nil {
 		return true
 	}
 
@@ -105,10 +105,10 @@ func (o *ConnectorClusterRequestMeta) SetAnnotations(v map[string]string) {
 
 func (o ConnectorClusterRequestMeta) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Name) {
+	if o.Name != nil {
 		toSerialize["name"] = o.Name
 	}
-	if !isNil(o.Annotations) {
+	if o.Annotations != nil {
 		toSerialize["annotations"] = o.Annotations
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_cluster_state.go b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_cluster_state.go
index 09bebf5e..1ecef21e 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_cluster_state.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_cluster_state.go
@@ -1,11 +1,11 @@
 /*
-Connector Management API
-
-Connector Management API is a REST API to manage connectors.
-
-API version: 0.1.0
-Contact: rhosak-support@redhat.com
-*/
+ * Connector Management API
+ *
+ * Connector Management API is a REST API to manage connectors.
+ *
+ * API version: 0.1.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -26,8 +26,7 @@ const (
 	CONNECTORCLUSTERSTATE_DELETING ConnectorClusterState = "deleting"
 )
 
-// All allowed values of ConnectorClusterState enum
-var AllowedConnectorClusterStateEnumValues = []ConnectorClusterState{
+var allowedConnectorClusterStateEnumValues = []ConnectorClusterState{
 	"disconnected",
 	"ready",
 	"deleting",
@@ -40,7 +39,7 @@ func (v *ConnectorClusterState) UnmarshalJSON(src []byte) error {
 		return err
 	}
 	enumTypeValue := ConnectorClusterState(value)
-	for _, existing := range AllowedConnectorClusterStateEnumValues {
+	for _, existing := range allowedConnectorClusterStateEnumValues {
 		if existing == enumTypeValue {
 			*v = enumTypeValue
 			return nil
@@ -57,13 +56,13 @@ func NewConnectorClusterStateFromValue(v string) (*ConnectorClusterState, error)
 	if ev.IsValid() {
 		return &ev, nil
 	} else {
-		return nil, fmt.Errorf("invalid value '%v' for ConnectorClusterState: valid values are %v", v, AllowedConnectorClusterStateEnumValues)
+		return nil, fmt.Errorf("invalid value '%v' for ConnectorClusterState: valid values are %v", v, allowedConnectorClusterStateEnumValues)
 	}
 }
 
 // IsValid return true if the value is valid for the enum, false otherwise
 func (v ConnectorClusterState) IsValid() bool {
-	for _, existing := range AllowedConnectorClusterStateEnumValues {
+	for _, existing := range allowedConnectorClusterStateEnumValues {
 		if existing == v {
 			return true
 		}
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_cluster_status.go b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_cluster_status.go
index aa6e1610..52f8ad8e 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_cluster_status.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_cluster_status.go
@@ -1,11 +1,11 @@
 /*
-Connector Management API
-
-Connector Management API is a REST API to manage connectors.
-
-API version: 0.1.0
-Contact: rhosak-support@redhat.com
-*/
+ * Connector Management API
+ *
+ * Connector Management API is a REST API to manage connectors.
+ *
+ * API version: 0.1.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -39,7 +39,7 @@ func NewConnectorClusterStatusWithDefaults() *ConnectorClusterStatus {
 
 // GetStatus returns the Status field value if set, zero value otherwise.
 func (o *ConnectorClusterStatus) GetStatus() ConnectorClusterStatusStatus {
-	if o == nil || isNil(o.Status) {
+	if o == nil || o.Status == nil {
 		var ret ConnectorClusterStatusStatus
 		return ret
 	}
@@ -49,15 +49,15 @@ func (o *ConnectorClusterStatus) GetStatus() ConnectorClusterStatusStatus {
 // GetStatusOk returns a tuple with the Status field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorClusterStatus) GetStatusOk() (*ConnectorClusterStatusStatus, bool) {
-	if o == nil || isNil(o.Status) {
-    return nil, false
+	if o == nil || o.Status == nil {
+		return nil, false
 	}
 	return o.Status, true
 }
 
 // HasStatus returns a boolean if a field has been set.
 func (o *ConnectorClusterStatus) HasStatus() bool {
-	if o != nil && !isNil(o.Status) {
+	if o != nil && o.Status != nil {
 		return true
 	}
 
@@ -71,7 +71,7 @@ func (o *ConnectorClusterStatus) SetStatus(v ConnectorClusterStatusStatus) {
 
 func (o ConnectorClusterStatus) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Status) {
+	if o.Status != nil {
 		toSerialize["status"] = o.Status
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_cluster_status_status.go b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_cluster_status_status.go
index 09c769bd..50b46250 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_cluster_status_status.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_cluster_status_status.go
@@ -1,11 +1,11 @@
 /*
-Connector Management API
-
-Connector Management API is a REST API to manage connectors.
-
-API version: 0.1.0
-Contact: rhosak-support@redhat.com
-*/
+ * Connector Management API
+ *
+ * Connector Management API is a REST API to manage connectors.
+ *
+ * API version: 0.1.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -40,7 +40,7 @@ func NewConnectorClusterStatusStatusWithDefaults() *ConnectorClusterStatusStatus
 
 // GetState returns the State field value if set, zero value otherwise.
 func (o *ConnectorClusterStatusStatus) GetState() ConnectorClusterState {
-	if o == nil || isNil(o.State) {
+	if o == nil || o.State == nil {
 		var ret ConnectorClusterState
 		return ret
 	}
@@ -50,15 +50,15 @@ func (o *ConnectorClusterStatusStatus) GetState() ConnectorClusterState {
 // GetStateOk returns a tuple with the State field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorClusterStatusStatus) GetStateOk() (*ConnectorClusterState, bool) {
-	if o == nil || isNil(o.State) {
-    return nil, false
+	if o == nil || o.State == nil {
+		return nil, false
 	}
 	return o.State, true
 }
 
 // HasState returns a boolean if a field has been set.
 func (o *ConnectorClusterStatusStatus) HasState() bool {
-	if o != nil && !isNil(o.State) {
+	if o != nil && o.State != nil {
 		return true
 	}
 
@@ -72,7 +72,7 @@ func (o *ConnectorClusterStatusStatus) SetState(v ConnectorClusterState) {
 
 // GetError returns the Error field value if set, zero value otherwise.
 func (o *ConnectorClusterStatusStatus) GetError() string {
-	if o == nil || isNil(o.Error) {
+	if o == nil || o.Error == nil {
 		var ret string
 		return ret
 	}
@@ -82,15 +82,15 @@ func (o *ConnectorClusterStatusStatus) GetError() string {
 // GetErrorOk returns a tuple with the Error field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorClusterStatusStatus) GetErrorOk() (*string, bool) {
-	if o == nil || isNil(o.Error) {
-    return nil, false
+	if o == nil || o.Error == nil {
+		return nil, false
 	}
 	return o.Error, true
 }
 
 // HasError returns a boolean if a field has been set.
 func (o *ConnectorClusterStatusStatus) HasError() bool {
-	if o != nil && !isNil(o.Error) {
+	if o != nil && o.Error != nil {
 		return true
 	}
 
@@ -104,10 +104,10 @@ func (o *ConnectorClusterStatusStatus) SetError(v string) {
 
 func (o ConnectorClusterStatusStatus) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.State) {
+	if o.State != nil {
 		toSerialize["state"] = o.State
 	}
-	if !isNil(o.Error) {
+	if o.Error != nil {
 		toSerialize["error"] = o.Error
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_configuration.go b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_configuration.go
index 1beaa869..40582d2b 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_configuration.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_configuration.go
@@ -1,11 +1,11 @@
 /*
-Connector Management API
-
-Connector Management API is a REST API to manage connectors.
-
-API version: 0.1.0
-Contact: rhosak-support@redhat.com
-*/
+ * Connector Management API
+ *
+ * Connector Management API is a REST API to manage connectors.
+ *
+ * API version: 0.1.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -56,8 +56,8 @@ func (o *ConnectorConfiguration) GetKafka() KafkaConnectionSettings {
 // GetKafkaOk returns a tuple with the Kafka field value
 // and a boolean to check if the value has been set.
 func (o *ConnectorConfiguration) GetKafkaOk() (*KafkaConnectionSettings, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kafka, true
 }
@@ -80,8 +80,8 @@ func (o *ConnectorConfiguration) GetServiceAccount() ServiceAccount {
 // GetServiceAccountOk returns a tuple with the ServiceAccount field value
 // and a boolean to check if the value has been set.
 func (o *ConnectorConfiguration) GetServiceAccountOk() (*ServiceAccount, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.ServiceAccount, true
 }
@@ -93,7 +93,7 @@ func (o *ConnectorConfiguration) SetServiceAccount(v ServiceAccount) {
 
 // GetSchemaRegistry returns the SchemaRegistry field value if set, zero value otherwise.
 func (o *ConnectorConfiguration) GetSchemaRegistry() SchemaRegistryConnectionSettings {
-	if o == nil || isNil(o.SchemaRegistry) {
+	if o == nil || o.SchemaRegistry == nil {
 		var ret SchemaRegistryConnectionSettings
 		return ret
 	}
@@ -103,15 +103,15 @@ func (o *ConnectorConfiguration) GetSchemaRegistry() SchemaRegistryConnectionSet
 // GetSchemaRegistryOk returns a tuple with the SchemaRegistry field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorConfiguration) GetSchemaRegistryOk() (*SchemaRegistryConnectionSettings, bool) {
-	if o == nil || isNil(o.SchemaRegistry) {
-    return nil, false
+	if o == nil || o.SchemaRegistry == nil {
+		return nil, false
 	}
 	return o.SchemaRegistry, true
 }
 
 // HasSchemaRegistry returns a boolean if a field has been set.
 func (o *ConnectorConfiguration) HasSchemaRegistry() bool {
-	if o != nil && !isNil(o.SchemaRegistry) {
+	if o != nil && o.SchemaRegistry != nil {
 		return true
 	}
 
@@ -135,11 +135,11 @@ func (o *ConnectorConfiguration) GetConnector() map[string]interface{} {
 
 // GetConnectorOk returns a tuple with the Connector field value
 // and a boolean to check if the value has been set.
-func (o *ConnectorConfiguration) GetConnectorOk() (map[string]interface{}, bool) {
-	if o == nil {
-    return map[string]interface{}{}, false
+func (o *ConnectorConfiguration) GetConnectorOk() (*map[string]interface{}, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Connector, true
+	return &o.Connector, true
 }
 
 // SetConnector sets field value
@@ -155,7 +155,7 @@ func (o ConnectorConfiguration) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["service_account"] = o.ServiceAccount
 	}
-	if !isNil(o.SchemaRegistry) {
+	if o.SchemaRegistry != nil {
 		toSerialize["schema_registry"] = o.SchemaRegistry
 	}
 	if true {
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_desired_state.go b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_desired_state.go
index 39d6e150..4234b2f6 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_desired_state.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_desired_state.go
@@ -1,11 +1,11 @@
 /*
-Connector Management API
-
-Connector Management API is a REST API to manage connectors.
-
-API version: 0.1.0
-Contact: rhosak-support@redhat.com
-*/
+ * Connector Management API
+ *
+ * Connector Management API is a REST API to manage connectors.
+ *
+ * API version: 0.1.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -27,8 +27,7 @@ const (
 	CONNECTORDESIREDSTATE_DELETED ConnectorDesiredState = "deleted"
 )
 
-// All allowed values of ConnectorDesiredState enum
-var AllowedConnectorDesiredStateEnumValues = []ConnectorDesiredState{
+var allowedConnectorDesiredStateEnumValues = []ConnectorDesiredState{
 	"unassigned",
 	"ready",
 	"stopped",
@@ -42,7 +41,7 @@ func (v *ConnectorDesiredState) UnmarshalJSON(src []byte) error {
 		return err
 	}
 	enumTypeValue := ConnectorDesiredState(value)
-	for _, existing := range AllowedConnectorDesiredStateEnumValues {
+	for _, existing := range allowedConnectorDesiredStateEnumValues {
 		if existing == enumTypeValue {
 			*v = enumTypeValue
 			return nil
@@ -59,13 +58,13 @@ func NewConnectorDesiredStateFromValue(v string) (*ConnectorDesiredState, error)
 	if ev.IsValid() {
 		return &ev, nil
 	} else {
-		return nil, fmt.Errorf("invalid value '%v' for ConnectorDesiredState: valid values are %v", v, AllowedConnectorDesiredStateEnumValues)
+		return nil, fmt.Errorf("invalid value '%v' for ConnectorDesiredState: valid values are %v", v, allowedConnectorDesiredStateEnumValues)
 	}
 }
 
 // IsValid return true if the value is valid for the enum, false otherwise
 func (v ConnectorDesiredState) IsValid() bool {
-	for _, existing := range AllowedConnectorDesiredStateEnumValues {
+	for _, existing := range allowedConnectorDesiredStateEnumValues {
 		if existing == v {
 			return true
 		}
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_list.go b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_list.go
index ad5a99e8..03d01fe4 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_list.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_list.go
@@ -1,11 +1,11 @@
 /*
-Connector Management API
-
-Connector Management API is a REST API to manage connectors.
-
-API version: 0.1.0
-Contact: rhosak-support@redhat.com
-*/
+ * Connector Management API
+ *
+ * Connector Management API is a REST API to manage connectors.
+ *
+ * API version: 0.1.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -59,8 +59,8 @@ func (o *ConnectorList) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *ConnectorList) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -83,8 +83,8 @@ func (o *ConnectorList) GetPage() int32 {
 // GetPageOk returns a tuple with the Page field value
 // and a boolean to check if the value has been set.
 func (o *ConnectorList) GetPageOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Page, true
 }
@@ -107,8 +107,8 @@ func (o *ConnectorList) GetSize() int32 {
 // GetSizeOk returns a tuple with the Size field value
 // and a boolean to check if the value has been set.
 func (o *ConnectorList) GetSizeOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Size, true
 }
@@ -131,8 +131,8 @@ func (o *ConnectorList) GetTotal() int32 {
 // GetTotalOk returns a tuple with the Total field value
 // and a boolean to check if the value has been set.
 func (o *ConnectorList) GetTotalOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Total, true
 }
@@ -154,11 +154,11 @@ func (o *ConnectorList) GetItems() []Connector {
 
 // GetItemsOk returns a tuple with the Items field value
 // and a boolean to check if the value has been set.
-func (o *ConnectorList) GetItemsOk() ([]Connector, bool) {
-	if o == nil {
-    return nil, false
+func (o *ConnectorList) GetItemsOk() (*[]Connector, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Items, true
+	return &o.Items, true
 }
 
 // SetItems sets field value
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_list_all_of.go b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_list_all_of.go
index e454f00f..18f9572e 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_list_all_of.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_list_all_of.go
@@ -1,11 +1,11 @@
 /*
-Connector Management API
-
-Connector Management API is a REST API to manage connectors.
-
-API version: 0.1.0
-Contact: rhosak-support@redhat.com
-*/
+ * Connector Management API
+ *
+ * Connector Management API is a REST API to manage connectors.
+ *
+ * API version: 0.1.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -17,7 +17,7 @@ import (
 
 // ConnectorListAllOf struct for ConnectorListAllOf
 type ConnectorListAllOf struct {
-	Items []Connector `json:"items,omitempty"`
+	Items *[]Connector `json:"items,omitempty"`
 }
 
 // NewConnectorListAllOf instantiates a new ConnectorListAllOf object
@@ -39,25 +39,25 @@ func NewConnectorListAllOfWithDefaults() *ConnectorListAllOf {
 
 // GetItems returns the Items field value if set, zero value otherwise.
 func (o *ConnectorListAllOf) GetItems() []Connector {
-	if o == nil || isNil(o.Items) {
+	if o == nil || o.Items == nil {
 		var ret []Connector
 		return ret
 	}
-	return o.Items
+	return *o.Items
 }
 
 // GetItemsOk returns a tuple with the Items field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *ConnectorListAllOf) GetItemsOk() ([]Connector, bool) {
-	if o == nil || isNil(o.Items) {
-    return nil, false
+func (o *ConnectorListAllOf) GetItemsOk() (*[]Connector, bool) {
+	if o == nil || o.Items == nil {
+		return nil, false
 	}
 	return o.Items, true
 }
 
 // HasItems returns a boolean if a field has been set.
 func (o *ConnectorListAllOf) HasItems() bool {
-	if o != nil && !isNil(o.Items) {
+	if o != nil && o.Items != nil {
 		return true
 	}
 
@@ -66,12 +66,12 @@ func (o *ConnectorListAllOf) HasItems() bool {
 
 // SetItems gets a reference to the given []Connector and assigns it to the Items field.
 func (o *ConnectorListAllOf) SetItems(v []Connector) {
-	o.Items = v
+	o.Items = &v
 }
 
 func (o ConnectorListAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Items) {
+	if o.Items != nil {
 		toSerialize["items"] = o.Items
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_meta.go b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_meta.go
index 68739c6e..701f1a20 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_meta.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_meta.go
@@ -1,11 +1,11 @@
 /*
-Connector Management API
-
-Connector Management API is a REST API to manage connectors.
-
-API version: 0.1.0
-Contact: rhosak-support@redhat.com
-*/
+ * Connector Management API
+ *
+ * Connector Management API is a REST API to manage connectors.
+ *
+ * API version: 0.1.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -13,6 +13,7 @@ package connectormgmtclient
 
 import (
 	"encoding/json"
+	"time"
 )
 
 // ConnectorMeta struct for ConnectorMeta
@@ -57,7 +58,7 @@ func NewConnectorMetaWithDefaults() *ConnectorMeta {
 
 // GetOwner returns the Owner field value if set, zero value otherwise.
 func (o *ConnectorMeta) GetOwner() string {
-	if o == nil || isNil(o.Owner) {
+	if o == nil || o.Owner == nil {
 		var ret string
 		return ret
 	}
@@ -67,15 +68,15 @@ func (o *ConnectorMeta) GetOwner() string {
 // GetOwnerOk returns a tuple with the Owner field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorMeta) GetOwnerOk() (*string, bool) {
-	if o == nil || isNil(o.Owner) {
-    return nil, false
+	if o == nil || o.Owner == nil {
+		return nil, false
 	}
 	return o.Owner, true
 }
 
 // HasOwner returns a boolean if a field has been set.
 func (o *ConnectorMeta) HasOwner() bool {
-	if o != nil && !isNil(o.Owner) {
+	if o != nil && o.Owner != nil {
 		return true
 	}
 
@@ -89,7 +90,7 @@ func (o *ConnectorMeta) SetOwner(v string) {
 
 // GetCreatedAt returns the CreatedAt field value if set, zero value otherwise.
 func (o *ConnectorMeta) GetCreatedAt() time.Time {
-	if o == nil || isNil(o.CreatedAt) {
+	if o == nil || o.CreatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -99,15 +100,15 @@ func (o *ConnectorMeta) GetCreatedAt() time.Time {
 // GetCreatedAtOk returns a tuple with the CreatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorMeta) GetCreatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.CreatedAt) {
-    return nil, false
+	if o == nil || o.CreatedAt == nil {
+		return nil, false
 	}
 	return o.CreatedAt, true
 }
 
 // HasCreatedAt returns a boolean if a field has been set.
 func (o *ConnectorMeta) HasCreatedAt() bool {
-	if o != nil && !isNil(o.CreatedAt) {
+	if o != nil && o.CreatedAt != nil {
 		return true
 	}
 
@@ -121,7 +122,7 @@ func (o *ConnectorMeta) SetCreatedAt(v time.Time) {
 
 // GetModifiedAt returns the ModifiedAt field value if set, zero value otherwise.
 func (o *ConnectorMeta) GetModifiedAt() time.Time {
-	if o == nil || isNil(o.ModifiedAt) {
+	if o == nil || o.ModifiedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -131,15 +132,15 @@ func (o *ConnectorMeta) GetModifiedAt() time.Time {
 // GetModifiedAtOk returns a tuple with the ModifiedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorMeta) GetModifiedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.ModifiedAt) {
-    return nil, false
+	if o == nil || o.ModifiedAt == nil {
+		return nil, false
 	}
 	return o.ModifiedAt, true
 }
 
 // HasModifiedAt returns a boolean if a field has been set.
 func (o *ConnectorMeta) HasModifiedAt() bool {
-	if o != nil && !isNil(o.ModifiedAt) {
+	if o != nil && o.ModifiedAt != nil {
 		return true
 	}
 
@@ -164,8 +165,8 @@ func (o *ConnectorMeta) GetName() string {
 // GetNameOk returns a tuple with the Name field value
 // and a boolean to check if the value has been set.
 func (o *ConnectorMeta) GetNameOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Name, true
 }
@@ -188,8 +189,8 @@ func (o *ConnectorMeta) GetConnectorTypeId() string {
 // GetConnectorTypeIdOk returns a tuple with the ConnectorTypeId field value
 // and a boolean to check if the value has been set.
 func (o *ConnectorMeta) GetConnectorTypeIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.ConnectorTypeId, true
 }
@@ -212,8 +213,8 @@ func (o *ConnectorMeta) GetNamespaceId() string {
 // GetNamespaceIdOk returns a tuple with the NamespaceId field value
 // and a boolean to check if the value has been set.
 func (o *ConnectorMeta) GetNamespaceIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.NamespaceId, true
 }
@@ -225,7 +226,7 @@ func (o *ConnectorMeta) SetNamespaceId(v string) {
 
 // GetChannel returns the Channel field value if set, zero value otherwise.
 func (o *ConnectorMeta) GetChannel() Channel {
-	if o == nil || isNil(o.Channel) {
+	if o == nil || o.Channel == nil {
 		var ret Channel
 		return ret
 	}
@@ -235,15 +236,15 @@ func (o *ConnectorMeta) GetChannel() Channel {
 // GetChannelOk returns a tuple with the Channel field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorMeta) GetChannelOk() (*Channel, bool) {
-	if o == nil || isNil(o.Channel) {
-    return nil, false
+	if o == nil || o.Channel == nil {
+		return nil, false
 	}
 	return o.Channel, true
 }
 
 // HasChannel returns a boolean if a field has been set.
 func (o *ConnectorMeta) HasChannel() bool {
-	if o != nil && !isNil(o.Channel) {
+	if o != nil && o.Channel != nil {
 		return true
 	}
 
@@ -268,8 +269,8 @@ func (o *ConnectorMeta) GetDesiredState() ConnectorDesiredState {
 // GetDesiredStateOk returns a tuple with the DesiredState field value
 // and a boolean to check if the value has been set.
 func (o *ConnectorMeta) GetDesiredStateOk() (*ConnectorDesiredState, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.DesiredState, true
 }
@@ -281,7 +282,7 @@ func (o *ConnectorMeta) SetDesiredState(v ConnectorDesiredState) {
 
 // GetAnnotations returns the Annotations field value if set, zero value otherwise.
 func (o *ConnectorMeta) GetAnnotations() map[string]string {
-	if o == nil || isNil(o.Annotations) {
+	if o == nil || o.Annotations == nil {
 		var ret map[string]string
 		return ret
 	}
@@ -291,15 +292,15 @@ func (o *ConnectorMeta) GetAnnotations() map[string]string {
 // GetAnnotationsOk returns a tuple with the Annotations field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorMeta) GetAnnotationsOk() (*map[string]string, bool) {
-	if o == nil || isNil(o.Annotations) {
-    return nil, false
+	if o == nil || o.Annotations == nil {
+		return nil, false
 	}
 	return o.Annotations, true
 }
 
 // HasAnnotations returns a boolean if a field has been set.
 func (o *ConnectorMeta) HasAnnotations() bool {
-	if o != nil && !isNil(o.Annotations) {
+	if o != nil && o.Annotations != nil {
 		return true
 	}
 
@@ -313,7 +314,7 @@ func (o *ConnectorMeta) SetAnnotations(v map[string]string) {
 
 // GetResourceVersion returns the ResourceVersion field value if set, zero value otherwise.
 func (o *ConnectorMeta) GetResourceVersion() int64 {
-	if o == nil || isNil(o.ResourceVersion) {
+	if o == nil || o.ResourceVersion == nil {
 		var ret int64
 		return ret
 	}
@@ -323,15 +324,15 @@ func (o *ConnectorMeta) GetResourceVersion() int64 {
 // GetResourceVersionOk returns a tuple with the ResourceVersion field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorMeta) GetResourceVersionOk() (*int64, bool) {
-	if o == nil || isNil(o.ResourceVersion) {
-    return nil, false
+	if o == nil || o.ResourceVersion == nil {
+		return nil, false
 	}
 	return o.ResourceVersion, true
 }
 
 // HasResourceVersion returns a boolean if a field has been set.
 func (o *ConnectorMeta) HasResourceVersion() bool {
-	if o != nil && !isNil(o.ResourceVersion) {
+	if o != nil && o.ResourceVersion != nil {
 		return true
 	}
 
@@ -345,13 +346,13 @@ func (o *ConnectorMeta) SetResourceVersion(v int64) {
 
 func (o ConnectorMeta) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Owner) {
+	if o.Owner != nil {
 		toSerialize["owner"] = o.Owner
 	}
-	if !isNil(o.CreatedAt) {
+	if o.CreatedAt != nil {
 		toSerialize["created_at"] = o.CreatedAt
 	}
-	if !isNil(o.ModifiedAt) {
+	if o.ModifiedAt != nil {
 		toSerialize["modified_at"] = o.ModifiedAt
 	}
 	if true {
@@ -363,16 +364,16 @@ func (o ConnectorMeta) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["namespace_id"] = o.NamespaceId
 	}
-	if !isNil(o.Channel) {
+	if o.Channel != nil {
 		toSerialize["channel"] = o.Channel
 	}
 	if true {
 		toSerialize["desired_state"] = o.DesiredState
 	}
-	if !isNil(o.Annotations) {
+	if o.Annotations != nil {
 		toSerialize["annotations"] = o.Annotations
 	}
-	if !isNil(o.ResourceVersion) {
+	if o.ResourceVersion != nil {
 		toSerialize["resource_version"] = o.ResourceVersion
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_meta_all_of.go b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_meta_all_of.go
index 8c513f72..061182bf 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_meta_all_of.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_meta_all_of.go
@@ -1,11 +1,11 @@
 /*
-Connector Management API
-
-Connector Management API is a REST API to manage connectors.
-
-API version: 0.1.0
-Contact: rhosak-support@redhat.com
-*/
+ * Connector Management API
+ *
+ * Connector Management API is a REST API to manage connectors.
+ *
+ * API version: 0.1.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -39,7 +39,7 @@ func NewConnectorMetaAllOfWithDefaults() *ConnectorMetaAllOf {
 
 // GetResourceVersion returns the ResourceVersion field value if set, zero value otherwise.
 func (o *ConnectorMetaAllOf) GetResourceVersion() int64 {
-	if o == nil || isNil(o.ResourceVersion) {
+	if o == nil || o.ResourceVersion == nil {
 		var ret int64
 		return ret
 	}
@@ -49,15 +49,15 @@ func (o *ConnectorMetaAllOf) GetResourceVersion() int64 {
 // GetResourceVersionOk returns a tuple with the ResourceVersion field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorMetaAllOf) GetResourceVersionOk() (*int64, bool) {
-	if o == nil || isNil(o.ResourceVersion) {
-    return nil, false
+	if o == nil || o.ResourceVersion == nil {
+		return nil, false
 	}
 	return o.ResourceVersion, true
 }
 
 // HasResourceVersion returns a boolean if a field has been set.
 func (o *ConnectorMetaAllOf) HasResourceVersion() bool {
-	if o != nil && !isNil(o.ResourceVersion) {
+	if o != nil && o.ResourceVersion != nil {
 		return true
 	}
 
@@ -71,7 +71,7 @@ func (o *ConnectorMetaAllOf) SetResourceVersion(v int64) {
 
 func (o ConnectorMetaAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.ResourceVersion) {
+	if o.ResourceVersion != nil {
 		toSerialize["resource_version"] = o.ResourceVersion
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_namespace.go b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_namespace.go
index 90cc4e5a..da492124 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_namespace.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_namespace.go
@@ -1,11 +1,11 @@
 /*
-Connector Management API
-
-Connector Management API is a REST API to manage connectors.
-
-API version: 0.1.0
-Contact: rhosak-support@redhat.com
-*/
+ * Connector Management API
+ *
+ * Connector Management API is a REST API to manage connectors.
+ *
+ * API version: 0.1.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -13,6 +13,7 @@ package connectormgmtclient
 
 import (
 	"encoding/json"
+	"time"
 )
 
 // ConnectorNamespace A connector namespace
@@ -71,8 +72,8 @@ func (o *ConnectorNamespace) GetId() string {
 // GetIdOk returns a tuple with the Id field value
 // and a boolean to check if the value has been set.
 func (o *ConnectorNamespace) GetIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Id, true
 }
@@ -84,7 +85,7 @@ func (o *ConnectorNamespace) SetId(v string) {
 
 // GetKind returns the Kind field value if set, zero value otherwise.
 func (o *ConnectorNamespace) GetKind() string {
-	if o == nil || isNil(o.Kind) {
+	if o == nil || o.Kind == nil {
 		var ret string
 		return ret
 	}
@@ -94,15 +95,15 @@ func (o *ConnectorNamespace) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorNamespace) GetKindOk() (*string, bool) {
-	if o == nil || isNil(o.Kind) {
-    return nil, false
+	if o == nil || o.Kind == nil {
+		return nil, false
 	}
 	return o.Kind, true
 }
 
 // HasKind returns a boolean if a field has been set.
 func (o *ConnectorNamespace) HasKind() bool {
-	if o != nil && !isNil(o.Kind) {
+	if o != nil && o.Kind != nil {
 		return true
 	}
 
@@ -116,7 +117,7 @@ func (o *ConnectorNamespace) SetKind(v string) {
 
 // GetHref returns the Href field value if set, zero value otherwise.
 func (o *ConnectorNamespace) GetHref() string {
-	if o == nil || isNil(o.Href) {
+	if o == nil || o.Href == nil {
 		var ret string
 		return ret
 	}
@@ -126,15 +127,15 @@ func (o *ConnectorNamespace) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorNamespace) GetHrefOk() (*string, bool) {
-	if o == nil || isNil(o.Href) {
-    return nil, false
+	if o == nil || o.Href == nil {
+		return nil, false
 	}
 	return o.Href, true
 }
 
 // HasHref returns a boolean if a field has been set.
 func (o *ConnectorNamespace) HasHref() bool {
-	if o != nil && !isNil(o.Href) {
+	if o != nil && o.Href != nil {
 		return true
 	}
 
@@ -148,7 +149,7 @@ func (o *ConnectorNamespace) SetHref(v string) {
 
 // GetOwner returns the Owner field value if set, zero value otherwise.
 func (o *ConnectorNamespace) GetOwner() string {
-	if o == nil || isNil(o.Owner) {
+	if o == nil || o.Owner == nil {
 		var ret string
 		return ret
 	}
@@ -158,15 +159,15 @@ func (o *ConnectorNamespace) GetOwner() string {
 // GetOwnerOk returns a tuple with the Owner field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorNamespace) GetOwnerOk() (*string, bool) {
-	if o == nil || isNil(o.Owner) {
-    return nil, false
+	if o == nil || o.Owner == nil {
+		return nil, false
 	}
 	return o.Owner, true
 }
 
 // HasOwner returns a boolean if a field has been set.
 func (o *ConnectorNamespace) HasOwner() bool {
-	if o != nil && !isNil(o.Owner) {
+	if o != nil && o.Owner != nil {
 		return true
 	}
 
@@ -180,7 +181,7 @@ func (o *ConnectorNamespace) SetOwner(v string) {
 
 // GetCreatedAt returns the CreatedAt field value if set, zero value otherwise.
 func (o *ConnectorNamespace) GetCreatedAt() time.Time {
-	if o == nil || isNil(o.CreatedAt) {
+	if o == nil || o.CreatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -190,15 +191,15 @@ func (o *ConnectorNamespace) GetCreatedAt() time.Time {
 // GetCreatedAtOk returns a tuple with the CreatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorNamespace) GetCreatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.CreatedAt) {
-    return nil, false
+	if o == nil || o.CreatedAt == nil {
+		return nil, false
 	}
 	return o.CreatedAt, true
 }
 
 // HasCreatedAt returns a boolean if a field has been set.
 func (o *ConnectorNamespace) HasCreatedAt() bool {
-	if o != nil && !isNil(o.CreatedAt) {
+	if o != nil && o.CreatedAt != nil {
 		return true
 	}
 
@@ -212,7 +213,7 @@ func (o *ConnectorNamespace) SetCreatedAt(v time.Time) {
 
 // GetModifiedAt returns the ModifiedAt field value if set, zero value otherwise.
 func (o *ConnectorNamespace) GetModifiedAt() time.Time {
-	if o == nil || isNil(o.ModifiedAt) {
+	if o == nil || o.ModifiedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -222,15 +223,15 @@ func (o *ConnectorNamespace) GetModifiedAt() time.Time {
 // GetModifiedAtOk returns a tuple with the ModifiedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorNamespace) GetModifiedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.ModifiedAt) {
-    return nil, false
+	if o == nil || o.ModifiedAt == nil {
+		return nil, false
 	}
 	return o.ModifiedAt, true
 }
 
 // HasModifiedAt returns a boolean if a field has been set.
 func (o *ConnectorNamespace) HasModifiedAt() bool {
-	if o != nil && !isNil(o.ModifiedAt) {
+	if o != nil && o.ModifiedAt != nil {
 		return true
 	}
 
@@ -255,8 +256,8 @@ func (o *ConnectorNamespace) GetName() string {
 // GetNameOk returns a tuple with the Name field value
 // and a boolean to check if the value has been set.
 func (o *ConnectorNamespace) GetNameOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Name, true
 }
@@ -268,7 +269,7 @@ func (o *ConnectorNamespace) SetName(v string) {
 
 // GetAnnotations returns the Annotations field value if set, zero value otherwise.
 func (o *ConnectorNamespace) GetAnnotations() map[string]string {
-	if o == nil || isNil(o.Annotations) {
+	if o == nil || o.Annotations == nil {
 		var ret map[string]string
 		return ret
 	}
@@ -278,15 +279,15 @@ func (o *ConnectorNamespace) GetAnnotations() map[string]string {
 // GetAnnotationsOk returns a tuple with the Annotations field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorNamespace) GetAnnotationsOk() (*map[string]string, bool) {
-	if o == nil || isNil(o.Annotations) {
-    return nil, false
+	if o == nil || o.Annotations == nil {
+		return nil, false
 	}
 	return o.Annotations, true
 }
 
 // HasAnnotations returns a boolean if a field has been set.
 func (o *ConnectorNamespace) HasAnnotations() bool {
-	if o != nil && !isNil(o.Annotations) {
+	if o != nil && o.Annotations != nil {
 		return true
 	}
 
@@ -311,8 +312,8 @@ func (o *ConnectorNamespace) GetResourceVersion() int64 {
 // GetResourceVersionOk returns a tuple with the ResourceVersion field value
 // and a boolean to check if the value has been set.
 func (o *ConnectorNamespace) GetResourceVersionOk() (*int64, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.ResourceVersion, true
 }
@@ -324,7 +325,7 @@ func (o *ConnectorNamespace) SetResourceVersion(v int64) {
 
 // GetQuota returns the Quota field value if set, zero value otherwise.
 func (o *ConnectorNamespace) GetQuota() ConnectorNamespaceQuota {
-	if o == nil || isNil(o.Quota) {
+	if o == nil || o.Quota == nil {
 		var ret ConnectorNamespaceQuota
 		return ret
 	}
@@ -334,15 +335,15 @@ func (o *ConnectorNamespace) GetQuota() ConnectorNamespaceQuota {
 // GetQuotaOk returns a tuple with the Quota field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorNamespace) GetQuotaOk() (*ConnectorNamespaceQuota, bool) {
-	if o == nil || isNil(o.Quota) {
-    return nil, false
+	if o == nil || o.Quota == nil {
+		return nil, false
 	}
 	return o.Quota, true
 }
 
 // HasQuota returns a boolean if a field has been set.
 func (o *ConnectorNamespace) HasQuota() bool {
-	if o != nil && !isNil(o.Quota) {
+	if o != nil && o.Quota != nil {
 		return true
 	}
 
@@ -367,8 +368,8 @@ func (o *ConnectorNamespace) GetClusterId() string {
 // GetClusterIdOk returns a tuple with the ClusterId field value
 // and a boolean to check if the value has been set.
 func (o *ConnectorNamespace) GetClusterIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.ClusterId, true
 }
@@ -380,7 +381,7 @@ func (o *ConnectorNamespace) SetClusterId(v string) {
 
 // GetExpiration returns the Expiration field value if set, zero value otherwise.
 func (o *ConnectorNamespace) GetExpiration() string {
-	if o == nil || isNil(o.Expiration) {
+	if o == nil || o.Expiration == nil {
 		var ret string
 		return ret
 	}
@@ -390,15 +391,15 @@ func (o *ConnectorNamespace) GetExpiration() string {
 // GetExpirationOk returns a tuple with the Expiration field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorNamespace) GetExpirationOk() (*string, bool) {
-	if o == nil || isNil(o.Expiration) {
-    return nil, false
+	if o == nil || o.Expiration == nil {
+		return nil, false
 	}
 	return o.Expiration, true
 }
 
 // HasExpiration returns a boolean if a field has been set.
 func (o *ConnectorNamespace) HasExpiration() bool {
-	if o != nil && !isNil(o.Expiration) {
+	if o != nil && o.Expiration != nil {
 		return true
 	}
 
@@ -423,8 +424,8 @@ func (o *ConnectorNamespace) GetTenant() ConnectorNamespaceTenant {
 // GetTenantOk returns a tuple with the Tenant field value
 // and a boolean to check if the value has been set.
 func (o *ConnectorNamespace) GetTenantOk() (*ConnectorNamespaceTenant, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Tenant, true
 }
@@ -447,8 +448,8 @@ func (o *ConnectorNamespace) GetStatus() ConnectorNamespaceStatus {
 // GetStatusOk returns a tuple with the Status field value
 // and a boolean to check if the value has been set.
 func (o *ConnectorNamespace) GetStatusOk() (*ConnectorNamespaceStatus, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Status, true
 }
@@ -463,37 +464,37 @@ func (o ConnectorNamespace) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.Kind) {
+	if o.Kind != nil {
 		toSerialize["kind"] = o.Kind
 	}
-	if !isNil(o.Href) {
+	if o.Href != nil {
 		toSerialize["href"] = o.Href
 	}
-	if !isNil(o.Owner) {
+	if o.Owner != nil {
 		toSerialize["owner"] = o.Owner
 	}
-	if !isNil(o.CreatedAt) {
+	if o.CreatedAt != nil {
 		toSerialize["created_at"] = o.CreatedAt
 	}
-	if !isNil(o.ModifiedAt) {
+	if o.ModifiedAt != nil {
 		toSerialize["modified_at"] = o.ModifiedAt
 	}
 	if true {
 		toSerialize["name"] = o.Name
 	}
-	if !isNil(o.Annotations) {
+	if o.Annotations != nil {
 		toSerialize["annotations"] = o.Annotations
 	}
 	if true {
 		toSerialize["resource_version"] = o.ResourceVersion
 	}
-	if !isNil(o.Quota) {
+	if o.Quota != nil {
 		toSerialize["quota"] = o.Quota
 	}
 	if true {
 		toSerialize["cluster_id"] = o.ClusterId
 	}
-	if !isNil(o.Expiration) {
+	if o.Expiration != nil {
 		toSerialize["expiration"] = o.Expiration
 	}
 	if true {
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_namespace_all_of.go b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_namespace_all_of.go
index 15c193c2..fa0f89c9 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_namespace_all_of.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_namespace_all_of.go
@@ -1,11 +1,11 @@
 /*
-Connector Management API
-
-Connector Management API is a REST API to manage connectors.
-
-API version: 0.1.0
-Contact: rhosak-support@redhat.com
-*/
+ * Connector Management API
+ *
+ * Connector Management API is a REST API to manage connectors.
+ *
+ * API version: 0.1.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -59,8 +59,8 @@ func (o *ConnectorNamespaceAllOf) GetName() string {
 // GetNameOk returns a tuple with the Name field value
 // and a boolean to check if the value has been set.
 func (o *ConnectorNamespaceAllOf) GetNameOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Name, true
 }
@@ -83,8 +83,8 @@ func (o *ConnectorNamespaceAllOf) GetClusterId() string {
 // GetClusterIdOk returns a tuple with the ClusterId field value
 // and a boolean to check if the value has been set.
 func (o *ConnectorNamespaceAllOf) GetClusterIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.ClusterId, true
 }
@@ -96,7 +96,7 @@ func (o *ConnectorNamespaceAllOf) SetClusterId(v string) {
 
 // GetExpiration returns the Expiration field value if set, zero value otherwise.
 func (o *ConnectorNamespaceAllOf) GetExpiration() string {
-	if o == nil || isNil(o.Expiration) {
+	if o == nil || o.Expiration == nil {
 		var ret string
 		return ret
 	}
@@ -106,15 +106,15 @@ func (o *ConnectorNamespaceAllOf) GetExpiration() string {
 // GetExpirationOk returns a tuple with the Expiration field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorNamespaceAllOf) GetExpirationOk() (*string, bool) {
-	if o == nil || isNil(o.Expiration) {
-    return nil, false
+	if o == nil || o.Expiration == nil {
+		return nil, false
 	}
 	return o.Expiration, true
 }
 
 // HasExpiration returns a boolean if a field has been set.
 func (o *ConnectorNamespaceAllOf) HasExpiration() bool {
-	if o != nil && !isNil(o.Expiration) {
+	if o != nil && o.Expiration != nil {
 		return true
 	}
 
@@ -139,8 +139,8 @@ func (o *ConnectorNamespaceAllOf) GetTenant() ConnectorNamespaceTenant {
 // GetTenantOk returns a tuple with the Tenant field value
 // and a boolean to check if the value has been set.
 func (o *ConnectorNamespaceAllOf) GetTenantOk() (*ConnectorNamespaceTenant, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Tenant, true
 }
@@ -163,8 +163,8 @@ func (o *ConnectorNamespaceAllOf) GetStatus() ConnectorNamespaceStatus {
 // GetStatusOk returns a tuple with the Status field value
 // and a boolean to check if the value has been set.
 func (o *ConnectorNamespaceAllOf) GetStatusOk() (*ConnectorNamespaceStatus, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Status, true
 }
@@ -182,7 +182,7 @@ func (o ConnectorNamespaceAllOf) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["cluster_id"] = o.ClusterId
 	}
-	if !isNil(o.Expiration) {
+	if o.Expiration != nil {
 		toSerialize["expiration"] = o.Expiration
 	}
 	if true {
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_namespace_eval_request.go b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_namespace_eval_request.go
index 45845403..22ca00aa 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_namespace_eval_request.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_namespace_eval_request.go
@@ -1,11 +1,11 @@
 /*
-Connector Management API
-
-Connector Management API is a REST API to manage connectors.
-
-API version: 0.1.0
-Contact: rhosak-support@redhat.com
-*/
+ * Connector Management API
+ *
+ * Connector Management API is a REST API to manage connectors.
+ *
+ * API version: 0.1.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -42,7 +42,7 @@ func NewConnectorNamespaceEvalRequestWithDefaults() *ConnectorNamespaceEvalReque
 
 // GetName returns the Name field value if set, zero value otherwise.
 func (o *ConnectorNamespaceEvalRequest) GetName() string {
-	if o == nil || isNil(o.Name) {
+	if o == nil || o.Name == nil {
 		var ret string
 		return ret
 	}
@@ -52,15 +52,15 @@ func (o *ConnectorNamespaceEvalRequest) GetName() string {
 // GetNameOk returns a tuple with the Name field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorNamespaceEvalRequest) GetNameOk() (*string, bool) {
-	if o == nil || isNil(o.Name) {
-    return nil, false
+	if o == nil || o.Name == nil {
+		return nil, false
 	}
 	return o.Name, true
 }
 
 // HasName returns a boolean if a field has been set.
 func (o *ConnectorNamespaceEvalRequest) HasName() bool {
-	if o != nil && !isNil(o.Name) {
+	if o != nil && o.Name != nil {
 		return true
 	}
 
@@ -74,7 +74,7 @@ func (o *ConnectorNamespaceEvalRequest) SetName(v string) {
 
 // GetAnnotations returns the Annotations field value if set, zero value otherwise.
 func (o *ConnectorNamespaceEvalRequest) GetAnnotations() map[string]string {
-	if o == nil || isNil(o.Annotations) {
+	if o == nil || o.Annotations == nil {
 		var ret map[string]string
 		return ret
 	}
@@ -84,15 +84,15 @@ func (o *ConnectorNamespaceEvalRequest) GetAnnotations() map[string]string {
 // GetAnnotationsOk returns a tuple with the Annotations field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorNamespaceEvalRequest) GetAnnotationsOk() (*map[string]string, bool) {
-	if o == nil || isNil(o.Annotations) {
-    return nil, false
+	if o == nil || o.Annotations == nil {
+		return nil, false
 	}
 	return o.Annotations, true
 }
 
 // HasAnnotations returns a boolean if a field has been set.
 func (o *ConnectorNamespaceEvalRequest) HasAnnotations() bool {
-	if o != nil && !isNil(o.Annotations) {
+	if o != nil && o.Annotations != nil {
 		return true
 	}
 
@@ -106,10 +106,10 @@ func (o *ConnectorNamespaceEvalRequest) SetAnnotations(v map[string]string) {
 
 func (o ConnectorNamespaceEvalRequest) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Name) {
+	if o.Name != nil {
 		toSerialize["name"] = o.Name
 	}
-	if !isNil(o.Annotations) {
+	if o.Annotations != nil {
 		toSerialize["annotations"] = o.Annotations
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_namespace_list.go b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_namespace_list.go
index 63879e9d..6833eda6 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_namespace_list.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_namespace_list.go
@@ -1,11 +1,11 @@
 /*
-Connector Management API
-
-Connector Management API is a REST API to manage connectors.
-
-API version: 0.1.0
-Contact: rhosak-support@redhat.com
-*/
+ * Connector Management API
+ *
+ * Connector Management API is a REST API to manage connectors.
+ *
+ * API version: 0.1.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -59,8 +59,8 @@ func (o *ConnectorNamespaceList) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *ConnectorNamespaceList) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -83,8 +83,8 @@ func (o *ConnectorNamespaceList) GetPage() int32 {
 // GetPageOk returns a tuple with the Page field value
 // and a boolean to check if the value has been set.
 func (o *ConnectorNamespaceList) GetPageOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Page, true
 }
@@ -107,8 +107,8 @@ func (o *ConnectorNamespaceList) GetSize() int32 {
 // GetSizeOk returns a tuple with the Size field value
 // and a boolean to check if the value has been set.
 func (o *ConnectorNamespaceList) GetSizeOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Size, true
 }
@@ -131,8 +131,8 @@ func (o *ConnectorNamespaceList) GetTotal() int32 {
 // GetTotalOk returns a tuple with the Total field value
 // and a boolean to check if the value has been set.
 func (o *ConnectorNamespaceList) GetTotalOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Total, true
 }
@@ -154,11 +154,11 @@ func (o *ConnectorNamespaceList) GetItems() []ConnectorNamespace {
 
 // GetItemsOk returns a tuple with the Items field value
 // and a boolean to check if the value has been set.
-func (o *ConnectorNamespaceList) GetItemsOk() ([]ConnectorNamespace, bool) {
-	if o == nil {
-    return nil, false
+func (o *ConnectorNamespaceList) GetItemsOk() (*[]ConnectorNamespace, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Items, true
+	return &o.Items, true
 }
 
 // SetItems sets field value
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_namespace_list_all_of.go b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_namespace_list_all_of.go
index f2859935..99310728 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_namespace_list_all_of.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_namespace_list_all_of.go
@@ -1,11 +1,11 @@
 /*
-Connector Management API
-
-Connector Management API is a REST API to manage connectors.
-
-API version: 0.1.0
-Contact: rhosak-support@redhat.com
-*/
+ * Connector Management API
+ *
+ * Connector Management API is a REST API to manage connectors.
+ *
+ * API version: 0.1.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -17,7 +17,7 @@ import (
 
 // ConnectorNamespaceListAllOf struct for ConnectorNamespaceListAllOf
 type ConnectorNamespaceListAllOf struct {
-	Items []ConnectorNamespace `json:"items,omitempty"`
+	Items *[]ConnectorNamespace `json:"items,omitempty"`
 }
 
 // NewConnectorNamespaceListAllOf instantiates a new ConnectorNamespaceListAllOf object
@@ -39,25 +39,25 @@ func NewConnectorNamespaceListAllOfWithDefaults() *ConnectorNamespaceListAllOf {
 
 // GetItems returns the Items field value if set, zero value otherwise.
 func (o *ConnectorNamespaceListAllOf) GetItems() []ConnectorNamespace {
-	if o == nil || isNil(o.Items) {
+	if o == nil || o.Items == nil {
 		var ret []ConnectorNamespace
 		return ret
 	}
-	return o.Items
+	return *o.Items
 }
 
 // GetItemsOk returns a tuple with the Items field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *ConnectorNamespaceListAllOf) GetItemsOk() ([]ConnectorNamespace, bool) {
-	if o == nil || isNil(o.Items) {
-    return nil, false
+func (o *ConnectorNamespaceListAllOf) GetItemsOk() (*[]ConnectorNamespace, bool) {
+	if o == nil || o.Items == nil {
+		return nil, false
 	}
 	return o.Items, true
 }
 
 // HasItems returns a boolean if a field has been set.
 func (o *ConnectorNamespaceListAllOf) HasItems() bool {
-	if o != nil && !isNil(o.Items) {
+	if o != nil && o.Items != nil {
 		return true
 	}
 
@@ -66,12 +66,12 @@ func (o *ConnectorNamespaceListAllOf) HasItems() bool {
 
 // SetItems gets a reference to the given []ConnectorNamespace and assigns it to the Items field.
 func (o *ConnectorNamespaceListAllOf) SetItems(v []ConnectorNamespace) {
-	o.Items = v
+	o.Items = &v
 }
 
 func (o ConnectorNamespaceListAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Items) {
+	if o.Items != nil {
 		toSerialize["items"] = o.Items
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_namespace_meta.go b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_namespace_meta.go
index 6d8785a6..35c37579 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_namespace_meta.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_namespace_meta.go
@@ -1,11 +1,11 @@
 /*
-Connector Management API
-
-Connector Management API is a REST API to manage connectors.
-
-API version: 0.1.0
-Contact: rhosak-support@redhat.com
-*/
+ * Connector Management API
+ *
+ * Connector Management API is a REST API to manage connectors.
+ *
+ * API version: 0.1.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -13,6 +13,7 @@ package connectormgmtclient
 
 import (
 	"encoding/json"
+	"time"
 )
 
 // ConnectorNamespaceMeta struct for ConnectorNamespaceMeta
@@ -47,7 +48,7 @@ func NewConnectorNamespaceMetaWithDefaults() *ConnectorNamespaceMeta {
 
 // GetOwner returns the Owner field value if set, zero value otherwise.
 func (o *ConnectorNamespaceMeta) GetOwner() string {
-	if o == nil || isNil(o.Owner) {
+	if o == nil || o.Owner == nil {
 		var ret string
 		return ret
 	}
@@ -57,15 +58,15 @@ func (o *ConnectorNamespaceMeta) GetOwner() string {
 // GetOwnerOk returns a tuple with the Owner field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorNamespaceMeta) GetOwnerOk() (*string, bool) {
-	if o == nil || isNil(o.Owner) {
-    return nil, false
+	if o == nil || o.Owner == nil {
+		return nil, false
 	}
 	return o.Owner, true
 }
 
 // HasOwner returns a boolean if a field has been set.
 func (o *ConnectorNamespaceMeta) HasOwner() bool {
-	if o != nil && !isNil(o.Owner) {
+	if o != nil && o.Owner != nil {
 		return true
 	}
 
@@ -79,7 +80,7 @@ func (o *ConnectorNamespaceMeta) SetOwner(v string) {
 
 // GetCreatedAt returns the CreatedAt field value if set, zero value otherwise.
 func (o *ConnectorNamespaceMeta) GetCreatedAt() time.Time {
-	if o == nil || isNil(o.CreatedAt) {
+	if o == nil || o.CreatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -89,15 +90,15 @@ func (o *ConnectorNamespaceMeta) GetCreatedAt() time.Time {
 // GetCreatedAtOk returns a tuple with the CreatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorNamespaceMeta) GetCreatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.CreatedAt) {
-    return nil, false
+	if o == nil || o.CreatedAt == nil {
+		return nil, false
 	}
 	return o.CreatedAt, true
 }
 
 // HasCreatedAt returns a boolean if a field has been set.
 func (o *ConnectorNamespaceMeta) HasCreatedAt() bool {
-	if o != nil && !isNil(o.CreatedAt) {
+	if o != nil && o.CreatedAt != nil {
 		return true
 	}
 
@@ -111,7 +112,7 @@ func (o *ConnectorNamespaceMeta) SetCreatedAt(v time.Time) {
 
 // GetModifiedAt returns the ModifiedAt field value if set, zero value otherwise.
 func (o *ConnectorNamespaceMeta) GetModifiedAt() time.Time {
-	if o == nil || isNil(o.ModifiedAt) {
+	if o == nil || o.ModifiedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -121,15 +122,15 @@ func (o *ConnectorNamespaceMeta) GetModifiedAt() time.Time {
 // GetModifiedAtOk returns a tuple with the ModifiedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorNamespaceMeta) GetModifiedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.ModifiedAt) {
-    return nil, false
+	if o == nil || o.ModifiedAt == nil {
+		return nil, false
 	}
 	return o.ModifiedAt, true
 }
 
 // HasModifiedAt returns a boolean if a field has been set.
 func (o *ConnectorNamespaceMeta) HasModifiedAt() bool {
-	if o != nil && !isNil(o.ModifiedAt) {
+	if o != nil && o.ModifiedAt != nil {
 		return true
 	}
 
@@ -143,7 +144,7 @@ func (o *ConnectorNamespaceMeta) SetModifiedAt(v time.Time) {
 
 // GetName returns the Name field value if set, zero value otherwise.
 func (o *ConnectorNamespaceMeta) GetName() string {
-	if o == nil || isNil(o.Name) {
+	if o == nil || o.Name == nil {
 		var ret string
 		return ret
 	}
@@ -153,15 +154,15 @@ func (o *ConnectorNamespaceMeta) GetName() string {
 // GetNameOk returns a tuple with the Name field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorNamespaceMeta) GetNameOk() (*string, bool) {
-	if o == nil || isNil(o.Name) {
-    return nil, false
+	if o == nil || o.Name == nil {
+		return nil, false
 	}
 	return o.Name, true
 }
 
 // HasName returns a boolean if a field has been set.
 func (o *ConnectorNamespaceMeta) HasName() bool {
-	if o != nil && !isNil(o.Name) {
+	if o != nil && o.Name != nil {
 		return true
 	}
 
@@ -175,7 +176,7 @@ func (o *ConnectorNamespaceMeta) SetName(v string) {
 
 // GetAnnotations returns the Annotations field value if set, zero value otherwise.
 func (o *ConnectorNamespaceMeta) GetAnnotations() map[string]string {
-	if o == nil || isNil(o.Annotations) {
+	if o == nil || o.Annotations == nil {
 		var ret map[string]string
 		return ret
 	}
@@ -185,15 +186,15 @@ func (o *ConnectorNamespaceMeta) GetAnnotations() map[string]string {
 // GetAnnotationsOk returns a tuple with the Annotations field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorNamespaceMeta) GetAnnotationsOk() (*map[string]string, bool) {
-	if o == nil || isNil(o.Annotations) {
-    return nil, false
+	if o == nil || o.Annotations == nil {
+		return nil, false
 	}
 	return o.Annotations, true
 }
 
 // HasAnnotations returns a boolean if a field has been set.
 func (o *ConnectorNamespaceMeta) HasAnnotations() bool {
-	if o != nil && !isNil(o.Annotations) {
+	if o != nil && o.Annotations != nil {
 		return true
 	}
 
@@ -207,7 +208,7 @@ func (o *ConnectorNamespaceMeta) SetAnnotations(v map[string]string) {
 
 // GetResourceVersion returns the ResourceVersion field value if set, zero value otherwise.
 func (o *ConnectorNamespaceMeta) GetResourceVersion() int64 {
-	if o == nil || isNil(o.ResourceVersion) {
+	if o == nil || o.ResourceVersion == nil {
 		var ret int64
 		return ret
 	}
@@ -217,15 +218,15 @@ func (o *ConnectorNamespaceMeta) GetResourceVersion() int64 {
 // GetResourceVersionOk returns a tuple with the ResourceVersion field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorNamespaceMeta) GetResourceVersionOk() (*int64, bool) {
-	if o == nil || isNil(o.ResourceVersion) {
-    return nil, false
+	if o == nil || o.ResourceVersion == nil {
+		return nil, false
 	}
 	return o.ResourceVersion, true
 }
 
 // HasResourceVersion returns a boolean if a field has been set.
 func (o *ConnectorNamespaceMeta) HasResourceVersion() bool {
-	if o != nil && !isNil(o.ResourceVersion) {
+	if o != nil && o.ResourceVersion != nil {
 		return true
 	}
 
@@ -239,7 +240,7 @@ func (o *ConnectorNamespaceMeta) SetResourceVersion(v int64) {
 
 // GetQuota returns the Quota field value if set, zero value otherwise.
 func (o *ConnectorNamespaceMeta) GetQuota() ConnectorNamespaceQuota {
-	if o == nil || isNil(o.Quota) {
+	if o == nil || o.Quota == nil {
 		var ret ConnectorNamespaceQuota
 		return ret
 	}
@@ -249,15 +250,15 @@ func (o *ConnectorNamespaceMeta) GetQuota() ConnectorNamespaceQuota {
 // GetQuotaOk returns a tuple with the Quota field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorNamespaceMeta) GetQuotaOk() (*ConnectorNamespaceQuota, bool) {
-	if o == nil || isNil(o.Quota) {
-    return nil, false
+	if o == nil || o.Quota == nil {
+		return nil, false
 	}
 	return o.Quota, true
 }
 
 // HasQuota returns a boolean if a field has been set.
 func (o *ConnectorNamespaceMeta) HasQuota() bool {
-	if o != nil && !isNil(o.Quota) {
+	if o != nil && o.Quota != nil {
 		return true
 	}
 
@@ -271,25 +272,25 @@ func (o *ConnectorNamespaceMeta) SetQuota(v ConnectorNamespaceQuota) {
 
 func (o ConnectorNamespaceMeta) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Owner) {
+	if o.Owner != nil {
 		toSerialize["owner"] = o.Owner
 	}
-	if !isNil(o.CreatedAt) {
+	if o.CreatedAt != nil {
 		toSerialize["created_at"] = o.CreatedAt
 	}
-	if !isNil(o.ModifiedAt) {
+	if o.ModifiedAt != nil {
 		toSerialize["modified_at"] = o.ModifiedAt
 	}
-	if !isNil(o.Name) {
+	if o.Name != nil {
 		toSerialize["name"] = o.Name
 	}
-	if !isNil(o.Annotations) {
+	if o.Annotations != nil {
 		toSerialize["annotations"] = o.Annotations
 	}
-	if !isNil(o.ResourceVersion) {
+	if o.ResourceVersion != nil {
 		toSerialize["resource_version"] = o.ResourceVersion
 	}
-	if !isNil(o.Quota) {
+	if o.Quota != nil {
 		toSerialize["quota"] = o.Quota
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_namespace_meta_all_of.go b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_namespace_meta_all_of.go
index 2c245668..c7696329 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_namespace_meta_all_of.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_namespace_meta_all_of.go
@@ -1,11 +1,11 @@
 /*
-Connector Management API
-
-Connector Management API is a REST API to manage connectors.
-
-API version: 0.1.0
-Contact: rhosak-support@redhat.com
-*/
+ * Connector Management API
+ *
+ * Connector Management API is a REST API to manage connectors.
+ *
+ * API version: 0.1.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -40,7 +40,7 @@ func NewConnectorNamespaceMetaAllOfWithDefaults() *ConnectorNamespaceMetaAllOf {
 
 // GetResourceVersion returns the ResourceVersion field value if set, zero value otherwise.
 func (o *ConnectorNamespaceMetaAllOf) GetResourceVersion() int64 {
-	if o == nil || isNil(o.ResourceVersion) {
+	if o == nil || o.ResourceVersion == nil {
 		var ret int64
 		return ret
 	}
@@ -50,15 +50,15 @@ func (o *ConnectorNamespaceMetaAllOf) GetResourceVersion() int64 {
 // GetResourceVersionOk returns a tuple with the ResourceVersion field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorNamespaceMetaAllOf) GetResourceVersionOk() (*int64, bool) {
-	if o == nil || isNil(o.ResourceVersion) {
-    return nil, false
+	if o == nil || o.ResourceVersion == nil {
+		return nil, false
 	}
 	return o.ResourceVersion, true
 }
 
 // HasResourceVersion returns a boolean if a field has been set.
 func (o *ConnectorNamespaceMetaAllOf) HasResourceVersion() bool {
-	if o != nil && !isNil(o.ResourceVersion) {
+	if o != nil && o.ResourceVersion != nil {
 		return true
 	}
 
@@ -72,7 +72,7 @@ func (o *ConnectorNamespaceMetaAllOf) SetResourceVersion(v int64) {
 
 // GetQuota returns the Quota field value if set, zero value otherwise.
 func (o *ConnectorNamespaceMetaAllOf) GetQuota() ConnectorNamespaceQuota {
-	if o == nil || isNil(o.Quota) {
+	if o == nil || o.Quota == nil {
 		var ret ConnectorNamespaceQuota
 		return ret
 	}
@@ -82,15 +82,15 @@ func (o *ConnectorNamespaceMetaAllOf) GetQuota() ConnectorNamespaceQuota {
 // GetQuotaOk returns a tuple with the Quota field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorNamespaceMetaAllOf) GetQuotaOk() (*ConnectorNamespaceQuota, bool) {
-	if o == nil || isNil(o.Quota) {
-    return nil, false
+	if o == nil || o.Quota == nil {
+		return nil, false
 	}
 	return o.Quota, true
 }
 
 // HasQuota returns a boolean if a field has been set.
 func (o *ConnectorNamespaceMetaAllOf) HasQuota() bool {
-	if o != nil && !isNil(o.Quota) {
+	if o != nil && o.Quota != nil {
 		return true
 	}
 
@@ -104,10 +104,10 @@ func (o *ConnectorNamespaceMetaAllOf) SetQuota(v ConnectorNamespaceQuota) {
 
 func (o ConnectorNamespaceMetaAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.ResourceVersion) {
+	if o.ResourceVersion != nil {
 		toSerialize["resource_version"] = o.ResourceVersion
 	}
-	if !isNil(o.Quota) {
+	if o.Quota != nil {
 		toSerialize["quota"] = o.Quota
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_namespace_patch_request.go b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_namespace_patch_request.go
index bd4906d1..d66c3c3f 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_namespace_patch_request.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_namespace_patch_request.go
@@ -1,11 +1,11 @@
 /*
-Connector Management API
-
-Connector Management API is a REST API to manage connectors.
-
-API version: 0.1.0
-Contact: rhosak-support@redhat.com
-*/
+ * Connector Management API
+ *
+ * Connector Management API is a REST API to manage connectors.
+ *
+ * API version: 0.1.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -42,7 +42,7 @@ func NewConnectorNamespacePatchRequestWithDefaults() *ConnectorNamespacePatchReq
 
 // GetName returns the Name field value if set, zero value otherwise.
 func (o *ConnectorNamespacePatchRequest) GetName() string {
-	if o == nil || isNil(o.Name) {
+	if o == nil || o.Name == nil {
 		var ret string
 		return ret
 	}
@@ -52,15 +52,15 @@ func (o *ConnectorNamespacePatchRequest) GetName() string {
 // GetNameOk returns a tuple with the Name field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorNamespacePatchRequest) GetNameOk() (*string, bool) {
-	if o == nil || isNil(o.Name) {
-    return nil, false
+	if o == nil || o.Name == nil {
+		return nil, false
 	}
 	return o.Name, true
 }
 
 // HasName returns a boolean if a field has been set.
 func (o *ConnectorNamespacePatchRequest) HasName() bool {
-	if o != nil && !isNil(o.Name) {
+	if o != nil && o.Name != nil {
 		return true
 	}
 
@@ -74,7 +74,7 @@ func (o *ConnectorNamespacePatchRequest) SetName(v string) {
 
 // GetAnnotations returns the Annotations field value if set, zero value otherwise.
 func (o *ConnectorNamespacePatchRequest) GetAnnotations() map[string]string {
-	if o == nil || isNil(o.Annotations) {
+	if o == nil || o.Annotations == nil {
 		var ret map[string]string
 		return ret
 	}
@@ -84,15 +84,15 @@ func (o *ConnectorNamespacePatchRequest) GetAnnotations() map[string]string {
 // GetAnnotationsOk returns a tuple with the Annotations field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorNamespacePatchRequest) GetAnnotationsOk() (*map[string]string, bool) {
-	if o == nil || isNil(o.Annotations) {
-    return nil, false
+	if o == nil || o.Annotations == nil {
+		return nil, false
 	}
 	return o.Annotations, true
 }
 
 // HasAnnotations returns a boolean if a field has been set.
 func (o *ConnectorNamespacePatchRequest) HasAnnotations() bool {
-	if o != nil && !isNil(o.Annotations) {
+	if o != nil && o.Annotations != nil {
 		return true
 	}
 
@@ -106,10 +106,10 @@ func (o *ConnectorNamespacePatchRequest) SetAnnotations(v map[string]string) {
 
 func (o ConnectorNamespacePatchRequest) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Name) {
+	if o.Name != nil {
 		toSerialize["name"] = o.Name
 	}
-	if !isNil(o.Annotations) {
+	if o.Annotations != nil {
 		toSerialize["annotations"] = o.Annotations
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_namespace_quota.go b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_namespace_quota.go
index 53ee471e..abd6aae2 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_namespace_quota.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_namespace_quota.go
@@ -1,11 +1,11 @@
 /*
-Connector Management API
-
-Connector Management API is a REST API to manage connectors.
-
-API version: 0.1.0
-Contact: rhosak-support@redhat.com
-*/
+ * Connector Management API
+ *
+ * Connector Management API is a REST API to manage connectors.
+ *
+ * API version: 0.1.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -47,7 +47,7 @@ func NewConnectorNamespaceQuotaWithDefaults() *ConnectorNamespaceQuota {
 
 // GetConnectors returns the Connectors field value if set, zero value otherwise.
 func (o *ConnectorNamespaceQuota) GetConnectors() int32 {
-	if o == nil || isNil(o.Connectors) {
+	if o == nil || o.Connectors == nil {
 		var ret int32
 		return ret
 	}
@@ -57,15 +57,15 @@ func (o *ConnectorNamespaceQuota) GetConnectors() int32 {
 // GetConnectorsOk returns a tuple with the Connectors field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorNamespaceQuota) GetConnectorsOk() (*int32, bool) {
-	if o == nil || isNil(o.Connectors) {
-    return nil, false
+	if o == nil || o.Connectors == nil {
+		return nil, false
 	}
 	return o.Connectors, true
 }
 
 // HasConnectors returns a boolean if a field has been set.
 func (o *ConnectorNamespaceQuota) HasConnectors() bool {
-	if o != nil && !isNil(o.Connectors) {
+	if o != nil && o.Connectors != nil {
 		return true
 	}
 
@@ -79,7 +79,7 @@ func (o *ConnectorNamespaceQuota) SetConnectors(v int32) {
 
 // GetMemoryRequests returns the MemoryRequests field value if set, zero value otherwise.
 func (o *ConnectorNamespaceQuota) GetMemoryRequests() string {
-	if o == nil || isNil(o.MemoryRequests) {
+	if o == nil || o.MemoryRequests == nil {
 		var ret string
 		return ret
 	}
@@ -89,15 +89,15 @@ func (o *ConnectorNamespaceQuota) GetMemoryRequests() string {
 // GetMemoryRequestsOk returns a tuple with the MemoryRequests field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorNamespaceQuota) GetMemoryRequestsOk() (*string, bool) {
-	if o == nil || isNil(o.MemoryRequests) {
-    return nil, false
+	if o == nil || o.MemoryRequests == nil {
+		return nil, false
 	}
 	return o.MemoryRequests, true
 }
 
 // HasMemoryRequests returns a boolean if a field has been set.
 func (o *ConnectorNamespaceQuota) HasMemoryRequests() bool {
-	if o != nil && !isNil(o.MemoryRequests) {
+	if o != nil && o.MemoryRequests != nil {
 		return true
 	}
 
@@ -111,7 +111,7 @@ func (o *ConnectorNamespaceQuota) SetMemoryRequests(v string) {
 
 // GetMemoryLimits returns the MemoryLimits field value if set, zero value otherwise.
 func (o *ConnectorNamespaceQuota) GetMemoryLimits() string {
-	if o == nil || isNil(o.MemoryLimits) {
+	if o == nil || o.MemoryLimits == nil {
 		var ret string
 		return ret
 	}
@@ -121,15 +121,15 @@ func (o *ConnectorNamespaceQuota) GetMemoryLimits() string {
 // GetMemoryLimitsOk returns a tuple with the MemoryLimits field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorNamespaceQuota) GetMemoryLimitsOk() (*string, bool) {
-	if o == nil || isNil(o.MemoryLimits) {
-    return nil, false
+	if o == nil || o.MemoryLimits == nil {
+		return nil, false
 	}
 	return o.MemoryLimits, true
 }
 
 // HasMemoryLimits returns a boolean if a field has been set.
 func (o *ConnectorNamespaceQuota) HasMemoryLimits() bool {
-	if o != nil && !isNil(o.MemoryLimits) {
+	if o != nil && o.MemoryLimits != nil {
 		return true
 	}
 
@@ -143,7 +143,7 @@ func (o *ConnectorNamespaceQuota) SetMemoryLimits(v string) {
 
 // GetCpuRequests returns the CpuRequests field value if set, zero value otherwise.
 func (o *ConnectorNamespaceQuota) GetCpuRequests() string {
-	if o == nil || isNil(o.CpuRequests) {
+	if o == nil || o.CpuRequests == nil {
 		var ret string
 		return ret
 	}
@@ -153,15 +153,15 @@ func (o *ConnectorNamespaceQuota) GetCpuRequests() string {
 // GetCpuRequestsOk returns a tuple with the CpuRequests field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorNamespaceQuota) GetCpuRequestsOk() (*string, bool) {
-	if o == nil || isNil(o.CpuRequests) {
-    return nil, false
+	if o == nil || o.CpuRequests == nil {
+		return nil, false
 	}
 	return o.CpuRequests, true
 }
 
 // HasCpuRequests returns a boolean if a field has been set.
 func (o *ConnectorNamespaceQuota) HasCpuRequests() bool {
-	if o != nil && !isNil(o.CpuRequests) {
+	if o != nil && o.CpuRequests != nil {
 		return true
 	}
 
@@ -175,7 +175,7 @@ func (o *ConnectorNamespaceQuota) SetCpuRequests(v string) {
 
 // GetCpuLimits returns the CpuLimits field value if set, zero value otherwise.
 func (o *ConnectorNamespaceQuota) GetCpuLimits() string {
-	if o == nil || isNil(o.CpuLimits) {
+	if o == nil || o.CpuLimits == nil {
 		var ret string
 		return ret
 	}
@@ -185,15 +185,15 @@ func (o *ConnectorNamespaceQuota) GetCpuLimits() string {
 // GetCpuLimitsOk returns a tuple with the CpuLimits field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorNamespaceQuota) GetCpuLimitsOk() (*string, bool) {
-	if o == nil || isNil(o.CpuLimits) {
-    return nil, false
+	if o == nil || o.CpuLimits == nil {
+		return nil, false
 	}
 	return o.CpuLimits, true
 }
 
 // HasCpuLimits returns a boolean if a field has been set.
 func (o *ConnectorNamespaceQuota) HasCpuLimits() bool {
-	if o != nil && !isNil(o.CpuLimits) {
+	if o != nil && o.CpuLimits != nil {
 		return true
 	}
 
@@ -207,19 +207,19 @@ func (o *ConnectorNamespaceQuota) SetCpuLimits(v string) {
 
 func (o ConnectorNamespaceQuota) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Connectors) {
+	if o.Connectors != nil {
 		toSerialize["connectors"] = o.Connectors
 	}
-	if !isNil(o.MemoryRequests) {
+	if o.MemoryRequests != nil {
 		toSerialize["memory_requests"] = o.MemoryRequests
 	}
-	if !isNil(o.MemoryLimits) {
+	if o.MemoryLimits != nil {
 		toSerialize["memory_limits"] = o.MemoryLimits
 	}
-	if !isNil(o.CpuRequests) {
+	if o.CpuRequests != nil {
 		toSerialize["cpu_requests"] = o.CpuRequests
 	}
-	if !isNil(o.CpuLimits) {
+	if o.CpuLimits != nil {
 		toSerialize["cpu_limits"] = o.CpuLimits
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_namespace_request.go b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_namespace_request.go
index 79e220ef..a816c7cf 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_namespace_request.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_namespace_request.go
@@ -1,11 +1,11 @@
 /*
-Connector Management API
-
-Connector Management API is a REST API to manage connectors.
-
-API version: 0.1.0
-Contact: rhosak-support@redhat.com
-*/
+ * Connector Management API
+ *
+ * Connector Management API is a REST API to manage connectors.
+ *
+ * API version: 0.1.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -58,8 +58,8 @@ func (o *ConnectorNamespaceRequest) GetName() string {
 // GetNameOk returns a tuple with the Name field value
 // and a boolean to check if the value has been set.
 func (o *ConnectorNamespaceRequest) GetNameOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Name, true
 }
@@ -71,7 +71,7 @@ func (o *ConnectorNamespaceRequest) SetName(v string) {
 
 // GetAnnotations returns the Annotations field value if set, zero value otherwise.
 func (o *ConnectorNamespaceRequest) GetAnnotations() map[string]string {
-	if o == nil || isNil(o.Annotations) {
+	if o == nil || o.Annotations == nil {
 		var ret map[string]string
 		return ret
 	}
@@ -81,15 +81,15 @@ func (o *ConnectorNamespaceRequest) GetAnnotations() map[string]string {
 // GetAnnotationsOk returns a tuple with the Annotations field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorNamespaceRequest) GetAnnotationsOk() (*map[string]string, bool) {
-	if o == nil || isNil(o.Annotations) {
-    return nil, false
+	if o == nil || o.Annotations == nil {
+		return nil, false
 	}
 	return o.Annotations, true
 }
 
 // HasAnnotations returns a boolean if a field has been set.
 func (o *ConnectorNamespaceRequest) HasAnnotations() bool {
-	if o != nil && !isNil(o.Annotations) {
+	if o != nil && o.Annotations != nil {
 		return true
 	}
 
@@ -114,8 +114,8 @@ func (o *ConnectorNamespaceRequest) GetClusterId() string {
 // GetClusterIdOk returns a tuple with the ClusterId field value
 // and a boolean to check if the value has been set.
 func (o *ConnectorNamespaceRequest) GetClusterIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.ClusterId, true
 }
@@ -138,8 +138,8 @@ func (o *ConnectorNamespaceRequest) GetKind() ConnectorNamespaceTenantKind {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *ConnectorNamespaceRequest) GetKindOk() (*ConnectorNamespaceTenantKind, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -154,7 +154,7 @@ func (o ConnectorNamespaceRequest) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["name"] = o.Name
 	}
-	if !isNil(o.Annotations) {
+	if o.Annotations != nil {
 		toSerialize["annotations"] = o.Annotations
 	}
 	if true {
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_namespace_request_all_of.go b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_namespace_request_all_of.go
index e833839e..39b66b1f 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_namespace_request_all_of.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_namespace_request_all_of.go
@@ -1,11 +1,11 @@
 /*
-Connector Management API
-
-Connector Management API is a REST API to manage connectors.
-
-API version: 0.1.0
-Contact: rhosak-support@redhat.com
-*/
+ * Connector Management API
+ *
+ * Connector Management API is a REST API to manage connectors.
+ *
+ * API version: 0.1.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -40,7 +40,7 @@ func NewConnectorNamespaceRequestAllOfWithDefaults() *ConnectorNamespaceRequestA
 
 // GetClusterId returns the ClusterId field value if set, zero value otherwise.
 func (o *ConnectorNamespaceRequestAllOf) GetClusterId() string {
-	if o == nil || isNil(o.ClusterId) {
+	if o == nil || o.ClusterId == nil {
 		var ret string
 		return ret
 	}
@@ -50,15 +50,15 @@ func (o *ConnectorNamespaceRequestAllOf) GetClusterId() string {
 // GetClusterIdOk returns a tuple with the ClusterId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorNamespaceRequestAllOf) GetClusterIdOk() (*string, bool) {
-	if o == nil || isNil(o.ClusterId) {
-    return nil, false
+	if o == nil || o.ClusterId == nil {
+		return nil, false
 	}
 	return o.ClusterId, true
 }
 
 // HasClusterId returns a boolean if a field has been set.
 func (o *ConnectorNamespaceRequestAllOf) HasClusterId() bool {
-	if o != nil && !isNil(o.ClusterId) {
+	if o != nil && o.ClusterId != nil {
 		return true
 	}
 
@@ -72,7 +72,7 @@ func (o *ConnectorNamespaceRequestAllOf) SetClusterId(v string) {
 
 // GetKind returns the Kind field value if set, zero value otherwise.
 func (o *ConnectorNamespaceRequestAllOf) GetKind() ConnectorNamespaceTenantKind {
-	if o == nil || isNil(o.Kind) {
+	if o == nil || o.Kind == nil {
 		var ret ConnectorNamespaceTenantKind
 		return ret
 	}
@@ -82,15 +82,15 @@ func (o *ConnectorNamespaceRequestAllOf) GetKind() ConnectorNamespaceTenantKind
 // GetKindOk returns a tuple with the Kind field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorNamespaceRequestAllOf) GetKindOk() (*ConnectorNamespaceTenantKind, bool) {
-	if o == nil || isNil(o.Kind) {
-    return nil, false
+	if o == nil || o.Kind == nil {
+		return nil, false
 	}
 	return o.Kind, true
 }
 
 // HasKind returns a boolean if a field has been set.
 func (o *ConnectorNamespaceRequestAllOf) HasKind() bool {
-	if o != nil && !isNil(o.Kind) {
+	if o != nil && o.Kind != nil {
 		return true
 	}
 
@@ -104,10 +104,10 @@ func (o *ConnectorNamespaceRequestAllOf) SetKind(v ConnectorNamespaceTenantKind)
 
 func (o ConnectorNamespaceRequestAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.ClusterId) {
+	if o.ClusterId != nil {
 		toSerialize["cluster_id"] = o.ClusterId
 	}
-	if !isNil(o.Kind) {
+	if o.Kind != nil {
 		toSerialize["kind"] = o.Kind
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_namespace_request_meta.go b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_namespace_request_meta.go
index c735d01e..65d5843e 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_namespace_request_meta.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_namespace_request_meta.go
@@ -1,11 +1,11 @@
 /*
-Connector Management API
-
-Connector Management API is a REST API to manage connectors.
-
-API version: 0.1.0
-Contact: rhosak-support@redhat.com
-*/
+ * Connector Management API
+ *
+ * Connector Management API is a REST API to manage connectors.
+ *
+ * API version: 0.1.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -42,7 +42,7 @@ func NewConnectorNamespaceRequestMetaWithDefaults() *ConnectorNamespaceRequestMe
 
 // GetName returns the Name field value if set, zero value otherwise.
 func (o *ConnectorNamespaceRequestMeta) GetName() string {
-	if o == nil || isNil(o.Name) {
+	if o == nil || o.Name == nil {
 		var ret string
 		return ret
 	}
@@ -52,15 +52,15 @@ func (o *ConnectorNamespaceRequestMeta) GetName() string {
 // GetNameOk returns a tuple with the Name field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorNamespaceRequestMeta) GetNameOk() (*string, bool) {
-	if o == nil || isNil(o.Name) {
-    return nil, false
+	if o == nil || o.Name == nil {
+		return nil, false
 	}
 	return o.Name, true
 }
 
 // HasName returns a boolean if a field has been set.
 func (o *ConnectorNamespaceRequestMeta) HasName() bool {
-	if o != nil && !isNil(o.Name) {
+	if o != nil && o.Name != nil {
 		return true
 	}
 
@@ -74,7 +74,7 @@ func (o *ConnectorNamespaceRequestMeta) SetName(v string) {
 
 // GetAnnotations returns the Annotations field value if set, zero value otherwise.
 func (o *ConnectorNamespaceRequestMeta) GetAnnotations() map[string]string {
-	if o == nil || isNil(o.Annotations) {
+	if o == nil || o.Annotations == nil {
 		var ret map[string]string
 		return ret
 	}
@@ -84,15 +84,15 @@ func (o *ConnectorNamespaceRequestMeta) GetAnnotations() map[string]string {
 // GetAnnotationsOk returns a tuple with the Annotations field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorNamespaceRequestMeta) GetAnnotationsOk() (*map[string]string, bool) {
-	if o == nil || isNil(o.Annotations) {
-    return nil, false
+	if o == nil || o.Annotations == nil {
+		return nil, false
 	}
 	return o.Annotations, true
 }
 
 // HasAnnotations returns a boolean if a field has been set.
 func (o *ConnectorNamespaceRequestMeta) HasAnnotations() bool {
-	if o != nil && !isNil(o.Annotations) {
+	if o != nil && o.Annotations != nil {
 		return true
 	}
 
@@ -106,10 +106,10 @@ func (o *ConnectorNamespaceRequestMeta) SetAnnotations(v map[string]string) {
 
 func (o ConnectorNamespaceRequestMeta) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Name) {
+	if o.Name != nil {
 		toSerialize["name"] = o.Name
 	}
-	if !isNil(o.Annotations) {
+	if o.Annotations != nil {
 		toSerialize["annotations"] = o.Annotations
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_namespace_state.go b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_namespace_state.go
index b00f6d97..8f0e8ff9 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_namespace_state.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_namespace_state.go
@@ -1,11 +1,11 @@
 /*
-Connector Management API
-
-Connector Management API is a REST API to manage connectors.
-
-API version: 0.1.0
-Contact: rhosak-support@redhat.com
-*/
+ * Connector Management API
+ *
+ * Connector Management API is a REST API to manage connectors.
+ *
+ * API version: 0.1.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -27,8 +27,7 @@ const (
 	CONNECTORNAMESPACESTATE_DELETED ConnectorNamespaceState = "deleted"
 )
 
-// All allowed values of ConnectorNamespaceState enum
-var AllowedConnectorNamespaceStateEnumValues = []ConnectorNamespaceState{
+var allowedConnectorNamespaceStateEnumValues = []ConnectorNamespaceState{
 	"disconnected",
 	"ready",
 	"deleting",
@@ -42,7 +41,7 @@ func (v *ConnectorNamespaceState) UnmarshalJSON(src []byte) error {
 		return err
 	}
 	enumTypeValue := ConnectorNamespaceState(value)
-	for _, existing := range AllowedConnectorNamespaceStateEnumValues {
+	for _, existing := range allowedConnectorNamespaceStateEnumValues {
 		if existing == enumTypeValue {
 			*v = enumTypeValue
 			return nil
@@ -59,13 +58,13 @@ func NewConnectorNamespaceStateFromValue(v string) (*ConnectorNamespaceState, er
 	if ev.IsValid() {
 		return &ev, nil
 	} else {
-		return nil, fmt.Errorf("invalid value '%v' for ConnectorNamespaceState: valid values are %v", v, AllowedConnectorNamespaceStateEnumValues)
+		return nil, fmt.Errorf("invalid value '%v' for ConnectorNamespaceState: valid values are %v", v, allowedConnectorNamespaceStateEnumValues)
 	}
 }
 
 // IsValid return true if the value is valid for the enum, false otherwise
 func (v ConnectorNamespaceState) IsValid() bool {
-	for _, existing := range AllowedConnectorNamespaceStateEnumValues {
+	for _, existing := range allowedConnectorNamespaceStateEnumValues {
 		if existing == v {
 			return true
 		}
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_namespace_status.go b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_namespace_status.go
index c1f24d72..2900ef05 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_namespace_status.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_namespace_status.go
@@ -1,11 +1,11 @@
 /*
-Connector Management API
-
-Connector Management API is a REST API to manage connectors.
-
-API version: 0.1.0
-Contact: rhosak-support@redhat.com
-*/
+ * Connector Management API
+ *
+ * Connector Management API is a REST API to manage connectors.
+ *
+ * API version: 0.1.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -55,8 +55,8 @@ func (o *ConnectorNamespaceStatus) GetState() ConnectorNamespaceState {
 // GetStateOk returns a tuple with the State field value
 // and a boolean to check if the value has been set.
 func (o *ConnectorNamespaceStatus) GetStateOk() (*ConnectorNamespaceState, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.State, true
 }
@@ -68,7 +68,7 @@ func (o *ConnectorNamespaceStatus) SetState(v ConnectorNamespaceState) {
 
 // GetVersion returns the Version field value if set, zero value otherwise.
 func (o *ConnectorNamespaceStatus) GetVersion() string {
-	if o == nil || isNil(o.Version) {
+	if o == nil || o.Version == nil {
 		var ret string
 		return ret
 	}
@@ -78,15 +78,15 @@ func (o *ConnectorNamespaceStatus) GetVersion() string {
 // GetVersionOk returns a tuple with the Version field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorNamespaceStatus) GetVersionOk() (*string, bool) {
-	if o == nil || isNil(o.Version) {
-    return nil, false
+	if o == nil || o.Version == nil {
+		return nil, false
 	}
 	return o.Version, true
 }
 
 // HasVersion returns a boolean if a field has been set.
 func (o *ConnectorNamespaceStatus) HasVersion() bool {
-	if o != nil && !isNil(o.Version) {
+	if o != nil && o.Version != nil {
 		return true
 	}
 
@@ -111,8 +111,8 @@ func (o *ConnectorNamespaceStatus) GetConnectorsDeployed() int32 {
 // GetConnectorsDeployedOk returns a tuple with the ConnectorsDeployed field value
 // and a boolean to check if the value has been set.
 func (o *ConnectorNamespaceStatus) GetConnectorsDeployedOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.ConnectorsDeployed, true
 }
@@ -124,7 +124,7 @@ func (o *ConnectorNamespaceStatus) SetConnectorsDeployed(v int32) {
 
 // GetError returns the Error field value if set, zero value otherwise.
 func (o *ConnectorNamespaceStatus) GetError() string {
-	if o == nil || isNil(o.Error) {
+	if o == nil || o.Error == nil {
 		var ret string
 		return ret
 	}
@@ -134,15 +134,15 @@ func (o *ConnectorNamespaceStatus) GetError() string {
 // GetErrorOk returns a tuple with the Error field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorNamespaceStatus) GetErrorOk() (*string, bool) {
-	if o == nil || isNil(o.Error) {
-    return nil, false
+	if o == nil || o.Error == nil {
+		return nil, false
 	}
 	return o.Error, true
 }
 
 // HasError returns a boolean if a field has been set.
 func (o *ConnectorNamespaceStatus) HasError() bool {
-	if o != nil && !isNil(o.Error) {
+	if o != nil && o.Error != nil {
 		return true
 	}
 
@@ -159,13 +159,13 @@ func (o ConnectorNamespaceStatus) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["state"] = o.State
 	}
-	if !isNil(o.Version) {
+	if o.Version != nil {
 		toSerialize["version"] = o.Version
 	}
 	if true {
 		toSerialize["connectors_deployed"] = o.ConnectorsDeployed
 	}
-	if !isNil(o.Error) {
+	if o.Error != nil {
 		toSerialize["error"] = o.Error
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_namespace_tenant.go b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_namespace_tenant.go
index f142e85e..f439411c 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_namespace_tenant.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_namespace_tenant.go
@@ -1,11 +1,11 @@
 /*
-Connector Management API
-
-Connector Management API is a REST API to manage connectors.
-
-API version: 0.1.0
-Contact: rhosak-support@redhat.com
-*/
+ * Connector Management API
+ *
+ * Connector Management API is a REST API to manage connectors.
+ *
+ * API version: 0.1.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -54,8 +54,8 @@ func (o *ConnectorNamespaceTenant) GetKind() ConnectorNamespaceTenantKind {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *ConnectorNamespaceTenant) GetKindOk() (*ConnectorNamespaceTenantKind, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -78,8 +78,8 @@ func (o *ConnectorNamespaceTenant) GetId() string {
 // GetIdOk returns a tuple with the Id field value
 // and a boolean to check if the value has been set.
 func (o *ConnectorNamespaceTenant) GetIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Id, true
 }
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_namespace_tenant_kind.go b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_namespace_tenant_kind.go
index 5f303b4a..3d930305 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_namespace_tenant_kind.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_namespace_tenant_kind.go
@@ -1,11 +1,11 @@
 /*
-Connector Management API
-
-Connector Management API is a REST API to manage connectors.
-
-API version: 0.1.0
-Contact: rhosak-support@redhat.com
-*/
+ * Connector Management API
+ *
+ * Connector Management API is a REST API to manage connectors.
+ *
+ * API version: 0.1.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -25,8 +25,7 @@ const (
 	CONNECTORNAMESPACETENANTKIND_ORGANISATION ConnectorNamespaceTenantKind = "organisation"
 )
 
-// All allowed values of ConnectorNamespaceTenantKind enum
-var AllowedConnectorNamespaceTenantKindEnumValues = []ConnectorNamespaceTenantKind{
+var allowedConnectorNamespaceTenantKindEnumValues = []ConnectorNamespaceTenantKind{
 	"user",
 	"organisation",
 }
@@ -38,7 +37,7 @@ func (v *ConnectorNamespaceTenantKind) UnmarshalJSON(src []byte) error {
 		return err
 	}
 	enumTypeValue := ConnectorNamespaceTenantKind(value)
-	for _, existing := range AllowedConnectorNamespaceTenantKindEnumValues {
+	for _, existing := range allowedConnectorNamespaceTenantKindEnumValues {
 		if existing == enumTypeValue {
 			*v = enumTypeValue
 			return nil
@@ -55,13 +54,13 @@ func NewConnectorNamespaceTenantKindFromValue(v string) (*ConnectorNamespaceTena
 	if ev.IsValid() {
 		return &ev, nil
 	} else {
-		return nil, fmt.Errorf("invalid value '%v' for ConnectorNamespaceTenantKind: valid values are %v", v, AllowedConnectorNamespaceTenantKindEnumValues)
+		return nil, fmt.Errorf("invalid value '%v' for ConnectorNamespaceTenantKind: valid values are %v", v, allowedConnectorNamespaceTenantKindEnumValues)
 	}
 }
 
 // IsValid return true if the value is valid for the enum, false otherwise
 func (v ConnectorNamespaceTenantKind) IsValid() bool {
-	for _, existing := range AllowedConnectorNamespaceTenantKindEnumValues {
+	for _, existing := range allowedConnectorNamespaceTenantKindEnumValues {
 		if existing == v {
 			return true
 		}
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_request.go b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_request.go
index 3c6e99d3..a1e0094d 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_request.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_request.go
@@ -1,11 +1,11 @@
 /*
-Connector Management API
-
-Connector Management API is a REST API to manage connectors.
-
-API version: 0.1.0
-Contact: rhosak-support@redhat.com
-*/
+ * Connector Management API
+ *
+ * Connector Management API is a REST API to manage connectors.
+ *
+ * API version: 0.1.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -71,8 +71,8 @@ func (o *ConnectorRequest) GetName() string {
 // GetNameOk returns a tuple with the Name field value
 // and a boolean to check if the value has been set.
 func (o *ConnectorRequest) GetNameOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Name, true
 }
@@ -95,8 +95,8 @@ func (o *ConnectorRequest) GetConnectorTypeId() string {
 // GetConnectorTypeIdOk returns a tuple with the ConnectorTypeId field value
 // and a boolean to check if the value has been set.
 func (o *ConnectorRequest) GetConnectorTypeIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.ConnectorTypeId, true
 }
@@ -119,8 +119,8 @@ func (o *ConnectorRequest) GetNamespaceId() string {
 // GetNamespaceIdOk returns a tuple with the NamespaceId field value
 // and a boolean to check if the value has been set.
 func (o *ConnectorRequest) GetNamespaceIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.NamespaceId, true
 }
@@ -132,7 +132,7 @@ func (o *ConnectorRequest) SetNamespaceId(v string) {
 
 // GetChannel returns the Channel field value if set, zero value otherwise.
 func (o *ConnectorRequest) GetChannel() Channel {
-	if o == nil || isNil(o.Channel) {
+	if o == nil || o.Channel == nil {
 		var ret Channel
 		return ret
 	}
@@ -142,15 +142,15 @@ func (o *ConnectorRequest) GetChannel() Channel {
 // GetChannelOk returns a tuple with the Channel field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorRequest) GetChannelOk() (*Channel, bool) {
-	if o == nil || isNil(o.Channel) {
-    return nil, false
+	if o == nil || o.Channel == nil {
+		return nil, false
 	}
 	return o.Channel, true
 }
 
 // HasChannel returns a boolean if a field has been set.
 func (o *ConnectorRequest) HasChannel() bool {
-	if o != nil && !isNil(o.Channel) {
+	if o != nil && o.Channel != nil {
 		return true
 	}
 
@@ -175,8 +175,8 @@ func (o *ConnectorRequest) GetDesiredState() ConnectorDesiredState {
 // GetDesiredStateOk returns a tuple with the DesiredState field value
 // and a boolean to check if the value has been set.
 func (o *ConnectorRequest) GetDesiredStateOk() (*ConnectorDesiredState, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.DesiredState, true
 }
@@ -188,7 +188,7 @@ func (o *ConnectorRequest) SetDesiredState(v ConnectorDesiredState) {
 
 // GetAnnotations returns the Annotations field value if set, zero value otherwise.
 func (o *ConnectorRequest) GetAnnotations() map[string]string {
-	if o == nil || isNil(o.Annotations) {
+	if o == nil || o.Annotations == nil {
 		var ret map[string]string
 		return ret
 	}
@@ -198,15 +198,15 @@ func (o *ConnectorRequest) GetAnnotations() map[string]string {
 // GetAnnotationsOk returns a tuple with the Annotations field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorRequest) GetAnnotationsOk() (*map[string]string, bool) {
-	if o == nil || isNil(o.Annotations) {
-    return nil, false
+	if o == nil || o.Annotations == nil {
+		return nil, false
 	}
 	return o.Annotations, true
 }
 
 // HasAnnotations returns a boolean if a field has been set.
 func (o *ConnectorRequest) HasAnnotations() bool {
-	if o != nil && !isNil(o.Annotations) {
+	if o != nil && o.Annotations != nil {
 		return true
 	}
 
@@ -231,8 +231,8 @@ func (o *ConnectorRequest) GetKafka() KafkaConnectionSettings {
 // GetKafkaOk returns a tuple with the Kafka field value
 // and a boolean to check if the value has been set.
 func (o *ConnectorRequest) GetKafkaOk() (*KafkaConnectionSettings, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kafka, true
 }
@@ -255,8 +255,8 @@ func (o *ConnectorRequest) GetServiceAccount() ServiceAccount {
 // GetServiceAccountOk returns a tuple with the ServiceAccount field value
 // and a boolean to check if the value has been set.
 func (o *ConnectorRequest) GetServiceAccountOk() (*ServiceAccount, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.ServiceAccount, true
 }
@@ -268,7 +268,7 @@ func (o *ConnectorRequest) SetServiceAccount(v ServiceAccount) {
 
 // GetSchemaRegistry returns the SchemaRegistry field value if set, zero value otherwise.
 func (o *ConnectorRequest) GetSchemaRegistry() SchemaRegistryConnectionSettings {
-	if o == nil || isNil(o.SchemaRegistry) {
+	if o == nil || o.SchemaRegistry == nil {
 		var ret SchemaRegistryConnectionSettings
 		return ret
 	}
@@ -278,15 +278,15 @@ func (o *ConnectorRequest) GetSchemaRegistry() SchemaRegistryConnectionSettings
 // GetSchemaRegistryOk returns a tuple with the SchemaRegistry field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorRequest) GetSchemaRegistryOk() (*SchemaRegistryConnectionSettings, bool) {
-	if o == nil || isNil(o.SchemaRegistry) {
-    return nil, false
+	if o == nil || o.SchemaRegistry == nil {
+		return nil, false
 	}
 	return o.SchemaRegistry, true
 }
 
 // HasSchemaRegistry returns a boolean if a field has been set.
 func (o *ConnectorRequest) HasSchemaRegistry() bool {
-	if o != nil && !isNil(o.SchemaRegistry) {
+	if o != nil && o.SchemaRegistry != nil {
 		return true
 	}
 
@@ -310,11 +310,11 @@ func (o *ConnectorRequest) GetConnector() map[string]interface{} {
 
 // GetConnectorOk returns a tuple with the Connector field value
 // and a boolean to check if the value has been set.
-func (o *ConnectorRequest) GetConnectorOk() (map[string]interface{}, bool) {
-	if o == nil {
-    return map[string]interface{}{}, false
+func (o *ConnectorRequest) GetConnectorOk() (*map[string]interface{}, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Connector, true
+	return &o.Connector, true
 }
 
 // SetConnector sets field value
@@ -333,13 +333,13 @@ func (o ConnectorRequest) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["namespace_id"] = o.NamespaceId
 	}
-	if !isNil(o.Channel) {
+	if o.Channel != nil {
 		toSerialize["channel"] = o.Channel
 	}
 	if true {
 		toSerialize["desired_state"] = o.DesiredState
 	}
-	if !isNil(o.Annotations) {
+	if o.Annotations != nil {
 		toSerialize["annotations"] = o.Annotations
 	}
 	if true {
@@ -348,7 +348,7 @@ func (o ConnectorRequest) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["service_account"] = o.ServiceAccount
 	}
-	if !isNil(o.SchemaRegistry) {
+	if o.SchemaRegistry != nil {
 		toSerialize["schema_registry"] = o.SchemaRegistry
 	}
 	if true {
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_request_meta.go b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_request_meta.go
index 7c0d54d8..b08cfbdf 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_request_meta.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_request_meta.go
@@ -1,11 +1,11 @@
 /*
-Connector Management API
-
-Connector Management API is a REST API to manage connectors.
-
-API version: 0.1.0
-Contact: rhosak-support@redhat.com
-*/
+ * Connector Management API
+ *
+ * Connector Management API is a REST API to manage connectors.
+ *
+ * API version: 0.1.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -64,8 +64,8 @@ func (o *ConnectorRequestMeta) GetName() string {
 // GetNameOk returns a tuple with the Name field value
 // and a boolean to check if the value has been set.
 func (o *ConnectorRequestMeta) GetNameOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Name, true
 }
@@ -88,8 +88,8 @@ func (o *ConnectorRequestMeta) GetConnectorTypeId() string {
 // GetConnectorTypeIdOk returns a tuple with the ConnectorTypeId field value
 // and a boolean to check if the value has been set.
 func (o *ConnectorRequestMeta) GetConnectorTypeIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.ConnectorTypeId, true
 }
@@ -112,8 +112,8 @@ func (o *ConnectorRequestMeta) GetNamespaceId() string {
 // GetNamespaceIdOk returns a tuple with the NamespaceId field value
 // and a boolean to check if the value has been set.
 func (o *ConnectorRequestMeta) GetNamespaceIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.NamespaceId, true
 }
@@ -125,7 +125,7 @@ func (o *ConnectorRequestMeta) SetNamespaceId(v string) {
 
 // GetChannel returns the Channel field value if set, zero value otherwise.
 func (o *ConnectorRequestMeta) GetChannel() Channel {
-	if o == nil || isNil(o.Channel) {
+	if o == nil || o.Channel == nil {
 		var ret Channel
 		return ret
 	}
@@ -135,15 +135,15 @@ func (o *ConnectorRequestMeta) GetChannel() Channel {
 // GetChannelOk returns a tuple with the Channel field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorRequestMeta) GetChannelOk() (*Channel, bool) {
-	if o == nil || isNil(o.Channel) {
-    return nil, false
+	if o == nil || o.Channel == nil {
+		return nil, false
 	}
 	return o.Channel, true
 }
 
 // HasChannel returns a boolean if a field has been set.
 func (o *ConnectorRequestMeta) HasChannel() bool {
-	if o != nil && !isNil(o.Channel) {
+	if o != nil && o.Channel != nil {
 		return true
 	}
 
@@ -168,8 +168,8 @@ func (o *ConnectorRequestMeta) GetDesiredState() ConnectorDesiredState {
 // GetDesiredStateOk returns a tuple with the DesiredState field value
 // and a boolean to check if the value has been set.
 func (o *ConnectorRequestMeta) GetDesiredStateOk() (*ConnectorDesiredState, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.DesiredState, true
 }
@@ -181,7 +181,7 @@ func (o *ConnectorRequestMeta) SetDesiredState(v ConnectorDesiredState) {
 
 // GetAnnotations returns the Annotations field value if set, zero value otherwise.
 func (o *ConnectorRequestMeta) GetAnnotations() map[string]string {
-	if o == nil || isNil(o.Annotations) {
+	if o == nil || o.Annotations == nil {
 		var ret map[string]string
 		return ret
 	}
@@ -191,15 +191,15 @@ func (o *ConnectorRequestMeta) GetAnnotations() map[string]string {
 // GetAnnotationsOk returns a tuple with the Annotations field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorRequestMeta) GetAnnotationsOk() (*map[string]string, bool) {
-	if o == nil || isNil(o.Annotations) {
-    return nil, false
+	if o == nil || o.Annotations == nil {
+		return nil, false
 	}
 	return o.Annotations, true
 }
 
 // HasAnnotations returns a boolean if a field has been set.
 func (o *ConnectorRequestMeta) HasAnnotations() bool {
-	if o != nil && !isNil(o.Annotations) {
+	if o != nil && o.Annotations != nil {
 		return true
 	}
 
@@ -222,13 +222,13 @@ func (o ConnectorRequestMeta) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["namespace_id"] = o.NamespaceId
 	}
-	if !isNil(o.Channel) {
+	if o.Channel != nil {
 		toSerialize["channel"] = o.Channel
 	}
 	if true {
 		toSerialize["desired_state"] = o.DesiredState
 	}
-	if !isNil(o.Annotations) {
+	if o.Annotations != nil {
 		toSerialize["annotations"] = o.Annotations
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_state.go b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_state.go
index 869d49e0..291fc92a 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_state.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_state.go
@@ -1,11 +1,11 @@
 /*
-Connector Management API
-
-Connector Management API is a REST API to manage connectors.
-
-API version: 0.1.0
-Contact: rhosak-support@redhat.com
-*/
+ * Connector Management API
+ *
+ * Connector Management API is a REST API to manage connectors.
+ *
+ * API version: 0.1.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -33,8 +33,7 @@ const (
 	CONNECTORSTATE_DEPROVISIONING ConnectorState = "deprovisioning"
 )
 
-// All allowed values of ConnectorState enum
-var AllowedConnectorStateEnumValues = []ConnectorState{
+var allowedConnectorStateEnumValues = []ConnectorState{
 	"assigning",
 	"assigned",
 	"updating",
@@ -54,7 +53,7 @@ func (v *ConnectorState) UnmarshalJSON(src []byte) error {
 		return err
 	}
 	enumTypeValue := ConnectorState(value)
-	for _, existing := range AllowedConnectorStateEnumValues {
+	for _, existing := range allowedConnectorStateEnumValues {
 		if existing == enumTypeValue {
 			*v = enumTypeValue
 			return nil
@@ -71,13 +70,13 @@ func NewConnectorStateFromValue(v string) (*ConnectorState, error) {
 	if ev.IsValid() {
 		return &ev, nil
 	} else {
-		return nil, fmt.Errorf("invalid value '%v' for ConnectorState: valid values are %v", v, AllowedConnectorStateEnumValues)
+		return nil, fmt.Errorf("invalid value '%v' for ConnectorState: valid values are %v", v, allowedConnectorStateEnumValues)
 	}
 }
 
 // IsValid return true if the value is valid for the enum, false otherwise
 func (v ConnectorState) IsValid() bool {
-	for _, existing := range AllowedConnectorStateEnumValues {
+	for _, existing := range allowedConnectorStateEnumValues {
 		if existing == v {
 			return true
 		}
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_status.go b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_status.go
index 6c646030..91b473c3 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_status.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_status.go
@@ -1,11 +1,11 @@
 /*
-Connector Management API
-
-Connector Management API is a REST API to manage connectors.
-
-API version: 0.1.0
-Contact: rhosak-support@redhat.com
-*/
+ * Connector Management API
+ *
+ * Connector Management API is a REST API to manage connectors.
+ *
+ * API version: 0.1.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -39,7 +39,7 @@ func NewConnectorStatusWithDefaults() *ConnectorStatus {
 
 // GetStatus returns the Status field value if set, zero value otherwise.
 func (o *ConnectorStatus) GetStatus() ConnectorStatusStatus {
-	if o == nil || isNil(o.Status) {
+	if o == nil || o.Status == nil {
 		var ret ConnectorStatusStatus
 		return ret
 	}
@@ -49,15 +49,15 @@ func (o *ConnectorStatus) GetStatus() ConnectorStatusStatus {
 // GetStatusOk returns a tuple with the Status field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorStatus) GetStatusOk() (*ConnectorStatusStatus, bool) {
-	if o == nil || isNil(o.Status) {
-    return nil, false
+	if o == nil || o.Status == nil {
+		return nil, false
 	}
 	return o.Status, true
 }
 
 // HasStatus returns a boolean if a field has been set.
 func (o *ConnectorStatus) HasStatus() bool {
-	if o != nil && !isNil(o.Status) {
+	if o != nil && o.Status != nil {
 		return true
 	}
 
@@ -71,7 +71,7 @@ func (o *ConnectorStatus) SetStatus(v ConnectorStatusStatus) {
 
 func (o ConnectorStatus) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Status) {
+	if o.Status != nil {
 		toSerialize["status"] = o.Status
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_status_status.go b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_status_status.go
index 7bfc1a0f..03586d0a 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_status_status.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_status_status.go
@@ -1,11 +1,11 @@
 /*
-Connector Management API
-
-Connector Management API is a REST API to manage connectors.
-
-API version: 0.1.0
-Contact: rhosak-support@redhat.com
-*/
+ * Connector Management API
+ *
+ * Connector Management API is a REST API to manage connectors.
+ *
+ * API version: 0.1.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -40,7 +40,7 @@ func NewConnectorStatusStatusWithDefaults() *ConnectorStatusStatus {
 
 // GetState returns the State field value if set, zero value otherwise.
 func (o *ConnectorStatusStatus) GetState() ConnectorState {
-	if o == nil || isNil(o.State) {
+	if o == nil || o.State == nil {
 		var ret ConnectorState
 		return ret
 	}
@@ -50,15 +50,15 @@ func (o *ConnectorStatusStatus) GetState() ConnectorState {
 // GetStateOk returns a tuple with the State field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorStatusStatus) GetStateOk() (*ConnectorState, bool) {
-	if o == nil || isNil(o.State) {
-    return nil, false
+	if o == nil || o.State == nil {
+		return nil, false
 	}
 	return o.State, true
 }
 
 // HasState returns a boolean if a field has been set.
 func (o *ConnectorStatusStatus) HasState() bool {
-	if o != nil && !isNil(o.State) {
+	if o != nil && o.State != nil {
 		return true
 	}
 
@@ -72,7 +72,7 @@ func (o *ConnectorStatusStatus) SetState(v ConnectorState) {
 
 // GetError returns the Error field value if set, zero value otherwise.
 func (o *ConnectorStatusStatus) GetError() string {
-	if o == nil || isNil(o.Error) {
+	if o == nil || o.Error == nil {
 		var ret string
 		return ret
 	}
@@ -82,15 +82,15 @@ func (o *ConnectorStatusStatus) GetError() string {
 // GetErrorOk returns a tuple with the Error field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorStatusStatus) GetErrorOk() (*string, bool) {
-	if o == nil || isNil(o.Error) {
-    return nil, false
+	if o == nil || o.Error == nil {
+		return nil, false
 	}
 	return o.Error, true
 }
 
 // HasError returns a boolean if a field has been set.
 func (o *ConnectorStatusStatus) HasError() bool {
-	if o != nil && !isNil(o.Error) {
+	if o != nil && o.Error != nil {
 		return true
 	}
 
@@ -104,10 +104,10 @@ func (o *ConnectorStatusStatus) SetError(v string) {
 
 func (o ConnectorStatusStatus) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.State) {
+	if o.State != nil {
 		toSerialize["state"] = o.State
 	}
-	if !isNil(o.Error) {
+	if o.Error != nil {
 		toSerialize["error"] = o.Error
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_type.go b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_type.go
index 1bc2ded1..4faf3553 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_type.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_type.go
@@ -1,11 +1,11 @@
 /*
-Connector Management API
-
-Connector Management API is a REST API to manage connectors.
-
-API version: 0.1.0
-Contact: rhosak-support@redhat.com
-*/
+ * Connector Management API
+ *
+ * Connector Management API is a REST API to manage connectors.
+ *
+ * API version: 0.1.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -25,19 +25,19 @@ type ConnectorType struct {
 	// Version of the connector type.
 	Version string `json:"version"`
 	// Channels of the connector type.
-	Channels []Channel `json:"channels,omitempty"`
+	Channels *[]Channel `json:"channels,omitempty"`
 	// A description of the connector.
 	Description *string `json:"description,omitempty"`
 	// URL to an icon of the connector.
 	IconHref *string `json:"icon_href,omitempty"`
 	// Labels used to categorize the connector
-	Labels []string `json:"labels,omitempty"`
+	Labels *[]string `json:"labels,omitempty"`
 	// Name-value string annotations for resource
 	Annotations *map[string]string `json:"annotations,omitempty"`
 	// Ranking for featured connectors
 	FeaturedRank *int32 `json:"featured_rank,omitempty"`
 	// The capabilities supported by the connector
-	Capabilities []string `json:"capabilities,omitempty"`
+	Capabilities *[]string `json:"capabilities,omitempty"`
 	// A json schema that can be used to validate a ConnectorRequest connector field.
 	Schema map[string]interface{} `json:"schema"`
 }
@@ -64,7 +64,7 @@ func NewConnectorTypeWithDefaults() *ConnectorType {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *ConnectorType) GetId() string {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret string
 		return ret
 	}
@@ -74,15 +74,15 @@ func (o *ConnectorType) GetId() string {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorType) GetIdOk() (*string, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *ConnectorType) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -96,7 +96,7 @@ func (o *ConnectorType) SetId(v string) {
 
 // GetKind returns the Kind field value if set, zero value otherwise.
 func (o *ConnectorType) GetKind() string {
-	if o == nil || isNil(o.Kind) {
+	if o == nil || o.Kind == nil {
 		var ret string
 		return ret
 	}
@@ -106,15 +106,15 @@ func (o *ConnectorType) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorType) GetKindOk() (*string, bool) {
-	if o == nil || isNil(o.Kind) {
-    return nil, false
+	if o == nil || o.Kind == nil {
+		return nil, false
 	}
 	return o.Kind, true
 }
 
 // HasKind returns a boolean if a field has been set.
 func (o *ConnectorType) HasKind() bool {
-	if o != nil && !isNil(o.Kind) {
+	if o != nil && o.Kind != nil {
 		return true
 	}
 
@@ -128,7 +128,7 @@ func (o *ConnectorType) SetKind(v string) {
 
 // GetHref returns the Href field value if set, zero value otherwise.
 func (o *ConnectorType) GetHref() string {
-	if o == nil || isNil(o.Href) {
+	if o == nil || o.Href == nil {
 		var ret string
 		return ret
 	}
@@ -138,15 +138,15 @@ func (o *ConnectorType) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorType) GetHrefOk() (*string, bool) {
-	if o == nil || isNil(o.Href) {
-    return nil, false
+	if o == nil || o.Href == nil {
+		return nil, false
 	}
 	return o.Href, true
 }
 
 // HasHref returns a boolean if a field has been set.
 func (o *ConnectorType) HasHref() bool {
-	if o != nil && !isNil(o.Href) {
+	if o != nil && o.Href != nil {
 		return true
 	}
 
@@ -171,8 +171,8 @@ func (o *ConnectorType) GetName() string {
 // GetNameOk returns a tuple with the Name field value
 // and a boolean to check if the value has been set.
 func (o *ConnectorType) GetNameOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Name, true
 }
@@ -195,8 +195,8 @@ func (o *ConnectorType) GetVersion() string {
 // GetVersionOk returns a tuple with the Version field value
 // and a boolean to check if the value has been set.
 func (o *ConnectorType) GetVersionOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Version, true
 }
@@ -208,25 +208,25 @@ func (o *ConnectorType) SetVersion(v string) {
 
 // GetChannels returns the Channels field value if set, zero value otherwise.
 func (o *ConnectorType) GetChannels() []Channel {
-	if o == nil || isNil(o.Channels) {
+	if o == nil || o.Channels == nil {
 		var ret []Channel
 		return ret
 	}
-	return o.Channels
+	return *o.Channels
 }
 
 // GetChannelsOk returns a tuple with the Channels field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *ConnectorType) GetChannelsOk() ([]Channel, bool) {
-	if o == nil || isNil(o.Channels) {
-    return nil, false
+func (o *ConnectorType) GetChannelsOk() (*[]Channel, bool) {
+	if o == nil || o.Channels == nil {
+		return nil, false
 	}
 	return o.Channels, true
 }
 
 // HasChannels returns a boolean if a field has been set.
 func (o *ConnectorType) HasChannels() bool {
-	if o != nil && !isNil(o.Channels) {
+	if o != nil && o.Channels != nil {
 		return true
 	}
 
@@ -235,12 +235,12 @@ func (o *ConnectorType) HasChannels() bool {
 
 // SetChannels gets a reference to the given []Channel and assigns it to the Channels field.
 func (o *ConnectorType) SetChannels(v []Channel) {
-	o.Channels = v
+	o.Channels = &v
 }
 
 // GetDescription returns the Description field value if set, zero value otherwise.
 func (o *ConnectorType) GetDescription() string {
-	if o == nil || isNil(o.Description) {
+	if o == nil || o.Description == nil {
 		var ret string
 		return ret
 	}
@@ -250,15 +250,15 @@ func (o *ConnectorType) GetDescription() string {
 // GetDescriptionOk returns a tuple with the Description field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorType) GetDescriptionOk() (*string, bool) {
-	if o == nil || isNil(o.Description) {
-    return nil, false
+	if o == nil || o.Description == nil {
+		return nil, false
 	}
 	return o.Description, true
 }
 
 // HasDescription returns a boolean if a field has been set.
 func (o *ConnectorType) HasDescription() bool {
-	if o != nil && !isNil(o.Description) {
+	if o != nil && o.Description != nil {
 		return true
 	}
 
@@ -272,7 +272,7 @@ func (o *ConnectorType) SetDescription(v string) {
 
 // GetIconHref returns the IconHref field value if set, zero value otherwise.
 func (o *ConnectorType) GetIconHref() string {
-	if o == nil || isNil(o.IconHref) {
+	if o == nil || o.IconHref == nil {
 		var ret string
 		return ret
 	}
@@ -282,15 +282,15 @@ func (o *ConnectorType) GetIconHref() string {
 // GetIconHrefOk returns a tuple with the IconHref field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorType) GetIconHrefOk() (*string, bool) {
-	if o == nil || isNil(o.IconHref) {
-    return nil, false
+	if o == nil || o.IconHref == nil {
+		return nil, false
 	}
 	return o.IconHref, true
 }
 
 // HasIconHref returns a boolean if a field has been set.
 func (o *ConnectorType) HasIconHref() bool {
-	if o != nil && !isNil(o.IconHref) {
+	if o != nil && o.IconHref != nil {
 		return true
 	}
 
@@ -304,25 +304,25 @@ func (o *ConnectorType) SetIconHref(v string) {
 
 // GetLabels returns the Labels field value if set, zero value otherwise.
 func (o *ConnectorType) GetLabels() []string {
-	if o == nil || isNil(o.Labels) {
+	if o == nil || o.Labels == nil {
 		var ret []string
 		return ret
 	}
-	return o.Labels
+	return *o.Labels
 }
 
 // GetLabelsOk returns a tuple with the Labels field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *ConnectorType) GetLabelsOk() ([]string, bool) {
-	if o == nil || isNil(o.Labels) {
-    return nil, false
+func (o *ConnectorType) GetLabelsOk() (*[]string, bool) {
+	if o == nil || o.Labels == nil {
+		return nil, false
 	}
 	return o.Labels, true
 }
 
 // HasLabels returns a boolean if a field has been set.
 func (o *ConnectorType) HasLabels() bool {
-	if o != nil && !isNil(o.Labels) {
+	if o != nil && o.Labels != nil {
 		return true
 	}
 
@@ -331,12 +331,12 @@ func (o *ConnectorType) HasLabels() bool {
 
 // SetLabels gets a reference to the given []string and assigns it to the Labels field.
 func (o *ConnectorType) SetLabels(v []string) {
-	o.Labels = v
+	o.Labels = &v
 }
 
 // GetAnnotations returns the Annotations field value if set, zero value otherwise.
 func (o *ConnectorType) GetAnnotations() map[string]string {
-	if o == nil || isNil(o.Annotations) {
+	if o == nil || o.Annotations == nil {
 		var ret map[string]string
 		return ret
 	}
@@ -346,15 +346,15 @@ func (o *ConnectorType) GetAnnotations() map[string]string {
 // GetAnnotationsOk returns a tuple with the Annotations field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorType) GetAnnotationsOk() (*map[string]string, bool) {
-	if o == nil || isNil(o.Annotations) {
-    return nil, false
+	if o == nil || o.Annotations == nil {
+		return nil, false
 	}
 	return o.Annotations, true
 }
 
 // HasAnnotations returns a boolean if a field has been set.
 func (o *ConnectorType) HasAnnotations() bool {
-	if o != nil && !isNil(o.Annotations) {
+	if o != nil && o.Annotations != nil {
 		return true
 	}
 
@@ -368,7 +368,7 @@ func (o *ConnectorType) SetAnnotations(v map[string]string) {
 
 // GetFeaturedRank returns the FeaturedRank field value if set, zero value otherwise.
 func (o *ConnectorType) GetFeaturedRank() int32 {
-	if o == nil || isNil(o.FeaturedRank) {
+	if o == nil || o.FeaturedRank == nil {
 		var ret int32
 		return ret
 	}
@@ -378,15 +378,15 @@ func (o *ConnectorType) GetFeaturedRank() int32 {
 // GetFeaturedRankOk returns a tuple with the FeaturedRank field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorType) GetFeaturedRankOk() (*int32, bool) {
-	if o == nil || isNil(o.FeaturedRank) {
-    return nil, false
+	if o == nil || o.FeaturedRank == nil {
+		return nil, false
 	}
 	return o.FeaturedRank, true
 }
 
 // HasFeaturedRank returns a boolean if a field has been set.
 func (o *ConnectorType) HasFeaturedRank() bool {
-	if o != nil && !isNil(o.FeaturedRank) {
+	if o != nil && o.FeaturedRank != nil {
 		return true
 	}
 
@@ -400,25 +400,25 @@ func (o *ConnectorType) SetFeaturedRank(v int32) {
 
 // GetCapabilities returns the Capabilities field value if set, zero value otherwise.
 func (o *ConnectorType) GetCapabilities() []string {
-	if o == nil || isNil(o.Capabilities) {
+	if o == nil || o.Capabilities == nil {
 		var ret []string
 		return ret
 	}
-	return o.Capabilities
+	return *o.Capabilities
 }
 
 // GetCapabilitiesOk returns a tuple with the Capabilities field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *ConnectorType) GetCapabilitiesOk() ([]string, bool) {
-	if o == nil || isNil(o.Capabilities) {
-    return nil, false
+func (o *ConnectorType) GetCapabilitiesOk() (*[]string, bool) {
+	if o == nil || o.Capabilities == nil {
+		return nil, false
 	}
 	return o.Capabilities, true
 }
 
 // HasCapabilities returns a boolean if a field has been set.
 func (o *ConnectorType) HasCapabilities() bool {
-	if o != nil && !isNil(o.Capabilities) {
+	if o != nil && o.Capabilities != nil {
 		return true
 	}
 
@@ -427,7 +427,7 @@ func (o *ConnectorType) HasCapabilities() bool {
 
 // SetCapabilities gets a reference to the given []string and assigns it to the Capabilities field.
 func (o *ConnectorType) SetCapabilities(v []string) {
-	o.Capabilities = v
+	o.Capabilities = &v
 }
 
 // GetSchema returns the Schema field value
@@ -442,11 +442,11 @@ func (o *ConnectorType) GetSchema() map[string]interface{} {
 
 // GetSchemaOk returns a tuple with the Schema field value
 // and a boolean to check if the value has been set.
-func (o *ConnectorType) GetSchemaOk() (map[string]interface{}, bool) {
-	if o == nil {
-    return map[string]interface{}{}, false
+func (o *ConnectorType) GetSchemaOk() (*map[string]interface{}, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Schema, true
+	return &o.Schema, true
 }
 
 // SetSchema sets field value
@@ -456,13 +456,13 @@ func (o *ConnectorType) SetSchema(v map[string]interface{}) {
 
 func (o ConnectorType) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.Kind) {
+	if o.Kind != nil {
 		toSerialize["kind"] = o.Kind
 	}
-	if !isNil(o.Href) {
+	if o.Href != nil {
 		toSerialize["href"] = o.Href
 	}
 	if true {
@@ -471,25 +471,25 @@ func (o ConnectorType) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["version"] = o.Version
 	}
-	if !isNil(o.Channels) {
+	if o.Channels != nil {
 		toSerialize["channels"] = o.Channels
 	}
-	if !isNil(o.Description) {
+	if o.Description != nil {
 		toSerialize["description"] = o.Description
 	}
-	if !isNil(o.IconHref) {
+	if o.IconHref != nil {
 		toSerialize["icon_href"] = o.IconHref
 	}
-	if !isNil(o.Labels) {
+	if o.Labels != nil {
 		toSerialize["labels"] = o.Labels
 	}
-	if !isNil(o.Annotations) {
+	if o.Annotations != nil {
 		toSerialize["annotations"] = o.Annotations
 	}
-	if !isNil(o.FeaturedRank) {
+	if o.FeaturedRank != nil {
 		toSerialize["featured_rank"] = o.FeaturedRank
 	}
-	if !isNil(o.Capabilities) {
+	if o.Capabilities != nil {
 		toSerialize["capabilities"] = o.Capabilities
 	}
 	if true {
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_type_all_of.go b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_type_all_of.go
index db4544d0..67355aa2 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_type_all_of.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_type_all_of.go
@@ -1,11 +1,11 @@
 /*
-Connector Management API
-
-Connector Management API is a REST API to manage connectors.
-
-API version: 0.1.0
-Contact: rhosak-support@redhat.com
-*/
+ * Connector Management API
+ *
+ * Connector Management API is a REST API to manage connectors.
+ *
+ * API version: 0.1.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -22,21 +22,21 @@ type ConnectorTypeAllOf struct {
 	// Version of the connector type.
 	Version *string `json:"version,omitempty"`
 	// Channels of the connector type.
-	Channels []Channel `json:"channels,omitempty"`
+	Channels *[]Channel `json:"channels,omitempty"`
 	// A description of the connector.
 	Description *string `json:"description,omitempty"`
 	// URL to an icon of the connector.
 	IconHref *string `json:"icon_href,omitempty"`
 	// Labels used to categorize the connector
-	Labels []string `json:"labels,omitempty"`
+	Labels *[]string `json:"labels,omitempty"`
 	// Name-value string annotations for resource
 	Annotations *map[string]string `json:"annotations,omitempty"`
 	// Ranking for featured connectors
 	FeaturedRank *int32 `json:"featured_rank,omitempty"`
 	// The capabilities supported by the connector
-	Capabilities []string `json:"capabilities,omitempty"`
+	Capabilities *[]string `json:"capabilities,omitempty"`
 	// A json schema that can be used to validate a ConnectorRequest connector field.
-	Schema map[string]interface{} `json:"schema,omitempty"`
+	Schema *map[string]interface{} `json:"schema,omitempty"`
 }
 
 // NewConnectorTypeAllOf instantiates a new ConnectorTypeAllOf object
@@ -58,7 +58,7 @@ func NewConnectorTypeAllOfWithDefaults() *ConnectorTypeAllOf {
 
 // GetName returns the Name field value if set, zero value otherwise.
 func (o *ConnectorTypeAllOf) GetName() string {
-	if o == nil || isNil(o.Name) {
+	if o == nil || o.Name == nil {
 		var ret string
 		return ret
 	}
@@ -68,15 +68,15 @@ func (o *ConnectorTypeAllOf) GetName() string {
 // GetNameOk returns a tuple with the Name field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorTypeAllOf) GetNameOk() (*string, bool) {
-	if o == nil || isNil(o.Name) {
-    return nil, false
+	if o == nil || o.Name == nil {
+		return nil, false
 	}
 	return o.Name, true
 }
 
 // HasName returns a boolean if a field has been set.
 func (o *ConnectorTypeAllOf) HasName() bool {
-	if o != nil && !isNil(o.Name) {
+	if o != nil && o.Name != nil {
 		return true
 	}
 
@@ -90,7 +90,7 @@ func (o *ConnectorTypeAllOf) SetName(v string) {
 
 // GetVersion returns the Version field value if set, zero value otherwise.
 func (o *ConnectorTypeAllOf) GetVersion() string {
-	if o == nil || isNil(o.Version) {
+	if o == nil || o.Version == nil {
 		var ret string
 		return ret
 	}
@@ -100,15 +100,15 @@ func (o *ConnectorTypeAllOf) GetVersion() string {
 // GetVersionOk returns a tuple with the Version field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorTypeAllOf) GetVersionOk() (*string, bool) {
-	if o == nil || isNil(o.Version) {
-    return nil, false
+	if o == nil || o.Version == nil {
+		return nil, false
 	}
 	return o.Version, true
 }
 
 // HasVersion returns a boolean if a field has been set.
 func (o *ConnectorTypeAllOf) HasVersion() bool {
-	if o != nil && !isNil(o.Version) {
+	if o != nil && o.Version != nil {
 		return true
 	}
 
@@ -122,25 +122,25 @@ func (o *ConnectorTypeAllOf) SetVersion(v string) {
 
 // GetChannels returns the Channels field value if set, zero value otherwise.
 func (o *ConnectorTypeAllOf) GetChannels() []Channel {
-	if o == nil || isNil(o.Channels) {
+	if o == nil || o.Channels == nil {
 		var ret []Channel
 		return ret
 	}
-	return o.Channels
+	return *o.Channels
 }
 
 // GetChannelsOk returns a tuple with the Channels field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *ConnectorTypeAllOf) GetChannelsOk() ([]Channel, bool) {
-	if o == nil || isNil(o.Channels) {
-    return nil, false
+func (o *ConnectorTypeAllOf) GetChannelsOk() (*[]Channel, bool) {
+	if o == nil || o.Channels == nil {
+		return nil, false
 	}
 	return o.Channels, true
 }
 
 // HasChannels returns a boolean if a field has been set.
 func (o *ConnectorTypeAllOf) HasChannels() bool {
-	if o != nil && !isNil(o.Channels) {
+	if o != nil && o.Channels != nil {
 		return true
 	}
 
@@ -149,12 +149,12 @@ func (o *ConnectorTypeAllOf) HasChannels() bool {
 
 // SetChannels gets a reference to the given []Channel and assigns it to the Channels field.
 func (o *ConnectorTypeAllOf) SetChannels(v []Channel) {
-	o.Channels = v
+	o.Channels = &v
 }
 
 // GetDescription returns the Description field value if set, zero value otherwise.
 func (o *ConnectorTypeAllOf) GetDescription() string {
-	if o == nil || isNil(o.Description) {
+	if o == nil || o.Description == nil {
 		var ret string
 		return ret
 	}
@@ -164,15 +164,15 @@ func (o *ConnectorTypeAllOf) GetDescription() string {
 // GetDescriptionOk returns a tuple with the Description field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorTypeAllOf) GetDescriptionOk() (*string, bool) {
-	if o == nil || isNil(o.Description) {
-    return nil, false
+	if o == nil || o.Description == nil {
+		return nil, false
 	}
 	return o.Description, true
 }
 
 // HasDescription returns a boolean if a field has been set.
 func (o *ConnectorTypeAllOf) HasDescription() bool {
-	if o != nil && !isNil(o.Description) {
+	if o != nil && o.Description != nil {
 		return true
 	}
 
@@ -186,7 +186,7 @@ func (o *ConnectorTypeAllOf) SetDescription(v string) {
 
 // GetIconHref returns the IconHref field value if set, zero value otherwise.
 func (o *ConnectorTypeAllOf) GetIconHref() string {
-	if o == nil || isNil(o.IconHref) {
+	if o == nil || o.IconHref == nil {
 		var ret string
 		return ret
 	}
@@ -196,15 +196,15 @@ func (o *ConnectorTypeAllOf) GetIconHref() string {
 // GetIconHrefOk returns a tuple with the IconHref field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorTypeAllOf) GetIconHrefOk() (*string, bool) {
-	if o == nil || isNil(o.IconHref) {
-    return nil, false
+	if o == nil || o.IconHref == nil {
+		return nil, false
 	}
 	return o.IconHref, true
 }
 
 // HasIconHref returns a boolean if a field has been set.
 func (o *ConnectorTypeAllOf) HasIconHref() bool {
-	if o != nil && !isNil(o.IconHref) {
+	if o != nil && o.IconHref != nil {
 		return true
 	}
 
@@ -218,25 +218,25 @@ func (o *ConnectorTypeAllOf) SetIconHref(v string) {
 
 // GetLabels returns the Labels field value if set, zero value otherwise.
 func (o *ConnectorTypeAllOf) GetLabels() []string {
-	if o == nil || isNil(o.Labels) {
+	if o == nil || o.Labels == nil {
 		var ret []string
 		return ret
 	}
-	return o.Labels
+	return *o.Labels
 }
 
 // GetLabelsOk returns a tuple with the Labels field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *ConnectorTypeAllOf) GetLabelsOk() ([]string, bool) {
-	if o == nil || isNil(o.Labels) {
-    return nil, false
+func (o *ConnectorTypeAllOf) GetLabelsOk() (*[]string, bool) {
+	if o == nil || o.Labels == nil {
+		return nil, false
 	}
 	return o.Labels, true
 }
 
 // HasLabels returns a boolean if a field has been set.
 func (o *ConnectorTypeAllOf) HasLabels() bool {
-	if o != nil && !isNil(o.Labels) {
+	if o != nil && o.Labels != nil {
 		return true
 	}
 
@@ -245,12 +245,12 @@ func (o *ConnectorTypeAllOf) HasLabels() bool {
 
 // SetLabels gets a reference to the given []string and assigns it to the Labels field.
 func (o *ConnectorTypeAllOf) SetLabels(v []string) {
-	o.Labels = v
+	o.Labels = &v
 }
 
 // GetAnnotations returns the Annotations field value if set, zero value otherwise.
 func (o *ConnectorTypeAllOf) GetAnnotations() map[string]string {
-	if o == nil || isNil(o.Annotations) {
+	if o == nil || o.Annotations == nil {
 		var ret map[string]string
 		return ret
 	}
@@ -260,15 +260,15 @@ func (o *ConnectorTypeAllOf) GetAnnotations() map[string]string {
 // GetAnnotationsOk returns a tuple with the Annotations field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorTypeAllOf) GetAnnotationsOk() (*map[string]string, bool) {
-	if o == nil || isNil(o.Annotations) {
-    return nil, false
+	if o == nil || o.Annotations == nil {
+		return nil, false
 	}
 	return o.Annotations, true
 }
 
 // HasAnnotations returns a boolean if a field has been set.
 func (o *ConnectorTypeAllOf) HasAnnotations() bool {
-	if o != nil && !isNil(o.Annotations) {
+	if o != nil && o.Annotations != nil {
 		return true
 	}
 
@@ -282,7 +282,7 @@ func (o *ConnectorTypeAllOf) SetAnnotations(v map[string]string) {
 
 // GetFeaturedRank returns the FeaturedRank field value if set, zero value otherwise.
 func (o *ConnectorTypeAllOf) GetFeaturedRank() int32 {
-	if o == nil || isNil(o.FeaturedRank) {
+	if o == nil || o.FeaturedRank == nil {
 		var ret int32
 		return ret
 	}
@@ -292,15 +292,15 @@ func (o *ConnectorTypeAllOf) GetFeaturedRank() int32 {
 // GetFeaturedRankOk returns a tuple with the FeaturedRank field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConnectorTypeAllOf) GetFeaturedRankOk() (*int32, bool) {
-	if o == nil || isNil(o.FeaturedRank) {
-    return nil, false
+	if o == nil || o.FeaturedRank == nil {
+		return nil, false
 	}
 	return o.FeaturedRank, true
 }
 
 // HasFeaturedRank returns a boolean if a field has been set.
 func (o *ConnectorTypeAllOf) HasFeaturedRank() bool {
-	if o != nil && !isNil(o.FeaturedRank) {
+	if o != nil && o.FeaturedRank != nil {
 		return true
 	}
 
@@ -314,25 +314,25 @@ func (o *ConnectorTypeAllOf) SetFeaturedRank(v int32) {
 
 // GetCapabilities returns the Capabilities field value if set, zero value otherwise.
 func (o *ConnectorTypeAllOf) GetCapabilities() []string {
-	if o == nil || isNil(o.Capabilities) {
+	if o == nil || o.Capabilities == nil {
 		var ret []string
 		return ret
 	}
-	return o.Capabilities
+	return *o.Capabilities
 }
 
 // GetCapabilitiesOk returns a tuple with the Capabilities field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *ConnectorTypeAllOf) GetCapabilitiesOk() ([]string, bool) {
-	if o == nil || isNil(o.Capabilities) {
-    return nil, false
+func (o *ConnectorTypeAllOf) GetCapabilitiesOk() (*[]string, bool) {
+	if o == nil || o.Capabilities == nil {
+		return nil, false
 	}
 	return o.Capabilities, true
 }
 
 // HasCapabilities returns a boolean if a field has been set.
 func (o *ConnectorTypeAllOf) HasCapabilities() bool {
-	if o != nil && !isNil(o.Capabilities) {
+	if o != nil && o.Capabilities != nil {
 		return true
 	}
 
@@ -341,30 +341,30 @@ func (o *ConnectorTypeAllOf) HasCapabilities() bool {
 
 // SetCapabilities gets a reference to the given []string and assigns it to the Capabilities field.
 func (o *ConnectorTypeAllOf) SetCapabilities(v []string) {
-	o.Capabilities = v
+	o.Capabilities = &v
 }
 
 // GetSchema returns the Schema field value if set, zero value otherwise.
 func (o *ConnectorTypeAllOf) GetSchema() map[string]interface{} {
-	if o == nil || isNil(o.Schema) {
+	if o == nil || o.Schema == nil {
 		var ret map[string]interface{}
 		return ret
 	}
-	return o.Schema
+	return *o.Schema
 }
 
 // GetSchemaOk returns a tuple with the Schema field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *ConnectorTypeAllOf) GetSchemaOk() (map[string]interface{}, bool) {
-	if o == nil || isNil(o.Schema) {
-    return map[string]interface{}{}, false
+func (o *ConnectorTypeAllOf) GetSchemaOk() (*map[string]interface{}, bool) {
+	if o == nil || o.Schema == nil {
+		return nil, false
 	}
 	return o.Schema, true
 }
 
 // HasSchema returns a boolean if a field has been set.
 func (o *ConnectorTypeAllOf) HasSchema() bool {
-	if o != nil && !isNil(o.Schema) {
+	if o != nil && o.Schema != nil {
 		return true
 	}
 
@@ -373,39 +373,39 @@ func (o *ConnectorTypeAllOf) HasSchema() bool {
 
 // SetSchema gets a reference to the given map[string]interface{} and assigns it to the Schema field.
 func (o *ConnectorTypeAllOf) SetSchema(v map[string]interface{}) {
-	o.Schema = v
+	o.Schema = &v
 }
 
 func (o ConnectorTypeAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Name) {
+	if o.Name != nil {
 		toSerialize["name"] = o.Name
 	}
-	if !isNil(o.Version) {
+	if o.Version != nil {
 		toSerialize["version"] = o.Version
 	}
-	if !isNil(o.Channels) {
+	if o.Channels != nil {
 		toSerialize["channels"] = o.Channels
 	}
-	if !isNil(o.Description) {
+	if o.Description != nil {
 		toSerialize["description"] = o.Description
 	}
-	if !isNil(o.IconHref) {
+	if o.IconHref != nil {
 		toSerialize["icon_href"] = o.IconHref
 	}
-	if !isNil(o.Labels) {
+	if o.Labels != nil {
 		toSerialize["labels"] = o.Labels
 	}
-	if !isNil(o.Annotations) {
+	if o.Annotations != nil {
 		toSerialize["annotations"] = o.Annotations
 	}
-	if !isNil(o.FeaturedRank) {
+	if o.FeaturedRank != nil {
 		toSerialize["featured_rank"] = o.FeaturedRank
 	}
-	if !isNil(o.Capabilities) {
+	if o.Capabilities != nil {
 		toSerialize["capabilities"] = o.Capabilities
 	}
-	if !isNil(o.Schema) {
+	if o.Schema != nil {
 		toSerialize["schema"] = o.Schema
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_type_label_count.go b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_type_label_count.go
index dd5b7a07..24641c99 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_type_label_count.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_type_label_count.go
@@ -1,11 +1,11 @@
 /*
-Connector Management API
-
-Connector Management API is a REST API to manage connectors.
-
-API version: 0.1.0
-Contact: rhosak-support@redhat.com
-*/
+ * Connector Management API
+ *
+ * Connector Management API is a REST API to manage connectors.
+ *
+ * API version: 0.1.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -55,8 +55,8 @@ func (o *ConnectorTypeLabelCount) GetLabel() string {
 // GetLabelOk returns a tuple with the Label field value
 // and a boolean to check if the value has been set.
 func (o *ConnectorTypeLabelCount) GetLabelOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Label, true
 }
@@ -79,8 +79,8 @@ func (o *ConnectorTypeLabelCount) GetCount() int32 {
 // GetCountOk returns a tuple with the Count field value
 // and a boolean to check if the value has been set.
 func (o *ConnectorTypeLabelCount) GetCountOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Count, true
 }
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_type_label_count_list.go b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_type_label_count_list.go
index a70cb579..77ae6252 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_type_label_count_list.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_type_label_count_list.go
@@ -1,11 +1,11 @@
 /*
-Connector Management API
-
-Connector Management API is a REST API to manage connectors.
-
-API version: 0.1.0
-Contact: rhosak-support@redhat.com
-*/
+ * Connector Management API
+ *
+ * Connector Management API is a REST API to manage connectors.
+ *
+ * API version: 0.1.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -17,7 +17,7 @@ import (
 
 // ConnectorTypeLabelCountList struct for ConnectorTypeLabelCountList
 type ConnectorTypeLabelCountList struct {
-	Items []ConnectorTypeLabelCount `json:"items,omitempty"`
+	Items *[]ConnectorTypeLabelCount `json:"items,omitempty"`
 }
 
 // NewConnectorTypeLabelCountList instantiates a new ConnectorTypeLabelCountList object
@@ -39,25 +39,25 @@ func NewConnectorTypeLabelCountListWithDefaults() *ConnectorTypeLabelCountList {
 
 // GetItems returns the Items field value if set, zero value otherwise.
 func (o *ConnectorTypeLabelCountList) GetItems() []ConnectorTypeLabelCount {
-	if o == nil || isNil(o.Items) {
+	if o == nil || o.Items == nil {
 		var ret []ConnectorTypeLabelCount
 		return ret
 	}
-	return o.Items
+	return *o.Items
 }
 
 // GetItemsOk returns a tuple with the Items field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *ConnectorTypeLabelCountList) GetItemsOk() ([]ConnectorTypeLabelCount, bool) {
-	if o == nil || isNil(o.Items) {
-    return nil, false
+func (o *ConnectorTypeLabelCountList) GetItemsOk() (*[]ConnectorTypeLabelCount, bool) {
+	if o == nil || o.Items == nil {
+		return nil, false
 	}
 	return o.Items, true
 }
 
 // HasItems returns a boolean if a field has been set.
 func (o *ConnectorTypeLabelCountList) HasItems() bool {
-	if o != nil && !isNil(o.Items) {
+	if o != nil && o.Items != nil {
 		return true
 	}
 
@@ -66,12 +66,12 @@ func (o *ConnectorTypeLabelCountList) HasItems() bool {
 
 // SetItems gets a reference to the given []ConnectorTypeLabelCount and assigns it to the Items field.
 func (o *ConnectorTypeLabelCountList) SetItems(v []ConnectorTypeLabelCount) {
-	o.Items = v
+	o.Items = &v
 }
 
 func (o ConnectorTypeLabelCountList) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Items) {
+	if o.Items != nil {
 		toSerialize["items"] = o.Items
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_type_list.go b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_type_list.go
index 65462bde..796f3814 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_type_list.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_type_list.go
@@ -1,11 +1,11 @@
 /*
-Connector Management API
-
-Connector Management API is a REST API to manage connectors.
-
-API version: 0.1.0
-Contact: rhosak-support@redhat.com
-*/
+ * Connector Management API
+ *
+ * Connector Management API is a REST API to manage connectors.
+ *
+ * API version: 0.1.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -59,8 +59,8 @@ func (o *ConnectorTypeList) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *ConnectorTypeList) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -83,8 +83,8 @@ func (o *ConnectorTypeList) GetPage() int32 {
 // GetPageOk returns a tuple with the Page field value
 // and a boolean to check if the value has been set.
 func (o *ConnectorTypeList) GetPageOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Page, true
 }
@@ -107,8 +107,8 @@ func (o *ConnectorTypeList) GetSize() int32 {
 // GetSizeOk returns a tuple with the Size field value
 // and a boolean to check if the value has been set.
 func (o *ConnectorTypeList) GetSizeOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Size, true
 }
@@ -131,8 +131,8 @@ func (o *ConnectorTypeList) GetTotal() int32 {
 // GetTotalOk returns a tuple with the Total field value
 // and a boolean to check if the value has been set.
 func (o *ConnectorTypeList) GetTotalOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Total, true
 }
@@ -154,11 +154,11 @@ func (o *ConnectorTypeList) GetItems() []ConnectorType {
 
 // GetItemsOk returns a tuple with the Items field value
 // and a boolean to check if the value has been set.
-func (o *ConnectorTypeList) GetItemsOk() ([]ConnectorType, bool) {
-	if o == nil {
-    return nil, false
+func (o *ConnectorTypeList) GetItemsOk() (*[]ConnectorType, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Items, true
+	return &o.Items, true
 }
 
 // SetItems sets field value
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_type_list_all_of.go b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_type_list_all_of.go
index 5598ed08..f1b7bc69 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_type_list_all_of.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/model_connector_type_list_all_of.go
@@ -1,11 +1,11 @@
 /*
-Connector Management API
-
-Connector Management API is a REST API to manage connectors.
-
-API version: 0.1.0
-Contact: rhosak-support@redhat.com
-*/
+ * Connector Management API
+ *
+ * Connector Management API is a REST API to manage connectors.
+ *
+ * API version: 0.1.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -17,7 +17,7 @@ import (
 
 // ConnectorTypeListAllOf struct for ConnectorTypeListAllOf
 type ConnectorTypeListAllOf struct {
-	Items []ConnectorType `json:"items,omitempty"`
+	Items *[]ConnectorType `json:"items,omitempty"`
 }
 
 // NewConnectorTypeListAllOf instantiates a new ConnectorTypeListAllOf object
@@ -39,25 +39,25 @@ func NewConnectorTypeListAllOfWithDefaults() *ConnectorTypeListAllOf {
 
 // GetItems returns the Items field value if set, zero value otherwise.
 func (o *ConnectorTypeListAllOf) GetItems() []ConnectorType {
-	if o == nil || isNil(o.Items) {
+	if o == nil || o.Items == nil {
 		var ret []ConnectorType
 		return ret
 	}
-	return o.Items
+	return *o.Items
 }
 
 // GetItemsOk returns a tuple with the Items field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *ConnectorTypeListAllOf) GetItemsOk() ([]ConnectorType, bool) {
-	if o == nil || isNil(o.Items) {
-    return nil, false
+func (o *ConnectorTypeListAllOf) GetItemsOk() (*[]ConnectorType, bool) {
+	if o == nil || o.Items == nil {
+		return nil, false
 	}
 	return o.Items, true
 }
 
 // HasItems returns a boolean if a field has been set.
 func (o *ConnectorTypeListAllOf) HasItems() bool {
-	if o != nil && !isNil(o.Items) {
+	if o != nil && o.Items != nil {
 		return true
 	}
 
@@ -66,12 +66,12 @@ func (o *ConnectorTypeListAllOf) HasItems() bool {
 
 // SetItems gets a reference to the given []ConnectorType and assigns it to the Items field.
 func (o *ConnectorTypeListAllOf) SetItems(v []ConnectorType) {
-	o.Items = v
+	o.Items = &v
 }
 
 func (o ConnectorTypeListAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Items) {
+	if o.Items != nil {
 		toSerialize["items"] = o.Items
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/model_error.go b/app-services-sdk-go/connectormgmt/apiv1/client/model_error.go
index a0c4c1f9..da7fad00 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/model_error.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/model_error.go
@@ -1,11 +1,11 @@
 /*
-Connector Management API
-
-Connector Management API is a REST API to manage connectors.
-
-API version: 0.1.0
-Contact: rhosak-support@redhat.com
-*/
+ * Connector Management API
+ *
+ * Connector Management API is a REST API to manage connectors.
+ *
+ * API version: 0.1.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -60,8 +60,8 @@ func (o *Error) GetReason() string {
 // GetReasonOk returns a tuple with the Reason field value
 // and a boolean to check if the value has been set.
 func (o *Error) GetReasonOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Reason, true
 }
@@ -73,7 +73,7 @@ func (o *Error) SetReason(v string) {
 
 // GetOperationId returns the OperationId field value if set, zero value otherwise.
 func (o *Error) GetOperationId() string {
-	if o == nil || isNil(o.OperationId) {
+	if o == nil || o.OperationId == nil {
 		var ret string
 		return ret
 	}
@@ -83,15 +83,15 @@ func (o *Error) GetOperationId() string {
 // GetOperationIdOk returns a tuple with the OperationId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Error) GetOperationIdOk() (*string, bool) {
-	if o == nil || isNil(o.OperationId) {
-    return nil, false
+	if o == nil || o.OperationId == nil {
+		return nil, false
 	}
 	return o.OperationId, true
 }
 
 // HasOperationId returns a boolean if a field has been set.
 func (o *Error) HasOperationId() bool {
-	if o != nil && !isNil(o.OperationId) {
+	if o != nil && o.OperationId != nil {
 		return true
 	}
 
@@ -116,8 +116,8 @@ func (o *Error) GetId() string {
 // GetIdOk returns a tuple with the Id field value
 // and a boolean to check if the value has been set.
 func (o *Error) GetIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Id, true
 }
@@ -140,8 +140,8 @@ func (o *Error) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *Error) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -164,8 +164,8 @@ func (o *Error) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value
 // and a boolean to check if the value has been set.
 func (o *Error) GetHrefOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Href, true
 }
@@ -188,8 +188,8 @@ func (o *Error) GetCode() string {
 // GetCodeOk returns a tuple with the Code field value
 // and a boolean to check if the value has been set.
 func (o *Error) GetCodeOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Code, true
 }
@@ -204,7 +204,7 @@ func (o Error) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["reason"] = o.Reason
 	}
-	if !isNil(o.OperationId) {
+	if o.OperationId != nil {
 		toSerialize["operation_id"] = o.OperationId
 	}
 	if true {
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/model_kafka_connection_settings.go b/app-services-sdk-go/connectormgmt/apiv1/client/model_kafka_connection_settings.go
index e445231e..ebd5e392 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/model_kafka_connection_settings.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/model_kafka_connection_settings.go
@@ -1,11 +1,11 @@
 /*
-Connector Management API
-
-Connector Management API is a REST API to manage connectors.
-
-API version: 0.1.0
-Contact: rhosak-support@redhat.com
-*/
+ * Connector Management API
+ *
+ * Connector Management API is a REST API to manage connectors.
+ *
+ * API version: 0.1.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -53,8 +53,8 @@ func (o *KafkaConnectionSettings) GetId() string {
 // GetIdOk returns a tuple with the Id field value
 // and a boolean to check if the value has been set.
 func (o *KafkaConnectionSettings) GetIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Id, true
 }
@@ -77,8 +77,8 @@ func (o *KafkaConnectionSettings) GetUrl() string {
 // GetUrlOk returns a tuple with the Url field value
 // and a boolean to check if the value has been set.
 func (o *KafkaConnectionSettings) GetUrlOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Url, true
 }
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/model_list.go b/app-services-sdk-go/connectormgmt/apiv1/client/model_list.go
index 70fbdce8..52d4f11b 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/model_list.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/model_list.go
@@ -1,11 +1,11 @@
 /*
-Connector Management API
-
-Connector Management API is a REST API to manage connectors.
-
-API version: 0.1.0
-Contact: rhosak-support@redhat.com
-*/
+ * Connector Management API
+ *
+ * Connector Management API is a REST API to manage connectors.
+ *
+ * API version: 0.1.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -59,8 +59,8 @@ func (o *List) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *List) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -83,8 +83,8 @@ func (o *List) GetPage() int32 {
 // GetPageOk returns a tuple with the Page field value
 // and a boolean to check if the value has been set.
 func (o *List) GetPageOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Page, true
 }
@@ -107,8 +107,8 @@ func (o *List) GetSize() int32 {
 // GetSizeOk returns a tuple with the Size field value
 // and a boolean to check if the value has been set.
 func (o *List) GetSizeOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Size, true
 }
@@ -131,8 +131,8 @@ func (o *List) GetTotal() int32 {
 // GetTotalOk returns a tuple with the Total field value
 // and a boolean to check if the value has been set.
 func (o *List) GetTotalOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Total, true
 }
@@ -154,11 +154,11 @@ func (o *List) GetItems() []ObjectReference {
 
 // GetItemsOk returns a tuple with the Items field value
 // and a boolean to check if the value has been set.
-func (o *List) GetItemsOk() ([]ObjectReference, bool) {
-	if o == nil {
-    return nil, false
+func (o *List) GetItemsOk() (*[]ObjectReference, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Items, true
+	return &o.Items, true
 }
 
 // SetItems sets field value
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/model_object_meta.go b/app-services-sdk-go/connectormgmt/apiv1/client/model_object_meta.go
index fdb5e87d..bdff7abf 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/model_object_meta.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/model_object_meta.go
@@ -1,11 +1,11 @@
 /*
-Connector Management API
-
-Connector Management API is a REST API to manage connectors.
-
-API version: 0.1.0
-Contact: rhosak-support@redhat.com
-*/
+ * Connector Management API
+ *
+ * Connector Management API is a REST API to manage connectors.
+ *
+ * API version: 0.1.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -42,7 +42,7 @@ func NewObjectMetaWithDefaults() *ObjectMeta {
 
 // GetOwner returns the Owner field value if set, zero value otherwise.
 func (o *ObjectMeta) GetOwner() string {
-	if o == nil || isNil(o.Owner) {
+	if o == nil || o.Owner == nil {
 		var ret string
 		return ret
 	}
@@ -52,15 +52,15 @@ func (o *ObjectMeta) GetOwner() string {
 // GetOwnerOk returns a tuple with the Owner field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ObjectMeta) GetOwnerOk() (*string, bool) {
-	if o == nil || isNil(o.Owner) {
-    return nil, false
+	if o == nil || o.Owner == nil {
+		return nil, false
 	}
 	return o.Owner, true
 }
 
 // HasOwner returns a boolean if a field has been set.
 func (o *ObjectMeta) HasOwner() bool {
-	if o != nil && !isNil(o.Owner) {
+	if o != nil && o.Owner != nil {
 		return true
 	}
 
@@ -74,7 +74,7 @@ func (o *ObjectMeta) SetOwner(v string) {
 
 // GetCreatedAt returns the CreatedAt field value if set, zero value otherwise.
 func (o *ObjectMeta) GetCreatedAt() time.Time {
-	if o == nil || isNil(o.CreatedAt) {
+	if o == nil || o.CreatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -84,15 +84,15 @@ func (o *ObjectMeta) GetCreatedAt() time.Time {
 // GetCreatedAtOk returns a tuple with the CreatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ObjectMeta) GetCreatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.CreatedAt) {
-    return nil, false
+	if o == nil || o.CreatedAt == nil {
+		return nil, false
 	}
 	return o.CreatedAt, true
 }
 
 // HasCreatedAt returns a boolean if a field has been set.
 func (o *ObjectMeta) HasCreatedAt() bool {
-	if o != nil && !isNil(o.CreatedAt) {
+	if o != nil && o.CreatedAt != nil {
 		return true
 	}
 
@@ -106,7 +106,7 @@ func (o *ObjectMeta) SetCreatedAt(v time.Time) {
 
 // GetModifiedAt returns the ModifiedAt field value if set, zero value otherwise.
 func (o *ObjectMeta) GetModifiedAt() time.Time {
-	if o == nil || isNil(o.ModifiedAt) {
+	if o == nil || o.ModifiedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -116,15 +116,15 @@ func (o *ObjectMeta) GetModifiedAt() time.Time {
 // GetModifiedAtOk returns a tuple with the ModifiedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ObjectMeta) GetModifiedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.ModifiedAt) {
-    return nil, false
+	if o == nil || o.ModifiedAt == nil {
+		return nil, false
 	}
 	return o.ModifiedAt, true
 }
 
 // HasModifiedAt returns a boolean if a field has been set.
 func (o *ObjectMeta) HasModifiedAt() bool {
-	if o != nil && !isNil(o.ModifiedAt) {
+	if o != nil && o.ModifiedAt != nil {
 		return true
 	}
 
@@ -138,13 +138,13 @@ func (o *ObjectMeta) SetModifiedAt(v time.Time) {
 
 func (o ObjectMeta) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Owner) {
+	if o.Owner != nil {
 		toSerialize["owner"] = o.Owner
 	}
-	if !isNil(o.CreatedAt) {
+	if o.CreatedAt != nil {
 		toSerialize["created_at"] = o.CreatedAt
 	}
-	if !isNil(o.ModifiedAt) {
+	if o.ModifiedAt != nil {
 		toSerialize["modified_at"] = o.ModifiedAt
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/model_object_reference.go b/app-services-sdk-go/connectormgmt/apiv1/client/model_object_reference.go
index b16a537d..9b29ee8b 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/model_object_reference.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/model_object_reference.go
@@ -1,11 +1,11 @@
 /*
-Connector Management API
-
-Connector Management API is a REST API to manage connectors.
-
-API version: 0.1.0
-Contact: rhosak-support@redhat.com
-*/
+ * Connector Management API
+ *
+ * Connector Management API is a REST API to manage connectors.
+ *
+ * API version: 0.1.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -41,7 +41,7 @@ func NewObjectReferenceWithDefaults() *ObjectReference {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *ObjectReference) GetId() string {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret string
 		return ret
 	}
@@ -51,15 +51,15 @@ func (o *ObjectReference) GetId() string {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ObjectReference) GetIdOk() (*string, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *ObjectReference) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -73,7 +73,7 @@ func (o *ObjectReference) SetId(v string) {
 
 // GetKind returns the Kind field value if set, zero value otherwise.
 func (o *ObjectReference) GetKind() string {
-	if o == nil || isNil(o.Kind) {
+	if o == nil || o.Kind == nil {
 		var ret string
 		return ret
 	}
@@ -83,15 +83,15 @@ func (o *ObjectReference) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ObjectReference) GetKindOk() (*string, bool) {
-	if o == nil || isNil(o.Kind) {
-    return nil, false
+	if o == nil || o.Kind == nil {
+		return nil, false
 	}
 	return o.Kind, true
 }
 
 // HasKind returns a boolean if a field has been set.
 func (o *ObjectReference) HasKind() bool {
-	if o != nil && !isNil(o.Kind) {
+	if o != nil && o.Kind != nil {
 		return true
 	}
 
@@ -105,7 +105,7 @@ func (o *ObjectReference) SetKind(v string) {
 
 // GetHref returns the Href field value if set, zero value otherwise.
 func (o *ObjectReference) GetHref() string {
-	if o == nil || isNil(o.Href) {
+	if o == nil || o.Href == nil {
 		var ret string
 		return ret
 	}
@@ -115,15 +115,15 @@ func (o *ObjectReference) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ObjectReference) GetHrefOk() (*string, bool) {
-	if o == nil || isNil(o.Href) {
-    return nil, false
+	if o == nil || o.Href == nil {
+		return nil, false
 	}
 	return o.Href, true
 }
 
 // HasHref returns a boolean if a field has been set.
 func (o *ObjectReference) HasHref() bool {
-	if o != nil && !isNil(o.Href) {
+	if o != nil && o.Href != nil {
 		return true
 	}
 
@@ -137,13 +137,13 @@ func (o *ObjectReference) SetHref(v string) {
 
 func (o ObjectReference) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.Kind) {
+	if o.Kind != nil {
 		toSerialize["kind"] = o.Kind
 	}
-	if !isNil(o.Href) {
+	if o.Href != nil {
 		toSerialize["href"] = o.Href
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/model_schema_registry_connection_settings.go b/app-services-sdk-go/connectormgmt/apiv1/client/model_schema_registry_connection_settings.go
index 72ed34c8..63d75cb1 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/model_schema_registry_connection_settings.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/model_schema_registry_connection_settings.go
@@ -1,11 +1,11 @@
 /*
-Connector Management API
-
-Connector Management API is a REST API to manage connectors.
-
-API version: 0.1.0
-Contact: rhosak-support@redhat.com
-*/
+ * Connector Management API
+ *
+ * Connector Management API is a REST API to manage connectors.
+ *
+ * API version: 0.1.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -53,8 +53,8 @@ func (o *SchemaRegistryConnectionSettings) GetId() string {
 // GetIdOk returns a tuple with the Id field value
 // and a boolean to check if the value has been set.
 func (o *SchemaRegistryConnectionSettings) GetIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Id, true
 }
@@ -77,8 +77,8 @@ func (o *SchemaRegistryConnectionSettings) GetUrl() string {
 // GetUrlOk returns a tuple with the Url field value
 // and a boolean to check if the value has been set.
 func (o *SchemaRegistryConnectionSettings) GetUrlOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Url, true
 }
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/model_service_account.go b/app-services-sdk-go/connectormgmt/apiv1/client/model_service_account.go
index 2165319f..b3be14f9 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/model_service_account.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/model_service_account.go
@@ -1,11 +1,11 @@
 /*
-Connector Management API
-
-Connector Management API is a REST API to manage connectors.
-
-API version: 0.1.0
-Contact: rhosak-support@redhat.com
-*/
+ * Connector Management API
+ *
+ * Connector Management API is a REST API to manage connectors.
+ *
+ * API version: 0.1.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -53,8 +53,8 @@ func (o *ServiceAccount) GetClientId() string {
 // GetClientIdOk returns a tuple with the ClientId field value
 // and a boolean to check if the value has been set.
 func (o *ServiceAccount) GetClientIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.ClientId, true
 }
@@ -77,8 +77,8 @@ func (o *ServiceAccount) GetClientSecret() string {
 // GetClientSecretOk returns a tuple with the ClientSecret field value
 // and a boolean to check if the value has been set.
 func (o *ServiceAccount) GetClientSecretOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.ClientSecret, true
 }
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/model_service_connection_settings.go b/app-services-sdk-go/connectormgmt/apiv1/client/model_service_connection_settings.go
index 8ddce9f2..86896ee8 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/model_service_connection_settings.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/model_service_connection_settings.go
@@ -1,11 +1,11 @@
 /*
-Connector Management API
-
-Connector Management API is a REST API to manage connectors.
-
-API version: 0.1.0
-Contact: rhosak-support@redhat.com
-*/
+ * Connector Management API
+ *
+ * Connector Management API is a REST API to manage connectors.
+ *
+ * API version: 0.1.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -53,8 +53,8 @@ func (o *ServiceConnectionSettings) GetId() string {
 // GetIdOk returns a tuple with the Id field value
 // and a boolean to check if the value has been set.
 func (o *ServiceConnectionSettings) GetIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Id, true
 }
@@ -77,8 +77,8 @@ func (o *ServiceConnectionSettings) GetUrl() string {
 // GetUrlOk returns a tuple with the Url field value
 // and a boolean to check if the value has been set.
 func (o *ServiceConnectionSettings) GetUrlOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Url, true
 }
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/model_version_metadata.go b/app-services-sdk-go/connectormgmt/apiv1/client/model_version_metadata.go
index 51a534f1..1ce5580c 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/model_version_metadata.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/model_version_metadata.go
@@ -1,11 +1,11 @@
 /*
-Connector Management API
-
-Connector Management API is a REST API to manage connectors.
-
-API version: 0.1.0
-Contact: rhosak-support@redhat.com
-*/
+ * Connector Management API
+ *
+ * Connector Management API is a REST API to manage connectors.
+ *
+ * API version: 0.1.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -20,7 +20,7 @@ type VersionMetadata struct {
 	Id *string `json:"id,omitempty"`
 	Kind *string `json:"kind,omitempty"`
 	Href *string `json:"href,omitempty"`
-	Collections []ObjectReference `json:"collections,omitempty"`
+	Collections *[]ObjectReference `json:"collections,omitempty"`
 }
 
 // NewVersionMetadata instantiates a new VersionMetadata object
@@ -42,7 +42,7 @@ func NewVersionMetadataWithDefaults() *VersionMetadata {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *VersionMetadata) GetId() string {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret string
 		return ret
 	}
@@ -52,15 +52,15 @@ func (o *VersionMetadata) GetId() string {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *VersionMetadata) GetIdOk() (*string, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *VersionMetadata) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -74,7 +74,7 @@ func (o *VersionMetadata) SetId(v string) {
 
 // GetKind returns the Kind field value if set, zero value otherwise.
 func (o *VersionMetadata) GetKind() string {
-	if o == nil || isNil(o.Kind) {
+	if o == nil || o.Kind == nil {
 		var ret string
 		return ret
 	}
@@ -84,15 +84,15 @@ func (o *VersionMetadata) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *VersionMetadata) GetKindOk() (*string, bool) {
-	if o == nil || isNil(o.Kind) {
-    return nil, false
+	if o == nil || o.Kind == nil {
+		return nil, false
 	}
 	return o.Kind, true
 }
 
 // HasKind returns a boolean if a field has been set.
 func (o *VersionMetadata) HasKind() bool {
-	if o != nil && !isNil(o.Kind) {
+	if o != nil && o.Kind != nil {
 		return true
 	}
 
@@ -106,7 +106,7 @@ func (o *VersionMetadata) SetKind(v string) {
 
 // GetHref returns the Href field value if set, zero value otherwise.
 func (o *VersionMetadata) GetHref() string {
-	if o == nil || isNil(o.Href) {
+	if o == nil || o.Href == nil {
 		var ret string
 		return ret
 	}
@@ -116,15 +116,15 @@ func (o *VersionMetadata) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *VersionMetadata) GetHrefOk() (*string, bool) {
-	if o == nil || isNil(o.Href) {
-    return nil, false
+	if o == nil || o.Href == nil {
+		return nil, false
 	}
 	return o.Href, true
 }
 
 // HasHref returns a boolean if a field has been set.
 func (o *VersionMetadata) HasHref() bool {
-	if o != nil && !isNil(o.Href) {
+	if o != nil && o.Href != nil {
 		return true
 	}
 
@@ -138,25 +138,25 @@ func (o *VersionMetadata) SetHref(v string) {
 
 // GetCollections returns the Collections field value if set, zero value otherwise.
 func (o *VersionMetadata) GetCollections() []ObjectReference {
-	if o == nil || isNil(o.Collections) {
+	if o == nil || o.Collections == nil {
 		var ret []ObjectReference
 		return ret
 	}
-	return o.Collections
+	return *o.Collections
 }
 
 // GetCollectionsOk returns a tuple with the Collections field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *VersionMetadata) GetCollectionsOk() ([]ObjectReference, bool) {
-	if o == nil || isNil(o.Collections) {
-    return nil, false
+func (o *VersionMetadata) GetCollectionsOk() (*[]ObjectReference, bool) {
+	if o == nil || o.Collections == nil {
+		return nil, false
 	}
 	return o.Collections, true
 }
 
 // HasCollections returns a boolean if a field has been set.
 func (o *VersionMetadata) HasCollections() bool {
-	if o != nil && !isNil(o.Collections) {
+	if o != nil && o.Collections != nil {
 		return true
 	}
 
@@ -165,21 +165,21 @@ func (o *VersionMetadata) HasCollections() bool {
 
 // SetCollections gets a reference to the given []ObjectReference and assigns it to the Collections field.
 func (o *VersionMetadata) SetCollections(v []ObjectReference) {
-	o.Collections = v
+	o.Collections = &v
 }
 
 func (o VersionMetadata) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.Kind) {
+	if o.Kind != nil {
 		toSerialize["kind"] = o.Kind
 	}
-	if !isNil(o.Href) {
+	if o.Href != nil {
 		toSerialize["href"] = o.Href
 	}
-	if !isNil(o.Collections) {
+	if o.Collections != nil {
 		toSerialize["collections"] = o.Collections
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/model_version_metadata_all_of.go b/app-services-sdk-go/connectormgmt/apiv1/client/model_version_metadata_all_of.go
index d720fed8..4de6d272 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/model_version_metadata_all_of.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/model_version_metadata_all_of.go
@@ -1,11 +1,11 @@
 /*
-Connector Management API
-
-Connector Management API is a REST API to manage connectors.
-
-API version: 0.1.0
-Contact: rhosak-support@redhat.com
-*/
+ * Connector Management API
+ *
+ * Connector Management API is a REST API to manage connectors.
+ *
+ * API version: 0.1.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -17,7 +17,7 @@ import (
 
 // VersionMetadataAllOf struct for VersionMetadataAllOf
 type VersionMetadataAllOf struct {
-	Collections []ObjectReference `json:"collections,omitempty"`
+	Collections *[]ObjectReference `json:"collections,omitempty"`
 }
 
 // NewVersionMetadataAllOf instantiates a new VersionMetadataAllOf object
@@ -39,25 +39,25 @@ func NewVersionMetadataAllOfWithDefaults() *VersionMetadataAllOf {
 
 // GetCollections returns the Collections field value if set, zero value otherwise.
 func (o *VersionMetadataAllOf) GetCollections() []ObjectReference {
-	if o == nil || isNil(o.Collections) {
+	if o == nil || o.Collections == nil {
 		var ret []ObjectReference
 		return ret
 	}
-	return o.Collections
+	return *o.Collections
 }
 
 // GetCollectionsOk returns a tuple with the Collections field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *VersionMetadataAllOf) GetCollectionsOk() ([]ObjectReference, bool) {
-	if o == nil || isNil(o.Collections) {
-    return nil, false
+func (o *VersionMetadataAllOf) GetCollectionsOk() (*[]ObjectReference, bool) {
+	if o == nil || o.Collections == nil {
+		return nil, false
 	}
 	return o.Collections, true
 }
 
 // HasCollections returns a boolean if a field has been set.
 func (o *VersionMetadataAllOf) HasCollections() bool {
-	if o != nil && !isNil(o.Collections) {
+	if o != nil && o.Collections != nil {
 		return true
 	}
 
@@ -66,12 +66,12 @@ func (o *VersionMetadataAllOf) HasCollections() bool {
 
 // SetCollections gets a reference to the given []ObjectReference and assigns it to the Collections field.
 func (o *VersionMetadataAllOf) SetCollections(v []ObjectReference) {
-	o.Collections = v
+	o.Collections = &v
 }
 
 func (o VersionMetadataAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Collections) {
+	if o.Collections != nil {
 		toSerialize["collections"] = o.Collections
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/response.go b/app-services-sdk-go/connectormgmt/apiv1/client/response.go
index 8dd88783..41923737 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/response.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/response.go
@@ -1,11 +1,11 @@
 /*
-Connector Management API
-
-Connector Management API is a REST API to manage connectors.
-
-API version: 0.1.0
-Contact: rhosak-support@redhat.com
-*/
+ * Connector Management API
+ *
+ * Connector Management API is a REST API to manage connectors.
+ *
+ * API version: 0.1.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/test/api_connector_clusters_test.go b/app-services-sdk-go/connectormgmt/apiv1/client/test/api_connector_clusters_test.go
deleted file mode 100644
index c25165ed..00000000
--- a/app-services-sdk-go/connectormgmt/apiv1/client/test/api_connector_clusters_test.go
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
-Connector Management API
-
-Testing ConnectorClustersApiService
-
-*/
-
-// Code generated by OpenAPI Generator (https://openapi-generator.tech);
-
-package connectormgmtclient
-
-import (
-    "context"
-    "github.com/stretchr/testify/assert"
-    "github.com/stretchr/testify/require"
-    "testing"
-    openapiclient "./openapi"
-)
-
-func Test_connectormgmtclient_ConnectorClustersApiService(t *testing.T) {
-
-    configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-
-    t.Run("Test ConnectorClustersApiService CreateConnectorCluster", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.ConnectorClustersApi.CreateConnectorCluster(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test ConnectorClustersApiService DeleteConnectorCluster", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var connectorClusterId string
-
-        resp, httpRes, err := apiClient.ConnectorClustersApi.DeleteConnectorCluster(context.Background(), connectorClusterId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test ConnectorClustersApiService GetConnectorCluster", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var connectorClusterId string
-
-        resp, httpRes, err := apiClient.ConnectorClustersApi.GetConnectorCluster(context.Background(), connectorClusterId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test ConnectorClustersApiService GetConnectorClusterAddonParameters", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var connectorClusterId string
-
-        resp, httpRes, err := apiClient.ConnectorClustersApi.GetConnectorClusterAddonParameters(context.Background(), connectorClusterId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test ConnectorClustersApiService GetConnectorClusterNamespaces", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var connectorClusterId string
-
-        resp, httpRes, err := apiClient.ConnectorClustersApi.GetConnectorClusterNamespaces(context.Background(), connectorClusterId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test ConnectorClustersApiService ListConnectorClusters", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.ConnectorClustersApi.ListConnectorClusters(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test ConnectorClustersApiService UpdateConnectorClusterById", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var connectorClusterId string
-
-        resp, httpRes, err := apiClient.ConnectorClustersApi.UpdateConnectorClusterById(context.Background(), connectorClusterId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-}
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/test/api_connector_namespaces_test.go b/app-services-sdk-go/connectormgmt/apiv1/client/test/api_connector_namespaces_test.go
deleted file mode 100644
index e32ad8d7..00000000
--- a/app-services-sdk-go/connectormgmt/apiv1/client/test/api_connector_namespaces_test.go
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
-Connector Management API
-
-Testing ConnectorNamespacesApiService
-
-*/
-
-// Code generated by OpenAPI Generator (https://openapi-generator.tech);
-
-package connectormgmtclient
-
-import (
-    "context"
-    "github.com/stretchr/testify/assert"
-    "github.com/stretchr/testify/require"
-    "testing"
-    openapiclient "./openapi"
-)
-
-func Test_connectormgmtclient_ConnectorNamespacesApiService(t *testing.T) {
-
-    configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-
-    t.Run("Test ConnectorNamespacesApiService CreateEvaluationNamespace", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.ConnectorNamespacesApi.CreateEvaluationNamespace(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test ConnectorNamespacesApiService GetConnectorNamespace", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var connectorNamespaceId string
-
-        resp, httpRes, err := apiClient.ConnectorNamespacesApi.GetConnectorNamespace(context.Background(), connectorNamespaceId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test ConnectorNamespacesApiService ListConnectorNamespaces", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.ConnectorNamespacesApi.ListConnectorNamespaces(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-}
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/test/api_connector_service_test.go b/app-services-sdk-go/connectormgmt/apiv1/client/test/api_connector_service_test.go
deleted file mode 100644
index dcb38408..00000000
--- a/app-services-sdk-go/connectormgmt/apiv1/client/test/api_connector_service_test.go
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-Connector Management API
-
-Testing ConnectorServiceApiService
-
-*/
-
-// Code generated by OpenAPI Generator (https://openapi-generator.tech);
-
-package connectormgmtclient
-
-import (
-    "context"
-    "github.com/stretchr/testify/assert"
-    "github.com/stretchr/testify/require"
-    "testing"
-    openapiclient "./openapi"
-)
-
-func Test_connectormgmtclient_ConnectorServiceApiService(t *testing.T) {
-
-    configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-
-    t.Run("Test ConnectorServiceApiService GetVersionMetadata", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.ConnectorServiceApi.GetVersionMetadata(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-}
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/test/api_connector_types_test.go b/app-services-sdk-go/connectormgmt/apiv1/client/test/api_connector_types_test.go
deleted file mode 100644
index 1b6606f3..00000000
--- a/app-services-sdk-go/connectormgmt/apiv1/client/test/api_connector_types_test.go
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
-Connector Management API
-
-Testing ConnectorTypesApiService
-
-*/
-
-// Code generated by OpenAPI Generator (https://openapi-generator.tech);
-
-package connectormgmtclient
-
-import (
-    "context"
-    "github.com/stretchr/testify/assert"
-    "github.com/stretchr/testify/require"
-    "testing"
-    openapiclient "./openapi"
-)
-
-func Test_connectormgmtclient_ConnectorTypesApiService(t *testing.T) {
-
-    configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-
-    t.Run("Test ConnectorTypesApiService GetConnectorTypeByID", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var connectorTypeId string
-
-        resp, httpRes, err := apiClient.ConnectorTypesApi.GetConnectorTypeByID(context.Background(), connectorTypeId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test ConnectorTypesApiService GetConnectorTypeLabels", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.ConnectorTypesApi.GetConnectorTypeLabels(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test ConnectorTypesApiService GetConnectorTypes", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.ConnectorTypesApi.GetConnectorTypes(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-}
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/test/api_connectors_test.go b/app-services-sdk-go/connectormgmt/apiv1/client/test/api_connectors_test.go
deleted file mode 100644
index 9aff1c13..00000000
--- a/app-services-sdk-go/connectormgmt/apiv1/client/test/api_connectors_test.go
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
-Connector Management API
-
-Testing ConnectorsApiService
-
-*/
-
-// Code generated by OpenAPI Generator (https://openapi-generator.tech);
-
-package connectormgmtclient
-
-import (
-    "context"
-    "github.com/stretchr/testify/assert"
-    "github.com/stretchr/testify/require"
-    "testing"
-    openapiclient "./openapi"
-)
-
-func Test_connectormgmtclient_ConnectorsApiService(t *testing.T) {
-
-    configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-
-    t.Run("Test ConnectorsApiService CreateConnector", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.ConnectorsApi.CreateConnector(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test ConnectorsApiService DeleteConnector", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.ConnectorsApi.DeleteConnector(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test ConnectorsApiService GetConnector", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.ConnectorsApi.GetConnector(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test ConnectorsApiService ListConnectors", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.ConnectorsApi.ListConnectors(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test ConnectorsApiService PatchConnector", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.ConnectorsApi.PatchConnector(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-}
diff --git a/app-services-sdk-go/connectormgmt/apiv1/client/utils.go b/app-services-sdk-go/connectormgmt/apiv1/client/utils.go
index 4b33f034..f8da50d4 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/client/utils.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/client/utils.go
@@ -1,11 +1,11 @@
 /*
-Connector Management API
-
-Connector Management API is a REST API to manage connectors.
-
-API version: 0.1.0
-Contact: rhosak-support@redhat.com
-*/
+ * Connector Management API
+ *
+ * Connector Management API is a REST API to manage connectors.
+ *
+ * API version: 0.1.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -13,7 +13,6 @@ package connectormgmtclient
 
 import (
 	"encoding/json"
-    "reflect"
 	"time"
 )
 
@@ -328,17 +327,3 @@ func (v *NullableTime) UnmarshalJSON(src []byte) error {
 	v.isSet = true
 	return json.Unmarshal(src, &v.value)
 }
-
-// isNil checks if an input is nil
-func isNil(i interface{}) bool {
-    if i == nil {
-        return true
-    }
-    switch reflect.TypeOf(i).Kind() {
-    case reflect.Chan, reflect.Func, reflect.Map, reflect.Ptr, reflect.UnsafePointer, reflect.Interface, reflect.Slice:
-        return reflect.ValueOf(i).IsNil()
-    case reflect.Array:
-        return reflect.ValueOf(i).IsZero()
-    }
-    return false
-}
\ No newline at end of file
diff --git a/app-services-sdk-go/connectormgmt/apiv1/error/error_sdk.go b/app-services-sdk-go/connectormgmt/apiv1/error/error_sdk.go
index 95567b52..d2788e39 100644
--- a/app-services-sdk-go/connectormgmt/apiv1/error/error_sdk.go
+++ b/app-services-sdk-go/connectormgmt/apiv1/error/error_sdk.go
@@ -3,7 +3,7 @@ package error
 import (
 	"errors"
 
-	connectormgmtclient "github.com/redhat-developer/app-services-sdk-go/connectormgmt/apiv1/client"
+	connectormgmtclient "github.com/jackdelahunt/app-services-sdk-core/app-services-sdk-go/connectormgmt/apiv1/client"
 )
 
 // GetAPIError gets a strongly typed error from an error
diff --git a/app-services-sdk-go/connectormgmt/go.mod b/app-services-sdk-go/connectormgmt/go.mod
index 7d2d7a7c..8261ee41 100644
--- a/app-services-sdk-go/connectormgmt/go.mod
+++ b/app-services-sdk-go/connectormgmt/go.mod
@@ -1,8 +1,8 @@
-module github.com/redhat-developer/app-services-sdk-go/connectormgmt
+module github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go/connectormgmt
 
 go 1.15
 
 require (
-	github.com/redhat-developer/app-services-sdk-go v0.10.0
+	github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go v0.1.0
 	golang.org/x/oauth2 v0.0.0-20220630143837-2104d58473e0
 )
diff --git a/app-services-sdk-go/examples/auth/auth.go b/app-services-sdk-go/examples/auth/auth.go
index 8f284e4d..9cc6299b 100644
--- a/app-services-sdk-go/examples/auth/auth.go
+++ b/app-services-sdk-go/examples/auth/auth.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"os"
 
-	rhoasAuth "github.com/redhat-developer/app-services-sdk-go/auth/apiv1"
-	kafkamgmt "github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1"
+	rhoasAuth "github.com/jackdelahunt/app-services-sdk-core/app-services-sdk-go/auth/apiv1"
+	kafkamgmt "github.com/jackdelahunt/app-services-sdk-core/app-services-sdk-go/kafkamgmt/apiv1"
 )
 
 func main() {
diff --git a/app-services-sdk-go/examples/connectormgmt/connector_mgmt.go b/app-services-sdk-go/examples/connectormgmt/connector_mgmt.go
index 8a684d8e..3167dea4 100644
--- a/app-services-sdk-go/examples/connectormgmt/connector_mgmt.go
+++ b/app-services-sdk-go/examples/connectormgmt/connector_mgmt.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"os"
 
-	rhoasAuth "github.com/redhat-developer/app-services-sdk-go/auth/apiv1"
-	connectormgmt "github.com/redhat-developer/app-services-sdk-go/connectormgmt/apiv1"
+	rhoasAuth "github.com/jackdelahunt/app-services-sdk-core/app-services-sdk-go/auth/apiv1"
+	connectormgmt "github.com/jackdelahunt/app-services-sdk-core/app-services-sdk-go/connectormgmt/apiv1"
 )
 
 func main() {
diff --git a/app-services-sdk-go/examples/go.mod b/app-services-sdk-go/examples/go.mod
index 6ba90fe6..b63463fc 100644
--- a/app-services-sdk-go/examples/go.mod
+++ b/app-services-sdk-go/examples/go.mod
@@ -1,4 +1,4 @@
-module github.com/redhat-developer/app-services-sdk-go/internal/examples
+module github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go/internals/examples
 
 go 1.15
 
diff --git a/app-services-sdk-go/examples/kafkainstance/kafka_instance.go b/app-services-sdk-go/examples/kafkainstance/kafka_instance.go
index 5b40f11e..9593d1e4 100644
--- a/app-services-sdk-go/examples/kafkainstance/kafka_instance.go
+++ b/app-services-sdk-go/examples/kafkainstance/kafka_instance.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"os"
 
-	rhoasAuth "github.com/redhat-developer/app-services-sdk-go/auth/apiv1"
-	kafkainstanceapi "github.com/redhat-developer/app-services-sdk-go/kafkainstance/apiv1"
+	rhoasAuth "github.com/jackdelahunt/app-services-sdk-core/app-services-sdk-go/auth/apiv1"
+	kafkainstanceapi "github.com/jackdelahunt/app-services-sdk-core/app-services-sdk-go/kafkainstance/apiv1"
 )
 
 func main() {
diff --git a/app-services-sdk-go/examples/kafkamgmt/kafka_mgmt.go b/app-services-sdk-go/examples/kafkamgmt/kafka_mgmt.go
index f85511ac..9cbf6c71 100644
--- a/app-services-sdk-go/examples/kafkamgmt/kafka_mgmt.go
+++ b/app-services-sdk-go/examples/kafkamgmt/kafka_mgmt.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"os"
 
-	rhoasAuth "github.com/redhat-developer/app-services-sdk-go/auth/apiv1"
-	kafkamgmt "github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1"
+	rhoasAuth "github.com/jackdelahunt/app-services-sdk-core/app-services-sdk-go/auth/apiv1"
+	kafkamgmt "github.com/jackdelahunt/app-services-sdk-core/app-services-sdk-go/kafkamgmt/apiv1"
 )
 
 func main() {
diff --git a/app-services-sdk-go/examples/registryinstance/registryinstance.go b/app-services-sdk-go/examples/registryinstance/registryinstance.go
index b4244d22..7f5f9d0a 100644
--- a/app-services-sdk-go/examples/registryinstance/registryinstance.go
+++ b/app-services-sdk-go/examples/registryinstance/registryinstance.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"os"
 
-	rhoasAuth "github.com/redhat-developer/app-services-sdk-go/auth/apiv1"
-	registryinstance "github.com/redhat-developer/app-services-sdk-go/registryinstance/apiv1internal"
+	rhoasAuth "github.com/jackdelahunt/app-services-sdk-core/app-services-sdk-go/auth/apiv1"
+	registryinstance "github.com/jackdelahunt/app-services-sdk-core/app-services-sdk-go/registryinstance/apiv1internal"
 )
 
 func main() {
diff --git a/app-services-sdk-go/examples/srsmgmt/srs_mgmt.go b/app-services-sdk-go/examples/srsmgmt/srs_mgmt.go
index 915e7d23..910cc767 100644
--- a/app-services-sdk-go/examples/srsmgmt/srs_mgmt.go
+++ b/app-services-sdk-go/examples/srsmgmt/srs_mgmt.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"os"
 
-	rhoasAuth "github.com/redhat-developer/app-services-sdk-go/auth/apiv1"
-	registrymgmt "github.com/redhat-developer/app-services-sdk-go/registrymgmt/apiv1"
+	rhoasAuth "github.com/jackdelahunt/app-services-sdk-core/app-services-sdk-go/auth/apiv1"
+	registrymgmt "github.com/jackdelahunt/app-services-sdk-core/app-services-sdk-go/registrymgmt/apiv1"
 )
 
 func main() {
diff --git a/app-services-sdk-go/go.mod b/app-services-sdk-go/go.mod
index 40dd9e60..65cb7973 100644
--- a/app-services-sdk-go/go.mod
+++ b/app-services-sdk-go/go.mod
@@ -1,4 +1,4 @@
-module github.com/redhat-developer/app-services-sdk-go
+module github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go
 
 go 1.15
 
diff --git a/app-services-sdk-go/kafkainstance/apiv1/api_client.go b/app-services-sdk-go/kafkainstance/apiv1/api_client.go
index 1d453964..66cf7815 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/api_client.go
+++ b/app-services-sdk-go/kafkainstance/apiv1/api_client.go
@@ -1,9 +1,9 @@
 package kafkainstance
 
 import (
-	"github.com/redhat-developer/app-services-sdk-go/core"
+	"github.com/jackdelahunt/app-services-sdk-core/app-services-sdk-go/core"
 
-	apiv1 "github.com/redhat-developer/app-services-sdk-go/kafkainstance/apiv1/client"
+	apiv1 "github.com/jackdelahunt/app-services-sdk-core/app-services-sdk-go/kafkainstance/apiv1/client"
 )
 
 // APIConfig defines the available configuration options
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/.openapi-generator/FILES b/app-services-sdk-go/kafkainstance/apiv1/client/.openapi-generator/FILES
index 91ee9650..1a5be514 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/.openapi-generator/FILES
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/.openapi-generator/FILES
@@ -48,7 +48,6 @@ docs/Node.md
 docs/ObjectReference.md
 docs/OffsetType.md
 docs/Partition.md
-docs/PartitionLeader.md
 docs/Record.md
 docs/RecordAllOf.md
 docs/RecordIncludedProperty.md
@@ -64,8 +63,6 @@ docs/TopicsApi.md
 docs/TopicsList.md
 docs/TopicsListAllOf.md
 docs/TopicsToResetOffset.md
-go.mod
-go.sum
 model_acl_binding.go
 model_acl_binding_all_of.go
 model_acl_binding_list_page.go
@@ -105,7 +102,6 @@ model_node.go
 model_object_reference.go
 model_offset_type.go
 model_partition.go
-model_partition_leader.go
 model_record.go
 model_record_all_of.go
 model_record_included_property.go
@@ -120,9 +116,4 @@ model_topics_list.go
 model_topics_list_all_of.go
 model_topics_to_reset_offset.go
 response.go
-test/api_acls_test.go
-test/api_errors_test.go
-test/api_groups_test.go
-test/api_records_test.go
-test/api_topics_test.go
 utils.go
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/.openapi-generator/VERSION b/app-services-sdk-go/kafkainstance/apiv1/client/.openapi-generator/VERSION
index 0df17dd0..7cbea073 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/.openapi-generator/VERSION
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/.openapi-generator/VERSION
@@ -1 +1 @@
-6.2.1
\ No newline at end of file
+5.2.0
\ No newline at end of file
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/api/openapi.yaml b/app-services-sdk-go/kafkainstance/apiv1/client/api/openapi.yaml
index b215df0c..34284099 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/api/openapi.yaml
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/api/openapi.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.3
 info:
-  description: "API for interacting with Kafka Instance. Includes Produce, Consume\
-    \ and Admin APIs"
+  description: API for interacting with Kafka Instance. Includes Produce, Consume
+    and Admin APIs
   license:
     name: Apache 2.0
     url: https://www.apache.org/licenses/LICENSE-2.0
@@ -27,13 +27,13 @@ tags:
 paths:
   /api/v1/topics:
     get:
-      description: "Returns a list of all of the available topics, or the list of\
-        \ topics that meet the request query parameters. The topics returned are limited\
-        \ to those records the requestor is authorized to view."
+      description: Returns a list of all of the available topics, or the list of topics
+        that meet the request query parameters. The topics returned are limited to
+        those records the requestor is authorized to view.
       operationId: getTopics
       parameters:
       - deprecated: true
-        description: "Offset of the first record to return, zero-based"
+        description: Offset of the first record to return, zero-based
         explode: true
         in: query
         name: offset
@@ -98,7 +98,7 @@ paths:
         schema:
           allOf:
           - $ref: '#/components/schemas/TopicOrderKey'
-          - default: name
+          - {}
         style: form
       responses:
         "400":
@@ -379,9 +379,9 @@ paths:
       - topics
   /api/v1/topics/{topicName}/records:
     get:
-      description: "Consume a limited number of records from a topic, optionally specifying\
-        \ a partition and an absolute offset or timestamp as the starting point for\
-        \ message retrieval."
+      description: Consume a limited number of records from a topic, optionally specifying
+        a partition and an absolute offset or timestamp as the starting point for
+        message retrieval.
       operationId: consumeRecords
       parameters:
       - description: List of properties to include for each record in the response
@@ -404,10 +404,9 @@ paths:
           minimum: 1
           type: integer
         style: form
-      - description: "Maximum length of string values returned in the response. Values\
-          \ with a length that exceeds this parameter will be truncated. When this\
-          \ parameter is not included in the request, the full string values will\
-          \ be returned."
+      - description: Maximum length of string values returned in the response. Values
+          with a length that exceeds this parameter will be truncated. When this parameter
+          is not included in the request, the full string values will be returned.
         explode: true
         in: query
         name: maxValueLength
@@ -417,9 +416,9 @@ paths:
           minimum: 1
           type: integer
         style: form
-      - description: "Retrieve messages with an offset equal to or greater than this\
-          \ offset. If both `timestamp` and `offset` are requested, `timestamp` is\
-          \ given preference."
+      - description: Retrieve messages with an offset equal to or greater than this
+          offset. If both `timestamp` and `offset` are requested, `timestamp` is given
+          preference.
         explode: true
         in: query
         name: offset
@@ -438,9 +437,9 @@ paths:
           format: int32
           type: integer
         style: form
-      - description: "Retrieve messages with a timestamp equal to or later than this\
-          \ timestamp. If both `timestamp` and `offset` are requested, `timestamp`\
-          \ is given preference."
+      - description: Retrieve messages with a timestamp equal to or later than this
+          timestamp. If both `timestamp` and `offset` are requested, `timestamp` is
+          given preference.
         explode: true
         in: query
         name: timestamp
@@ -581,7 +580,7 @@ paths:
       operationId: getConsumerGroups
       parameters:
       - deprecated: true
-        description: "Offset of the first record to return, zero-based"
+        description: Offset of the first record to return, zero-based
         explode: true
         in: query
         name: offset
@@ -653,7 +652,7 @@ paths:
         schema:
           allOf:
           - $ref: '#/components/schemas/ConsumerGroupOrderKey'
-          - default: name
+          - {}
         style: form
       responses:
         "200":
@@ -735,7 +734,7 @@ paths:
       - groups
   /api/v1/consumer-groups/{consumerGroupId}:
     delete:
-      description: "Delete a consumer group, along with its consumers."
+      description: Delete a consumer group, along with its consumers.
       operationId: deleteConsumerGroupById
       parameters:
       - description: Consumer group identifier
@@ -814,7 +813,7 @@ paths:
         schema:
           allOf:
           - $ref: '#/components/schemas/ConsumerGroupDescriptionOrderKey'
-          - default: partition
+          - {}
         style: form
       - description: Value of partition to include. Value -1 means filter is not active.
         explode: true
@@ -981,7 +980,7 @@ paths:
         schema:
           allOf:
           - $ref: '#/components/schemas/AclResourceTypeFilter'
-          - default: ANY
+          - {}
         style: form
       - description: ACL Resource Name Filter
         explode: true
@@ -1009,7 +1008,7 @@ paths:
         schema:
           allOf:
           - $ref: '#/components/schemas/AclPatternTypeFilter'
-          - default: ANY
+          - {}
         style: form
       - description: |-
           ACL Principal Filter. Either a specific user or the wildcard user `User:*` may be provided.
@@ -1030,8 +1029,8 @@ paths:
           default: ""
           type: string
         style: form
-      - description: "ACL Operation Filter. The ACL binding operation provided should\
-          \ be valid for the resource type in the request, if not `ANY`."
+      - description: ACL Operation Filter. The ACL binding operation provided should
+          be valid for the resource type in the request, if not `ANY`.
         examples:
           anything:
             summary: Match any ACL binding operation
@@ -1043,7 +1042,7 @@ paths:
         schema:
           allOf:
           - $ref: '#/components/schemas/AclOperationFilter'
-          - default: ANY
+          - {}
         style: form
       - description: ACL Permission Type Filter
         examples:
@@ -1063,7 +1062,7 @@ paths:
         schema:
           allOf:
           - $ref: '#/components/schemas/AclPermissionTypeFilter'
-          - default: ANY
+          - {}
         style: form
       responses:
         "400":
@@ -1115,10 +1114,9 @@ paths:
       tags:
       - acls
     get:
-      description: "Returns a list of all of the available ACL bindings, or the list\
-        \ of bindings that meet the user's URL query parameters. If no parameters\
-        \ are specified, all ACL bindings known to the system will be returned (with\
-        \ paging)."
+      description: Returns a list of all of the available ACL bindings, or the list
+        of bindings that meet the user's URL query parameters. If no parameters are
+        specified, all ACL bindings known to the system will be returned (with paging).
       operationId: getAcls
       parameters:
       - description: ACL Resource Type Filter
@@ -1145,7 +1143,7 @@ paths:
         schema:
           allOf:
           - $ref: '#/components/schemas/AclResourceTypeFilter'
-          - default: ANY
+          - {}
         style: form
       - description: ACL Resource Name Filter
         explode: true
@@ -1173,7 +1171,7 @@ paths:
         schema:
           allOf:
           - $ref: '#/components/schemas/AclPatternTypeFilter'
-          - default: ANY
+          - {}
         style: form
       - description: |-
           ACL Principal Filter. Either a specific user or the wildcard user `User:*` may be provided.
@@ -1194,8 +1192,8 @@ paths:
           default: ""
           type: string
         style: form
-      - description: "ACL Operation Filter. The ACL binding operation provided should\
-          \ be valid for the resource type in the request, if not `ANY`."
+      - description: ACL Operation Filter. The ACL binding operation provided should
+          be valid for the resource type in the request, if not `ANY`.
         examples:
           anything:
             summary: Match any ACL binding operation
@@ -1207,7 +1205,7 @@ paths:
         schema:
           allOf:
           - $ref: '#/components/schemas/AclOperationFilter'
-          - default: ANY
+          - {}
         style: form
       - description: ACL Permission Type Filter
         examples:
@@ -1227,7 +1225,7 @@ paths:
         schema:
           allOf:
           - $ref: '#/components/schemas/AclPermissionTypeFilter'
-          - default: ANY
+          - {}
         style: form
       - description: Page number
         explode: true
@@ -1264,7 +1262,7 @@ paths:
         schema:
           allOf:
           - $ref: '#/components/schemas/AclBindingOrderKey'
-          - default: permission
+          - {}
         style: form
       responses:
         "400":
@@ -1389,7 +1387,7 @@ paths:
                     }
                 disabled:
                   summary: No configuration of ACL bindings is allowed
-                  value: "{}"
+                  value: '{}'
               schema:
                 additionalProperties:
                   items:
@@ -1529,14 +1527,14 @@ components:
           partitions:
           - 0
     RecordProduceExample:
-      description: "Sample record to produce a record to partition 1, including a\
-        \ custom header"
+      description: Sample record to produce a record to partition 1, including a custom
+        header
       value:
         kind: Record
         partition: 1
         headers:
           X-Custom-Header: header-value-1
-        value: "{ \"examplekey\": \"example-value\" }"
+        value: '{ "examplekey": "example-value" }'
   responses:
     BadRequest:
       content:
@@ -1817,7 +1815,6 @@ components:
       type: string
     ConsumerGroupResetOffsetParameters:
       example:
-        offset: null
         topics:
         - partitions:
           - 0
@@ -1935,7 +1932,7 @@ components:
             value: "1050000"
       properties:
         name:
-          description: "The topic name, this value must be unique."
+          description: The topic name, this value must be unique.
           nullable: false
           pattern: \S
           type: string
@@ -1987,7 +1984,7 @@ components:
           id: 1
       properties:
         partition:
-          description: "The partition id, unique among partitions of the same topic"
+          description: The partition id, unique among partitions of the same topic
           format: int32
           nullable: false
           type: integer
@@ -2002,10 +1999,12 @@ components:
             $ref: '#/components/schemas/Node'
           type: array
         leader:
-          $ref: '#/components/schemas/Partition_leader'
+          allOf:
+          - $ref: '#/components/schemas/Node'
+          - description: Node that is the leader for this partition.
         id:
           deprecated: true
-          description: "Unique id for the partition (deprecated, use `partition` instead)"
+          description: Unique id for the partition (deprecated, use `partition` instead)
           format: int32
           type: integer
       required:
@@ -2075,8 +2074,8 @@ components:
       - retention.bytes
       type: string
     TopicSettings:
-      description: "The settings that are applicable to this topic. This includes\
-        \ partitions, configuration information, and number of replicas."
+      description: The settings that are applicable to this topic. This includes partitions,
+        configuration information, and number of replicas.
       example:
         numPartitions: 2
         config:
@@ -2086,9 +2085,9 @@ components:
           value: "1050000"
       properties:
         numPartitions:
-          description: "Number of partitions for this topic. If not specified, the\
-            \ default for new topics is `1`. Number of partitions may not be reduced\
-            \ when updating existing topics"
+          description: Number of partitions for this topic. If not specified, the
+            default for new topics is `1`. Number of partitions may not be reduced
+            when updating existing topics
           format: int32
           maximum: 100
           minimum: 1
@@ -2187,7 +2186,6 @@ components:
       - resourceName
       - resourceType
       type: object
-      example: null
     AclBindingListPage_allOf:
       description: A page of ACL binding entries
       properties:
@@ -2196,7 +2194,6 @@ components:
             $ref: '#/components/schemas/AclBinding'
           type: array
       type: object
-      example: null
     ConsumerGroup_allOf:
       description: A group of Kafka consumers
       properties:
@@ -2219,7 +2216,6 @@ components:
       - consumers
       - groupId
       type: object
-      example: null
     ConsumerGroupList_allOf:
       description: A list of consumer groups
       properties:
@@ -2228,7 +2224,6 @@ components:
             $ref: '#/components/schemas/ConsumerGroup'
           type: array
       type: object
-      example: null
     ConsumerGroupResetOffsetResult_allOf:
       properties:
         items:
@@ -2236,7 +2231,6 @@ components:
             $ref: '#/components/schemas/ConsumerGroupResetOffsetResultItem'
           type: array
       type: object
-      example: null
     Error_allOf:
       description: General error response
       properties:
@@ -2258,7 +2252,6 @@ components:
           deprecated: true
           type: string
       type: object
-      example: null
     ErrorList_allOf:
       description: List of errors
       properties:
@@ -2271,17 +2264,16 @@ components:
           format: int32
           type: integer
       type: object
-      example: null
     ListDeprecated_allOf:
       properties:
         offset:
           deprecated: true
-          description: "Offset of the first record returned, zero-based"
+          description: Offset of the first record returned, zero-based
           format: int32
           type: integer
         limit:
           deprecated: true
-          description: "Maximum number of records to return, from request"
+          description: Maximum number of records to return, from request
           format: int32
           type: integer
         count:
@@ -2290,11 +2282,6 @@ components:
           format: int32
           type: integer
       type: object
-      example: null
-    Partition_leader:
-      allOf:
-      - $ref: '#/components/schemas/Node'
-      - description: Node that is the leader for this partition.
     Record_allOf:
       description: An individual record consumed from a topic or produced to a topic
       properties:
@@ -2308,9 +2295,9 @@ components:
           readOnly: true
           type: integer
         timestamp:
-          description: "Timestamp associated with the record. The type is indicated\
-            \ by `timestampType`. When producing a record, this value will be used\
-            \ as the record's `CREATE_TIME`."
+          description: Timestamp associated with the record. The type is indicated
+            by `timestampType`. When producing a record, this value will be used as
+            the record's `CREATE_TIME`.
           format: date-time
           type: string
         timestampType:
@@ -2320,7 +2307,7 @@ components:
         headers:
           additionalProperties:
             type: string
-          description: "Record headers, key/value pairs"
+          description: Record headers, key/value pairs
           type: object
         key:
           description: Record key
@@ -2332,7 +2319,6 @@ components:
       required:
       - value
       type: object
-      example: null
     RecordList_allOf:
       description: A page of records consumed from a topic
       properties:
@@ -2354,7 +2340,6 @@ components:
           format: int32
           type: integer
       type: object
-      example: null
     Topic_allOf:
       description: Kafka Topic (A feed where records are stored and published)
       properties:
@@ -2374,7 +2359,6 @@ components:
             $ref: '#/components/schemas/ConfigEntry'
           type: array
       type: object
-      example: null
     TopicsList_allOf:
       description: A list of topics.
       properties:
@@ -2383,7 +2367,6 @@ components:
             $ref: '#/components/schemas/Topic'
           type: array
       type: object
-      example: null
   securitySchemes:
     Bearer:
       bearerFormat: JWT
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/api_acls.go b/app-services-sdk-go/kafkainstance/apiv1/client/api_acls.go
index 893c8637..4d6a9bc9 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/api_acls.go
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/api_acls.go
@@ -1,10 +1,10 @@
 /*
-Kafka Instance API
-
-API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
-
-API version: 0.13.0-SNAPSHOT
-*/
+ * Kafka Instance API
+ *
+ * API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
+ *
+ * API version: 0.13.0-SNAPSHOT
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -12,123 +12,128 @@ package kafkainstanceclient
 
 import (
 	"bytes"
-	"context"
-	"io/ioutil"
-	"net/http"
-	"net/url"
+	_context "context"
+	_ioutil "io/ioutil"
+	_nethttp "net/http"
+	_neturl "net/url"
 )
 
+// Linger please
+var (
+	_ _context.Context
+)
 
 type AclsApi interface {
 
 	/*
-	CreateAcl Create ACL binding
-
-	Creates a new ACL binding for a Kafka instance.
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiCreateAclRequest
-	*/
-	CreateAcl(ctx context.Context) ApiCreateAclRequest
-
-	// CreateAclExecute executes the request
-	CreateAclExecute(r ApiCreateAclRequest) (*http.Response, error)
+	 * CreateAcl Create ACL binding
+	 * Creates a new ACL binding for a Kafka instance.
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiCreateAclRequest
+	 */
+	CreateAcl(ctx _context.Context) ApiCreateAclRequest
 
 	/*
-	DeleteAcls Delete ACL bindings
-
-	Deletes ACL bindings that match the query parameters.
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiDeleteAclsRequest
-	*/
-	DeleteAcls(ctx context.Context) ApiDeleteAclsRequest
-
-	// DeleteAclsExecute executes the request
-	//  @return AclBindingListPage
-	DeleteAclsExecute(r ApiDeleteAclsRequest) (*AclBindingListPage, *http.Response, error)
+	 * CreateAclExecute executes the request
+	 */
+	CreateAclExecute(r ApiCreateAclRequest) (*_nethttp.Response, error)
 
 	/*
-	GetAclResourceOperations Retrieve allowed ACL resources and operations
-
-	Retrieve the resources and associated operations that may have ACLs configured.
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiGetAclResourceOperationsRequest
-	*/
-	GetAclResourceOperations(ctx context.Context) ApiGetAclResourceOperationsRequest
+	 * DeleteAcls Delete ACL bindings
+	 * Deletes ACL bindings that match the query parameters.
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiDeleteAclsRequest
+	 */
+	DeleteAcls(ctx _context.Context) ApiDeleteAclsRequest
 
-	// GetAclResourceOperationsExecute executes the request
-	//  @return map[string][]string
-	GetAclResourceOperationsExecute(r ApiGetAclResourceOperationsRequest) (*map[string][]string, *http.Response, error)
+	/*
+	 * DeleteAclsExecute executes the request
+	 * @return AclBindingListPage
+	 */
+	DeleteAclsExecute(r ApiDeleteAclsRequest) (AclBindingListPage, *_nethttp.Response, error)
 
 	/*
-	GetAcls List ACL bindings
+	 * GetAclResourceOperations Retrieve allowed ACL resources and operations
+	 * Retrieve the resources and associated operations that may have ACLs configured.
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiGetAclResourceOperationsRequest
+	 */
+	GetAclResourceOperations(ctx _context.Context) ApiGetAclResourceOperationsRequest
 
-	Returns a list of all of the available ACL bindings, or the list of bindings that meet the user's URL query parameters. If no parameters are specified, all ACL bindings known to the system will be returned (with paging).
+	/*
+	 * GetAclResourceOperationsExecute executes the request
+	 * @return map[string][]string
+	 */
+	GetAclResourceOperationsExecute(r ApiGetAclResourceOperationsRequest) (map[string][]string, *_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiGetAclsRequest
-	*/
-	GetAcls(ctx context.Context) ApiGetAclsRequest
+	/*
+	 * GetAcls List ACL bindings
+	 * Returns a list of all of the available ACL bindings, or the list of bindings that meet the user's URL query parameters. If no parameters are specified, all ACL bindings known to the system will be returned (with paging).
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiGetAclsRequest
+	 */
+	GetAcls(ctx _context.Context) ApiGetAclsRequest
 
-	// GetAclsExecute executes the request
-	//  @return AclBindingListPage
-	GetAclsExecute(r ApiGetAclsRequest) (*AclBindingListPage, *http.Response, error)
+	/*
+	 * GetAclsExecute executes the request
+	 * @return AclBindingListPage
+	 */
+	GetAclsExecute(r ApiGetAclsRequest) (AclBindingListPage, *_nethttp.Response, error)
 }
 
 // AclsApiService AclsApi service
 type AclsApiService service
 
 type ApiCreateAclRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService AclsApi
 	aclBinding *AclBinding
 }
 
-// ACL to create.
 func (r ApiCreateAclRequest) AclBinding(aclBinding AclBinding) ApiCreateAclRequest {
 	r.aclBinding = &aclBinding
 	return r
 }
 
-func (r ApiCreateAclRequest) Execute() (*http.Response, error) {
+func (r ApiCreateAclRequest) Execute() (*_nethttp.Response, error) {
 	return r.ApiService.CreateAclExecute(r)
 }
 
 /*
-CreateAcl Create ACL binding
-
-Creates a new ACL binding for a Kafka instance.
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiCreateAclRequest
-*/
-func (a *AclsApiService) CreateAcl(ctx context.Context) ApiCreateAclRequest {
+ * CreateAcl Create ACL binding
+ * Creates a new ACL binding for a Kafka instance.
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiCreateAclRequest
+ */
+func (a *AclsApiService) CreateAcl(ctx _context.Context) ApiCreateAclRequest {
 	return ApiCreateAclRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-func (a *AclsApiService) CreateAclExecute(r ApiCreateAclRequest) (*http.Response, error) {
+/*
+ * Execute executes the request
+ */
+func (a *AclsApiService) CreateAclExecute(r ApiCreateAclRequest) (*_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "AclsApiService.CreateAcl")
 	if err != nil {
-		return nil, &GenericOpenAPIError{error: err.Error()}
+		return nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/v1/acls"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.aclBinding == nil {
 		return nil, reportError("aclBinding is required and must be specified")
 	}
@@ -152,7 +157,7 @@ func (a *AclsApiService) CreateAclExecute(r ApiCreateAclRequest) (*http.Response
 	}
 	// body params
 	localVarPostBody = r.aclBinding
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return nil, err
 	}
@@ -162,15 +167,15 @@ func (a *AclsApiService) CreateAclExecute(r ApiCreateAclRequest) (*http.Response
 		return localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -181,8 +186,7 @@ func (a *AclsApiService) CreateAclExecute(r ApiCreateAclRequest) (*http.Response
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -192,8 +196,7 @@ func (a *AclsApiService) CreateAclExecute(r ApiCreateAclRequest) (*http.Response
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -203,8 +206,7 @@ func (a *AclsApiService) CreateAclExecute(r ApiCreateAclRequest) (*http.Response
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -214,8 +216,7 @@ func (a *AclsApiService) CreateAclExecute(r ApiCreateAclRequest) (*http.Response
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 503 {
@@ -225,8 +226,7 @@ func (a *AclsApiService) CreateAclExecute(r ApiCreateAclRequest) (*http.Response
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarHTTPResponse, newErr
 	}
@@ -235,7 +235,7 @@ func (a *AclsApiService) CreateAclExecute(r ApiCreateAclRequest) (*http.Response
 }
 
 type ApiDeleteAclsRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService AclsApi
 	resourceType *AclResourceTypeFilter
 	resourceName *string
@@ -245,81 +245,72 @@ type ApiDeleteAclsRequest struct {
 	permission *AclPermissionTypeFilter
 }
 
-// ACL Resource Type Filter
 func (r ApiDeleteAclsRequest) ResourceType(resourceType AclResourceTypeFilter) ApiDeleteAclsRequest {
 	r.resourceType = &resourceType
 	return r
 }
-
-// ACL Resource Name Filter
 func (r ApiDeleteAclsRequest) ResourceName(resourceName string) ApiDeleteAclsRequest {
 	r.resourceName = &resourceName
 	return r
 }
-
-// ACL Pattern Type Filter
 func (r ApiDeleteAclsRequest) PatternType(patternType AclPatternTypeFilter) ApiDeleteAclsRequest {
 	r.patternType = &patternType
 	return r
 }
-
-// ACL Principal Filter. Either a specific user or the wildcard user &#x60;User:*&#x60; may be provided. - When fetching by a specific user, the results will also include ACL bindings that apply to all users. - When deleting, ACL bindings to be delete must match the provided &#x60;principal&#x60; exactly.
 func (r ApiDeleteAclsRequest) Principal(principal string) ApiDeleteAclsRequest {
 	r.principal = &principal
 	return r
 }
-
-// ACL Operation Filter. The ACL binding operation provided should be valid for the resource type in the request, if not &#x60;ANY&#x60;.
 func (r ApiDeleteAclsRequest) Operation(operation AclOperationFilter) ApiDeleteAclsRequest {
 	r.operation = &operation
 	return r
 }
-
-// ACL Permission Type Filter
 func (r ApiDeleteAclsRequest) Permission(permission AclPermissionTypeFilter) ApiDeleteAclsRequest {
 	r.permission = &permission
 	return r
 }
 
-func (r ApiDeleteAclsRequest) Execute() (*AclBindingListPage, *http.Response, error) {
+func (r ApiDeleteAclsRequest) Execute() (AclBindingListPage, *_nethttp.Response, error) {
 	return r.ApiService.DeleteAclsExecute(r)
 }
 
 /*
-DeleteAcls Delete ACL bindings
-
-Deletes ACL bindings that match the query parameters.
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiDeleteAclsRequest
-*/
-func (a *AclsApiService) DeleteAcls(ctx context.Context) ApiDeleteAclsRequest {
+ * DeleteAcls Delete ACL bindings
+ * Deletes ACL bindings that match the query parameters.
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiDeleteAclsRequest
+ */
+func (a *AclsApiService) DeleteAcls(ctx _context.Context) ApiDeleteAclsRequest {
 	return ApiDeleteAclsRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return AclBindingListPage
-func (a *AclsApiService) DeleteAclsExecute(r ApiDeleteAclsRequest) (*AclBindingListPage, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return AclBindingListPage
+ */
+func (a *AclsApiService) DeleteAclsExecute(r ApiDeleteAclsRequest) (AclBindingListPage, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodDelete
+		localVarHTTPMethod   = _nethttp.MethodDelete
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *AclBindingListPage
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  AclBindingListPage
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "AclsApiService.DeleteAcls")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/v1/acls"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.resourceType != nil {
 		localVarQueryParams.Add("resourceType", parameterToString(*r.resourceType, ""))
@@ -356,7 +347,7 @@ func (a *AclsApiService) DeleteAclsExecute(r ApiDeleteAclsRequest) (*AclBindingL
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -366,15 +357,15 @@ func (a *AclsApiService) DeleteAclsExecute(r ApiDeleteAclsRequest) (*AclBindingL
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -385,8 +376,7 @@ func (a *AclsApiService) DeleteAclsExecute(r ApiDeleteAclsRequest) (*AclBindingL
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -396,8 +386,7 @@ func (a *AclsApiService) DeleteAclsExecute(r ApiDeleteAclsRequest) (*AclBindingL
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -407,8 +396,7 @@ func (a *AclsApiService) DeleteAclsExecute(r ApiDeleteAclsRequest) (*AclBindingL
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -418,8 +406,7 @@ func (a *AclsApiService) DeleteAclsExecute(r ApiDeleteAclsRequest) (*AclBindingL
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 503 {
@@ -429,8 +416,7 @@ func (a *AclsApiService) DeleteAclsExecute(r ApiDeleteAclsRequest) (*AclBindingL
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
@@ -438,7 +424,7 @@ func (a *AclsApiService) DeleteAclsExecute(r ApiDeleteAclsRequest) (*AclBindingL
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -449,49 +435,52 @@ func (a *AclsApiService) DeleteAclsExecute(r ApiDeleteAclsRequest) (*AclBindingL
 }
 
 type ApiGetAclResourceOperationsRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService AclsApi
 }
 
-func (r ApiGetAclResourceOperationsRequest) Execute() (*map[string][]string, *http.Response, error) {
+
+func (r ApiGetAclResourceOperationsRequest) Execute() (map[string][]string, *_nethttp.Response, error) {
 	return r.ApiService.GetAclResourceOperationsExecute(r)
 }
 
 /*
-GetAclResourceOperations Retrieve allowed ACL resources and operations
-
-Retrieve the resources and associated operations that may have ACLs configured.
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiGetAclResourceOperationsRequest
-*/
-func (a *AclsApiService) GetAclResourceOperations(ctx context.Context) ApiGetAclResourceOperationsRequest {
+ * GetAclResourceOperations Retrieve allowed ACL resources and operations
+ * Retrieve the resources and associated operations that may have ACLs configured.
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiGetAclResourceOperationsRequest
+ */
+func (a *AclsApiService) GetAclResourceOperations(ctx _context.Context) ApiGetAclResourceOperationsRequest {
 	return ApiGetAclResourceOperationsRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return map[string][]string
-func (a *AclsApiService) GetAclResourceOperationsExecute(r ApiGetAclResourceOperationsRequest) (*map[string][]string, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return map[string][]string
+ */
+func (a *AclsApiService) GetAclResourceOperationsExecute(r ApiGetAclResourceOperationsRequest) (map[string][]string, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *map[string][]string
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  map[string][]string
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "AclsApiService.GetAclResourceOperations")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/v1/acls/resource-operations"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -510,7 +499,7 @@ func (a *AclsApiService) GetAclResourceOperationsExecute(r ApiGetAclResourceOper
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -520,15 +509,15 @@ func (a *AclsApiService) GetAclResourceOperationsExecute(r ApiGetAclResourceOper
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -539,8 +528,7 @@ func (a *AclsApiService) GetAclResourceOperationsExecute(r ApiGetAclResourceOper
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -550,15 +538,14 @@ func (a *AclsApiService) GetAclResourceOperationsExecute(r ApiGetAclResourceOper
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -569,7 +556,7 @@ func (a *AclsApiService) GetAclResourceOperationsExecute(r ApiGetAclResourceOper
 }
 
 type ApiGetAclsRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService AclsApi
 	resourceType *AclResourceTypeFilter
 	resourceName *string
@@ -583,104 +570,88 @@ type ApiGetAclsRequest struct {
 	orderKey *AclBindingOrderKey
 }
 
-// ACL Resource Type Filter
 func (r ApiGetAclsRequest) ResourceType(resourceType AclResourceTypeFilter) ApiGetAclsRequest {
 	r.resourceType = &resourceType
 	return r
 }
-
-// ACL Resource Name Filter
 func (r ApiGetAclsRequest) ResourceName(resourceName string) ApiGetAclsRequest {
 	r.resourceName = &resourceName
 	return r
 }
-
-// ACL Pattern Type Filter
 func (r ApiGetAclsRequest) PatternType(patternType AclPatternTypeFilter) ApiGetAclsRequest {
 	r.patternType = &patternType
 	return r
 }
-
-// ACL Principal Filter. Either a specific user or the wildcard user &#x60;User:*&#x60; may be provided. - When fetching by a specific user, the results will also include ACL bindings that apply to all users. - When deleting, ACL bindings to be delete must match the provided &#x60;principal&#x60; exactly.
 func (r ApiGetAclsRequest) Principal(principal string) ApiGetAclsRequest {
 	r.principal = &principal
 	return r
 }
-
-// ACL Operation Filter. The ACL binding operation provided should be valid for the resource type in the request, if not &#x60;ANY&#x60;.
 func (r ApiGetAclsRequest) Operation(operation AclOperationFilter) ApiGetAclsRequest {
 	r.operation = &operation
 	return r
 }
-
-// ACL Permission Type Filter
 func (r ApiGetAclsRequest) Permission(permission AclPermissionTypeFilter) ApiGetAclsRequest {
 	r.permission = &permission
 	return r
 }
-
-// Page number
 func (r ApiGetAclsRequest) Page(page int32) ApiGetAclsRequest {
 	r.page = &page
 	return r
 }
-
-// Number of records per page
 func (r ApiGetAclsRequest) Size(size int32) ApiGetAclsRequest {
 	r.size = &size
 	return r
 }
-
-// Order items are sorted
 func (r ApiGetAclsRequest) Order(order SortDirection) ApiGetAclsRequest {
 	r.order = &order
 	return r
 }
-
 func (r ApiGetAclsRequest) OrderKey(orderKey AclBindingOrderKey) ApiGetAclsRequest {
 	r.orderKey = &orderKey
 	return r
 }
 
-func (r ApiGetAclsRequest) Execute() (*AclBindingListPage, *http.Response, error) {
+func (r ApiGetAclsRequest) Execute() (AclBindingListPage, *_nethttp.Response, error) {
 	return r.ApiService.GetAclsExecute(r)
 }
 
 /*
-GetAcls List ACL bindings
-
-Returns a list of all of the available ACL bindings, or the list of bindings that meet the user's URL query parameters. If no parameters are specified, all ACL bindings known to the system will be returned (with paging).
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiGetAclsRequest
-*/
-func (a *AclsApiService) GetAcls(ctx context.Context) ApiGetAclsRequest {
+ * GetAcls List ACL bindings
+ * Returns a list of all of the available ACL bindings, or the list of bindings that meet the user's URL query parameters. If no parameters are specified, all ACL bindings known to the system will be returned (with paging).
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiGetAclsRequest
+ */
+func (a *AclsApiService) GetAcls(ctx _context.Context) ApiGetAclsRequest {
 	return ApiGetAclsRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return AclBindingListPage
-func (a *AclsApiService) GetAclsExecute(r ApiGetAclsRequest) (*AclBindingListPage, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return AclBindingListPage
+ */
+func (a *AclsApiService) GetAclsExecute(r ApiGetAclsRequest) (AclBindingListPage, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *AclBindingListPage
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  AclBindingListPage
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "AclsApiService.GetAcls")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/v1/acls"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.resourceType != nil {
 		localVarQueryParams.Add("resourceType", parameterToString(*r.resourceType, ""))
@@ -729,7 +700,7 @@ func (a *AclsApiService) GetAclsExecute(r ApiGetAclsRequest) (*AclBindingListPag
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -739,15 +710,15 @@ func (a *AclsApiService) GetAclsExecute(r ApiGetAclsRequest) (*AclBindingListPag
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -758,8 +729,7 @@ func (a *AclsApiService) GetAclsExecute(r ApiGetAclsRequest) (*AclBindingListPag
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -769,8 +739,7 @@ func (a *AclsApiService) GetAclsExecute(r ApiGetAclsRequest) (*AclBindingListPag
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -780,8 +749,7 @@ func (a *AclsApiService) GetAclsExecute(r ApiGetAclsRequest) (*AclBindingListPag
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -791,8 +759,7 @@ func (a *AclsApiService) GetAclsExecute(r ApiGetAclsRequest) (*AclBindingListPag
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 503 {
@@ -802,8 +769,7 @@ func (a *AclsApiService) GetAclsExecute(r ApiGetAclsRequest) (*AclBindingListPag
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
@@ -811,7 +777,7 @@ func (a *AclsApiService) GetAclsExecute(r ApiGetAclsRequest) (*AclBindingListPag
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/api_errors.go b/app-services-sdk-go/kafkainstance/apiv1/client/api_errors.go
index 3d473623..fbc021b0 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/api_errors.go
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/api_errors.go
@@ -1,10 +1,10 @@
 /*
-Kafka Instance API
-
-API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
-
-API version: 0.13.0-SNAPSHOT
-*/
+ * Kafka Instance API
+ *
+ * API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
+ *
+ * API version: 0.13.0-SNAPSHOT
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -12,63 +12,69 @@ package kafkainstanceclient
 
 import (
 	"bytes"
-	"context"
-	"io/ioutil"
-	"net/http"
-	"net/url"
+	_context "context"
+	_ioutil "io/ioutil"
+	_nethttp "net/http"
+	_neturl "net/url"
 	"strings"
 )
 
+// Linger please
+var (
+	_ _context.Context
+)
 
 type ErrorsApi interface {
 
 	/*
-	GetError Get an error by its unique ID
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param errorId Error identifier
-	@return ApiGetErrorRequest
-	*/
-	GetError(ctx context.Context, errorId string) ApiGetErrorRequest
-
-	// GetErrorExecute executes the request
-	//  @return Error
-	GetErrorExecute(r ApiGetErrorRequest) (*Error, *http.Response, error)
+	 * GetError Get an error by its unique ID
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param errorId Error identifier
+	 * @return ApiGetErrorRequest
+	 */
+	GetError(ctx _context.Context, errorId string) ApiGetErrorRequest
 
 	/*
-	GetErrors Get list of errors
+	 * GetErrorExecute executes the request
+	 * @return Error
+	 */
+	GetErrorExecute(r ApiGetErrorRequest) (Error, *_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiGetErrorsRequest
-	*/
-	GetErrors(ctx context.Context) ApiGetErrorsRequest
+	/*
+	 * GetErrors Get list of errors
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiGetErrorsRequest
+	 */
+	GetErrors(ctx _context.Context) ApiGetErrorsRequest
 
-	// GetErrorsExecute executes the request
-	//  @return ErrorList
-	GetErrorsExecute(r ApiGetErrorsRequest) (*ErrorList, *http.Response, error)
+	/*
+	 * GetErrorsExecute executes the request
+	 * @return ErrorList
+	 */
+	GetErrorsExecute(r ApiGetErrorsRequest) (ErrorList, *_nethttp.Response, error)
 }
 
 // ErrorsApiService ErrorsApi service
 type ErrorsApiService service
 
 type ApiGetErrorRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService ErrorsApi
 	errorId string
 }
 
-func (r ApiGetErrorRequest) Execute() (*Error, *http.Response, error) {
+
+func (r ApiGetErrorRequest) Execute() (Error, *_nethttp.Response, error) {
 	return r.ApiService.GetErrorExecute(r)
 }
 
 /*
-GetError Get an error by its unique ID
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param errorId Error identifier
- @return ApiGetErrorRequest
-*/
-func (a *ErrorsApiService) GetError(ctx context.Context, errorId string) ApiGetErrorRequest {
+ * GetError Get an error by its unique ID
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param errorId Error identifier
+ * @return ApiGetErrorRequest
+ */
+func (a *ErrorsApiService) GetError(ctx _context.Context, errorId string) ApiGetErrorRequest {
 	return ApiGetErrorRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -76,27 +82,31 @@ func (a *ErrorsApiService) GetError(ctx context.Context, errorId string) ApiGetE
 	}
 }
 
-// Execute executes the request
-//  @return Error
-func (a *ErrorsApiService) GetErrorExecute(r ApiGetErrorRequest) (*Error, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return Error
+ */
+func (a *ErrorsApiService) GetErrorExecute(r ApiGetErrorRequest) (Error, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *Error
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  Error
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "ErrorsApiService.GetError")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/v1/errors/{errorId}"
-	localVarPath = strings.Replace(localVarPath, "{"+"errorId"+"}", url.PathEscape(parameterToString(r.errorId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"errorId"+"}", _neturl.PathEscape(parameterToString(r.errorId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -115,7 +125,7 @@ func (a *ErrorsApiService) GetErrorExecute(r ApiGetErrorRequest) (*Error, *http.
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -125,15 +135,15 @@ func (a *ErrorsApiService) GetErrorExecute(r ApiGetErrorRequest) (*Error, *http.
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -144,8 +154,7 @@ func (a *ErrorsApiService) GetErrorExecute(r ApiGetErrorRequest) (*Error, *http.
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -155,15 +164,14 @@ func (a *ErrorsApiService) GetErrorExecute(r ApiGetErrorRequest) (*Error, *http.
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -174,47 +182,51 @@ func (a *ErrorsApiService) GetErrorExecute(r ApiGetErrorRequest) (*Error, *http.
 }
 
 type ApiGetErrorsRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService ErrorsApi
 }
 
-func (r ApiGetErrorsRequest) Execute() (*ErrorList, *http.Response, error) {
+
+func (r ApiGetErrorsRequest) Execute() (ErrorList, *_nethttp.Response, error) {
 	return r.ApiService.GetErrorsExecute(r)
 }
 
 /*
-GetErrors Get list of errors
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiGetErrorsRequest
-*/
-func (a *ErrorsApiService) GetErrors(ctx context.Context) ApiGetErrorsRequest {
+ * GetErrors Get list of errors
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiGetErrorsRequest
+ */
+func (a *ErrorsApiService) GetErrors(ctx _context.Context) ApiGetErrorsRequest {
 	return ApiGetErrorsRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return ErrorList
-func (a *ErrorsApiService) GetErrorsExecute(r ApiGetErrorsRequest) (*ErrorList, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return ErrorList
+ */
+func (a *ErrorsApiService) GetErrorsExecute(r ApiGetErrorsRequest) (ErrorList, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *ErrorList
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  ErrorList
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "ErrorsApiService.GetErrors")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/v1/errors"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -233,7 +245,7 @@ func (a *ErrorsApiService) GetErrorsExecute(r ApiGetErrorsRequest) (*ErrorList,
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -243,15 +255,15 @@ func (a *ErrorsApiService) GetErrorsExecute(r ApiGetErrorsRequest) (*ErrorList,
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -262,15 +274,14 @@ func (a *ErrorsApiService) GetErrorsExecute(r ApiGetErrorsRequest) (*ErrorList,
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/api_groups.go b/app-services-sdk-go/kafkainstance/apiv1/client/api_groups.go
index b24b1817..913b4dfb 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/api_groups.go
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/api_groups.go
@@ -1,10 +1,10 @@
 /*
-Kafka Instance API
-
-API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
-
-API version: 0.13.0-SNAPSHOT
-*/
+ * Kafka Instance API
+ *
+ * API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
+ *
+ * API version: 0.13.0-SNAPSHOT
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -12,96 +12,100 @@ package kafkainstanceclient
 
 import (
 	"bytes"
-	"context"
-	"io/ioutil"
-	"net/http"
-	"net/url"
+	_context "context"
+	_ioutil "io/ioutil"
+	_nethttp "net/http"
+	_neturl "net/url"
 	"strings"
 )
 
+// Linger please
+var (
+	_ _context.Context
+)
 
 type GroupsApi interface {
 
 	/*
-	DeleteConsumerGroupById Delete a consumer group.
-
-	Delete a consumer group, along with its consumers.
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param consumerGroupId Consumer group identifier
-	@return ApiDeleteConsumerGroupByIdRequest
-	*/
-	DeleteConsumerGroupById(ctx context.Context, consumerGroupId string) ApiDeleteConsumerGroupByIdRequest
-
-	// DeleteConsumerGroupByIdExecute executes the request
-	DeleteConsumerGroupByIdExecute(r ApiDeleteConsumerGroupByIdRequest) (*http.Response, error)
+	 * DeleteConsumerGroupById Delete a consumer group.
+	 * Delete a consumer group, along with its consumers.
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param consumerGroupId Consumer group identifier
+	 * @return ApiDeleteConsumerGroupByIdRequest
+	 */
+	DeleteConsumerGroupById(ctx _context.Context, consumerGroupId string) ApiDeleteConsumerGroupByIdRequest
 
 	/*
-	GetConsumerGroupById Get a single consumer group by its unique ID.
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param consumerGroupId Consumer group identifier
-	@return ApiGetConsumerGroupByIdRequest
-	*/
-	GetConsumerGroupById(ctx context.Context, consumerGroupId string) ApiGetConsumerGroupByIdRequest
-
-	// GetConsumerGroupByIdExecute executes the request
-	//  @return ConsumerGroup
-	GetConsumerGroupByIdExecute(r ApiGetConsumerGroupByIdRequest) (*ConsumerGroup, *http.Response, error)
+	 * DeleteConsumerGroupByIdExecute executes the request
+	 */
+	DeleteConsumerGroupByIdExecute(r ApiDeleteConsumerGroupByIdRequest) (*_nethttp.Response, error)
 
 	/*
-	GetConsumerGroups List of consumer groups in the Kafka instance.
-
-	Returns a list of all consumer groups for a particular Kafka instance. The consumer groups returned are limited to those records the requestor is authorized to view.
+	 * GetConsumerGroupById Get a single consumer group by its unique ID.
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param consumerGroupId Consumer group identifier
+	 * @return ApiGetConsumerGroupByIdRequest
+	 */
+	GetConsumerGroupById(ctx _context.Context, consumerGroupId string) ApiGetConsumerGroupByIdRequest
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiGetConsumerGroupsRequest
-	*/
-	GetConsumerGroups(ctx context.Context) ApiGetConsumerGroupsRequest
-
-	// GetConsumerGroupsExecute executes the request
-	//  @return ConsumerGroupList
-	GetConsumerGroupsExecute(r ApiGetConsumerGroupsRequest) (*ConsumerGroupList, *http.Response, error)
+	/*
+	 * GetConsumerGroupByIdExecute executes the request
+	 * @return ConsumerGroup
+	 */
+	GetConsumerGroupByIdExecute(r ApiGetConsumerGroupByIdRequest) (ConsumerGroup, *_nethttp.Response, error)
 
 	/*
-	ResetConsumerGroupOffset Reset the offset for a consumer group.
+	 * GetConsumerGroups List of consumer groups in the Kafka instance.
+	 * Returns a list of all consumer groups for a particular Kafka instance. The consumer groups returned are limited to those records the requestor is authorized to view.
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiGetConsumerGroupsRequest
+	 */
+	GetConsumerGroups(ctx _context.Context) ApiGetConsumerGroupsRequest
 
-	Reset the offset for a particular consumer group.
+	/*
+	 * GetConsumerGroupsExecute executes the request
+	 * @return ConsumerGroupList
+	 */
+	GetConsumerGroupsExecute(r ApiGetConsumerGroupsRequest) (ConsumerGroupList, *_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param consumerGroupId Consumer group identifier
-	@return ApiResetConsumerGroupOffsetRequest
-	*/
-	ResetConsumerGroupOffset(ctx context.Context, consumerGroupId string) ApiResetConsumerGroupOffsetRequest
+	/*
+	 * ResetConsumerGroupOffset Reset the offset for a consumer group.
+	 * Reset the offset for a particular consumer group.
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param consumerGroupId Consumer group identifier
+	 * @return ApiResetConsumerGroupOffsetRequest
+	 */
+	ResetConsumerGroupOffset(ctx _context.Context, consumerGroupId string) ApiResetConsumerGroupOffsetRequest
 
-	// ResetConsumerGroupOffsetExecute executes the request
-	//  @return ConsumerGroupResetOffsetResult
-	ResetConsumerGroupOffsetExecute(r ApiResetConsumerGroupOffsetRequest) (*ConsumerGroupResetOffsetResult, *http.Response, error)
+	/*
+	 * ResetConsumerGroupOffsetExecute executes the request
+	 * @return ConsumerGroupResetOffsetResult
+	 */
+	ResetConsumerGroupOffsetExecute(r ApiResetConsumerGroupOffsetRequest) (ConsumerGroupResetOffsetResult, *_nethttp.Response, error)
 }
 
 // GroupsApiService GroupsApi service
 type GroupsApiService service
 
 type ApiDeleteConsumerGroupByIdRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService GroupsApi
 	consumerGroupId string
 }
 
-func (r ApiDeleteConsumerGroupByIdRequest) Execute() (*http.Response, error) {
+
+func (r ApiDeleteConsumerGroupByIdRequest) Execute() (*_nethttp.Response, error) {
 	return r.ApiService.DeleteConsumerGroupByIdExecute(r)
 }
 
 /*
-DeleteConsumerGroupById Delete a consumer group.
-
-Delete a consumer group, along with its consumers.
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param consumerGroupId Consumer group identifier
- @return ApiDeleteConsumerGroupByIdRequest
-*/
-func (a *GroupsApiService) DeleteConsumerGroupById(ctx context.Context, consumerGroupId string) ApiDeleteConsumerGroupByIdRequest {
+ * DeleteConsumerGroupById Delete a consumer group.
+ * Delete a consumer group, along with its consumers.
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param consumerGroupId Consumer group identifier
+ * @return ApiDeleteConsumerGroupByIdRequest
+ */
+func (a *GroupsApiService) DeleteConsumerGroupById(ctx _context.Context, consumerGroupId string) ApiDeleteConsumerGroupByIdRequest {
 	return ApiDeleteConsumerGroupByIdRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -109,25 +113,29 @@ func (a *GroupsApiService) DeleteConsumerGroupById(ctx context.Context, consumer
 	}
 }
 
-// Execute executes the request
-func (a *GroupsApiService) DeleteConsumerGroupByIdExecute(r ApiDeleteConsumerGroupByIdRequest) (*http.Response, error) {
+/*
+ * Execute executes the request
+ */
+func (a *GroupsApiService) DeleteConsumerGroupByIdExecute(r ApiDeleteConsumerGroupByIdRequest) (*_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodDelete
+		localVarHTTPMethod   = _nethttp.MethodDelete
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "GroupsApiService.DeleteConsumerGroupById")
 	if err != nil {
-		return nil, &GenericOpenAPIError{error: err.Error()}
+		return nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/v1/consumer-groups/{consumerGroupId}"
-	localVarPath = strings.Replace(localVarPath, "{"+"consumerGroupId"+"}", url.PathEscape(parameterToString(r.consumerGroupId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"consumerGroupId"+"}", _neturl.PathEscape(parameterToString(r.consumerGroupId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -146,7 +154,7 @@ func (a *GroupsApiService) DeleteConsumerGroupByIdExecute(r ApiDeleteConsumerGro
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return nil, err
 	}
@@ -156,15 +164,15 @@ func (a *GroupsApiService) DeleteConsumerGroupByIdExecute(r ApiDeleteConsumerGro
 		return localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -175,8 +183,7 @@ func (a *GroupsApiService) DeleteConsumerGroupByIdExecute(r ApiDeleteConsumerGro
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -186,8 +193,7 @@ func (a *GroupsApiService) DeleteConsumerGroupByIdExecute(r ApiDeleteConsumerGro
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -197,8 +203,7 @@ func (a *GroupsApiService) DeleteConsumerGroupByIdExecute(r ApiDeleteConsumerGro
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 423 {
@@ -208,8 +213,7 @@ func (a *GroupsApiService) DeleteConsumerGroupByIdExecute(r ApiDeleteConsumerGro
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -219,8 +223,7 @@ func (a *GroupsApiService) DeleteConsumerGroupByIdExecute(r ApiDeleteConsumerGro
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 503 {
@@ -230,8 +233,7 @@ func (a *GroupsApiService) DeleteConsumerGroupByIdExecute(r ApiDeleteConsumerGro
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarHTTPResponse, newErr
 	}
@@ -240,7 +242,7 @@ func (a *GroupsApiService) DeleteConsumerGroupByIdExecute(r ApiDeleteConsumerGro
 }
 
 type ApiGetConsumerGroupByIdRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService GroupsApi
 	consumerGroupId string
 	order *SortDirection
@@ -249,41 +251,34 @@ type ApiGetConsumerGroupByIdRequest struct {
 	topic *string
 }
 
-// Order items are sorted
 func (r ApiGetConsumerGroupByIdRequest) Order(order SortDirection) ApiGetConsumerGroupByIdRequest {
 	r.order = &order
 	return r
 }
-
 func (r ApiGetConsumerGroupByIdRequest) OrderKey(orderKey ConsumerGroupDescriptionOrderKey) ApiGetConsumerGroupByIdRequest {
 	r.orderKey = &orderKey
 	return r
 }
-
-// Value of partition to include. Value -1 means filter is not active.
 func (r ApiGetConsumerGroupByIdRequest) PartitionFilter(partitionFilter int32) ApiGetConsumerGroupByIdRequest {
 	r.partitionFilter = &partitionFilter
 	return r
 }
-
-// Filter consumer groups for a specific topic
 func (r ApiGetConsumerGroupByIdRequest) Topic(topic string) ApiGetConsumerGroupByIdRequest {
 	r.topic = &topic
 	return r
 }
 
-func (r ApiGetConsumerGroupByIdRequest) Execute() (*ConsumerGroup, *http.Response, error) {
+func (r ApiGetConsumerGroupByIdRequest) Execute() (ConsumerGroup, *_nethttp.Response, error) {
 	return r.ApiService.GetConsumerGroupByIdExecute(r)
 }
 
 /*
-GetConsumerGroupById Get a single consumer group by its unique ID.
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param consumerGroupId Consumer group identifier
- @return ApiGetConsumerGroupByIdRequest
-*/
-func (a *GroupsApiService) GetConsumerGroupById(ctx context.Context, consumerGroupId string) ApiGetConsumerGroupByIdRequest {
+ * GetConsumerGroupById Get a single consumer group by its unique ID.
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param consumerGroupId Consumer group identifier
+ * @return ApiGetConsumerGroupByIdRequest
+ */
+func (a *GroupsApiService) GetConsumerGroupById(ctx _context.Context, consumerGroupId string) ApiGetConsumerGroupByIdRequest {
 	return ApiGetConsumerGroupByIdRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -291,27 +286,31 @@ func (a *GroupsApiService) GetConsumerGroupById(ctx context.Context, consumerGro
 	}
 }
 
-// Execute executes the request
-//  @return ConsumerGroup
-func (a *GroupsApiService) GetConsumerGroupByIdExecute(r ApiGetConsumerGroupByIdRequest) (*ConsumerGroup, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return ConsumerGroup
+ */
+func (a *GroupsApiService) GetConsumerGroupByIdExecute(r ApiGetConsumerGroupByIdRequest) (ConsumerGroup, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *ConsumerGroup
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  ConsumerGroup
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "GroupsApiService.GetConsumerGroupById")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/v1/consumer-groups/{consumerGroupId}"
-	localVarPath = strings.Replace(localVarPath, "{"+"consumerGroupId"+"}", url.PathEscape(parameterToString(r.consumerGroupId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"consumerGroupId"+"}", _neturl.PathEscape(parameterToString(r.consumerGroupId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.order != nil {
 		localVarQueryParams.Add("order", parameterToString(*r.order, ""))
@@ -342,7 +341,7 @@ func (a *GroupsApiService) GetConsumerGroupByIdExecute(r ApiGetConsumerGroupById
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -352,15 +351,15 @@ func (a *GroupsApiService) GetConsumerGroupByIdExecute(r ApiGetConsumerGroupById
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -371,8 +370,7 @@ func (a *GroupsApiService) GetConsumerGroupByIdExecute(r ApiGetConsumerGroupById
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -382,8 +380,7 @@ func (a *GroupsApiService) GetConsumerGroupByIdExecute(r ApiGetConsumerGroupById
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -393,8 +390,7 @@ func (a *GroupsApiService) GetConsumerGroupByIdExecute(r ApiGetConsumerGroupById
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -404,8 +400,7 @@ func (a *GroupsApiService) GetConsumerGroupByIdExecute(r ApiGetConsumerGroupById
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 503 {
@@ -415,15 +410,14 @@ func (a *GroupsApiService) GetConsumerGroupByIdExecute(r ApiGetConsumerGroupById
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -434,7 +428,7 @@ func (a *GroupsApiService) GetConsumerGroupByIdExecute(r ApiGetConsumerGroupById
 }
 
 type ApiGetConsumerGroupsRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService GroupsApi
 	offset *int32
 	limit *int32
@@ -446,94 +440,80 @@ type ApiGetConsumerGroupsRequest struct {
 	orderKey *ConsumerGroupOrderKey
 }
 
-// Offset of the first record to return, zero-based
-// Deprecated
 func (r ApiGetConsumerGroupsRequest) Offset(offset int32) ApiGetConsumerGroupsRequest {
 	r.offset = &offset
 	return r
 }
-
-// Maximum number of records to return
-// Deprecated
 func (r ApiGetConsumerGroupsRequest) Limit(limit int32) ApiGetConsumerGroupsRequest {
 	r.limit = &limit
 	return r
 }
-
-// Number of records per page
 func (r ApiGetConsumerGroupsRequest) Size(size int32) ApiGetConsumerGroupsRequest {
 	r.size = &size
 	return r
 }
-
-// Page number
 func (r ApiGetConsumerGroupsRequest) Page(page int32) ApiGetConsumerGroupsRequest {
 	r.page = &page
 	return r
 }
-
-// Return consumer groups where the topic name contains this value
 func (r ApiGetConsumerGroupsRequest) Topic(topic string) ApiGetConsumerGroupsRequest {
 	r.topic = &topic
 	return r
 }
-
-// Return the consumer groups where the ID contains this value
 func (r ApiGetConsumerGroupsRequest) GroupIdFilter(groupIdFilter string) ApiGetConsumerGroupsRequest {
 	r.groupIdFilter = &groupIdFilter
 	return r
 }
-
-// Order items are sorted
 func (r ApiGetConsumerGroupsRequest) Order(order SortDirection) ApiGetConsumerGroupsRequest {
 	r.order = &order
 	return r
 }
-
 func (r ApiGetConsumerGroupsRequest) OrderKey(orderKey ConsumerGroupOrderKey) ApiGetConsumerGroupsRequest {
 	r.orderKey = &orderKey
 	return r
 }
 
-func (r ApiGetConsumerGroupsRequest) Execute() (*ConsumerGroupList, *http.Response, error) {
+func (r ApiGetConsumerGroupsRequest) Execute() (ConsumerGroupList, *_nethttp.Response, error) {
 	return r.ApiService.GetConsumerGroupsExecute(r)
 }
 
 /*
-GetConsumerGroups List of consumer groups in the Kafka instance.
-
-Returns a list of all consumer groups for a particular Kafka instance. The consumer groups returned are limited to those records the requestor is authorized to view.
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiGetConsumerGroupsRequest
-*/
-func (a *GroupsApiService) GetConsumerGroups(ctx context.Context) ApiGetConsumerGroupsRequest {
+ * GetConsumerGroups List of consumer groups in the Kafka instance.
+ * Returns a list of all consumer groups for a particular Kafka instance. The consumer groups returned are limited to those records the requestor is authorized to view.
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiGetConsumerGroupsRequest
+ */
+func (a *GroupsApiService) GetConsumerGroups(ctx _context.Context) ApiGetConsumerGroupsRequest {
 	return ApiGetConsumerGroupsRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return ConsumerGroupList
-func (a *GroupsApiService) GetConsumerGroupsExecute(r ApiGetConsumerGroupsRequest) (*ConsumerGroupList, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return ConsumerGroupList
+ */
+func (a *GroupsApiService) GetConsumerGroupsExecute(r ApiGetConsumerGroupsRequest) (ConsumerGroupList, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *ConsumerGroupList
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  ConsumerGroupList
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "GroupsApiService.GetConsumerGroups")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/v1/consumer-groups"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.offset != nil {
 		localVarQueryParams.Add("offset", parameterToString(*r.offset, ""))
@@ -576,7 +556,7 @@ func (a *GroupsApiService) GetConsumerGroupsExecute(r ApiGetConsumerGroupsReques
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -586,15 +566,15 @@ func (a *GroupsApiService) GetConsumerGroupsExecute(r ApiGetConsumerGroupsReques
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -605,8 +585,7 @@ func (a *GroupsApiService) GetConsumerGroupsExecute(r ApiGetConsumerGroupsReques
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -616,8 +595,7 @@ func (a *GroupsApiService) GetConsumerGroupsExecute(r ApiGetConsumerGroupsReques
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -627,8 +605,7 @@ func (a *GroupsApiService) GetConsumerGroupsExecute(r ApiGetConsumerGroupsReques
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 503 {
@@ -638,15 +615,14 @@ func (a *GroupsApiService) GetConsumerGroupsExecute(r ApiGetConsumerGroupsReques
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -657,7 +633,7 @@ func (a *GroupsApiService) GetConsumerGroupsExecute(r ApiGetConsumerGroupsReques
 }
 
 type ApiResetConsumerGroupOffsetRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService GroupsApi
 	consumerGroupId string
 	consumerGroupResetOffsetParameters *ConsumerGroupResetOffsetParameters
@@ -668,20 +644,18 @@ func (r ApiResetConsumerGroupOffsetRequest) ConsumerGroupResetOffsetParameters(c
 	return r
 }
 
-func (r ApiResetConsumerGroupOffsetRequest) Execute() (*ConsumerGroupResetOffsetResult, *http.Response, error) {
+func (r ApiResetConsumerGroupOffsetRequest) Execute() (ConsumerGroupResetOffsetResult, *_nethttp.Response, error) {
 	return r.ApiService.ResetConsumerGroupOffsetExecute(r)
 }
 
 /*
-ResetConsumerGroupOffset Reset the offset for a consumer group.
-
-Reset the offset for a particular consumer group.
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param consumerGroupId Consumer group identifier
- @return ApiResetConsumerGroupOffsetRequest
-*/
-func (a *GroupsApiService) ResetConsumerGroupOffset(ctx context.Context, consumerGroupId string) ApiResetConsumerGroupOffsetRequest {
+ * ResetConsumerGroupOffset Reset the offset for a consumer group.
+ * Reset the offset for a particular consumer group.
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param consumerGroupId Consumer group identifier
+ * @return ApiResetConsumerGroupOffsetRequest
+ */
+func (a *GroupsApiService) ResetConsumerGroupOffset(ctx _context.Context, consumerGroupId string) ApiResetConsumerGroupOffsetRequest {
 	return ApiResetConsumerGroupOffsetRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -689,27 +663,31 @@ func (a *GroupsApiService) ResetConsumerGroupOffset(ctx context.Context, consume
 	}
 }
 
-// Execute executes the request
-//  @return ConsumerGroupResetOffsetResult
-func (a *GroupsApiService) ResetConsumerGroupOffsetExecute(r ApiResetConsumerGroupOffsetRequest) (*ConsumerGroupResetOffsetResult, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return ConsumerGroupResetOffsetResult
+ */
+func (a *GroupsApiService) ResetConsumerGroupOffsetExecute(r ApiResetConsumerGroupOffsetRequest) (ConsumerGroupResetOffsetResult, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *ConsumerGroupResetOffsetResult
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  ConsumerGroupResetOffsetResult
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "GroupsApiService.ResetConsumerGroupOffset")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/v1/consumer-groups/{consumerGroupId}/reset-offset"
-	localVarPath = strings.Replace(localVarPath, "{"+"consumerGroupId"+"}", url.PathEscape(parameterToString(r.consumerGroupId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"consumerGroupId"+"}", _neturl.PathEscape(parameterToString(r.consumerGroupId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.consumerGroupResetOffsetParameters == nil {
 		return localVarReturnValue, nil, reportError("consumerGroupResetOffsetParameters is required and must be specified")
 	}
@@ -733,7 +711,7 @@ func (a *GroupsApiService) ResetConsumerGroupOffsetExecute(r ApiResetConsumerGro
 	}
 	// body params
 	localVarPostBody = r.consumerGroupResetOffsetParameters
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -743,15 +721,15 @@ func (a *GroupsApiService) ResetConsumerGroupOffsetExecute(r ApiResetConsumerGro
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -762,8 +740,7 @@ func (a *GroupsApiService) ResetConsumerGroupOffsetExecute(r ApiResetConsumerGro
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -773,8 +750,7 @@ func (a *GroupsApiService) ResetConsumerGroupOffsetExecute(r ApiResetConsumerGro
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -784,8 +760,7 @@ func (a *GroupsApiService) ResetConsumerGroupOffsetExecute(r ApiResetConsumerGro
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -795,8 +770,7 @@ func (a *GroupsApiService) ResetConsumerGroupOffsetExecute(r ApiResetConsumerGro
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -806,8 +780,7 @@ func (a *GroupsApiService) ResetConsumerGroupOffsetExecute(r ApiResetConsumerGro
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 503 {
@@ -817,8 +790,7 @@ func (a *GroupsApiService) ResetConsumerGroupOffsetExecute(r ApiResetConsumerGro
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
@@ -826,7 +798,7 @@ func (a *GroupsApiService) ResetConsumerGroupOffsetExecute(r ApiResetConsumerGro
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/api_records.go b/app-services-sdk-go/kafkainstance/apiv1/client/api_records.go
index 1f02df66..3b0ad868 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/api_records.go
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/api_records.go
@@ -1,10 +1,10 @@
 /*
-Kafka Instance API
-
-API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
-
-API version: 0.13.0-SNAPSHOT
-*/
+ * Kafka Instance API
+ *
+ * API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
+ *
+ * API version: 0.13.0-SNAPSHOT
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -12,52 +12,56 @@ package kafkainstanceclient
 
 import (
 	"bytes"
-	"context"
-	"io/ioutil"
-	"net/http"
-	"net/url"
+	_context "context"
+	_ioutil "io/ioutil"
+	_nethttp "net/http"
+	_neturl "net/url"
 	"strings"
 )
 
+// Linger please
+var (
+	_ _context.Context
+)
 
 type RecordsApi interface {
 
 	/*
-	ConsumeRecords Consume records from a topic
-
-	Consume a limited number of records from a topic, optionally specifying a partition and an absolute offset or timestamp as the starting point for message retrieval.
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param topicName Topic name
-	@return ApiConsumeRecordsRequest
-	*/
-	ConsumeRecords(ctx context.Context, topicName string) ApiConsumeRecordsRequest
-
-	// ConsumeRecordsExecute executes the request
-	//  @return RecordList
-	ConsumeRecordsExecute(r ApiConsumeRecordsRequest) (*RecordList, *http.Response, error)
+	 * ConsumeRecords Consume records from a topic
+	 * Consume a limited number of records from a topic, optionally specifying a partition and an absolute offset or timestamp as the starting point for message retrieval.
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param topicName Topic name
+	 * @return ApiConsumeRecordsRequest
+	 */
+	ConsumeRecords(ctx _context.Context, topicName string) ApiConsumeRecordsRequest
 
 	/*
-	ProduceRecord Send a record to a topic
-
-	Produce (write) a single record to a topic.
+	 * ConsumeRecordsExecute executes the request
+	 * @return RecordList
+	 */
+	ConsumeRecordsExecute(r ApiConsumeRecordsRequest) (RecordList, *_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param topicName Topic name
-	@return ApiProduceRecordRequest
-	*/
-	ProduceRecord(ctx context.Context, topicName string) ApiProduceRecordRequest
+	/*
+	 * ProduceRecord Send a record to a topic
+	 * Produce (write) a single record to a topic.
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param topicName Topic name
+	 * @return ApiProduceRecordRequest
+	 */
+	ProduceRecord(ctx _context.Context, topicName string) ApiProduceRecordRequest
 
-	// ProduceRecordExecute executes the request
-	//  @return Record
-	ProduceRecordExecute(r ApiProduceRecordRequest) (*Record, *http.Response, error)
+	/*
+	 * ProduceRecordExecute executes the request
+	 * @return Record
+	 */
+	ProduceRecordExecute(r ApiProduceRecordRequest) (Record, *_nethttp.Response, error)
 }
 
 // RecordsApiService RecordsApi service
 type RecordsApiService service
 
 type ApiConsumeRecordsRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService RecordsApi
 	topicName string
 	include *[]RecordIncludedProperty
@@ -68,56 +72,43 @@ type ApiConsumeRecordsRequest struct {
 	timestamp *interface{}
 }
 
-// List of properties to include for each record in the response
 func (r ApiConsumeRecordsRequest) Include(include []RecordIncludedProperty) ApiConsumeRecordsRequest {
 	r.include = &include
 	return r
 }
-
-// Limit the number of records fetched and returned
 func (r ApiConsumeRecordsRequest) Limit(limit int32) ApiConsumeRecordsRequest {
 	r.limit = &limit
 	return r
 }
-
-// Maximum length of string values returned in the response. Values with a length that exceeds this parameter will be truncated. When this parameter is not included in the request, the full string values will be returned.
 func (r ApiConsumeRecordsRequest) MaxValueLength(maxValueLength int32) ApiConsumeRecordsRequest {
 	r.maxValueLength = &maxValueLength
 	return r
 }
-
-// Retrieve messages with an offset equal to or greater than this offset. If both &#x60;timestamp&#x60; and &#x60;offset&#x60; are requested, &#x60;timestamp&#x60; is given preference.
 func (r ApiConsumeRecordsRequest) Offset(offset int32) ApiConsumeRecordsRequest {
 	r.offset = &offset
 	return r
 }
-
-// Retrieve messages only from this partition
 func (r ApiConsumeRecordsRequest) Partition(partition int32) ApiConsumeRecordsRequest {
 	r.partition = &partition
 	return r
 }
-
-// Retrieve messages with a timestamp equal to or later than this timestamp. If both &#x60;timestamp&#x60; and &#x60;offset&#x60; are requested, &#x60;timestamp&#x60; is given preference.
 func (r ApiConsumeRecordsRequest) Timestamp(timestamp interface{}) ApiConsumeRecordsRequest {
 	r.timestamp = &timestamp
 	return r
 }
 
-func (r ApiConsumeRecordsRequest) Execute() (*RecordList, *http.Response, error) {
+func (r ApiConsumeRecordsRequest) Execute() (RecordList, *_nethttp.Response, error) {
 	return r.ApiService.ConsumeRecordsExecute(r)
 }
 
 /*
-ConsumeRecords Consume records from a topic
-
-Consume a limited number of records from a topic, optionally specifying a partition and an absolute offset or timestamp as the starting point for message retrieval.
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param topicName Topic name
- @return ApiConsumeRecordsRequest
-*/
-func (a *RecordsApiService) ConsumeRecords(ctx context.Context, topicName string) ApiConsumeRecordsRequest {
+ * ConsumeRecords Consume records from a topic
+ * Consume a limited number of records from a topic, optionally specifying a partition and an absolute offset or timestamp as the starting point for message retrieval.
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param topicName Topic name
+ * @return ApiConsumeRecordsRequest
+ */
+func (a *RecordsApiService) ConsumeRecords(ctx _context.Context, topicName string) ApiConsumeRecordsRequest {
 	return ApiConsumeRecordsRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -125,27 +116,31 @@ func (a *RecordsApiService) ConsumeRecords(ctx context.Context, topicName string
 	}
 }
 
-// Execute executes the request
-//  @return RecordList
-func (a *RecordsApiService) ConsumeRecordsExecute(r ApiConsumeRecordsRequest) (*RecordList, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return RecordList
+ */
+func (a *RecordsApiService) ConsumeRecordsExecute(r ApiConsumeRecordsRequest) (RecordList, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *RecordList
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  RecordList
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "RecordsApiService.ConsumeRecords")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/v1/topics/{topicName}/records"
-	localVarPath = strings.Replace(localVarPath, "{"+"topicName"+"}", url.PathEscape(parameterToString(r.topicName, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"topicName"+"}", _neturl.PathEscape(parameterToString(r.topicName, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.include != nil {
 		localVarQueryParams.Add("include", parameterToString(*r.include, "csv"))
@@ -182,7 +177,7 @@ func (a *RecordsApiService) ConsumeRecordsExecute(r ApiConsumeRecordsRequest) (*
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -192,15 +187,15 @@ func (a *RecordsApiService) ConsumeRecordsExecute(r ApiConsumeRecordsRequest) (*
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -211,8 +206,7 @@ func (a *RecordsApiService) ConsumeRecordsExecute(r ApiConsumeRecordsRequest) (*
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -222,8 +216,7 @@ func (a *RecordsApiService) ConsumeRecordsExecute(r ApiConsumeRecordsRequest) (*
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -233,8 +226,7 @@ func (a *RecordsApiService) ConsumeRecordsExecute(r ApiConsumeRecordsRequest) (*
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -244,8 +236,7 @@ func (a *RecordsApiService) ConsumeRecordsExecute(r ApiConsumeRecordsRequest) (*
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 503 {
@@ -255,8 +246,7 @@ func (a *RecordsApiService) ConsumeRecordsExecute(r ApiConsumeRecordsRequest) (*
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
@@ -264,7 +254,7 @@ func (a *RecordsApiService) ConsumeRecordsExecute(r ApiConsumeRecordsRequest) (*
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -275,7 +265,7 @@ func (a *RecordsApiService) ConsumeRecordsExecute(r ApiConsumeRecordsRequest) (*
 }
 
 type ApiProduceRecordRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService RecordsApi
 	topicName string
 	record *Record
@@ -286,20 +276,18 @@ func (r ApiProduceRecordRequest) Record(record Record) ApiProduceRecordRequest {
 	return r
 }
 
-func (r ApiProduceRecordRequest) Execute() (*Record, *http.Response, error) {
+func (r ApiProduceRecordRequest) Execute() (Record, *_nethttp.Response, error) {
 	return r.ApiService.ProduceRecordExecute(r)
 }
 
 /*
-ProduceRecord Send a record to a topic
-
-Produce (write) a single record to a topic.
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param topicName Topic name
- @return ApiProduceRecordRequest
-*/
-func (a *RecordsApiService) ProduceRecord(ctx context.Context, topicName string) ApiProduceRecordRequest {
+ * ProduceRecord Send a record to a topic
+ * Produce (write) a single record to a topic.
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param topicName Topic name
+ * @return ApiProduceRecordRequest
+ */
+func (a *RecordsApiService) ProduceRecord(ctx _context.Context, topicName string) ApiProduceRecordRequest {
 	return ApiProduceRecordRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -307,27 +295,31 @@ func (a *RecordsApiService) ProduceRecord(ctx context.Context, topicName string)
 	}
 }
 
-// Execute executes the request
-//  @return Record
-func (a *RecordsApiService) ProduceRecordExecute(r ApiProduceRecordRequest) (*Record, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return Record
+ */
+func (a *RecordsApiService) ProduceRecordExecute(r ApiProduceRecordRequest) (Record, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *Record
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  Record
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "RecordsApiService.ProduceRecord")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/v1/topics/{topicName}/records"
-	localVarPath = strings.Replace(localVarPath, "{"+"topicName"+"}", url.PathEscape(parameterToString(r.topicName, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"topicName"+"}", _neturl.PathEscape(parameterToString(r.topicName, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.record == nil {
 		return localVarReturnValue, nil, reportError("record is required and must be specified")
 	}
@@ -351,7 +343,7 @@ func (a *RecordsApiService) ProduceRecordExecute(r ApiProduceRecordRequest) (*Re
 	}
 	// body params
 	localVarPostBody = r.record
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -361,15 +353,15 @@ func (a *RecordsApiService) ProduceRecordExecute(r ApiProduceRecordRequest) (*Re
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -380,8 +372,7 @@ func (a *RecordsApiService) ProduceRecordExecute(r ApiProduceRecordRequest) (*Re
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -391,8 +382,7 @@ func (a *RecordsApiService) ProduceRecordExecute(r ApiProduceRecordRequest) (*Re
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -402,8 +392,7 @@ func (a *RecordsApiService) ProduceRecordExecute(r ApiProduceRecordRequest) (*Re
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -413,8 +402,7 @@ func (a *RecordsApiService) ProduceRecordExecute(r ApiProduceRecordRequest) (*Re
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 503 {
@@ -424,8 +412,7 @@ func (a *RecordsApiService) ProduceRecordExecute(r ApiProduceRecordRequest) (*Re
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
@@ -433,7 +420,7 @@ func (a *RecordsApiService) ProduceRecordExecute(r ApiProduceRecordRequest) (*Re
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/api_topics.go b/app-services-sdk-go/kafkainstance/apiv1/client/api_topics.go
index dd7b0126..4657e602 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/api_topics.go
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/api_topics.go
@@ -1,10 +1,10 @@
 /*
-Kafka Instance API
-
-API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
-
-API version: 0.13.0-SNAPSHOT
-*/
+ * Kafka Instance API
+ *
+ * API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
+ *
+ * API version: 0.13.0-SNAPSHOT
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -12,143 +12,148 @@ package kafkainstanceclient
 
 import (
 	"bytes"
-	"context"
-	"io/ioutil"
-	"net/http"
-	"net/url"
+	_context "context"
+	_ioutil "io/ioutil"
+	_nethttp "net/http"
+	_neturl "net/url"
 	"strings"
 )
 
+// Linger please
+var (
+	_ _context.Context
+)
 
 type TopicsApi interface {
 
 	/*
-	CreateTopic Creates a new topic
-
-	Creates a new topic for Kafka.
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiCreateTopicRequest
-	*/
-	CreateTopic(ctx context.Context) ApiCreateTopicRequest
-
-	// CreateTopicExecute executes the request
-	//  @return Topic
-	CreateTopicExecute(r ApiCreateTopicRequest) (*Topic, *http.Response, error)
+	 * CreateTopic Creates a new topic
+	 * Creates a new topic for Kafka.
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiCreateTopicRequest
+	 */
+	CreateTopic(ctx _context.Context) ApiCreateTopicRequest
 
 	/*
-	DeleteTopic Deletes a topic
-
-	Deletes the topic with the specified name.
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param topicName Name of the topic to delete
-	@return ApiDeleteTopicRequest
-	*/
-	DeleteTopic(ctx context.Context, topicName string) ApiDeleteTopicRequest
-
-	// DeleteTopicExecute executes the request
-	DeleteTopicExecute(r ApiDeleteTopicRequest) (*http.Response, error)
+	 * CreateTopicExecute executes the request
+	 * @return Topic
+	 */
+	CreateTopicExecute(r ApiCreateTopicRequest) (Topic, *_nethttp.Response, error)
 
 	/*
-	GetTopic Retrieves a single topic
-
-	Topic
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param topicName Name of the topic to describe
-	@return ApiGetTopicRequest
-	*/
-	GetTopic(ctx context.Context, topicName string) ApiGetTopicRequest
-
-	// GetTopicExecute executes the request
-	//  @return Topic
-	GetTopicExecute(r ApiGetTopicRequest) (*Topic, *http.Response, error)
+	 * DeleteTopic Deletes a topic
+	 * Deletes the topic with the specified name.
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param topicName Name of the topic to delete
+	 * @return ApiDeleteTopicRequest
+	 */
+	DeleteTopic(ctx _context.Context, topicName string) ApiDeleteTopicRequest
 
 	/*
-	GetTopics Retrieves a list of topics
-
-	Returns a list of all of the available topics, or the list of topics that meet the request query parameters. The topics returned are limited to those records the requestor is authorized to view.
+	 * DeleteTopicExecute executes the request
+	 */
+	DeleteTopicExecute(r ApiDeleteTopicRequest) (*_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiGetTopicsRequest
-	*/
-	GetTopics(ctx context.Context) ApiGetTopicsRequest
+	/*
+	 * GetTopic Retrieves a single topic
+	 * Topic
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param topicName Name of the topic to describe
+	 * @return ApiGetTopicRequest
+	 */
+	GetTopic(ctx _context.Context, topicName string) ApiGetTopicRequest
 
-	// GetTopicsExecute executes the request
-	//  @return TopicsList
-	GetTopicsExecute(r ApiGetTopicsRequest) (*TopicsList, *http.Response, error)
+	/*
+	 * GetTopicExecute executes the request
+	 * @return Topic
+	 */
+	GetTopicExecute(r ApiGetTopicRequest) (Topic, *_nethttp.Response, error)
 
 	/*
-	UpdateTopic Updates a single topic
+	 * GetTopics Retrieves a list of topics
+	 * Returns a list of all of the available topics, or the list of topics that meet the request query parameters. The topics returned are limited to those records the requestor is authorized to view.
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiGetTopicsRequest
+	 */
+	GetTopics(ctx _context.Context) ApiGetTopicsRequest
 
-	Update the configuration settings for a topic.
+	/*
+	 * GetTopicsExecute executes the request
+	 * @return TopicsList
+	 */
+	GetTopicsExecute(r ApiGetTopicsRequest) (TopicsList, *_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param topicName Name of the topic to update
-	@return ApiUpdateTopicRequest
-	*/
-	UpdateTopic(ctx context.Context, topicName string) ApiUpdateTopicRequest
+	/*
+	 * UpdateTopic Updates a single topic
+	 * Update the configuration settings for a topic.
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param topicName Name of the topic to update
+	 * @return ApiUpdateTopicRequest
+	 */
+	UpdateTopic(ctx _context.Context, topicName string) ApiUpdateTopicRequest
 
-	// UpdateTopicExecute executes the request
-	//  @return Topic
-	UpdateTopicExecute(r ApiUpdateTopicRequest) (*Topic, *http.Response, error)
+	/*
+	 * UpdateTopicExecute executes the request
+	 * @return Topic
+	 */
+	UpdateTopicExecute(r ApiUpdateTopicRequest) (Topic, *_nethttp.Response, error)
 }
 
 // TopicsApiService TopicsApi service
 type TopicsApiService service
 
 type ApiCreateTopicRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService TopicsApi
 	newTopicInput *NewTopicInput
 }
 
-// Topic to create.
 func (r ApiCreateTopicRequest) NewTopicInput(newTopicInput NewTopicInput) ApiCreateTopicRequest {
 	r.newTopicInput = &newTopicInput
 	return r
 }
 
-func (r ApiCreateTopicRequest) Execute() (*Topic, *http.Response, error) {
+func (r ApiCreateTopicRequest) Execute() (Topic, *_nethttp.Response, error) {
 	return r.ApiService.CreateTopicExecute(r)
 }
 
 /*
-CreateTopic Creates a new topic
-
-Creates a new topic for Kafka.
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiCreateTopicRequest
-*/
-func (a *TopicsApiService) CreateTopic(ctx context.Context) ApiCreateTopicRequest {
+ * CreateTopic Creates a new topic
+ * Creates a new topic for Kafka.
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiCreateTopicRequest
+ */
+func (a *TopicsApiService) CreateTopic(ctx _context.Context) ApiCreateTopicRequest {
 	return ApiCreateTopicRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return Topic
-func (a *TopicsApiService) CreateTopicExecute(r ApiCreateTopicRequest) (*Topic, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return Topic
+ */
+func (a *TopicsApiService) CreateTopicExecute(r ApiCreateTopicRequest) (Topic, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *Topic
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  Topic
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "TopicsApiService.CreateTopic")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/v1/topics"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.newTopicInput == nil {
 		return localVarReturnValue, nil, reportError("newTopicInput is required and must be specified")
 	}
@@ -172,7 +177,7 @@ func (a *TopicsApiService) CreateTopicExecute(r ApiCreateTopicRequest) (*Topic,
 	}
 	// body params
 	localVarPostBody = r.newTopicInput
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -182,15 +187,15 @@ func (a *TopicsApiService) CreateTopicExecute(r ApiCreateTopicRequest) (*Topic,
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -201,8 +206,7 @@ func (a *TopicsApiService) CreateTopicExecute(r ApiCreateTopicRequest) (*Topic,
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -212,8 +216,7 @@ func (a *TopicsApiService) CreateTopicExecute(r ApiCreateTopicRequest) (*Topic,
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 409 {
@@ -223,8 +226,7 @@ func (a *TopicsApiService) CreateTopicExecute(r ApiCreateTopicRequest) (*Topic,
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -234,8 +236,7 @@ func (a *TopicsApiService) CreateTopicExecute(r ApiCreateTopicRequest) (*Topic,
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 503 {
@@ -245,8 +246,7 @@ func (a *TopicsApiService) CreateTopicExecute(r ApiCreateTopicRequest) (*Topic,
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
@@ -254,7 +254,7 @@ func (a *TopicsApiService) CreateTopicExecute(r ApiCreateTopicRequest) (*Topic,
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -265,25 +265,24 @@ func (a *TopicsApiService) CreateTopicExecute(r ApiCreateTopicRequest) (*Topic,
 }
 
 type ApiDeleteTopicRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService TopicsApi
 	topicName string
 }
 
-func (r ApiDeleteTopicRequest) Execute() (*http.Response, error) {
+
+func (r ApiDeleteTopicRequest) Execute() (*_nethttp.Response, error) {
 	return r.ApiService.DeleteTopicExecute(r)
 }
 
 /*
-DeleteTopic Deletes a topic
-
-Deletes the topic with the specified name.
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param topicName Name of the topic to delete
- @return ApiDeleteTopicRequest
-*/
-func (a *TopicsApiService) DeleteTopic(ctx context.Context, topicName string) ApiDeleteTopicRequest {
+ * DeleteTopic Deletes a topic
+ * Deletes the topic with the specified name.
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param topicName Name of the topic to delete
+ * @return ApiDeleteTopicRequest
+ */
+func (a *TopicsApiService) DeleteTopic(ctx _context.Context, topicName string) ApiDeleteTopicRequest {
 	return ApiDeleteTopicRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -291,25 +290,29 @@ func (a *TopicsApiService) DeleteTopic(ctx context.Context, topicName string) Ap
 	}
 }
 
-// Execute executes the request
-func (a *TopicsApiService) DeleteTopicExecute(r ApiDeleteTopicRequest) (*http.Response, error) {
+/*
+ * Execute executes the request
+ */
+func (a *TopicsApiService) DeleteTopicExecute(r ApiDeleteTopicRequest) (*_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodDelete
+		localVarHTTPMethod   = _nethttp.MethodDelete
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "TopicsApiService.DeleteTopic")
 	if err != nil {
-		return nil, &GenericOpenAPIError{error: err.Error()}
+		return nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/v1/topics/{topicName}"
-	localVarPath = strings.Replace(localVarPath, "{"+"topicName"+"}", url.PathEscape(parameterToString(r.topicName, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"topicName"+"}", _neturl.PathEscape(parameterToString(r.topicName, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -328,7 +331,7 @@ func (a *TopicsApiService) DeleteTopicExecute(r ApiDeleteTopicRequest) (*http.Re
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return nil, err
 	}
@@ -338,15 +341,15 @@ func (a *TopicsApiService) DeleteTopicExecute(r ApiDeleteTopicRequest) (*http.Re
 		return localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -357,8 +360,7 @@ func (a *TopicsApiService) DeleteTopicExecute(r ApiDeleteTopicRequest) (*http.Re
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -368,8 +370,7 @@ func (a *TopicsApiService) DeleteTopicExecute(r ApiDeleteTopicRequest) (*http.Re
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -379,8 +380,7 @@ func (a *TopicsApiService) DeleteTopicExecute(r ApiDeleteTopicRequest) (*http.Re
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -390,8 +390,7 @@ func (a *TopicsApiService) DeleteTopicExecute(r ApiDeleteTopicRequest) (*http.Re
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 503 {
@@ -401,8 +400,7 @@ func (a *TopicsApiService) DeleteTopicExecute(r ApiDeleteTopicRequest) (*http.Re
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarHTTPResponse, newErr
 	}
@@ -411,25 +409,24 @@ func (a *TopicsApiService) DeleteTopicExecute(r ApiDeleteTopicRequest) (*http.Re
 }
 
 type ApiGetTopicRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService TopicsApi
 	topicName string
 }
 
-func (r ApiGetTopicRequest) Execute() (*Topic, *http.Response, error) {
+
+func (r ApiGetTopicRequest) Execute() (Topic, *_nethttp.Response, error) {
 	return r.ApiService.GetTopicExecute(r)
 }
 
 /*
-GetTopic Retrieves a single topic
-
-Topic
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param topicName Name of the topic to describe
- @return ApiGetTopicRequest
-*/
-func (a *TopicsApiService) GetTopic(ctx context.Context, topicName string) ApiGetTopicRequest {
+ * GetTopic Retrieves a single topic
+ * Topic
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param topicName Name of the topic to describe
+ * @return ApiGetTopicRequest
+ */
+func (a *TopicsApiService) GetTopic(ctx _context.Context, topicName string) ApiGetTopicRequest {
 	return ApiGetTopicRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -437,27 +434,31 @@ func (a *TopicsApiService) GetTopic(ctx context.Context, topicName string) ApiGe
 	}
 }
 
-// Execute executes the request
-//  @return Topic
-func (a *TopicsApiService) GetTopicExecute(r ApiGetTopicRequest) (*Topic, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return Topic
+ */
+func (a *TopicsApiService) GetTopicExecute(r ApiGetTopicRequest) (Topic, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *Topic
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  Topic
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "TopicsApiService.GetTopic")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/v1/topics/{topicName}"
-	localVarPath = strings.Replace(localVarPath, "{"+"topicName"+"}", url.PathEscape(parameterToString(r.topicName, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"topicName"+"}", _neturl.PathEscape(parameterToString(r.topicName, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -476,7 +477,7 @@ func (a *TopicsApiService) GetTopicExecute(r ApiGetTopicRequest) (*Topic, *http.
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -486,15 +487,15 @@ func (a *TopicsApiService) GetTopicExecute(r ApiGetTopicRequest) (*Topic, *http.
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -505,8 +506,7 @@ func (a *TopicsApiService) GetTopicExecute(r ApiGetTopicRequest) (*Topic, *http.
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -516,8 +516,7 @@ func (a *TopicsApiService) GetTopicExecute(r ApiGetTopicRequest) (*Topic, *http.
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -527,8 +526,7 @@ func (a *TopicsApiService) GetTopicExecute(r ApiGetTopicRequest) (*Topic, *http.
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -538,8 +536,7 @@ func (a *TopicsApiService) GetTopicExecute(r ApiGetTopicRequest) (*Topic, *http.
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 503 {
@@ -549,8 +546,7 @@ func (a *TopicsApiService) GetTopicExecute(r ApiGetTopicRequest) (*Topic, *http.
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
@@ -558,7 +554,7 @@ func (a *TopicsApiService) GetTopicExecute(r ApiGetTopicRequest) (*Topic, *http.
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -569,7 +565,7 @@ func (a *TopicsApiService) GetTopicExecute(r ApiGetTopicRequest) (*Topic, *http.
 }
 
 type ApiGetTopicsRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService TopicsApi
 	offset *int32
 	limit *int32
@@ -580,89 +576,76 @@ type ApiGetTopicsRequest struct {
 	orderKey *TopicOrderKey
 }
 
-// Offset of the first record to return, zero-based
-// Deprecated
 func (r ApiGetTopicsRequest) Offset(offset int32) ApiGetTopicsRequest {
 	r.offset = &offset
 	return r
 }
-
-// Maximum number of records to return
-// Deprecated
 func (r ApiGetTopicsRequest) Limit(limit int32) ApiGetTopicsRequest {
 	r.limit = &limit
 	return r
 }
-
-// Number of records per page
 func (r ApiGetTopicsRequest) Size(size int32) ApiGetTopicsRequest {
 	r.size = &size
 	return r
 }
-
-// Filter to apply when returning the list of topics
 func (r ApiGetTopicsRequest) Filter(filter string) ApiGetTopicsRequest {
 	r.filter = &filter
 	return r
 }
-
-// Page number
 func (r ApiGetTopicsRequest) Page(page int32) ApiGetTopicsRequest {
 	r.page = &page
 	return r
 }
-
-// Order items are sorted
 func (r ApiGetTopicsRequest) Order(order SortDirection) ApiGetTopicsRequest {
 	r.order = &order
 	return r
 }
-
-// Order key to sort the topics by.
 func (r ApiGetTopicsRequest) OrderKey(orderKey TopicOrderKey) ApiGetTopicsRequest {
 	r.orderKey = &orderKey
 	return r
 }
 
-func (r ApiGetTopicsRequest) Execute() (*TopicsList, *http.Response, error) {
+func (r ApiGetTopicsRequest) Execute() (TopicsList, *_nethttp.Response, error) {
 	return r.ApiService.GetTopicsExecute(r)
 }
 
 /*
-GetTopics Retrieves a list of topics
-
-Returns a list of all of the available topics, or the list of topics that meet the request query parameters. The topics returned are limited to those records the requestor is authorized to view.
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiGetTopicsRequest
-*/
-func (a *TopicsApiService) GetTopics(ctx context.Context) ApiGetTopicsRequest {
+ * GetTopics Retrieves a list of topics
+ * Returns a list of all of the available topics, or the list of topics that meet the request query parameters. The topics returned are limited to those records the requestor is authorized to view.
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiGetTopicsRequest
+ */
+func (a *TopicsApiService) GetTopics(ctx _context.Context) ApiGetTopicsRequest {
 	return ApiGetTopicsRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return TopicsList
-func (a *TopicsApiService) GetTopicsExecute(r ApiGetTopicsRequest) (*TopicsList, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return TopicsList
+ */
+func (a *TopicsApiService) GetTopicsExecute(r ApiGetTopicsRequest) (TopicsList, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *TopicsList
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  TopicsList
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "TopicsApiService.GetTopics")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/v1/topics"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.offset != nil {
 		localVarQueryParams.Add("offset", parameterToString(*r.offset, ""))
@@ -702,7 +685,7 @@ func (a *TopicsApiService) GetTopicsExecute(r ApiGetTopicsRequest) (*TopicsList,
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -712,15 +695,15 @@ func (a *TopicsApiService) GetTopicsExecute(r ApiGetTopicsRequest) (*TopicsList,
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -731,8 +714,7 @@ func (a *TopicsApiService) GetTopicsExecute(r ApiGetTopicsRequest) (*TopicsList,
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -742,8 +724,7 @@ func (a *TopicsApiService) GetTopicsExecute(r ApiGetTopicsRequest) (*TopicsList,
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -753,8 +734,7 @@ func (a *TopicsApiService) GetTopicsExecute(r ApiGetTopicsRequest) (*TopicsList,
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 503 {
@@ -764,8 +744,7 @@ func (a *TopicsApiService) GetTopicsExecute(r ApiGetTopicsRequest) (*TopicsList,
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
@@ -773,7 +752,7 @@ func (a *TopicsApiService) GetTopicsExecute(r ApiGetTopicsRequest) (*TopicsList,
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -784,7 +763,7 @@ func (a *TopicsApiService) GetTopicsExecute(r ApiGetTopicsRequest) (*TopicsList,
 }
 
 type ApiUpdateTopicRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService TopicsApi
 	topicName string
 	topicSettings *TopicSettings
@@ -795,20 +774,18 @@ func (r ApiUpdateTopicRequest) TopicSettings(topicSettings TopicSettings) ApiUpd
 	return r
 }
 
-func (r ApiUpdateTopicRequest) Execute() (*Topic, *http.Response, error) {
+func (r ApiUpdateTopicRequest) Execute() (Topic, *_nethttp.Response, error) {
 	return r.ApiService.UpdateTopicExecute(r)
 }
 
 /*
-UpdateTopic Updates a single topic
-
-Update the configuration settings for a topic.
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param topicName Name of the topic to update
- @return ApiUpdateTopicRequest
-*/
-func (a *TopicsApiService) UpdateTopic(ctx context.Context, topicName string) ApiUpdateTopicRequest {
+ * UpdateTopic Updates a single topic
+ * Update the configuration settings for a topic.
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param topicName Name of the topic to update
+ * @return ApiUpdateTopicRequest
+ */
+func (a *TopicsApiService) UpdateTopic(ctx _context.Context, topicName string) ApiUpdateTopicRequest {
 	return ApiUpdateTopicRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -816,27 +793,31 @@ func (a *TopicsApiService) UpdateTopic(ctx context.Context, topicName string) Ap
 	}
 }
 
-// Execute executes the request
-//  @return Topic
-func (a *TopicsApiService) UpdateTopicExecute(r ApiUpdateTopicRequest) (*Topic, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return Topic
+ */
+func (a *TopicsApiService) UpdateTopicExecute(r ApiUpdateTopicRequest) (Topic, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPatch
+		localVarHTTPMethod   = _nethttp.MethodPatch
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *Topic
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  Topic
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "TopicsApiService.UpdateTopic")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/v1/topics/{topicName}"
-	localVarPath = strings.Replace(localVarPath, "{"+"topicName"+"}", url.PathEscape(parameterToString(r.topicName, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"topicName"+"}", _neturl.PathEscape(parameterToString(r.topicName, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.topicSettings == nil {
 		return localVarReturnValue, nil, reportError("topicSettings is required and must be specified")
 	}
@@ -860,7 +841,7 @@ func (a *TopicsApiService) UpdateTopicExecute(r ApiUpdateTopicRequest) (*Topic,
 	}
 	// body params
 	localVarPostBody = r.topicSettings
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -870,15 +851,15 @@ func (a *TopicsApiService) UpdateTopicExecute(r ApiUpdateTopicRequest) (*Topic,
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -889,8 +870,7 @@ func (a *TopicsApiService) UpdateTopicExecute(r ApiUpdateTopicRequest) (*Topic,
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -900,8 +880,7 @@ func (a *TopicsApiService) UpdateTopicExecute(r ApiUpdateTopicRequest) (*Topic,
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -911,8 +890,7 @@ func (a *TopicsApiService) UpdateTopicExecute(r ApiUpdateTopicRequest) (*Topic,
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -922,8 +900,7 @@ func (a *TopicsApiService) UpdateTopicExecute(r ApiUpdateTopicRequest) (*Topic,
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -933,8 +910,7 @@ func (a *TopicsApiService) UpdateTopicExecute(r ApiUpdateTopicRequest) (*Topic,
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 503 {
@@ -944,8 +920,7 @@ func (a *TopicsApiService) UpdateTopicExecute(r ApiUpdateTopicRequest) (*Topic,
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
@@ -953,7 +928,7 @@ func (a *TopicsApiService) UpdateTopicExecute(r ApiUpdateTopicRequest) (*Topic,
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/client.go b/app-services-sdk-go/kafkainstance/apiv1/client/client.go
index 995b1c7d..7e1ff51d 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/client.go
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/client.go
@@ -1,10 +1,10 @@
 /*
-Kafka Instance API
-
-API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
-
-API version: 0.13.0-SNAPSHOT
-*/
+ * Kafka Instance API
+ *
+ * API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
+ *
+ * API version: 0.13.0-SNAPSHOT
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -116,7 +116,7 @@ func selectHeaderAccept(accepts []string) string {
 // contains is a case insensitive match, finding needle in a haystack
 func contains(haystack []string, needle string) bool {
 	for _, a := range haystack {
-		if strings.EqualFold(a, needle) {
+		if strings.ToLower(a) == strings.ToLower(needle) {
 			return true
 		}
 	}
@@ -132,7 +132,7 @@ func typeCheckParameter(obj interface{}, expected string, name string) error {
 
 	// Check the type is as expected.
 	if reflect.TypeOf(obj).String() != expected {
-		return fmt.Errorf("expected %s to be of type %s but received %s", name, expected, reflect.TypeOf(obj).String())
+		return fmt.Errorf("Expected %s to be of type %s but received %s.", name, expected, reflect.TypeOf(obj).String())
 	}
 	return nil
 }
@@ -201,12 +201,6 @@ func (c *APIClient) GetConfig() *Configuration {
 	return c.cfg
 }
 
-type formFile struct {
-		fileBytes []byte
-		fileName string
-		formFileName string
-}
-
 // prepareRequest build the request
 func (c *APIClient) prepareRequest(
 	ctx context.Context,
@@ -215,7 +209,9 @@ func (c *APIClient) prepareRequest(
 	headerParams map[string]string,
 	queryParams url.Values,
 	formParams url.Values,
-	formFiles []formFile) (localVarRequest *http.Request, err error) {
+	formFileName string,
+	fileName string,
+	fileBytes []byte) (localVarRequest *http.Request, err error) {
 
 	var body *bytes.Buffer
 
@@ -234,7 +230,7 @@ func (c *APIClient) prepareRequest(
 	}
 
 	// add form parameters and file if available.
-	if strings.HasPrefix(headerParams["Content-Type"], "multipart/form-data") && len(formParams) > 0 || (len(formFiles) > 0) {
+	if strings.HasPrefix(headerParams["Content-Type"], "multipart/form-data") && len(formParams) > 0 || (len(fileBytes) > 0 && fileName != "") {
 		if body != nil {
 			return nil, errors.New("Cannot specify postBody and multipart form at the same time.")
 		}
@@ -253,17 +249,16 @@ func (c *APIClient) prepareRequest(
 				}
 			}
 		}
-		for _, formFile := range formFiles {
-			if len(formFile.fileBytes) > 0 && formFile.fileName != "" {
-				w.Boundary()
-				part, err := w.CreateFormFile(formFile.formFileName, filepath.Base(formFile.fileName))
-				if err != nil {
-						return nil, err
-				}
-				_, err = part.Write(formFile.fileBytes)
-				if err != nil {
-						return nil, err
-				}
+		if len(fileBytes) > 0 && fileName != "" {
+			w.Boundary()
+			//_, fileNm := filepath.Split(fileName)
+			part, err := w.CreateFormFile(formFileName, filepath.Base(fileName))
+			if err != nil {
+				return nil, err
+			}
+			_, err = part.Write(fileBytes)
+			if err != nil {
+				return nil, err
 			}
 		}
 
@@ -326,7 +321,7 @@ func (c *APIClient) prepareRequest(
 	if len(headerParams) > 0 {
 		headers := http.Header{}
 		for h, v := range headerParams {
-			headers[h] = []string{v}
+			headers.Set(h, v)
 		}
 		localVarRequest.Header = headers
 	}
@@ -383,9 +378,6 @@ func (c *APIClient) decode(v interface{}, b []byte, contentType string) (err err
 			return
 		}
 		_, err = (*f).Write(b)
-		if err != nil {
-			return
-		}
 		_, err = (*f).Seek(0, io.SeekStart)
 		return
 	}
@@ -414,14 +406,11 @@ func (c *APIClient) decode(v interface{}, b []byte, contentType string) (err err
 
 // Add a file to the multipart request
 func addFile(w *multipart.Writer, fieldName, path string) error {
-	file, err := os.Open(filepath.Clean(path))
-	if err != nil {
-		return err
-	}
-	err = file.Close()
+	file, err := os.Open(path)
 	if err != nil {
 		return err
 	}
+	defer file.Close()
 
 	part, err := w.CreateFormFile(fieldName, filepath.Base(path))
 	if err != nil {
@@ -437,13 +426,6 @@ func reportError(format string, a ...interface{}) error {
 	return fmt.Errorf(format, a...)
 }
 
-// A wrapper for strict JSON decoding
-func newStrictDecoder(data []byte) *json.Decoder {
-	dec := json.NewDecoder(bytes.NewBuffer(data))
-	dec.DisallowUnknownFields()
-	return dec
-}
-
 // Set request body from an interface{}
 func setBody(body interface{}, contentType string) (bodyBuf *bytes.Buffer, err error) {
 	if bodyBuf == nil {
@@ -471,7 +453,7 @@ func setBody(body interface{}, contentType string) (bodyBuf *bytes.Buffer, err e
 	}
 
 	if bodyBuf.Len() == 0 {
-		err = fmt.Errorf("invalid body type %s\n", contentType)
+		err = fmt.Errorf("Invalid body type %s\n", contentType)
 		return nil, err
 	}
 	return bodyBuf, nil
@@ -573,23 +555,3 @@ func (e GenericOpenAPIError) Body() []byte {
 func (e GenericOpenAPIError) Model() interface{} {
 	return e.model
 }
-
-// format error message using title and detail when model implements rfc7807
-func formatErrorMessage(status string, v interface{}) string {
-
-    str := ""
-    metaValue := reflect.ValueOf(v).Elem()
-
-    field := metaValue.FieldByName("Title")
-    if field != (reflect.Value{}) {
-        str = fmt.Sprintf("%s", field.Interface())
-    }
-
-    field = metaValue.FieldByName("Detail")
-    if field != (reflect.Value{}) {
-        str = fmt.Sprintf("%s (%s)", str, field.Interface())
-    }
-
-    // status title (detail)
-    return fmt.Sprintf("%s %s", status, str)
-}
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/configuration.go b/app-services-sdk-go/kafkainstance/apiv1/client/configuration.go
index 9d93cfe6..d77199fb 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/configuration.go
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/configuration.go
@@ -1,10 +1,10 @@
 /*
-Kafka Instance API
-
-API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
-
-API version: 0.13.0-SNAPSHOT
-*/
+ * Kafka Instance API
+ *
+ * API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
+ *
+ * API version: 0.13.0-SNAPSHOT
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -123,7 +123,7 @@ func (c *Configuration) AddDefaultHeader(key string, value string) {
 // URL formats template on a index using given variables
 func (sc ServerConfigurations) URL(index int, variables map[string]string) (string, error) {
 	if index < 0 || len(sc) <= index {
-		return "", fmt.Errorf("index %v out of range %v", index, len(sc)-1)
+		return "", fmt.Errorf("Index %v out of range %v", index, len(sc)-1)
 	}
 	server := sc[index]
 	url := server.URL
@@ -138,7 +138,7 @@ func (sc ServerConfigurations) URL(index int, variables map[string]string) (stri
 				}
 			}
 			if !found {
-				return "", fmt.Errorf("the variable %s in the server URL has invalid value %v. Must be %v", name, value, variable.EnumValues)
+				return "", fmt.Errorf("The variable %s in the server URL has invalid value %v. Must be %v", name, value, variable.EnumValues)
 			}
 			url = strings.Replace(url, "{"+name+"}", value, -1)
 		} else {
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/docs/AclsApi.md b/app-services-sdk-go/kafkainstance/apiv1/client/docs/AclsApi.md
index a76c2b40..e0f1f8ec 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/docs/AclsApi.md
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/docs/AclsApi.md
@@ -35,8 +35,8 @@ func main() {
     aclBinding := *openapiclient.NewAclBinding(openapiclient.AclResourceType("GROUP"), "ResourceName_example", openapiclient.AclPatternType("LITERAL"), "User:user-123-abc", openapiclient.AclOperation("ALL"), openapiclient.AclPermissionType("ALLOW")) // AclBinding | ACL to create.
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.AclsApi.CreateAcl(context.Background()).AclBinding(aclBinding).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.AclsApi.CreateAcl(context.Background()).AclBinding(aclBinding).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `AclsApi.CreateAcl``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -104,8 +104,8 @@ func main() {
     permission := openapiclient.AclPermissionTypeFilter("ALLOW") // AclPermissionTypeFilter | ACL Permission Type Filter (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.AclsApi.DeleteAcls(context.Background()).ResourceType(resourceType).ResourceName(resourceName).PatternType(patternType).Principal(principal).Operation(operation).Permission(permission).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.AclsApi.DeleteAcls(context.Background()).ResourceType(resourceType).ResourceName(resourceName).PatternType(patternType).Principal(principal).Operation(operation).Permission(permission).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `AclsApi.DeleteAcls``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -174,8 +174,8 @@ import (
 func main() {
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.AclsApi.GetAclResourceOperations(context.Background()).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.AclsApi.GetAclResourceOperations(context.Background()).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `AclsApi.GetAclResourceOperations``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -245,8 +245,8 @@ func main() {
     orderKey := openapiclient.AclBindingOrderKey("resourceType") // AclBindingOrderKey |  (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.AclsApi.GetAcls(context.Background()).ResourceType(resourceType).ResourceName(resourceName).PatternType(patternType).Principal(principal).Operation(operation).Permission(permission).Page(page).Size(size).Order(order).OrderKey(orderKey).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.AclsApi.GetAcls(context.Background()).ResourceType(resourceType).ResourceName(resourceName).PatternType(patternType).Principal(principal).Operation(operation).Permission(permission).Page(page).Size(size).Order(order).OrderKey(orderKey).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `AclsApi.GetAcls``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/docs/ErrorsApi.md b/app-services-sdk-go/kafkainstance/apiv1/client/docs/ErrorsApi.md
index b054c319..78a19faf 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/docs/ErrorsApi.md
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/docs/ErrorsApi.md
@@ -31,8 +31,8 @@ func main() {
     errorId := "errorId_example" // string | Error identifier
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.ErrorsApi.GetError(context.Background(), errorId).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.ErrorsApi.GetError(context.Background(), errorId).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `ErrorsApi.GetError``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -98,8 +98,8 @@ import (
 func main() {
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.ErrorsApi.GetErrors(context.Background()).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.ErrorsApi.GetErrors(context.Background()).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `ErrorsApi.GetErrors``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/docs/GroupsApi.md b/app-services-sdk-go/kafkainstance/apiv1/client/docs/GroupsApi.md
index 2f733274..79210cbd 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/docs/GroupsApi.md
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/docs/GroupsApi.md
@@ -35,8 +35,8 @@ func main() {
     consumerGroupId := "consumerGroupId_example" // string | Consumer group identifier
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.GroupsApi.DeleteConsumerGroupById(context.Background(), consumerGroupId).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.GroupsApi.DeleteConsumerGroupById(context.Background(), consumerGroupId).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `GroupsApi.DeleteConsumerGroupById``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -105,8 +105,8 @@ func main() {
     topic := "topic_example" // string | Filter consumer groups for a specific topic (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.GroupsApi.GetConsumerGroupById(context.Background(), consumerGroupId).Order(order).OrderKey(orderKey).PartitionFilter(partitionFilter).Topic(topic).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.GroupsApi.GetConsumerGroupById(context.Background(), consumerGroupId).Order(order).OrderKey(orderKey).PartitionFilter(partitionFilter).Topic(topic).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `GroupsApi.GetConsumerGroupById``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -186,8 +186,8 @@ func main() {
     orderKey := openapiclient.ConsumerGroupOrderKey("name") // ConsumerGroupOrderKey |  (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.GroupsApi.GetConsumerGroups(context.Background()).Offset(offset).Limit(limit).Size(size).Page(page).Topic(topic).GroupIdFilter(groupIdFilter).Order(order).OrderKey(orderKey).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.GroupsApi.GetConsumerGroups(context.Background()).Offset(offset).Limit(limit).Size(size).Page(page).Topic(topic).GroupIdFilter(groupIdFilter).Order(order).OrderKey(orderKey).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `GroupsApi.GetConsumerGroups``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -260,8 +260,8 @@ func main() {
     consumerGroupResetOffsetParameters := *openapiclient.NewConsumerGroupResetOffsetParameters(openapiclient.OffsetType("timestamp")) // ConsumerGroupResetOffsetParameters | 
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.GroupsApi.ResetConsumerGroupOffset(context.Background(), consumerGroupId).ConsumerGroupResetOffsetParameters(consumerGroupResetOffsetParameters).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.GroupsApi.ResetConsumerGroupOffset(context.Background(), consumerGroupId).ConsumerGroupResetOffsetParameters(consumerGroupResetOffsetParameters).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `GroupsApi.ResetConsumerGroupOffset``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/docs/Partition.md b/app-services-sdk-go/kafkainstance/apiv1/client/docs/Partition.md
index 3257f60e..43f3d23b 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/docs/Partition.md
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/docs/Partition.md
@@ -7,7 +7,7 @@ Name | Type | Description | Notes
 **Partition** | **int32** | The partition id, unique among partitions of the same topic | 
 **Replicas** | Pointer to [**[]Node**](Node.md) | List of replicas for the partition | [optional] 
 **Isr** | Pointer to [**[]Node**](Node.md) | List in-sync replicas for this partition. | [optional] 
-**Leader** | Pointer to [**PartitionLeader**](PartitionLeader.md) |  | [optional] 
+**Leader** | Pointer to [**Node**](Node.md) |  | [optional] 
 **Id** | Pointer to **int32** | Unique id for the partition (deprecated, use &#x60;partition&#x60; instead) | [optional] 
 
 ## Methods
@@ -101,20 +101,20 @@ HasIsr returns a boolean if a field has been set.
 
 ### GetLeader
 
-`func (o *Partition) GetLeader() PartitionLeader`
+`func (o *Partition) GetLeader() Node`
 
 GetLeader returns the Leader field if non-nil, zero value otherwise.
 
 ### GetLeaderOk
 
-`func (o *Partition) GetLeaderOk() (*PartitionLeader, bool)`
+`func (o *Partition) GetLeaderOk() (*Node, bool)`
 
 GetLeaderOk returns a tuple with the Leader field if it's non-nil, zero value otherwise
 and a boolean to check if the value has been set.
 
 ### SetLeader
 
-`func (o *Partition) SetLeader(v PartitionLeader)`
+`func (o *Partition) SetLeader(v Node)`
 
 SetLeader sets Leader field to given value.
 
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/docs/PartitionLeader.md b/app-services-sdk-go/kafkainstance/apiv1/client/docs/PartitionLeader.md
deleted file mode 100644
index 47d76597..00000000
--- a/app-services-sdk-go/kafkainstance/apiv1/client/docs/PartitionLeader.md
+++ /dev/null
@@ -1,56 +0,0 @@
-# PartitionLeader
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**Id** | Pointer to **int32** |  | [optional] 
-
-## Methods
-
-### NewPartitionLeader
-
-`func NewPartitionLeader() *PartitionLeader`
-
-NewPartitionLeader instantiates a new PartitionLeader object
-This constructor will assign default values to properties that have it defined,
-and makes sure properties required by API are set, but the set of arguments
-will change when the set of required properties is changed
-
-### NewPartitionLeaderWithDefaults
-
-`func NewPartitionLeaderWithDefaults() *PartitionLeader`
-
-NewPartitionLeaderWithDefaults instantiates a new PartitionLeader object
-This constructor will only assign default values to properties that have it defined,
-but it doesn't guarantee that properties required by API are set
-
-### GetId
-
-`func (o *PartitionLeader) GetId() int32`
-
-GetId returns the Id field if non-nil, zero value otherwise.
-
-### GetIdOk
-
-`func (o *PartitionLeader) GetIdOk() (*int32, bool)`
-
-GetIdOk returns a tuple with the Id field if it's non-nil, zero value otherwise
-and a boolean to check if the value has been set.
-
-### SetId
-
-`func (o *PartitionLeader) SetId(v int32)`
-
-SetId sets Id field to given value.
-
-### HasId
-
-`func (o *PartitionLeader) HasId() bool`
-
-HasId returns a boolean if a field has been set.
-
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/docs/RecordsApi.md b/app-services-sdk-go/kafkainstance/apiv1/client/docs/RecordsApi.md
index 8ff141cb..d87f7265 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/docs/RecordsApi.md
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/docs/RecordsApi.md
@@ -39,8 +39,8 @@ func main() {
     timestamp := TODO // interface{} | Retrieve messages with a timestamp equal to or later than this timestamp. If both `timestamp` and `offset` are requested, `timestamp` is given preference. (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.RecordsApi.ConsumeRecords(context.Background(), topicName).Include(include).Limit(limit).MaxValueLength(maxValueLength).Offset(offset).Partition(partition).Timestamp(timestamp).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.RecordsApi.ConsumeRecords(context.Background(), topicName).Include(include).Limit(limit).MaxValueLength(maxValueLength).Offset(offset).Partition(partition).Timestamp(timestamp).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `RecordsApi.ConsumeRecords``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -116,8 +116,8 @@ func main() {
     record := *openapiclient.NewRecord("Value_example") // Record | 
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.RecordsApi.ProduceRecord(context.Background(), topicName).Record(record).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.RecordsApi.ProduceRecord(context.Background(), topicName).Record(record).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `RecordsApi.ProduceRecord``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/docs/TopicsApi.md b/app-services-sdk-go/kafkainstance/apiv1/client/docs/TopicsApi.md
index 301c5a84..4f8c65d7 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/docs/TopicsApi.md
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/docs/TopicsApi.md
@@ -36,8 +36,8 @@ func main() {
     newTopicInput := *openapiclient.NewNewTopicInput("Name_example", *openapiclient.NewTopicSettings()) // NewTopicInput | Topic to create.
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.TopicsApi.CreateTopic(context.Background()).NewTopicInput(newTopicInput).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.TopicsApi.CreateTopic(context.Background()).NewTopicInput(newTopicInput).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `TopicsApi.CreateTopic``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -102,8 +102,8 @@ func main() {
     topicName := "topicName_example" // string | Name of the topic to delete
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.TopicsApi.DeleteTopic(context.Background(), topicName).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.TopicsApi.DeleteTopic(context.Background(), topicName).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `TopicsApi.DeleteTopic``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -170,8 +170,8 @@ func main() {
     topicName := "topicName_example" // string | Name of the topic to describe
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.TopicsApi.GetTopic(context.Background(), topicName).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.TopicsApi.GetTopic(context.Background(), topicName).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `TopicsApi.GetTopic``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -246,8 +246,8 @@ func main() {
     orderKey := openapiclient.TopicOrderKey("name") // TopicOrderKey | Order key to sort the topics by. (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.TopicsApi.GetTopics(context.Background()).Offset(offset).Limit(limit).Size(size).Filter(filter).Page(page).Order(order).OrderKey(orderKey).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.TopicsApi.GetTopics(context.Background()).Offset(offset).Limit(limit).Size(size).Filter(filter).Page(page).Order(order).OrderKey(orderKey).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `TopicsApi.GetTopics``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -319,8 +319,8 @@ func main() {
     topicSettings := *openapiclient.NewTopicSettings() // TopicSettings | 
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.TopicsApi.UpdateTopic(context.Background(), topicName).TopicSettings(topicSettings).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.TopicsApi.UpdateTopic(context.Background(), topicName).TopicSettings(topicSettings).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `TopicsApi.UpdateTopic``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/go.mod b/app-services-sdk-go/kafkainstance/apiv1/client/go.mod
deleted file mode 100644
index ead32606..00000000
--- a/app-services-sdk-go/kafkainstance/apiv1/client/go.mod
+++ /dev/null
@@ -1,7 +0,0 @@
-module github.com/GIT_USER_ID/GIT_REPO_ID
-
-go 1.13
-
-require (
-	golang.org/x/oauth2 v0.0.0-20210323180902-22b0adad7558
-)
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/go.sum b/app-services-sdk-go/kafkainstance/apiv1/client/go.sum
deleted file mode 100644
index 734252e6..00000000
--- a/app-services-sdk-go/kafkainstance/apiv1/client/go.sum
+++ /dev/null
@@ -1,13 +0,0 @@
-cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
-github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e h1:bRhVy7zSSasaqNksaRZiA5EEI+Ei4I1nO5Jh72wfHlg=
-golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 h1:SVwTIAaPC2U/AvvLNZ2a7OVsmBpC8L5BlwK1whH3hm0=
-golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 h1:YUO/7uOKsKeq9UokNS62b8FYywz3ker1l1vDZRCRefw=
-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508=
-google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/model_acl_binding.go b/app-services-sdk-go/kafkainstance/apiv1/client/model_acl_binding.go
index 486a070f..7b85ec9d 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/model_acl_binding.go
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/model_acl_binding.go
@@ -1,10 +1,10 @@
 /*
-Kafka Instance API
-
-API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
-
-API version: 0.13.0-SNAPSHOT
-*/
+ * Kafka Instance API
+ *
+ * API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
+ *
+ * API version: 0.13.0-SNAPSHOT
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -55,7 +55,7 @@ func NewAclBindingWithDefaults() *AclBinding {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *AclBinding) GetId() string {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret string
 		return ret
 	}
@@ -65,15 +65,15 @@ func (o *AclBinding) GetId() string {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AclBinding) GetIdOk() (*string, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *AclBinding) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -87,7 +87,7 @@ func (o *AclBinding) SetId(v string) {
 
 // GetKind returns the Kind field value if set, zero value otherwise.
 func (o *AclBinding) GetKind() string {
-	if o == nil || isNil(o.Kind) {
+	if o == nil || o.Kind == nil {
 		var ret string
 		return ret
 	}
@@ -97,15 +97,15 @@ func (o *AclBinding) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AclBinding) GetKindOk() (*string, bool) {
-	if o == nil || isNil(o.Kind) {
-    return nil, false
+	if o == nil || o.Kind == nil {
+		return nil, false
 	}
 	return o.Kind, true
 }
 
 // HasKind returns a boolean if a field has been set.
 func (o *AclBinding) HasKind() bool {
-	if o != nil && !isNil(o.Kind) {
+	if o != nil && o.Kind != nil {
 		return true
 	}
 
@@ -119,7 +119,7 @@ func (o *AclBinding) SetKind(v string) {
 
 // GetHref returns the Href field value if set, zero value otherwise.
 func (o *AclBinding) GetHref() string {
-	if o == nil || isNil(o.Href) {
+	if o == nil || o.Href == nil {
 		var ret string
 		return ret
 	}
@@ -129,15 +129,15 @@ func (o *AclBinding) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AclBinding) GetHrefOk() (*string, bool) {
-	if o == nil || isNil(o.Href) {
-    return nil, false
+	if o == nil || o.Href == nil {
+		return nil, false
 	}
 	return o.Href, true
 }
 
 // HasHref returns a boolean if a field has been set.
 func (o *AclBinding) HasHref() bool {
-	if o != nil && !isNil(o.Href) {
+	if o != nil && o.Href != nil {
 		return true
 	}
 
@@ -162,8 +162,8 @@ func (o *AclBinding) GetResourceType() AclResourceType {
 // GetResourceTypeOk returns a tuple with the ResourceType field value
 // and a boolean to check if the value has been set.
 func (o *AclBinding) GetResourceTypeOk() (*AclResourceType, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.ResourceType, true
 }
@@ -186,8 +186,8 @@ func (o *AclBinding) GetResourceName() string {
 // GetResourceNameOk returns a tuple with the ResourceName field value
 // and a boolean to check if the value has been set.
 func (o *AclBinding) GetResourceNameOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.ResourceName, true
 }
@@ -210,8 +210,8 @@ func (o *AclBinding) GetPatternType() AclPatternType {
 // GetPatternTypeOk returns a tuple with the PatternType field value
 // and a boolean to check if the value has been set.
 func (o *AclBinding) GetPatternTypeOk() (*AclPatternType, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.PatternType, true
 }
@@ -234,8 +234,8 @@ func (o *AclBinding) GetPrincipal() string {
 // GetPrincipalOk returns a tuple with the Principal field value
 // and a boolean to check if the value has been set.
 func (o *AclBinding) GetPrincipalOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Principal, true
 }
@@ -258,8 +258,8 @@ func (o *AclBinding) GetOperation() AclOperation {
 // GetOperationOk returns a tuple with the Operation field value
 // and a boolean to check if the value has been set.
 func (o *AclBinding) GetOperationOk() (*AclOperation, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Operation, true
 }
@@ -282,8 +282,8 @@ func (o *AclBinding) GetPermission() AclPermissionType {
 // GetPermissionOk returns a tuple with the Permission field value
 // and a boolean to check if the value has been set.
 func (o *AclBinding) GetPermissionOk() (*AclPermissionType, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Permission, true
 }
@@ -295,13 +295,13 @@ func (o *AclBinding) SetPermission(v AclPermissionType) {
 
 func (o AclBinding) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.Kind) {
+	if o.Kind != nil {
 		toSerialize["kind"] = o.Kind
 	}
-	if !isNil(o.Href) {
+	if o.Href != nil {
 		toSerialize["href"] = o.Href
 	}
 	if true {
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/model_acl_binding_all_of.go b/app-services-sdk-go/kafkainstance/apiv1/client/model_acl_binding_all_of.go
index 6759f7ce..ba8767bf 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/model_acl_binding_all_of.go
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/model_acl_binding_all_of.go
@@ -1,10 +1,10 @@
 /*
-Kafka Instance API
-
-API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
-
-API version: 0.13.0-SNAPSHOT
-*/
+ * Kafka Instance API
+ *
+ * API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
+ *
+ * API version: 0.13.0-SNAPSHOT
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -61,8 +61,8 @@ func (o *AclBindingAllOf) GetResourceType() AclResourceType {
 // GetResourceTypeOk returns a tuple with the ResourceType field value
 // and a boolean to check if the value has been set.
 func (o *AclBindingAllOf) GetResourceTypeOk() (*AclResourceType, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.ResourceType, true
 }
@@ -85,8 +85,8 @@ func (o *AclBindingAllOf) GetResourceName() string {
 // GetResourceNameOk returns a tuple with the ResourceName field value
 // and a boolean to check if the value has been set.
 func (o *AclBindingAllOf) GetResourceNameOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.ResourceName, true
 }
@@ -109,8 +109,8 @@ func (o *AclBindingAllOf) GetPatternType() AclPatternType {
 // GetPatternTypeOk returns a tuple with the PatternType field value
 // and a boolean to check if the value has been set.
 func (o *AclBindingAllOf) GetPatternTypeOk() (*AclPatternType, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.PatternType, true
 }
@@ -133,8 +133,8 @@ func (o *AclBindingAllOf) GetPrincipal() string {
 // GetPrincipalOk returns a tuple with the Principal field value
 // and a boolean to check if the value has been set.
 func (o *AclBindingAllOf) GetPrincipalOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Principal, true
 }
@@ -157,8 +157,8 @@ func (o *AclBindingAllOf) GetOperation() AclOperation {
 // GetOperationOk returns a tuple with the Operation field value
 // and a boolean to check if the value has been set.
 func (o *AclBindingAllOf) GetOperationOk() (*AclOperation, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Operation, true
 }
@@ -181,8 +181,8 @@ func (o *AclBindingAllOf) GetPermission() AclPermissionType {
 // GetPermissionOk returns a tuple with the Permission field value
 // and a boolean to check if the value has been set.
 func (o *AclBindingAllOf) GetPermissionOk() (*AclPermissionType, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Permission, true
 }
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/model_acl_binding_list_page.go b/app-services-sdk-go/kafkainstance/apiv1/client/model_acl_binding_list_page.go
index 02efef87..a3c469cb 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/model_acl_binding_list_page.go
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/model_acl_binding_list_page.go
@@ -1,10 +1,10 @@
 /*
-Kafka Instance API
-
-API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
-
-API version: 0.13.0-SNAPSHOT
-*/
+ * Kafka Instance API
+ *
+ * API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
+ *
+ * API version: 0.13.0-SNAPSHOT
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -47,7 +47,7 @@ func NewAclBindingListPageWithDefaults() *AclBindingListPage {
 
 // GetKind returns the Kind field value if set, zero value otherwise.
 func (o *AclBindingListPage) GetKind() string {
-	if o == nil || isNil(o.Kind) {
+	if o == nil || o.Kind == nil {
 		var ret string
 		return ret
 	}
@@ -57,15 +57,15 @@ func (o *AclBindingListPage) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AclBindingListPage) GetKindOk() (*string, bool) {
-	if o == nil || isNil(o.Kind) {
-    return nil, false
+	if o == nil || o.Kind == nil {
+		return nil, false
 	}
 	return o.Kind, true
 }
 
 // HasKind returns a boolean if a field has been set.
 func (o *AclBindingListPage) HasKind() bool {
-	if o != nil && !isNil(o.Kind) {
+	if o != nil && o.Kind != nil {
 		return true
 	}
 
@@ -89,11 +89,11 @@ func (o *AclBindingListPage) GetItems() []AclBinding {
 
 // GetItemsOk returns a tuple with the Items field value
 // and a boolean to check if the value has been set.
-func (o *AclBindingListPage) GetItemsOk() ([]AclBinding, bool) {
-	if o == nil {
-    return nil, false
+func (o *AclBindingListPage) GetItemsOk() (*[]AclBinding, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Items, true
+	return &o.Items, true
 }
 
 // SetItems sets field value
@@ -114,8 +114,8 @@ func (o *AclBindingListPage) GetTotal() int32 {
 // GetTotalOk returns a tuple with the Total field value
 // and a boolean to check if the value has been set.
 func (o *AclBindingListPage) GetTotalOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Total, true
 }
@@ -127,7 +127,7 @@ func (o *AclBindingListPage) SetTotal(v int32) {
 
 // GetSize returns the Size field value if set, zero value otherwise.
 func (o *AclBindingListPage) GetSize() int32 {
-	if o == nil || isNil(o.Size) {
+	if o == nil || o.Size == nil {
 		var ret int32
 		return ret
 	}
@@ -137,15 +137,15 @@ func (o *AclBindingListPage) GetSize() int32 {
 // GetSizeOk returns a tuple with the Size field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AclBindingListPage) GetSizeOk() (*int32, bool) {
-	if o == nil || isNil(o.Size) {
-    return nil, false
+	if o == nil || o.Size == nil {
+		return nil, false
 	}
 	return o.Size, true
 }
 
 // HasSize returns a boolean if a field has been set.
 func (o *AclBindingListPage) HasSize() bool {
-	if o != nil && !isNil(o.Size) {
+	if o != nil && o.Size != nil {
 		return true
 	}
 
@@ -159,7 +159,7 @@ func (o *AclBindingListPage) SetSize(v int32) {
 
 // GetPage returns the Page field value if set, zero value otherwise.
 func (o *AclBindingListPage) GetPage() int32 {
-	if o == nil || isNil(o.Page) {
+	if o == nil || o.Page == nil {
 		var ret int32
 		return ret
 	}
@@ -169,15 +169,15 @@ func (o *AclBindingListPage) GetPage() int32 {
 // GetPageOk returns a tuple with the Page field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AclBindingListPage) GetPageOk() (*int32, bool) {
-	if o == nil || isNil(o.Page) {
-    return nil, false
+	if o == nil || o.Page == nil {
+		return nil, false
 	}
 	return o.Page, true
 }
 
 // HasPage returns a boolean if a field has been set.
 func (o *AclBindingListPage) HasPage() bool {
-	if o != nil && !isNil(o.Page) {
+	if o != nil && o.Page != nil {
 		return true
 	}
 
@@ -191,7 +191,7 @@ func (o *AclBindingListPage) SetPage(v int32) {
 
 func (o AclBindingListPage) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Kind) {
+	if o.Kind != nil {
 		toSerialize["kind"] = o.Kind
 	}
 	if true {
@@ -200,10 +200,10 @@ func (o AclBindingListPage) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["total"] = o.Total
 	}
-	if !isNil(o.Size) {
+	if o.Size != nil {
 		toSerialize["size"] = o.Size
 	}
-	if !isNil(o.Page) {
+	if o.Page != nil {
 		toSerialize["page"] = o.Page
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/model_acl_binding_list_page_all_of.go b/app-services-sdk-go/kafkainstance/apiv1/client/model_acl_binding_list_page_all_of.go
index 1cdb86ac..01335522 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/model_acl_binding_list_page_all_of.go
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/model_acl_binding_list_page_all_of.go
@@ -1,10 +1,10 @@
 /*
-Kafka Instance API
-
-API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
-
-API version: 0.13.0-SNAPSHOT
-*/
+ * Kafka Instance API
+ *
+ * API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
+ *
+ * API version: 0.13.0-SNAPSHOT
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -16,7 +16,7 @@ import (
 
 // AclBindingListPageAllOf A page of ACL binding entries
 type AclBindingListPageAllOf struct {
-	Items []AclBinding `json:"items,omitempty"`
+	Items *[]AclBinding `json:"items,omitempty"`
 }
 
 // NewAclBindingListPageAllOf instantiates a new AclBindingListPageAllOf object
@@ -38,25 +38,25 @@ func NewAclBindingListPageAllOfWithDefaults() *AclBindingListPageAllOf {
 
 // GetItems returns the Items field value if set, zero value otherwise.
 func (o *AclBindingListPageAllOf) GetItems() []AclBinding {
-	if o == nil || isNil(o.Items) {
+	if o == nil || o.Items == nil {
 		var ret []AclBinding
 		return ret
 	}
-	return o.Items
+	return *o.Items
 }
 
 // GetItemsOk returns a tuple with the Items field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *AclBindingListPageAllOf) GetItemsOk() ([]AclBinding, bool) {
-	if o == nil || isNil(o.Items) {
-    return nil, false
+func (o *AclBindingListPageAllOf) GetItemsOk() (*[]AclBinding, bool) {
+	if o == nil || o.Items == nil {
+		return nil, false
 	}
 	return o.Items, true
 }
 
 // HasItems returns a boolean if a field has been set.
 func (o *AclBindingListPageAllOf) HasItems() bool {
-	if o != nil && !isNil(o.Items) {
+	if o != nil && o.Items != nil {
 		return true
 	}
 
@@ -65,12 +65,12 @@ func (o *AclBindingListPageAllOf) HasItems() bool {
 
 // SetItems gets a reference to the given []AclBinding and assigns it to the Items field.
 func (o *AclBindingListPageAllOf) SetItems(v []AclBinding) {
-	o.Items = v
+	o.Items = &v
 }
 
 func (o AclBindingListPageAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Items) {
+	if o.Items != nil {
 		toSerialize["items"] = o.Items
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/model_acl_binding_order_key.go b/app-services-sdk-go/kafkainstance/apiv1/client/model_acl_binding_order_key.go
index e7373e31..08f1eb90 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/model_acl_binding_order_key.go
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/model_acl_binding_order_key.go
@@ -1,10 +1,10 @@
 /*
-Kafka Instance API
-
-API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
-
-API version: 0.13.0-SNAPSHOT
-*/
+ * Kafka Instance API
+ *
+ * API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
+ *
+ * API version: 0.13.0-SNAPSHOT
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -28,8 +28,7 @@ const (
 	ACLBINDINGORDERKEY_PERMISSION AclBindingOrderKey = "permission"
 )
 
-// All allowed values of AclBindingOrderKey enum
-var AllowedAclBindingOrderKeyEnumValues = []AclBindingOrderKey{
+var allowedAclBindingOrderKeyEnumValues = []AclBindingOrderKey{
 	"resourceType",
 	"resourceName",
 	"patternType",
@@ -45,7 +44,7 @@ func (v *AclBindingOrderKey) UnmarshalJSON(src []byte) error {
 		return err
 	}
 	enumTypeValue := AclBindingOrderKey(value)
-	for _, existing := range AllowedAclBindingOrderKeyEnumValues {
+	for _, existing := range allowedAclBindingOrderKeyEnumValues {
 		if existing == enumTypeValue {
 			*v = enumTypeValue
 			return nil
@@ -62,13 +61,13 @@ func NewAclBindingOrderKeyFromValue(v string) (*AclBindingOrderKey, error) {
 	if ev.IsValid() {
 		return &ev, nil
 	} else {
-		return nil, fmt.Errorf("invalid value '%v' for AclBindingOrderKey: valid values are %v", v, AllowedAclBindingOrderKeyEnumValues)
+		return nil, fmt.Errorf("invalid value '%v' for AclBindingOrderKey: valid values are %v", v, allowedAclBindingOrderKeyEnumValues)
 	}
 }
 
 // IsValid return true if the value is valid for the enum, false otherwise
 func (v AclBindingOrderKey) IsValid() bool {
-	for _, existing := range AllowedAclBindingOrderKeyEnumValues {
+	for _, existing := range allowedAclBindingOrderKeyEnumValues {
 		if existing == v {
 			return true
 		}
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/model_acl_operation.go b/app-services-sdk-go/kafkainstance/apiv1/client/model_acl_operation.go
index 0c3abaa0..5cc24f24 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/model_acl_operation.go
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/model_acl_operation.go
@@ -1,10 +1,10 @@
 /*
-Kafka Instance API
-
-API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
-
-API version: 0.13.0-SNAPSHOT
-*/
+ * Kafka Instance API
+ *
+ * API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
+ *
+ * API version: 0.13.0-SNAPSHOT
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -31,8 +31,7 @@ const (
 	ACLOPERATION_ALTER_CONFIGS AclOperation = "ALTER_CONFIGS"
 )
 
-// All allowed values of AclOperation enum
-var AllowedAclOperationEnumValues = []AclOperation{
+var allowedAclOperationEnumValues = []AclOperation{
 	"ALL",
 	"READ",
 	"WRITE",
@@ -51,7 +50,7 @@ func (v *AclOperation) UnmarshalJSON(src []byte) error {
 		return err
 	}
 	enumTypeValue := AclOperation(value)
-	for _, existing := range AllowedAclOperationEnumValues {
+	for _, existing := range allowedAclOperationEnumValues {
 		if existing == enumTypeValue {
 			*v = enumTypeValue
 			return nil
@@ -68,13 +67,13 @@ func NewAclOperationFromValue(v string) (*AclOperation, error) {
 	if ev.IsValid() {
 		return &ev, nil
 	} else {
-		return nil, fmt.Errorf("invalid value '%v' for AclOperation: valid values are %v", v, AllowedAclOperationEnumValues)
+		return nil, fmt.Errorf("invalid value '%v' for AclOperation: valid values are %v", v, allowedAclOperationEnumValues)
 	}
 }
 
 // IsValid return true if the value is valid for the enum, false otherwise
 func (v AclOperation) IsValid() bool {
-	for _, existing := range AllowedAclOperationEnumValues {
+	for _, existing := range allowedAclOperationEnumValues {
 		if existing == v {
 			return true
 		}
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/model_acl_operation_filter.go b/app-services-sdk-go/kafkainstance/apiv1/client/model_acl_operation_filter.go
index 61c7b6fc..6c8147ba 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/model_acl_operation_filter.go
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/model_acl_operation_filter.go
@@ -1,10 +1,10 @@
 /*
-Kafka Instance API
-
-API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
-
-API version: 0.13.0-SNAPSHOT
-*/
+ * Kafka Instance API
+ *
+ * API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
+ *
+ * API version: 0.13.0-SNAPSHOT
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -32,8 +32,7 @@ const (
 	ACLOPERATIONFILTER_ANY AclOperationFilter = "ANY"
 )
 
-// All allowed values of AclOperationFilter enum
-var AllowedAclOperationFilterEnumValues = []AclOperationFilter{
+var allowedAclOperationFilterEnumValues = []AclOperationFilter{
 	"ALL",
 	"READ",
 	"WRITE",
@@ -53,7 +52,7 @@ func (v *AclOperationFilter) UnmarshalJSON(src []byte) error {
 		return err
 	}
 	enumTypeValue := AclOperationFilter(value)
-	for _, existing := range AllowedAclOperationFilterEnumValues {
+	for _, existing := range allowedAclOperationFilterEnumValues {
 		if existing == enumTypeValue {
 			*v = enumTypeValue
 			return nil
@@ -70,13 +69,13 @@ func NewAclOperationFilterFromValue(v string) (*AclOperationFilter, error) {
 	if ev.IsValid() {
 		return &ev, nil
 	} else {
-		return nil, fmt.Errorf("invalid value '%v' for AclOperationFilter: valid values are %v", v, AllowedAclOperationFilterEnumValues)
+		return nil, fmt.Errorf("invalid value '%v' for AclOperationFilter: valid values are %v", v, allowedAclOperationFilterEnumValues)
 	}
 }
 
 // IsValid return true if the value is valid for the enum, false otherwise
 func (v AclOperationFilter) IsValid() bool {
-	for _, existing := range AllowedAclOperationFilterEnumValues {
+	for _, existing := range allowedAclOperationFilterEnumValues {
 		if existing == v {
 			return true
 		}
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/model_acl_pattern_type.go b/app-services-sdk-go/kafkainstance/apiv1/client/model_acl_pattern_type.go
index f090aa21..e1b4ed23 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/model_acl_pattern_type.go
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/model_acl_pattern_type.go
@@ -1,10 +1,10 @@
 /*
-Kafka Instance API
-
-API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
-
-API version: 0.13.0-SNAPSHOT
-*/
+ * Kafka Instance API
+ *
+ * API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
+ *
+ * API version: 0.13.0-SNAPSHOT
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -24,8 +24,7 @@ const (
 	ACLPATTERNTYPE_PREFIXED AclPatternType = "PREFIXED"
 )
 
-// All allowed values of AclPatternType enum
-var AllowedAclPatternTypeEnumValues = []AclPatternType{
+var allowedAclPatternTypeEnumValues = []AclPatternType{
 	"LITERAL",
 	"PREFIXED",
 }
@@ -37,7 +36,7 @@ func (v *AclPatternType) UnmarshalJSON(src []byte) error {
 		return err
 	}
 	enumTypeValue := AclPatternType(value)
-	for _, existing := range AllowedAclPatternTypeEnumValues {
+	for _, existing := range allowedAclPatternTypeEnumValues {
 		if existing == enumTypeValue {
 			*v = enumTypeValue
 			return nil
@@ -54,13 +53,13 @@ func NewAclPatternTypeFromValue(v string) (*AclPatternType, error) {
 	if ev.IsValid() {
 		return &ev, nil
 	} else {
-		return nil, fmt.Errorf("invalid value '%v' for AclPatternType: valid values are %v", v, AllowedAclPatternTypeEnumValues)
+		return nil, fmt.Errorf("invalid value '%v' for AclPatternType: valid values are %v", v, allowedAclPatternTypeEnumValues)
 	}
 }
 
 // IsValid return true if the value is valid for the enum, false otherwise
 func (v AclPatternType) IsValid() bool {
-	for _, existing := range AllowedAclPatternTypeEnumValues {
+	for _, existing := range allowedAclPatternTypeEnumValues {
 		if existing == v {
 			return true
 		}
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/model_acl_pattern_type_filter.go b/app-services-sdk-go/kafkainstance/apiv1/client/model_acl_pattern_type_filter.go
index 9b238b20..e60c8a9f 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/model_acl_pattern_type_filter.go
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/model_acl_pattern_type_filter.go
@@ -1,10 +1,10 @@
 /*
-Kafka Instance API
-
-API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
-
-API version: 0.13.0-SNAPSHOT
-*/
+ * Kafka Instance API
+ *
+ * API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
+ *
+ * API version: 0.13.0-SNAPSHOT
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -26,8 +26,7 @@ const (
 	ACLPATTERNTYPEFILTER_MATCH AclPatternTypeFilter = "MATCH"
 )
 
-// All allowed values of AclPatternTypeFilter enum
-var AllowedAclPatternTypeFilterEnumValues = []AclPatternTypeFilter{
+var allowedAclPatternTypeFilterEnumValues = []AclPatternTypeFilter{
 	"LITERAL",
 	"PREFIXED",
 	"ANY",
@@ -41,7 +40,7 @@ func (v *AclPatternTypeFilter) UnmarshalJSON(src []byte) error {
 		return err
 	}
 	enumTypeValue := AclPatternTypeFilter(value)
-	for _, existing := range AllowedAclPatternTypeFilterEnumValues {
+	for _, existing := range allowedAclPatternTypeFilterEnumValues {
 		if existing == enumTypeValue {
 			*v = enumTypeValue
 			return nil
@@ -58,13 +57,13 @@ func NewAclPatternTypeFilterFromValue(v string) (*AclPatternTypeFilter, error) {
 	if ev.IsValid() {
 		return &ev, nil
 	} else {
-		return nil, fmt.Errorf("invalid value '%v' for AclPatternTypeFilter: valid values are %v", v, AllowedAclPatternTypeFilterEnumValues)
+		return nil, fmt.Errorf("invalid value '%v' for AclPatternTypeFilter: valid values are %v", v, allowedAclPatternTypeFilterEnumValues)
 	}
 }
 
 // IsValid return true if the value is valid for the enum, false otherwise
 func (v AclPatternTypeFilter) IsValid() bool {
-	for _, existing := range AllowedAclPatternTypeFilterEnumValues {
+	for _, existing := range allowedAclPatternTypeFilterEnumValues {
 		if existing == v {
 			return true
 		}
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/model_acl_permission_type.go b/app-services-sdk-go/kafkainstance/apiv1/client/model_acl_permission_type.go
index ffc5a1ea..1e406aef 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/model_acl_permission_type.go
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/model_acl_permission_type.go
@@ -1,10 +1,10 @@
 /*
-Kafka Instance API
-
-API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
-
-API version: 0.13.0-SNAPSHOT
-*/
+ * Kafka Instance API
+ *
+ * API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
+ *
+ * API version: 0.13.0-SNAPSHOT
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -24,8 +24,7 @@ const (
 	ACLPERMISSIONTYPE_DENY AclPermissionType = "DENY"
 )
 
-// All allowed values of AclPermissionType enum
-var AllowedAclPermissionTypeEnumValues = []AclPermissionType{
+var allowedAclPermissionTypeEnumValues = []AclPermissionType{
 	"ALLOW",
 	"DENY",
 }
@@ -37,7 +36,7 @@ func (v *AclPermissionType) UnmarshalJSON(src []byte) error {
 		return err
 	}
 	enumTypeValue := AclPermissionType(value)
-	for _, existing := range AllowedAclPermissionTypeEnumValues {
+	for _, existing := range allowedAclPermissionTypeEnumValues {
 		if existing == enumTypeValue {
 			*v = enumTypeValue
 			return nil
@@ -54,13 +53,13 @@ func NewAclPermissionTypeFromValue(v string) (*AclPermissionType, error) {
 	if ev.IsValid() {
 		return &ev, nil
 	} else {
-		return nil, fmt.Errorf("invalid value '%v' for AclPermissionType: valid values are %v", v, AllowedAclPermissionTypeEnumValues)
+		return nil, fmt.Errorf("invalid value '%v' for AclPermissionType: valid values are %v", v, allowedAclPermissionTypeEnumValues)
 	}
 }
 
 // IsValid return true if the value is valid for the enum, false otherwise
 func (v AclPermissionType) IsValid() bool {
-	for _, existing := range AllowedAclPermissionTypeEnumValues {
+	for _, existing := range allowedAclPermissionTypeEnumValues {
 		if existing == v {
 			return true
 		}
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/model_acl_permission_type_filter.go b/app-services-sdk-go/kafkainstance/apiv1/client/model_acl_permission_type_filter.go
index 15d59235..888d66d9 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/model_acl_permission_type_filter.go
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/model_acl_permission_type_filter.go
@@ -1,10 +1,10 @@
 /*
-Kafka Instance API
-
-API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
-
-API version: 0.13.0-SNAPSHOT
-*/
+ * Kafka Instance API
+ *
+ * API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
+ *
+ * API version: 0.13.0-SNAPSHOT
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -25,8 +25,7 @@ const (
 	ACLPERMISSIONTYPEFILTER_ANY AclPermissionTypeFilter = "ANY"
 )
 
-// All allowed values of AclPermissionTypeFilter enum
-var AllowedAclPermissionTypeFilterEnumValues = []AclPermissionTypeFilter{
+var allowedAclPermissionTypeFilterEnumValues = []AclPermissionTypeFilter{
 	"ALLOW",
 	"DENY",
 	"ANY",
@@ -39,7 +38,7 @@ func (v *AclPermissionTypeFilter) UnmarshalJSON(src []byte) error {
 		return err
 	}
 	enumTypeValue := AclPermissionTypeFilter(value)
-	for _, existing := range AllowedAclPermissionTypeFilterEnumValues {
+	for _, existing := range allowedAclPermissionTypeFilterEnumValues {
 		if existing == enumTypeValue {
 			*v = enumTypeValue
 			return nil
@@ -56,13 +55,13 @@ func NewAclPermissionTypeFilterFromValue(v string) (*AclPermissionTypeFilter, er
 	if ev.IsValid() {
 		return &ev, nil
 	} else {
-		return nil, fmt.Errorf("invalid value '%v' for AclPermissionTypeFilter: valid values are %v", v, AllowedAclPermissionTypeFilterEnumValues)
+		return nil, fmt.Errorf("invalid value '%v' for AclPermissionTypeFilter: valid values are %v", v, allowedAclPermissionTypeFilterEnumValues)
 	}
 }
 
 // IsValid return true if the value is valid for the enum, false otherwise
 func (v AclPermissionTypeFilter) IsValid() bool {
-	for _, existing := range AllowedAclPermissionTypeFilterEnumValues {
+	for _, existing := range allowedAclPermissionTypeFilterEnumValues {
 		if existing == v {
 			return true
 		}
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/model_acl_resource_type.go b/app-services-sdk-go/kafkainstance/apiv1/client/model_acl_resource_type.go
index 98dd7a98..e70c5746 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/model_acl_resource_type.go
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/model_acl_resource_type.go
@@ -1,10 +1,10 @@
 /*
-Kafka Instance API
-
-API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
-
-API version: 0.13.0-SNAPSHOT
-*/
+ * Kafka Instance API
+ *
+ * API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
+ *
+ * API version: 0.13.0-SNAPSHOT
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -26,8 +26,7 @@ const (
 	ACLRESOURCETYPE_TRANSACTIONAL_ID AclResourceType = "TRANSACTIONAL_ID"
 )
 
-// All allowed values of AclResourceType enum
-var AllowedAclResourceTypeEnumValues = []AclResourceType{
+var allowedAclResourceTypeEnumValues = []AclResourceType{
 	"GROUP",
 	"TOPIC",
 	"CLUSTER",
@@ -41,7 +40,7 @@ func (v *AclResourceType) UnmarshalJSON(src []byte) error {
 		return err
 	}
 	enumTypeValue := AclResourceType(value)
-	for _, existing := range AllowedAclResourceTypeEnumValues {
+	for _, existing := range allowedAclResourceTypeEnumValues {
 		if existing == enumTypeValue {
 			*v = enumTypeValue
 			return nil
@@ -58,13 +57,13 @@ func NewAclResourceTypeFromValue(v string) (*AclResourceType, error) {
 	if ev.IsValid() {
 		return &ev, nil
 	} else {
-		return nil, fmt.Errorf("invalid value '%v' for AclResourceType: valid values are %v", v, AllowedAclResourceTypeEnumValues)
+		return nil, fmt.Errorf("invalid value '%v' for AclResourceType: valid values are %v", v, allowedAclResourceTypeEnumValues)
 	}
 }
 
 // IsValid return true if the value is valid for the enum, false otherwise
 func (v AclResourceType) IsValid() bool {
-	for _, existing := range AllowedAclResourceTypeEnumValues {
+	for _, existing := range allowedAclResourceTypeEnumValues {
 		if existing == v {
 			return true
 		}
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/model_acl_resource_type_filter.go b/app-services-sdk-go/kafkainstance/apiv1/client/model_acl_resource_type_filter.go
index 97f136ad..41ce0285 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/model_acl_resource_type_filter.go
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/model_acl_resource_type_filter.go
@@ -1,10 +1,10 @@
 /*
-Kafka Instance API
-
-API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
-
-API version: 0.13.0-SNAPSHOT
-*/
+ * Kafka Instance API
+ *
+ * API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
+ *
+ * API version: 0.13.0-SNAPSHOT
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -27,8 +27,7 @@ const (
 	ACLRESOURCETYPEFILTER_TRANSACTIONAL_ID AclResourceTypeFilter = "TRANSACTIONAL_ID"
 )
 
-// All allowed values of AclResourceTypeFilter enum
-var AllowedAclResourceTypeFilterEnumValues = []AclResourceTypeFilter{
+var allowedAclResourceTypeFilterEnumValues = []AclResourceTypeFilter{
 	"ANY",
 	"GROUP",
 	"TOPIC",
@@ -43,7 +42,7 @@ func (v *AclResourceTypeFilter) UnmarshalJSON(src []byte) error {
 		return err
 	}
 	enumTypeValue := AclResourceTypeFilter(value)
-	for _, existing := range AllowedAclResourceTypeFilterEnumValues {
+	for _, existing := range allowedAclResourceTypeFilterEnumValues {
 		if existing == enumTypeValue {
 			*v = enumTypeValue
 			return nil
@@ -60,13 +59,13 @@ func NewAclResourceTypeFilterFromValue(v string) (*AclResourceTypeFilter, error)
 	if ev.IsValid() {
 		return &ev, nil
 	} else {
-		return nil, fmt.Errorf("invalid value '%v' for AclResourceTypeFilter: valid values are %v", v, AllowedAclResourceTypeFilterEnumValues)
+		return nil, fmt.Errorf("invalid value '%v' for AclResourceTypeFilter: valid values are %v", v, allowedAclResourceTypeFilterEnumValues)
 	}
 }
 
 // IsValid return true if the value is valid for the enum, false otherwise
 func (v AclResourceTypeFilter) IsValid() bool {
-	for _, existing := range AllowedAclResourceTypeFilterEnumValues {
+	for _, existing := range allowedAclResourceTypeFilterEnumValues {
 		if existing == v {
 			return true
 		}
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/model_config_entry.go b/app-services-sdk-go/kafkainstance/apiv1/client/model_config_entry.go
index 247976a9..ad0e542c 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/model_config_entry.go
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/model_config_entry.go
@@ -1,10 +1,10 @@
 /*
-Kafka Instance API
-
-API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
-
-API version: 0.13.0-SNAPSHOT
-*/
+ * Kafka Instance API
+ *
+ * API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
+ *
+ * API version: 0.13.0-SNAPSHOT
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -54,8 +54,8 @@ func (o *ConfigEntry) GetKey() string {
 // GetKeyOk returns a tuple with the Key field value
 // and a boolean to check if the value has been set.
 func (o *ConfigEntry) GetKeyOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Key, true
 }
@@ -78,8 +78,8 @@ func (o *ConfigEntry) GetValue() string {
 // GetValueOk returns a tuple with the Value field value
 // and a boolean to check if the value has been set.
 func (o *ConfigEntry) GetValueOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Value, true
 }
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/model_consumer.go b/app-services-sdk-go/kafkainstance/apiv1/client/model_consumer.go
index 0a3e5252..7e1a893b 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/model_consumer.go
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/model_consumer.go
@@ -1,10 +1,10 @@
 /*
-Kafka Instance API
-
-API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
-
-API version: 0.13.0-SNAPSHOT
-*/
+ * Kafka Instance API
+ *
+ * API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
+ *
+ * API version: 0.13.0-SNAPSHOT
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -67,8 +67,8 @@ func (o *Consumer) GetGroupId() string {
 // GetGroupIdOk returns a tuple with the GroupId field value
 // and a boolean to check if the value has been set.
 func (o *Consumer) GetGroupIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.GroupId, true
 }
@@ -91,8 +91,8 @@ func (o *Consumer) GetTopic() string {
 // GetTopicOk returns a tuple with the Topic field value
 // and a boolean to check if the value has been set.
 func (o *Consumer) GetTopicOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Topic, true
 }
@@ -115,8 +115,8 @@ func (o *Consumer) GetPartition() int32 {
 // GetPartitionOk returns a tuple with the Partition field value
 // and a boolean to check if the value has been set.
 func (o *Consumer) GetPartitionOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Partition, true
 }
@@ -139,8 +139,8 @@ func (o *Consumer) GetOffset() int64 {
 // GetOffsetOk returns a tuple with the Offset field value
 // and a boolean to check if the value has been set.
 func (o *Consumer) GetOffsetOk() (*int64, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Offset, true
 }
@@ -152,7 +152,7 @@ func (o *Consumer) SetOffset(v int64) {
 
 // GetLogEndOffset returns the LogEndOffset field value if set, zero value otherwise.
 func (o *Consumer) GetLogEndOffset() int64 {
-	if o == nil || isNil(o.LogEndOffset) {
+	if o == nil || o.LogEndOffset == nil {
 		var ret int64
 		return ret
 	}
@@ -162,15 +162,15 @@ func (o *Consumer) GetLogEndOffset() int64 {
 // GetLogEndOffsetOk returns a tuple with the LogEndOffset field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Consumer) GetLogEndOffsetOk() (*int64, bool) {
-	if o == nil || isNil(o.LogEndOffset) {
-    return nil, false
+	if o == nil || o.LogEndOffset == nil {
+		return nil, false
 	}
 	return o.LogEndOffset, true
 }
 
 // HasLogEndOffset returns a boolean if a field has been set.
 func (o *Consumer) HasLogEndOffset() bool {
-	if o != nil && !isNil(o.LogEndOffset) {
+	if o != nil && o.LogEndOffset != nil {
 		return true
 	}
 
@@ -195,8 +195,8 @@ func (o *Consumer) GetLag() int64 {
 // GetLagOk returns a tuple with the Lag field value
 // and a boolean to check if the value has been set.
 func (o *Consumer) GetLagOk() (*int64, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Lag, true
 }
@@ -208,7 +208,7 @@ func (o *Consumer) SetLag(v int64) {
 
 // GetMemberId returns the MemberId field value if set, zero value otherwise.
 func (o *Consumer) GetMemberId() string {
-	if o == nil || isNil(o.MemberId) {
+	if o == nil || o.MemberId == nil {
 		var ret string
 		return ret
 	}
@@ -218,15 +218,15 @@ func (o *Consumer) GetMemberId() string {
 // GetMemberIdOk returns a tuple with the MemberId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Consumer) GetMemberIdOk() (*string, bool) {
-	if o == nil || isNil(o.MemberId) {
-    return nil, false
+	if o == nil || o.MemberId == nil {
+		return nil, false
 	}
 	return o.MemberId, true
 }
 
 // HasMemberId returns a boolean if a field has been set.
 func (o *Consumer) HasMemberId() bool {
-	if o != nil && !isNil(o.MemberId) {
+	if o != nil && o.MemberId != nil {
 		return true
 	}
 
@@ -252,13 +252,13 @@ func (o Consumer) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["offset"] = o.Offset
 	}
-	if !isNil(o.LogEndOffset) {
+	if o.LogEndOffset != nil {
 		toSerialize["logEndOffset"] = o.LogEndOffset
 	}
 	if true {
 		toSerialize["lag"] = o.Lag
 	}
-	if !isNil(o.MemberId) {
+	if o.MemberId != nil {
 		toSerialize["memberId"] = o.MemberId
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/model_consumer_group.go b/app-services-sdk-go/kafkainstance/apiv1/client/model_consumer_group.go
index c48ecf07..cc28856c 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/model_consumer_group.go
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/model_consumer_group.go
@@ -1,10 +1,10 @@
 /*
-Kafka Instance API
-
-API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
-
-API version: 0.13.0-SNAPSHOT
-*/
+ * Kafka Instance API
+ *
+ * API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
+ *
+ * API version: 0.13.0-SNAPSHOT
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -50,7 +50,7 @@ func NewConsumerGroupWithDefaults() *ConsumerGroup {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *ConsumerGroup) GetId() string {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret string
 		return ret
 	}
@@ -60,15 +60,15 @@ func (o *ConsumerGroup) GetId() string {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConsumerGroup) GetIdOk() (*string, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *ConsumerGroup) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -82,7 +82,7 @@ func (o *ConsumerGroup) SetId(v string) {
 
 // GetKind returns the Kind field value if set, zero value otherwise.
 func (o *ConsumerGroup) GetKind() string {
-	if o == nil || isNil(o.Kind) {
+	if o == nil || o.Kind == nil {
 		var ret string
 		return ret
 	}
@@ -92,15 +92,15 @@ func (o *ConsumerGroup) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConsumerGroup) GetKindOk() (*string, bool) {
-	if o == nil || isNil(o.Kind) {
-    return nil, false
+	if o == nil || o.Kind == nil {
+		return nil, false
 	}
 	return o.Kind, true
 }
 
 // HasKind returns a boolean if a field has been set.
 func (o *ConsumerGroup) HasKind() bool {
-	if o != nil && !isNil(o.Kind) {
+	if o != nil && o.Kind != nil {
 		return true
 	}
 
@@ -114,7 +114,7 @@ func (o *ConsumerGroup) SetKind(v string) {
 
 // GetHref returns the Href field value if set, zero value otherwise.
 func (o *ConsumerGroup) GetHref() string {
-	if o == nil || isNil(o.Href) {
+	if o == nil || o.Href == nil {
 		var ret string
 		return ret
 	}
@@ -124,15 +124,15 @@ func (o *ConsumerGroup) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConsumerGroup) GetHrefOk() (*string, bool) {
-	if o == nil || isNil(o.Href) {
-    return nil, false
+	if o == nil || o.Href == nil {
+		return nil, false
 	}
 	return o.Href, true
 }
 
 // HasHref returns a boolean if a field has been set.
 func (o *ConsumerGroup) HasHref() bool {
-	if o != nil && !isNil(o.Href) {
+	if o != nil && o.Href != nil {
 		return true
 	}
 
@@ -157,8 +157,8 @@ func (o *ConsumerGroup) GetGroupId() string {
 // GetGroupIdOk returns a tuple with the GroupId field value
 // and a boolean to check if the value has been set.
 func (o *ConsumerGroup) GetGroupIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.GroupId, true
 }
@@ -170,7 +170,7 @@ func (o *ConsumerGroup) SetGroupId(v string) {
 
 // GetState returns the State field value if set, zero value otherwise.
 func (o *ConsumerGroup) GetState() ConsumerGroupState {
-	if o == nil || isNil(o.State) {
+	if o == nil || o.State == nil {
 		var ret ConsumerGroupState
 		return ret
 	}
@@ -180,15 +180,15 @@ func (o *ConsumerGroup) GetState() ConsumerGroupState {
 // GetStateOk returns a tuple with the State field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConsumerGroup) GetStateOk() (*ConsumerGroupState, bool) {
-	if o == nil || isNil(o.State) {
-    return nil, false
+	if o == nil || o.State == nil {
+		return nil, false
 	}
 	return o.State, true
 }
 
 // HasState returns a boolean if a field has been set.
 func (o *ConsumerGroup) HasState() bool {
-	if o != nil && !isNil(o.State) {
+	if o != nil && o.State != nil {
 		return true
 	}
 
@@ -212,11 +212,11 @@ func (o *ConsumerGroup) GetConsumers() []Consumer {
 
 // GetConsumersOk returns a tuple with the Consumers field value
 // and a boolean to check if the value has been set.
-func (o *ConsumerGroup) GetConsumersOk() ([]Consumer, bool) {
-	if o == nil {
-    return nil, false
+func (o *ConsumerGroup) GetConsumersOk() (*[]Consumer, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Consumers, true
+	return &o.Consumers, true
 }
 
 // SetConsumers sets field value
@@ -226,7 +226,7 @@ func (o *ConsumerGroup) SetConsumers(v []Consumer) {
 
 // GetMetrics returns the Metrics field value if set, zero value otherwise.
 func (o *ConsumerGroup) GetMetrics() ConsumerGroupMetrics {
-	if o == nil || isNil(o.Metrics) {
+	if o == nil || o.Metrics == nil {
 		var ret ConsumerGroupMetrics
 		return ret
 	}
@@ -236,15 +236,15 @@ func (o *ConsumerGroup) GetMetrics() ConsumerGroupMetrics {
 // GetMetricsOk returns a tuple with the Metrics field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConsumerGroup) GetMetricsOk() (*ConsumerGroupMetrics, bool) {
-	if o == nil || isNil(o.Metrics) {
-    return nil, false
+	if o == nil || o.Metrics == nil {
+		return nil, false
 	}
 	return o.Metrics, true
 }
 
 // HasMetrics returns a boolean if a field has been set.
 func (o *ConsumerGroup) HasMetrics() bool {
-	if o != nil && !isNil(o.Metrics) {
+	if o != nil && o.Metrics != nil {
 		return true
 	}
 
@@ -258,25 +258,25 @@ func (o *ConsumerGroup) SetMetrics(v ConsumerGroupMetrics) {
 
 func (o ConsumerGroup) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.Kind) {
+	if o.Kind != nil {
 		toSerialize["kind"] = o.Kind
 	}
-	if !isNil(o.Href) {
+	if o.Href != nil {
 		toSerialize["href"] = o.Href
 	}
 	if true {
 		toSerialize["groupId"] = o.GroupId
 	}
-	if !isNil(o.State) {
+	if o.State != nil {
 		toSerialize["state"] = o.State
 	}
 	if true {
 		toSerialize["consumers"] = o.Consumers
 	}
-	if !isNil(o.Metrics) {
+	if o.Metrics != nil {
 		toSerialize["metrics"] = o.Metrics
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/model_consumer_group_all_of.go b/app-services-sdk-go/kafkainstance/apiv1/client/model_consumer_group_all_of.go
index e95ed904..e292c13b 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/model_consumer_group_all_of.go
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/model_consumer_group_all_of.go
@@ -1,10 +1,10 @@
 /*
-Kafka Instance API
-
-API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
-
-API version: 0.13.0-SNAPSHOT
-*/
+ * Kafka Instance API
+ *
+ * API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
+ *
+ * API version: 0.13.0-SNAPSHOT
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -56,8 +56,8 @@ func (o *ConsumerGroupAllOf) GetGroupId() string {
 // GetGroupIdOk returns a tuple with the GroupId field value
 // and a boolean to check if the value has been set.
 func (o *ConsumerGroupAllOf) GetGroupIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.GroupId, true
 }
@@ -69,7 +69,7 @@ func (o *ConsumerGroupAllOf) SetGroupId(v string) {
 
 // GetState returns the State field value if set, zero value otherwise.
 func (o *ConsumerGroupAllOf) GetState() ConsumerGroupState {
-	if o == nil || isNil(o.State) {
+	if o == nil || o.State == nil {
 		var ret ConsumerGroupState
 		return ret
 	}
@@ -79,15 +79,15 @@ func (o *ConsumerGroupAllOf) GetState() ConsumerGroupState {
 // GetStateOk returns a tuple with the State field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConsumerGroupAllOf) GetStateOk() (*ConsumerGroupState, bool) {
-	if o == nil || isNil(o.State) {
-    return nil, false
+	if o == nil || o.State == nil {
+		return nil, false
 	}
 	return o.State, true
 }
 
 // HasState returns a boolean if a field has been set.
 func (o *ConsumerGroupAllOf) HasState() bool {
-	if o != nil && !isNil(o.State) {
+	if o != nil && o.State != nil {
 		return true
 	}
 
@@ -111,11 +111,11 @@ func (o *ConsumerGroupAllOf) GetConsumers() []Consumer {
 
 // GetConsumersOk returns a tuple with the Consumers field value
 // and a boolean to check if the value has been set.
-func (o *ConsumerGroupAllOf) GetConsumersOk() ([]Consumer, bool) {
-	if o == nil {
-    return nil, false
+func (o *ConsumerGroupAllOf) GetConsumersOk() (*[]Consumer, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Consumers, true
+	return &o.Consumers, true
 }
 
 // SetConsumers sets field value
@@ -125,7 +125,7 @@ func (o *ConsumerGroupAllOf) SetConsumers(v []Consumer) {
 
 // GetMetrics returns the Metrics field value if set, zero value otherwise.
 func (o *ConsumerGroupAllOf) GetMetrics() ConsumerGroupMetrics {
-	if o == nil || isNil(o.Metrics) {
+	if o == nil || o.Metrics == nil {
 		var ret ConsumerGroupMetrics
 		return ret
 	}
@@ -135,15 +135,15 @@ func (o *ConsumerGroupAllOf) GetMetrics() ConsumerGroupMetrics {
 // GetMetricsOk returns a tuple with the Metrics field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConsumerGroupAllOf) GetMetricsOk() (*ConsumerGroupMetrics, bool) {
-	if o == nil || isNil(o.Metrics) {
-    return nil, false
+	if o == nil || o.Metrics == nil {
+		return nil, false
 	}
 	return o.Metrics, true
 }
 
 // HasMetrics returns a boolean if a field has been set.
 func (o *ConsumerGroupAllOf) HasMetrics() bool {
-	if o != nil && !isNil(o.Metrics) {
+	if o != nil && o.Metrics != nil {
 		return true
 	}
 
@@ -160,13 +160,13 @@ func (o ConsumerGroupAllOf) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["groupId"] = o.GroupId
 	}
-	if !isNil(o.State) {
+	if o.State != nil {
 		toSerialize["state"] = o.State
 	}
 	if true {
 		toSerialize["consumers"] = o.Consumers
 	}
-	if !isNil(o.Metrics) {
+	if o.Metrics != nil {
 		toSerialize["metrics"] = o.Metrics
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/model_consumer_group_description_order_key.go b/app-services-sdk-go/kafkainstance/apiv1/client/model_consumer_group_description_order_key.go
index 56cbee7a..ee43c60a 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/model_consumer_group_description_order_key.go
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/model_consumer_group_description_order_key.go
@@ -1,10 +1,10 @@
 /*
-Kafka Instance API
-
-API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
-
-API version: 0.13.0-SNAPSHOT
-*/
+ * Kafka Instance API
+ *
+ * API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
+ *
+ * API version: 0.13.0-SNAPSHOT
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -26,8 +26,7 @@ const (
 	CONSUMERGROUPDESCRIPTIONORDERKEY_PARTITION ConsumerGroupDescriptionOrderKey = "partition"
 )
 
-// All allowed values of ConsumerGroupDescriptionOrderKey enum
-var AllowedConsumerGroupDescriptionOrderKeyEnumValues = []ConsumerGroupDescriptionOrderKey{
+var allowedConsumerGroupDescriptionOrderKeyEnumValues = []ConsumerGroupDescriptionOrderKey{
 	"offset",
 	"endOffset",
 	"lag",
@@ -41,7 +40,7 @@ func (v *ConsumerGroupDescriptionOrderKey) UnmarshalJSON(src []byte) error {
 		return err
 	}
 	enumTypeValue := ConsumerGroupDescriptionOrderKey(value)
-	for _, existing := range AllowedConsumerGroupDescriptionOrderKeyEnumValues {
+	for _, existing := range allowedConsumerGroupDescriptionOrderKeyEnumValues {
 		if existing == enumTypeValue {
 			*v = enumTypeValue
 			return nil
@@ -58,13 +57,13 @@ func NewConsumerGroupDescriptionOrderKeyFromValue(v string) (*ConsumerGroupDescr
 	if ev.IsValid() {
 		return &ev, nil
 	} else {
-		return nil, fmt.Errorf("invalid value '%v' for ConsumerGroupDescriptionOrderKey: valid values are %v", v, AllowedConsumerGroupDescriptionOrderKeyEnumValues)
+		return nil, fmt.Errorf("invalid value '%v' for ConsumerGroupDescriptionOrderKey: valid values are %v", v, allowedConsumerGroupDescriptionOrderKeyEnumValues)
 	}
 }
 
 // IsValid return true if the value is valid for the enum, false otherwise
 func (v ConsumerGroupDescriptionOrderKey) IsValid() bool {
-	for _, existing := range AllowedConsumerGroupDescriptionOrderKeyEnumValues {
+	for _, existing := range allowedConsumerGroupDescriptionOrderKeyEnumValues {
 		if existing == v {
 			return true
 		}
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/model_consumer_group_list.go b/app-services-sdk-go/kafkainstance/apiv1/client/model_consumer_group_list.go
index 829413eb..c8d8d4a5 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/model_consumer_group_list.go
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/model_consumer_group_list.go
@@ -1,10 +1,10 @@
 /*
-Kafka Instance API
-
-API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
-
-API version: 0.13.0-SNAPSHOT
-*/
+ * Kafka Instance API
+ *
+ * API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
+ *
+ * API version: 0.13.0-SNAPSHOT
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -25,13 +25,10 @@ type ConsumerGroupList struct {
 	// Current page number (returned for fetch requests)
 	Page *int32 `json:"page,omitempty"`
 	// Offset of the first record returned, zero-based
-	// Deprecated
 	Offset *int32 `json:"offset,omitempty"`
 	// Maximum number of records to return, from request
-	// Deprecated
 	Limit *int32 `json:"limit,omitempty"`
 	// Total number of entries in the full result set
-	// Deprecated
 	Count *int32 `json:"count,omitempty"`
 }
 
@@ -56,7 +53,7 @@ func NewConsumerGroupListWithDefaults() *ConsumerGroupList {
 
 // GetKind returns the Kind field value if set, zero value otherwise.
 func (o *ConsumerGroupList) GetKind() string {
-	if o == nil || isNil(o.Kind) {
+	if o == nil || o.Kind == nil {
 		var ret string
 		return ret
 	}
@@ -66,15 +63,15 @@ func (o *ConsumerGroupList) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConsumerGroupList) GetKindOk() (*string, bool) {
-	if o == nil || isNil(o.Kind) {
-    return nil, false
+	if o == nil || o.Kind == nil {
+		return nil, false
 	}
 	return o.Kind, true
 }
 
 // HasKind returns a boolean if a field has been set.
 func (o *ConsumerGroupList) HasKind() bool {
-	if o != nil && !isNil(o.Kind) {
+	if o != nil && o.Kind != nil {
 		return true
 	}
 
@@ -98,11 +95,11 @@ func (o *ConsumerGroupList) GetItems() []ConsumerGroup {
 
 // GetItemsOk returns a tuple with the Items field value
 // and a boolean to check if the value has been set.
-func (o *ConsumerGroupList) GetItemsOk() ([]ConsumerGroup, bool) {
-	if o == nil {
-    return nil, false
+func (o *ConsumerGroupList) GetItemsOk() (*[]ConsumerGroup, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Items, true
+	return &o.Items, true
 }
 
 // SetItems sets field value
@@ -123,8 +120,8 @@ func (o *ConsumerGroupList) GetTotal() int32 {
 // GetTotalOk returns a tuple with the Total field value
 // and a boolean to check if the value has been set.
 func (o *ConsumerGroupList) GetTotalOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Total, true
 }
@@ -136,7 +133,7 @@ func (o *ConsumerGroupList) SetTotal(v int32) {
 
 // GetSize returns the Size field value if set, zero value otherwise.
 func (o *ConsumerGroupList) GetSize() int32 {
-	if o == nil || isNil(o.Size) {
+	if o == nil || o.Size == nil {
 		var ret int32
 		return ret
 	}
@@ -146,15 +143,15 @@ func (o *ConsumerGroupList) GetSize() int32 {
 // GetSizeOk returns a tuple with the Size field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConsumerGroupList) GetSizeOk() (*int32, bool) {
-	if o == nil || isNil(o.Size) {
-    return nil, false
+	if o == nil || o.Size == nil {
+		return nil, false
 	}
 	return o.Size, true
 }
 
 // HasSize returns a boolean if a field has been set.
 func (o *ConsumerGroupList) HasSize() bool {
-	if o != nil && !isNil(o.Size) {
+	if o != nil && o.Size != nil {
 		return true
 	}
 
@@ -168,7 +165,7 @@ func (o *ConsumerGroupList) SetSize(v int32) {
 
 // GetPage returns the Page field value if set, zero value otherwise.
 func (o *ConsumerGroupList) GetPage() int32 {
-	if o == nil || isNil(o.Page) {
+	if o == nil || o.Page == nil {
 		var ret int32
 		return ret
 	}
@@ -178,15 +175,15 @@ func (o *ConsumerGroupList) GetPage() int32 {
 // GetPageOk returns a tuple with the Page field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConsumerGroupList) GetPageOk() (*int32, bool) {
-	if o == nil || isNil(o.Page) {
-    return nil, false
+	if o == nil || o.Page == nil {
+		return nil, false
 	}
 	return o.Page, true
 }
 
 // HasPage returns a boolean if a field has been set.
 func (o *ConsumerGroupList) HasPage() bool {
-	if o != nil && !isNil(o.Page) {
+	if o != nil && o.Page != nil {
 		return true
 	}
 
@@ -199,9 +196,8 @@ func (o *ConsumerGroupList) SetPage(v int32) {
 }
 
 // GetOffset returns the Offset field value if set, zero value otherwise.
-// Deprecated
 func (o *ConsumerGroupList) GetOffset() int32 {
-	if o == nil || isNil(o.Offset) {
+	if o == nil || o.Offset == nil {
 		var ret int32
 		return ret
 	}
@@ -210,17 +206,16 @@ func (o *ConsumerGroupList) GetOffset() int32 {
 
 // GetOffsetOk returns a tuple with the Offset field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-// Deprecated
 func (o *ConsumerGroupList) GetOffsetOk() (*int32, bool) {
-	if o == nil || isNil(o.Offset) {
-    return nil, false
+	if o == nil || o.Offset == nil {
+		return nil, false
 	}
 	return o.Offset, true
 }
 
 // HasOffset returns a boolean if a field has been set.
 func (o *ConsumerGroupList) HasOffset() bool {
-	if o != nil && !isNil(o.Offset) {
+	if o != nil && o.Offset != nil {
 		return true
 	}
 
@@ -228,15 +223,13 @@ func (o *ConsumerGroupList) HasOffset() bool {
 }
 
 // SetOffset gets a reference to the given int32 and assigns it to the Offset field.
-// Deprecated
 func (o *ConsumerGroupList) SetOffset(v int32) {
 	o.Offset = &v
 }
 
 // GetLimit returns the Limit field value if set, zero value otherwise.
-// Deprecated
 func (o *ConsumerGroupList) GetLimit() int32 {
-	if o == nil || isNil(o.Limit) {
+	if o == nil || o.Limit == nil {
 		var ret int32
 		return ret
 	}
@@ -245,17 +238,16 @@ func (o *ConsumerGroupList) GetLimit() int32 {
 
 // GetLimitOk returns a tuple with the Limit field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-// Deprecated
 func (o *ConsumerGroupList) GetLimitOk() (*int32, bool) {
-	if o == nil || isNil(o.Limit) {
-    return nil, false
+	if o == nil || o.Limit == nil {
+		return nil, false
 	}
 	return o.Limit, true
 }
 
 // HasLimit returns a boolean if a field has been set.
 func (o *ConsumerGroupList) HasLimit() bool {
-	if o != nil && !isNil(o.Limit) {
+	if o != nil && o.Limit != nil {
 		return true
 	}
 
@@ -263,15 +255,13 @@ func (o *ConsumerGroupList) HasLimit() bool {
 }
 
 // SetLimit gets a reference to the given int32 and assigns it to the Limit field.
-// Deprecated
 func (o *ConsumerGroupList) SetLimit(v int32) {
 	o.Limit = &v
 }
 
 // GetCount returns the Count field value if set, zero value otherwise.
-// Deprecated
 func (o *ConsumerGroupList) GetCount() int32 {
-	if o == nil || isNil(o.Count) {
+	if o == nil || o.Count == nil {
 		var ret int32
 		return ret
 	}
@@ -280,17 +270,16 @@ func (o *ConsumerGroupList) GetCount() int32 {
 
 // GetCountOk returns a tuple with the Count field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-// Deprecated
 func (o *ConsumerGroupList) GetCountOk() (*int32, bool) {
-	if o == nil || isNil(o.Count) {
-    return nil, false
+	if o == nil || o.Count == nil {
+		return nil, false
 	}
 	return o.Count, true
 }
 
 // HasCount returns a boolean if a field has been set.
 func (o *ConsumerGroupList) HasCount() bool {
-	if o != nil && !isNil(o.Count) {
+	if o != nil && o.Count != nil {
 		return true
 	}
 
@@ -298,14 +287,13 @@ func (o *ConsumerGroupList) HasCount() bool {
 }
 
 // SetCount gets a reference to the given int32 and assigns it to the Count field.
-// Deprecated
 func (o *ConsumerGroupList) SetCount(v int32) {
 	o.Count = &v
 }
 
 func (o ConsumerGroupList) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Kind) {
+	if o.Kind != nil {
 		toSerialize["kind"] = o.Kind
 	}
 	if true {
@@ -314,19 +302,19 @@ func (o ConsumerGroupList) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["total"] = o.Total
 	}
-	if !isNil(o.Size) {
+	if o.Size != nil {
 		toSerialize["size"] = o.Size
 	}
-	if !isNil(o.Page) {
+	if o.Page != nil {
 		toSerialize["page"] = o.Page
 	}
-	if !isNil(o.Offset) {
+	if o.Offset != nil {
 		toSerialize["offset"] = o.Offset
 	}
-	if !isNil(o.Limit) {
+	if o.Limit != nil {
 		toSerialize["limit"] = o.Limit
 	}
-	if !isNil(o.Count) {
+	if o.Count != nil {
 		toSerialize["count"] = o.Count
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/model_consumer_group_list_all_of.go b/app-services-sdk-go/kafkainstance/apiv1/client/model_consumer_group_list_all_of.go
index e3fa07fe..bfb2d7ea 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/model_consumer_group_list_all_of.go
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/model_consumer_group_list_all_of.go
@@ -1,10 +1,10 @@
 /*
-Kafka Instance API
-
-API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
-
-API version: 0.13.0-SNAPSHOT
-*/
+ * Kafka Instance API
+ *
+ * API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
+ *
+ * API version: 0.13.0-SNAPSHOT
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -16,7 +16,7 @@ import (
 
 // ConsumerGroupListAllOf A list of consumer groups
 type ConsumerGroupListAllOf struct {
-	Items []ConsumerGroup `json:"items,omitempty"`
+	Items *[]ConsumerGroup `json:"items,omitempty"`
 }
 
 // NewConsumerGroupListAllOf instantiates a new ConsumerGroupListAllOf object
@@ -38,25 +38,25 @@ func NewConsumerGroupListAllOfWithDefaults() *ConsumerGroupListAllOf {
 
 // GetItems returns the Items field value if set, zero value otherwise.
 func (o *ConsumerGroupListAllOf) GetItems() []ConsumerGroup {
-	if o == nil || isNil(o.Items) {
+	if o == nil || o.Items == nil {
 		var ret []ConsumerGroup
 		return ret
 	}
-	return o.Items
+	return *o.Items
 }
 
 // GetItemsOk returns a tuple with the Items field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *ConsumerGroupListAllOf) GetItemsOk() ([]ConsumerGroup, bool) {
-	if o == nil || isNil(o.Items) {
-    return nil, false
+func (o *ConsumerGroupListAllOf) GetItemsOk() (*[]ConsumerGroup, bool) {
+	if o == nil || o.Items == nil {
+		return nil, false
 	}
 	return o.Items, true
 }
 
 // HasItems returns a boolean if a field has been set.
 func (o *ConsumerGroupListAllOf) HasItems() bool {
-	if o != nil && !isNil(o.Items) {
+	if o != nil && o.Items != nil {
 		return true
 	}
 
@@ -65,12 +65,12 @@ func (o *ConsumerGroupListAllOf) HasItems() bool {
 
 // SetItems gets a reference to the given []ConsumerGroup and assigns it to the Items field.
 func (o *ConsumerGroupListAllOf) SetItems(v []ConsumerGroup) {
-	o.Items = v
+	o.Items = &v
 }
 
 func (o ConsumerGroupListAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Items) {
+	if o.Items != nil {
 		toSerialize["items"] = o.Items
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/model_consumer_group_metrics.go b/app-services-sdk-go/kafkainstance/apiv1/client/model_consumer_group_metrics.go
index e2b5cea7..14708551 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/model_consumer_group_metrics.go
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/model_consumer_group_metrics.go
@@ -1,10 +1,10 @@
 /*
-Kafka Instance API
-
-API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
-
-API version: 0.13.0-SNAPSHOT
-*/
+ * Kafka Instance API
+ *
+ * API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
+ *
+ * API version: 0.13.0-SNAPSHOT
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -40,7 +40,7 @@ func NewConsumerGroupMetricsWithDefaults() *ConsumerGroupMetrics {
 
 // GetLaggingPartitions returns the LaggingPartitions field value if set, zero value otherwise.
 func (o *ConsumerGroupMetrics) GetLaggingPartitions() int32 {
-	if o == nil || isNil(o.LaggingPartitions) {
+	if o == nil || o.LaggingPartitions == nil {
 		var ret int32
 		return ret
 	}
@@ -50,15 +50,15 @@ func (o *ConsumerGroupMetrics) GetLaggingPartitions() int32 {
 // GetLaggingPartitionsOk returns a tuple with the LaggingPartitions field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConsumerGroupMetrics) GetLaggingPartitionsOk() (*int32, bool) {
-	if o == nil || isNil(o.LaggingPartitions) {
-    return nil, false
+	if o == nil || o.LaggingPartitions == nil {
+		return nil, false
 	}
 	return o.LaggingPartitions, true
 }
 
 // HasLaggingPartitions returns a boolean if a field has been set.
 func (o *ConsumerGroupMetrics) HasLaggingPartitions() bool {
-	if o != nil && !isNil(o.LaggingPartitions) {
+	if o != nil && o.LaggingPartitions != nil {
 		return true
 	}
 
@@ -72,7 +72,7 @@ func (o *ConsumerGroupMetrics) SetLaggingPartitions(v int32) {
 
 // GetActiveConsumers returns the ActiveConsumers field value if set, zero value otherwise.
 func (o *ConsumerGroupMetrics) GetActiveConsumers() int32 {
-	if o == nil || isNil(o.ActiveConsumers) {
+	if o == nil || o.ActiveConsumers == nil {
 		var ret int32
 		return ret
 	}
@@ -82,15 +82,15 @@ func (o *ConsumerGroupMetrics) GetActiveConsumers() int32 {
 // GetActiveConsumersOk returns a tuple with the ActiveConsumers field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConsumerGroupMetrics) GetActiveConsumersOk() (*int32, bool) {
-	if o == nil || isNil(o.ActiveConsumers) {
-    return nil, false
+	if o == nil || o.ActiveConsumers == nil {
+		return nil, false
 	}
 	return o.ActiveConsumers, true
 }
 
 // HasActiveConsumers returns a boolean if a field has been set.
 func (o *ConsumerGroupMetrics) HasActiveConsumers() bool {
-	if o != nil && !isNil(o.ActiveConsumers) {
+	if o != nil && o.ActiveConsumers != nil {
 		return true
 	}
 
@@ -104,7 +104,7 @@ func (o *ConsumerGroupMetrics) SetActiveConsumers(v int32) {
 
 // GetUnassignedPartitions returns the UnassignedPartitions field value if set, zero value otherwise.
 func (o *ConsumerGroupMetrics) GetUnassignedPartitions() int32 {
-	if o == nil || isNil(o.UnassignedPartitions) {
+	if o == nil || o.UnassignedPartitions == nil {
 		var ret int32
 		return ret
 	}
@@ -114,15 +114,15 @@ func (o *ConsumerGroupMetrics) GetUnassignedPartitions() int32 {
 // GetUnassignedPartitionsOk returns a tuple with the UnassignedPartitions field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConsumerGroupMetrics) GetUnassignedPartitionsOk() (*int32, bool) {
-	if o == nil || isNil(o.UnassignedPartitions) {
-    return nil, false
+	if o == nil || o.UnassignedPartitions == nil {
+		return nil, false
 	}
 	return o.UnassignedPartitions, true
 }
 
 // HasUnassignedPartitions returns a boolean if a field has been set.
 func (o *ConsumerGroupMetrics) HasUnassignedPartitions() bool {
-	if o != nil && !isNil(o.UnassignedPartitions) {
+	if o != nil && o.UnassignedPartitions != nil {
 		return true
 	}
 
@@ -136,13 +136,13 @@ func (o *ConsumerGroupMetrics) SetUnassignedPartitions(v int32) {
 
 func (o ConsumerGroupMetrics) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.LaggingPartitions) {
+	if o.LaggingPartitions != nil {
 		toSerialize["laggingPartitions"] = o.LaggingPartitions
 	}
-	if !isNil(o.ActiveConsumers) {
+	if o.ActiveConsumers != nil {
 		toSerialize["activeConsumers"] = o.ActiveConsumers
 	}
-	if !isNil(o.UnassignedPartitions) {
+	if o.UnassignedPartitions != nil {
 		toSerialize["unassignedPartitions"] = o.UnassignedPartitions
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/model_consumer_group_order_key.go b/app-services-sdk-go/kafkainstance/apiv1/client/model_consumer_group_order_key.go
index 3e2b12e4..bdd14e49 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/model_consumer_group_order_key.go
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/model_consumer_group_order_key.go
@@ -1,10 +1,10 @@
 /*
-Kafka Instance API
-
-API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
-
-API version: 0.13.0-SNAPSHOT
-*/
+ * Kafka Instance API
+ *
+ * API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
+ *
+ * API version: 0.13.0-SNAPSHOT
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -23,8 +23,7 @@ const (
 	CONSUMERGROUPORDERKEY_NAME ConsumerGroupOrderKey = "name"
 )
 
-// All allowed values of ConsumerGroupOrderKey enum
-var AllowedConsumerGroupOrderKeyEnumValues = []ConsumerGroupOrderKey{
+var allowedConsumerGroupOrderKeyEnumValues = []ConsumerGroupOrderKey{
 	"name",
 }
 
@@ -35,7 +34,7 @@ func (v *ConsumerGroupOrderKey) UnmarshalJSON(src []byte) error {
 		return err
 	}
 	enumTypeValue := ConsumerGroupOrderKey(value)
-	for _, existing := range AllowedConsumerGroupOrderKeyEnumValues {
+	for _, existing := range allowedConsumerGroupOrderKeyEnumValues {
 		if existing == enumTypeValue {
 			*v = enumTypeValue
 			return nil
@@ -52,13 +51,13 @@ func NewConsumerGroupOrderKeyFromValue(v string) (*ConsumerGroupOrderKey, error)
 	if ev.IsValid() {
 		return &ev, nil
 	} else {
-		return nil, fmt.Errorf("invalid value '%v' for ConsumerGroupOrderKey: valid values are %v", v, AllowedConsumerGroupOrderKeyEnumValues)
+		return nil, fmt.Errorf("invalid value '%v' for ConsumerGroupOrderKey: valid values are %v", v, allowedConsumerGroupOrderKeyEnumValues)
 	}
 }
 
 // IsValid return true if the value is valid for the enum, false otherwise
 func (v ConsumerGroupOrderKey) IsValid() bool {
-	for _, existing := range AllowedConsumerGroupOrderKeyEnumValues {
+	for _, existing := range allowedConsumerGroupOrderKeyEnumValues {
 		if existing == v {
 			return true
 		}
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/model_consumer_group_reset_offset_parameters.go b/app-services-sdk-go/kafkainstance/apiv1/client/model_consumer_group_reset_offset_parameters.go
index 53b4a9d1..87b04f9b 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/model_consumer_group_reset_offset_parameters.go
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/model_consumer_group_reset_offset_parameters.go
@@ -1,10 +1,10 @@
 /*
-Kafka Instance API
-
-API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
-
-API version: 0.13.0-SNAPSHOT
-*/
+ * Kafka Instance API
+ *
+ * API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
+ *
+ * API version: 0.13.0-SNAPSHOT
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -19,7 +19,7 @@ type ConsumerGroupResetOffsetParameters struct {
 	Offset OffsetType `json:"offset"`
 	// Value associated with the given `offset`. Not used for `offset` values `earliest` and `latest`. When `offset` is `timestamp` then `value` must be a valid timestamp representing the point in time to reset the consumer group. When `offset` is `absolute` then `value` must be the integer offset to which the consumer group will be reset.
 	Value *string `json:"value,omitempty"`
-	Topics []TopicsToResetOffset `json:"topics,omitempty"`
+	Topics *[]TopicsToResetOffset `json:"topics,omitempty"`
 }
 
 // NewConsumerGroupResetOffsetParameters instantiates a new ConsumerGroupResetOffsetParameters object
@@ -53,8 +53,8 @@ func (o *ConsumerGroupResetOffsetParameters) GetOffset() OffsetType {
 // GetOffsetOk returns a tuple with the Offset field value
 // and a boolean to check if the value has been set.
 func (o *ConsumerGroupResetOffsetParameters) GetOffsetOk() (*OffsetType, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Offset, true
 }
@@ -66,7 +66,7 @@ func (o *ConsumerGroupResetOffsetParameters) SetOffset(v OffsetType) {
 
 // GetValue returns the Value field value if set, zero value otherwise.
 func (o *ConsumerGroupResetOffsetParameters) GetValue() string {
-	if o == nil || isNil(o.Value) {
+	if o == nil || o.Value == nil {
 		var ret string
 		return ret
 	}
@@ -76,15 +76,15 @@ func (o *ConsumerGroupResetOffsetParameters) GetValue() string {
 // GetValueOk returns a tuple with the Value field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConsumerGroupResetOffsetParameters) GetValueOk() (*string, bool) {
-	if o == nil || isNil(o.Value) {
-    return nil, false
+	if o == nil || o.Value == nil {
+		return nil, false
 	}
 	return o.Value, true
 }
 
 // HasValue returns a boolean if a field has been set.
 func (o *ConsumerGroupResetOffsetParameters) HasValue() bool {
-	if o != nil && !isNil(o.Value) {
+	if o != nil && o.Value != nil {
 		return true
 	}
 
@@ -98,25 +98,25 @@ func (o *ConsumerGroupResetOffsetParameters) SetValue(v string) {
 
 // GetTopics returns the Topics field value if set, zero value otherwise.
 func (o *ConsumerGroupResetOffsetParameters) GetTopics() []TopicsToResetOffset {
-	if o == nil || isNil(o.Topics) {
+	if o == nil || o.Topics == nil {
 		var ret []TopicsToResetOffset
 		return ret
 	}
-	return o.Topics
+	return *o.Topics
 }
 
 // GetTopicsOk returns a tuple with the Topics field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *ConsumerGroupResetOffsetParameters) GetTopicsOk() ([]TopicsToResetOffset, bool) {
-	if o == nil || isNil(o.Topics) {
-    return nil, false
+func (o *ConsumerGroupResetOffsetParameters) GetTopicsOk() (*[]TopicsToResetOffset, bool) {
+	if o == nil || o.Topics == nil {
+		return nil, false
 	}
 	return o.Topics, true
 }
 
 // HasTopics returns a boolean if a field has been set.
 func (o *ConsumerGroupResetOffsetParameters) HasTopics() bool {
-	if o != nil && !isNil(o.Topics) {
+	if o != nil && o.Topics != nil {
 		return true
 	}
 
@@ -125,7 +125,7 @@ func (o *ConsumerGroupResetOffsetParameters) HasTopics() bool {
 
 // SetTopics gets a reference to the given []TopicsToResetOffset and assigns it to the Topics field.
 func (o *ConsumerGroupResetOffsetParameters) SetTopics(v []TopicsToResetOffset) {
-	o.Topics = v
+	o.Topics = &v
 }
 
 func (o ConsumerGroupResetOffsetParameters) MarshalJSON() ([]byte, error) {
@@ -133,10 +133,10 @@ func (o ConsumerGroupResetOffsetParameters) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["offset"] = o.Offset
 	}
-	if !isNil(o.Value) {
+	if o.Value != nil {
 		toSerialize["value"] = o.Value
 	}
-	if !isNil(o.Topics) {
+	if o.Topics != nil {
 		toSerialize["topics"] = o.Topics
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/model_consumer_group_reset_offset_result.go b/app-services-sdk-go/kafkainstance/apiv1/client/model_consumer_group_reset_offset_result.go
index 8da27171..6c02f896 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/model_consumer_group_reset_offset_result.go
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/model_consumer_group_reset_offset_result.go
@@ -1,10 +1,10 @@
 /*
-Kafka Instance API
-
-API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
-
-API version: 0.13.0-SNAPSHOT
-*/
+ * Kafka Instance API
+ *
+ * API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
+ *
+ * API version: 0.13.0-SNAPSHOT
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -47,7 +47,7 @@ func NewConsumerGroupResetOffsetResultWithDefaults() *ConsumerGroupResetOffsetRe
 
 // GetKind returns the Kind field value if set, zero value otherwise.
 func (o *ConsumerGroupResetOffsetResult) GetKind() string {
-	if o == nil || isNil(o.Kind) {
+	if o == nil || o.Kind == nil {
 		var ret string
 		return ret
 	}
@@ -57,15 +57,15 @@ func (o *ConsumerGroupResetOffsetResult) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConsumerGroupResetOffsetResult) GetKindOk() (*string, bool) {
-	if o == nil || isNil(o.Kind) {
-    return nil, false
+	if o == nil || o.Kind == nil {
+		return nil, false
 	}
 	return o.Kind, true
 }
 
 // HasKind returns a boolean if a field has been set.
 func (o *ConsumerGroupResetOffsetResult) HasKind() bool {
-	if o != nil && !isNil(o.Kind) {
+	if o != nil && o.Kind != nil {
 		return true
 	}
 
@@ -89,11 +89,11 @@ func (o *ConsumerGroupResetOffsetResult) GetItems() []ConsumerGroupResetOffsetRe
 
 // GetItemsOk returns a tuple with the Items field value
 // and a boolean to check if the value has been set.
-func (o *ConsumerGroupResetOffsetResult) GetItemsOk() ([]ConsumerGroupResetOffsetResultItem, bool) {
-	if o == nil {
-    return nil, false
+func (o *ConsumerGroupResetOffsetResult) GetItemsOk() (*[]ConsumerGroupResetOffsetResultItem, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Items, true
+	return &o.Items, true
 }
 
 // SetItems sets field value
@@ -114,8 +114,8 @@ func (o *ConsumerGroupResetOffsetResult) GetTotal() int32 {
 // GetTotalOk returns a tuple with the Total field value
 // and a boolean to check if the value has been set.
 func (o *ConsumerGroupResetOffsetResult) GetTotalOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Total, true
 }
@@ -127,7 +127,7 @@ func (o *ConsumerGroupResetOffsetResult) SetTotal(v int32) {
 
 // GetSize returns the Size field value if set, zero value otherwise.
 func (o *ConsumerGroupResetOffsetResult) GetSize() int32 {
-	if o == nil || isNil(o.Size) {
+	if o == nil || o.Size == nil {
 		var ret int32
 		return ret
 	}
@@ -137,15 +137,15 @@ func (o *ConsumerGroupResetOffsetResult) GetSize() int32 {
 // GetSizeOk returns a tuple with the Size field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConsumerGroupResetOffsetResult) GetSizeOk() (*int32, bool) {
-	if o == nil || isNil(o.Size) {
-    return nil, false
+	if o == nil || o.Size == nil {
+		return nil, false
 	}
 	return o.Size, true
 }
 
 // HasSize returns a boolean if a field has been set.
 func (o *ConsumerGroupResetOffsetResult) HasSize() bool {
-	if o != nil && !isNil(o.Size) {
+	if o != nil && o.Size != nil {
 		return true
 	}
 
@@ -159,7 +159,7 @@ func (o *ConsumerGroupResetOffsetResult) SetSize(v int32) {
 
 // GetPage returns the Page field value if set, zero value otherwise.
 func (o *ConsumerGroupResetOffsetResult) GetPage() int32 {
-	if o == nil || isNil(o.Page) {
+	if o == nil || o.Page == nil {
 		var ret int32
 		return ret
 	}
@@ -169,15 +169,15 @@ func (o *ConsumerGroupResetOffsetResult) GetPage() int32 {
 // GetPageOk returns a tuple with the Page field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConsumerGroupResetOffsetResult) GetPageOk() (*int32, bool) {
-	if o == nil || isNil(o.Page) {
-    return nil, false
+	if o == nil || o.Page == nil {
+		return nil, false
 	}
 	return o.Page, true
 }
 
 // HasPage returns a boolean if a field has been set.
 func (o *ConsumerGroupResetOffsetResult) HasPage() bool {
-	if o != nil && !isNil(o.Page) {
+	if o != nil && o.Page != nil {
 		return true
 	}
 
@@ -191,7 +191,7 @@ func (o *ConsumerGroupResetOffsetResult) SetPage(v int32) {
 
 func (o ConsumerGroupResetOffsetResult) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Kind) {
+	if o.Kind != nil {
 		toSerialize["kind"] = o.Kind
 	}
 	if true {
@@ -200,10 +200,10 @@ func (o ConsumerGroupResetOffsetResult) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["total"] = o.Total
 	}
-	if !isNil(o.Size) {
+	if o.Size != nil {
 		toSerialize["size"] = o.Size
 	}
-	if !isNil(o.Page) {
+	if o.Page != nil {
 		toSerialize["page"] = o.Page
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/model_consumer_group_reset_offset_result_all_of.go b/app-services-sdk-go/kafkainstance/apiv1/client/model_consumer_group_reset_offset_result_all_of.go
index d2f227f0..aee3f768 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/model_consumer_group_reset_offset_result_all_of.go
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/model_consumer_group_reset_offset_result_all_of.go
@@ -1,10 +1,10 @@
 /*
-Kafka Instance API
-
-API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
-
-API version: 0.13.0-SNAPSHOT
-*/
+ * Kafka Instance API
+ *
+ * API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
+ *
+ * API version: 0.13.0-SNAPSHOT
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -16,7 +16,7 @@ import (
 
 // ConsumerGroupResetOffsetResultAllOf struct for ConsumerGroupResetOffsetResultAllOf
 type ConsumerGroupResetOffsetResultAllOf struct {
-	Items []ConsumerGroupResetOffsetResultItem `json:"items,omitempty"`
+	Items *[]ConsumerGroupResetOffsetResultItem `json:"items,omitempty"`
 }
 
 // NewConsumerGroupResetOffsetResultAllOf instantiates a new ConsumerGroupResetOffsetResultAllOf object
@@ -38,25 +38,25 @@ func NewConsumerGroupResetOffsetResultAllOfWithDefaults() *ConsumerGroupResetOff
 
 // GetItems returns the Items field value if set, zero value otherwise.
 func (o *ConsumerGroupResetOffsetResultAllOf) GetItems() []ConsumerGroupResetOffsetResultItem {
-	if o == nil || isNil(o.Items) {
+	if o == nil || o.Items == nil {
 		var ret []ConsumerGroupResetOffsetResultItem
 		return ret
 	}
-	return o.Items
+	return *o.Items
 }
 
 // GetItemsOk returns a tuple with the Items field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *ConsumerGroupResetOffsetResultAllOf) GetItemsOk() ([]ConsumerGroupResetOffsetResultItem, bool) {
-	if o == nil || isNil(o.Items) {
-    return nil, false
+func (o *ConsumerGroupResetOffsetResultAllOf) GetItemsOk() (*[]ConsumerGroupResetOffsetResultItem, bool) {
+	if o == nil || o.Items == nil {
+		return nil, false
 	}
 	return o.Items, true
 }
 
 // HasItems returns a boolean if a field has been set.
 func (o *ConsumerGroupResetOffsetResultAllOf) HasItems() bool {
-	if o != nil && !isNil(o.Items) {
+	if o != nil && o.Items != nil {
 		return true
 	}
 
@@ -65,12 +65,12 @@ func (o *ConsumerGroupResetOffsetResultAllOf) HasItems() bool {
 
 // SetItems gets a reference to the given []ConsumerGroupResetOffsetResultItem and assigns it to the Items field.
 func (o *ConsumerGroupResetOffsetResultAllOf) SetItems(v []ConsumerGroupResetOffsetResultItem) {
-	o.Items = v
+	o.Items = &v
 }
 
 func (o ConsumerGroupResetOffsetResultAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Items) {
+	if o.Items != nil {
 		toSerialize["items"] = o.Items
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/model_consumer_group_reset_offset_result_item.go b/app-services-sdk-go/kafkainstance/apiv1/client/model_consumer_group_reset_offset_result_item.go
index bc92ecac..d8f32133 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/model_consumer_group_reset_offset_result_item.go
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/model_consumer_group_reset_offset_result_item.go
@@ -1,10 +1,10 @@
 /*
-Kafka Instance API
-
-API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
-
-API version: 0.13.0-SNAPSHOT
-*/
+ * Kafka Instance API
+ *
+ * API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
+ *
+ * API version: 0.13.0-SNAPSHOT
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -40,7 +40,7 @@ func NewConsumerGroupResetOffsetResultItemWithDefaults() *ConsumerGroupResetOffs
 
 // GetTopic returns the Topic field value if set, zero value otherwise.
 func (o *ConsumerGroupResetOffsetResultItem) GetTopic() string {
-	if o == nil || isNil(o.Topic) {
+	if o == nil || o.Topic == nil {
 		var ret string
 		return ret
 	}
@@ -50,15 +50,15 @@ func (o *ConsumerGroupResetOffsetResultItem) GetTopic() string {
 // GetTopicOk returns a tuple with the Topic field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConsumerGroupResetOffsetResultItem) GetTopicOk() (*string, bool) {
-	if o == nil || isNil(o.Topic) {
-    return nil, false
+	if o == nil || o.Topic == nil {
+		return nil, false
 	}
 	return o.Topic, true
 }
 
 // HasTopic returns a boolean if a field has been set.
 func (o *ConsumerGroupResetOffsetResultItem) HasTopic() bool {
-	if o != nil && !isNil(o.Topic) {
+	if o != nil && o.Topic != nil {
 		return true
 	}
 
@@ -72,7 +72,7 @@ func (o *ConsumerGroupResetOffsetResultItem) SetTopic(v string) {
 
 // GetPartition returns the Partition field value if set, zero value otherwise.
 func (o *ConsumerGroupResetOffsetResultItem) GetPartition() int32 {
-	if o == nil || isNil(o.Partition) {
+	if o == nil || o.Partition == nil {
 		var ret int32
 		return ret
 	}
@@ -82,15 +82,15 @@ func (o *ConsumerGroupResetOffsetResultItem) GetPartition() int32 {
 // GetPartitionOk returns a tuple with the Partition field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConsumerGroupResetOffsetResultItem) GetPartitionOk() (*int32, bool) {
-	if o == nil || isNil(o.Partition) {
-    return nil, false
+	if o == nil || o.Partition == nil {
+		return nil, false
 	}
 	return o.Partition, true
 }
 
 // HasPartition returns a boolean if a field has been set.
 func (o *ConsumerGroupResetOffsetResultItem) HasPartition() bool {
-	if o != nil && !isNil(o.Partition) {
+	if o != nil && o.Partition != nil {
 		return true
 	}
 
@@ -104,7 +104,7 @@ func (o *ConsumerGroupResetOffsetResultItem) SetPartition(v int32) {
 
 // GetOffset returns the Offset field value if set, zero value otherwise.
 func (o *ConsumerGroupResetOffsetResultItem) GetOffset() int64 {
-	if o == nil || isNil(o.Offset) {
+	if o == nil || o.Offset == nil {
 		var ret int64
 		return ret
 	}
@@ -114,15 +114,15 @@ func (o *ConsumerGroupResetOffsetResultItem) GetOffset() int64 {
 // GetOffsetOk returns a tuple with the Offset field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ConsumerGroupResetOffsetResultItem) GetOffsetOk() (*int64, bool) {
-	if o == nil || isNil(o.Offset) {
-    return nil, false
+	if o == nil || o.Offset == nil {
+		return nil, false
 	}
 	return o.Offset, true
 }
 
 // HasOffset returns a boolean if a field has been set.
 func (o *ConsumerGroupResetOffsetResultItem) HasOffset() bool {
-	if o != nil && !isNil(o.Offset) {
+	if o != nil && o.Offset != nil {
 		return true
 	}
 
@@ -136,13 +136,13 @@ func (o *ConsumerGroupResetOffsetResultItem) SetOffset(v int64) {
 
 func (o ConsumerGroupResetOffsetResultItem) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Topic) {
+	if o.Topic != nil {
 		toSerialize["topic"] = o.Topic
 	}
-	if !isNil(o.Partition) {
+	if o.Partition != nil {
 		toSerialize["partition"] = o.Partition
 	}
-	if !isNil(o.Offset) {
+	if o.Offset != nil {
 		toSerialize["offset"] = o.Offset
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/model_consumer_group_state.go b/app-services-sdk-go/kafkainstance/apiv1/client/model_consumer_group_state.go
index 945323d3..b24291bb 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/model_consumer_group_state.go
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/model_consumer_group_state.go
@@ -1,10 +1,10 @@
 /*
-Kafka Instance API
-
-API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
-
-API version: 0.13.0-SNAPSHOT
-*/
+ * Kafka Instance API
+ *
+ * API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
+ *
+ * API version: 0.13.0-SNAPSHOT
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -28,8 +28,7 @@ const (
 	CONSUMERGROUPSTATE_EMPTY ConsumerGroupState = "EMPTY"
 )
 
-// All allowed values of ConsumerGroupState enum
-var AllowedConsumerGroupStateEnumValues = []ConsumerGroupState{
+var allowedConsumerGroupStateEnumValues = []ConsumerGroupState{
 	"UNKNOWN",
 	"PREPARING_REBALANCE",
 	"COMPLETING_REBALANCE",
@@ -45,7 +44,7 @@ func (v *ConsumerGroupState) UnmarshalJSON(src []byte) error {
 		return err
 	}
 	enumTypeValue := ConsumerGroupState(value)
-	for _, existing := range AllowedConsumerGroupStateEnumValues {
+	for _, existing := range allowedConsumerGroupStateEnumValues {
 		if existing == enumTypeValue {
 			*v = enumTypeValue
 			return nil
@@ -62,13 +61,13 @@ func NewConsumerGroupStateFromValue(v string) (*ConsumerGroupState, error) {
 	if ev.IsValid() {
 		return &ev, nil
 	} else {
-		return nil, fmt.Errorf("invalid value '%v' for ConsumerGroupState: valid values are %v", v, AllowedConsumerGroupStateEnumValues)
+		return nil, fmt.Errorf("invalid value '%v' for ConsumerGroupState: valid values are %v", v, allowedConsumerGroupStateEnumValues)
 	}
 }
 
 // IsValid return true if the value is valid for the enum, false otherwise
 func (v ConsumerGroupState) IsValid() bool {
-	for _, existing := range AllowedConsumerGroupStateEnumValues {
+	for _, existing := range allowedConsumerGroupStateEnumValues {
 		if existing == v {
 			return true
 		}
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/model_error.go b/app-services-sdk-go/kafkainstance/apiv1/client/model_error.go
index 5710062a..5dcd8742 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/model_error.go
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/model_error.go
@@ -1,10 +1,10 @@
 /*
-Kafka Instance API
-
-API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
-
-API version: 0.13.0-SNAPSHOT
-*/
+ * Kafka Instance API
+ *
+ * API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
+ *
+ * API version: 0.13.0-SNAPSHOT
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -26,9 +26,7 @@ type Error struct {
 	// Detail specific to an error occurrence. May be different depending on the condition(s) that trigger the error.
 	Detail *string `json:"detail,omitempty"`
 	Code *int32 `json:"code,omitempty"`
-	// Deprecated
 	ErrorMessage *string `json:"error_message,omitempty"`
-	// Deprecated
 	Class *string `json:"class,omitempty"`
 }
 
@@ -51,7 +49,7 @@ func NewErrorWithDefaults() *Error {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *Error) GetId() string {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret string
 		return ret
 	}
@@ -61,15 +59,15 @@ func (o *Error) GetId() string {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Error) GetIdOk() (*string, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *Error) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -83,7 +81,7 @@ func (o *Error) SetId(v string) {
 
 // GetKind returns the Kind field value if set, zero value otherwise.
 func (o *Error) GetKind() string {
-	if o == nil || isNil(o.Kind) {
+	if o == nil || o.Kind == nil {
 		var ret string
 		return ret
 	}
@@ -93,15 +91,15 @@ func (o *Error) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Error) GetKindOk() (*string, bool) {
-	if o == nil || isNil(o.Kind) {
-    return nil, false
+	if o == nil || o.Kind == nil {
+		return nil, false
 	}
 	return o.Kind, true
 }
 
 // HasKind returns a boolean if a field has been set.
 func (o *Error) HasKind() bool {
-	if o != nil && !isNil(o.Kind) {
+	if o != nil && o.Kind != nil {
 		return true
 	}
 
@@ -115,7 +113,7 @@ func (o *Error) SetKind(v string) {
 
 // GetHref returns the Href field value if set, zero value otherwise.
 func (o *Error) GetHref() string {
-	if o == nil || isNil(o.Href) {
+	if o == nil || o.Href == nil {
 		var ret string
 		return ret
 	}
@@ -125,15 +123,15 @@ func (o *Error) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Error) GetHrefOk() (*string, bool) {
-	if o == nil || isNil(o.Href) {
-    return nil, false
+	if o == nil || o.Href == nil {
+		return nil, false
 	}
 	return o.Href, true
 }
 
 // HasHref returns a boolean if a field has been set.
 func (o *Error) HasHref() bool {
-	if o != nil && !isNil(o.Href) {
+	if o != nil && o.Href != nil {
 		return true
 	}
 
@@ -147,7 +145,7 @@ func (o *Error) SetHref(v string) {
 
 // GetReason returns the Reason field value if set, zero value otherwise.
 func (o *Error) GetReason() string {
-	if o == nil || isNil(o.Reason) {
+	if o == nil || o.Reason == nil {
 		var ret string
 		return ret
 	}
@@ -157,15 +155,15 @@ func (o *Error) GetReason() string {
 // GetReasonOk returns a tuple with the Reason field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Error) GetReasonOk() (*string, bool) {
-	if o == nil || isNil(o.Reason) {
-    return nil, false
+	if o == nil || o.Reason == nil {
+		return nil, false
 	}
 	return o.Reason, true
 }
 
 // HasReason returns a boolean if a field has been set.
 func (o *Error) HasReason() bool {
-	if o != nil && !isNil(o.Reason) {
+	if o != nil && o.Reason != nil {
 		return true
 	}
 
@@ -179,7 +177,7 @@ func (o *Error) SetReason(v string) {
 
 // GetDetail returns the Detail field value if set, zero value otherwise.
 func (o *Error) GetDetail() string {
-	if o == nil || isNil(o.Detail) {
+	if o == nil || o.Detail == nil {
 		var ret string
 		return ret
 	}
@@ -189,15 +187,15 @@ func (o *Error) GetDetail() string {
 // GetDetailOk returns a tuple with the Detail field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Error) GetDetailOk() (*string, bool) {
-	if o == nil || isNil(o.Detail) {
-    return nil, false
+	if o == nil || o.Detail == nil {
+		return nil, false
 	}
 	return o.Detail, true
 }
 
 // HasDetail returns a boolean if a field has been set.
 func (o *Error) HasDetail() bool {
-	if o != nil && !isNil(o.Detail) {
+	if o != nil && o.Detail != nil {
 		return true
 	}
 
@@ -211,7 +209,7 @@ func (o *Error) SetDetail(v string) {
 
 // GetCode returns the Code field value if set, zero value otherwise.
 func (o *Error) GetCode() int32 {
-	if o == nil || isNil(o.Code) {
+	if o == nil || o.Code == nil {
 		var ret int32
 		return ret
 	}
@@ -221,15 +219,15 @@ func (o *Error) GetCode() int32 {
 // GetCodeOk returns a tuple with the Code field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Error) GetCodeOk() (*int32, bool) {
-	if o == nil || isNil(o.Code) {
-    return nil, false
+	if o == nil || o.Code == nil {
+		return nil, false
 	}
 	return o.Code, true
 }
 
 // HasCode returns a boolean if a field has been set.
 func (o *Error) HasCode() bool {
-	if o != nil && !isNil(o.Code) {
+	if o != nil && o.Code != nil {
 		return true
 	}
 
@@ -242,9 +240,8 @@ func (o *Error) SetCode(v int32) {
 }
 
 // GetErrorMessage returns the ErrorMessage field value if set, zero value otherwise.
-// Deprecated
 func (o *Error) GetErrorMessage() string {
-	if o == nil || isNil(o.ErrorMessage) {
+	if o == nil || o.ErrorMessage == nil {
 		var ret string
 		return ret
 	}
@@ -253,17 +250,16 @@ func (o *Error) GetErrorMessage() string {
 
 // GetErrorMessageOk returns a tuple with the ErrorMessage field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-// Deprecated
 func (o *Error) GetErrorMessageOk() (*string, bool) {
-	if o == nil || isNil(o.ErrorMessage) {
-    return nil, false
+	if o == nil || o.ErrorMessage == nil {
+		return nil, false
 	}
 	return o.ErrorMessage, true
 }
 
 // HasErrorMessage returns a boolean if a field has been set.
 func (o *Error) HasErrorMessage() bool {
-	if o != nil && !isNil(o.ErrorMessage) {
+	if o != nil && o.ErrorMessage != nil {
 		return true
 	}
 
@@ -271,15 +267,13 @@ func (o *Error) HasErrorMessage() bool {
 }
 
 // SetErrorMessage gets a reference to the given string and assigns it to the ErrorMessage field.
-// Deprecated
 func (o *Error) SetErrorMessage(v string) {
 	o.ErrorMessage = &v
 }
 
 // GetClass returns the Class field value if set, zero value otherwise.
-// Deprecated
 func (o *Error) GetClass() string {
-	if o == nil || isNil(o.Class) {
+	if o == nil || o.Class == nil {
 		var ret string
 		return ret
 	}
@@ -288,17 +282,16 @@ func (o *Error) GetClass() string {
 
 // GetClassOk returns a tuple with the Class field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-// Deprecated
 func (o *Error) GetClassOk() (*string, bool) {
-	if o == nil || isNil(o.Class) {
-    return nil, false
+	if o == nil || o.Class == nil {
+		return nil, false
 	}
 	return o.Class, true
 }
 
 // HasClass returns a boolean if a field has been set.
 func (o *Error) HasClass() bool {
-	if o != nil && !isNil(o.Class) {
+	if o != nil && o.Class != nil {
 		return true
 	}
 
@@ -306,35 +299,34 @@ func (o *Error) HasClass() bool {
 }
 
 // SetClass gets a reference to the given string and assigns it to the Class field.
-// Deprecated
 func (o *Error) SetClass(v string) {
 	o.Class = &v
 }
 
 func (o Error) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.Kind) {
+	if o.Kind != nil {
 		toSerialize["kind"] = o.Kind
 	}
-	if !isNil(o.Href) {
+	if o.Href != nil {
 		toSerialize["href"] = o.Href
 	}
-	if !isNil(o.Reason) {
+	if o.Reason != nil {
 		toSerialize["reason"] = o.Reason
 	}
-	if !isNil(o.Detail) {
+	if o.Detail != nil {
 		toSerialize["detail"] = o.Detail
 	}
-	if !isNil(o.Code) {
+	if o.Code != nil {
 		toSerialize["code"] = o.Code
 	}
-	if !isNil(o.ErrorMessage) {
+	if o.ErrorMessage != nil {
 		toSerialize["error_message"] = o.ErrorMessage
 	}
-	if !isNil(o.Class) {
+	if o.Class != nil {
 		toSerialize["class"] = o.Class
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/model_error_all_of.go b/app-services-sdk-go/kafkainstance/apiv1/client/model_error_all_of.go
index 9a78d74f..0d9d24a3 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/model_error_all_of.go
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/model_error_all_of.go
@@ -1,10 +1,10 @@
 /*
-Kafka Instance API
-
-API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
-
-API version: 0.13.0-SNAPSHOT
-*/
+ * Kafka Instance API
+ *
+ * API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
+ *
+ * API version: 0.13.0-SNAPSHOT
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -21,9 +21,7 @@ type ErrorAllOf struct {
 	// Detail specific to an error occurrence. May be different depending on the condition(s) that trigger the error.
 	Detail *string `json:"detail,omitempty"`
 	Code *int32 `json:"code,omitempty"`
-	// Deprecated
 	ErrorMessage *string `json:"error_message,omitempty"`
-	// Deprecated
 	Class *string `json:"class,omitempty"`
 }
 
@@ -46,7 +44,7 @@ func NewErrorAllOfWithDefaults() *ErrorAllOf {
 
 // GetReason returns the Reason field value if set, zero value otherwise.
 func (o *ErrorAllOf) GetReason() string {
-	if o == nil || isNil(o.Reason) {
+	if o == nil || o.Reason == nil {
 		var ret string
 		return ret
 	}
@@ -56,15 +54,15 @@ func (o *ErrorAllOf) GetReason() string {
 // GetReasonOk returns a tuple with the Reason field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ErrorAllOf) GetReasonOk() (*string, bool) {
-	if o == nil || isNil(o.Reason) {
-    return nil, false
+	if o == nil || o.Reason == nil {
+		return nil, false
 	}
 	return o.Reason, true
 }
 
 // HasReason returns a boolean if a field has been set.
 func (o *ErrorAllOf) HasReason() bool {
-	if o != nil && !isNil(o.Reason) {
+	if o != nil && o.Reason != nil {
 		return true
 	}
 
@@ -78,7 +76,7 @@ func (o *ErrorAllOf) SetReason(v string) {
 
 // GetDetail returns the Detail field value if set, zero value otherwise.
 func (o *ErrorAllOf) GetDetail() string {
-	if o == nil || isNil(o.Detail) {
+	if o == nil || o.Detail == nil {
 		var ret string
 		return ret
 	}
@@ -88,15 +86,15 @@ func (o *ErrorAllOf) GetDetail() string {
 // GetDetailOk returns a tuple with the Detail field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ErrorAllOf) GetDetailOk() (*string, bool) {
-	if o == nil || isNil(o.Detail) {
-    return nil, false
+	if o == nil || o.Detail == nil {
+		return nil, false
 	}
 	return o.Detail, true
 }
 
 // HasDetail returns a boolean if a field has been set.
 func (o *ErrorAllOf) HasDetail() bool {
-	if o != nil && !isNil(o.Detail) {
+	if o != nil && o.Detail != nil {
 		return true
 	}
 
@@ -110,7 +108,7 @@ func (o *ErrorAllOf) SetDetail(v string) {
 
 // GetCode returns the Code field value if set, zero value otherwise.
 func (o *ErrorAllOf) GetCode() int32 {
-	if o == nil || isNil(o.Code) {
+	if o == nil || o.Code == nil {
 		var ret int32
 		return ret
 	}
@@ -120,15 +118,15 @@ func (o *ErrorAllOf) GetCode() int32 {
 // GetCodeOk returns a tuple with the Code field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ErrorAllOf) GetCodeOk() (*int32, bool) {
-	if o == nil || isNil(o.Code) {
-    return nil, false
+	if o == nil || o.Code == nil {
+		return nil, false
 	}
 	return o.Code, true
 }
 
 // HasCode returns a boolean if a field has been set.
 func (o *ErrorAllOf) HasCode() bool {
-	if o != nil && !isNil(o.Code) {
+	if o != nil && o.Code != nil {
 		return true
 	}
 
@@ -141,9 +139,8 @@ func (o *ErrorAllOf) SetCode(v int32) {
 }
 
 // GetErrorMessage returns the ErrorMessage field value if set, zero value otherwise.
-// Deprecated
 func (o *ErrorAllOf) GetErrorMessage() string {
-	if o == nil || isNil(o.ErrorMessage) {
+	if o == nil || o.ErrorMessage == nil {
 		var ret string
 		return ret
 	}
@@ -152,17 +149,16 @@ func (o *ErrorAllOf) GetErrorMessage() string {
 
 // GetErrorMessageOk returns a tuple with the ErrorMessage field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-// Deprecated
 func (o *ErrorAllOf) GetErrorMessageOk() (*string, bool) {
-	if o == nil || isNil(o.ErrorMessage) {
-    return nil, false
+	if o == nil || o.ErrorMessage == nil {
+		return nil, false
 	}
 	return o.ErrorMessage, true
 }
 
 // HasErrorMessage returns a boolean if a field has been set.
 func (o *ErrorAllOf) HasErrorMessage() bool {
-	if o != nil && !isNil(o.ErrorMessage) {
+	if o != nil && o.ErrorMessage != nil {
 		return true
 	}
 
@@ -170,15 +166,13 @@ func (o *ErrorAllOf) HasErrorMessage() bool {
 }
 
 // SetErrorMessage gets a reference to the given string and assigns it to the ErrorMessage field.
-// Deprecated
 func (o *ErrorAllOf) SetErrorMessage(v string) {
 	o.ErrorMessage = &v
 }
 
 // GetClass returns the Class field value if set, zero value otherwise.
-// Deprecated
 func (o *ErrorAllOf) GetClass() string {
-	if o == nil || isNil(o.Class) {
+	if o == nil || o.Class == nil {
 		var ret string
 		return ret
 	}
@@ -187,17 +181,16 @@ func (o *ErrorAllOf) GetClass() string {
 
 // GetClassOk returns a tuple with the Class field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-// Deprecated
 func (o *ErrorAllOf) GetClassOk() (*string, bool) {
-	if o == nil || isNil(o.Class) {
-    return nil, false
+	if o == nil || o.Class == nil {
+		return nil, false
 	}
 	return o.Class, true
 }
 
 // HasClass returns a boolean if a field has been set.
 func (o *ErrorAllOf) HasClass() bool {
-	if o != nil && !isNil(o.Class) {
+	if o != nil && o.Class != nil {
 		return true
 	}
 
@@ -205,26 +198,25 @@ func (o *ErrorAllOf) HasClass() bool {
 }
 
 // SetClass gets a reference to the given string and assigns it to the Class field.
-// Deprecated
 func (o *ErrorAllOf) SetClass(v string) {
 	o.Class = &v
 }
 
 func (o ErrorAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Reason) {
+	if o.Reason != nil {
 		toSerialize["reason"] = o.Reason
 	}
-	if !isNil(o.Detail) {
+	if o.Detail != nil {
 		toSerialize["detail"] = o.Detail
 	}
-	if !isNil(o.Code) {
+	if o.Code != nil {
 		toSerialize["code"] = o.Code
 	}
-	if !isNil(o.ErrorMessage) {
+	if o.ErrorMessage != nil {
 		toSerialize["error_message"] = o.ErrorMessage
 	}
-	if !isNil(o.Class) {
+	if o.Class != nil {
 		toSerialize["class"] = o.Class
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/model_error_list.go b/app-services-sdk-go/kafkainstance/apiv1/client/model_error_list.go
index 4b4e3356..10d49b98 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/model_error_list.go
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/model_error_list.go
@@ -1,10 +1,10 @@
 /*
-Kafka Instance API
-
-API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
-
-API version: 0.13.0-SNAPSHOT
-*/
+ * Kafka Instance API
+ *
+ * API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
+ *
+ * API version: 0.13.0-SNAPSHOT
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -47,7 +47,7 @@ func NewErrorListWithDefaults() *ErrorList {
 
 // GetKind returns the Kind field value if set, zero value otherwise.
 func (o *ErrorList) GetKind() string {
-	if o == nil || isNil(o.Kind) {
+	if o == nil || o.Kind == nil {
 		var ret string
 		return ret
 	}
@@ -57,15 +57,15 @@ func (o *ErrorList) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ErrorList) GetKindOk() (*string, bool) {
-	if o == nil || isNil(o.Kind) {
-    return nil, false
+	if o == nil || o.Kind == nil {
+		return nil, false
 	}
 	return o.Kind, true
 }
 
 // HasKind returns a boolean if a field has been set.
 func (o *ErrorList) HasKind() bool {
-	if o != nil && !isNil(o.Kind) {
+	if o != nil && o.Kind != nil {
 		return true
 	}
 
@@ -89,11 +89,11 @@ func (o *ErrorList) GetItems() []Error {
 
 // GetItemsOk returns a tuple with the Items field value
 // and a boolean to check if the value has been set.
-func (o *ErrorList) GetItemsOk() ([]Error, bool) {
-	if o == nil {
-    return nil, false
+func (o *ErrorList) GetItemsOk() (*[]Error, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Items, true
+	return &o.Items, true
 }
 
 // SetItems sets field value
@@ -114,8 +114,8 @@ func (o *ErrorList) GetTotal() int32 {
 // GetTotalOk returns a tuple with the Total field value
 // and a boolean to check if the value has been set.
 func (o *ErrorList) GetTotalOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Total, true
 }
@@ -127,7 +127,7 @@ func (o *ErrorList) SetTotal(v int32) {
 
 // GetSize returns the Size field value if set, zero value otherwise.
 func (o *ErrorList) GetSize() int32 {
-	if o == nil || isNil(o.Size) {
+	if o == nil || o.Size == nil {
 		var ret int32
 		return ret
 	}
@@ -137,15 +137,15 @@ func (o *ErrorList) GetSize() int32 {
 // GetSizeOk returns a tuple with the Size field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ErrorList) GetSizeOk() (*int32, bool) {
-	if o == nil || isNil(o.Size) {
-    return nil, false
+	if o == nil || o.Size == nil {
+		return nil, false
 	}
 	return o.Size, true
 }
 
 // HasSize returns a boolean if a field has been set.
 func (o *ErrorList) HasSize() bool {
-	if o != nil && !isNil(o.Size) {
+	if o != nil && o.Size != nil {
 		return true
 	}
 
@@ -159,7 +159,7 @@ func (o *ErrorList) SetSize(v int32) {
 
 // GetPage returns the Page field value if set, zero value otherwise.
 func (o *ErrorList) GetPage() int32 {
-	if o == nil || isNil(o.Page) {
+	if o == nil || o.Page == nil {
 		var ret int32
 		return ret
 	}
@@ -169,15 +169,15 @@ func (o *ErrorList) GetPage() int32 {
 // GetPageOk returns a tuple with the Page field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ErrorList) GetPageOk() (*int32, bool) {
-	if o == nil || isNil(o.Page) {
-    return nil, false
+	if o == nil || o.Page == nil {
+		return nil, false
 	}
 	return o.Page, true
 }
 
 // HasPage returns a boolean if a field has been set.
 func (o *ErrorList) HasPage() bool {
-	if o != nil && !isNil(o.Page) {
+	if o != nil && o.Page != nil {
 		return true
 	}
 
@@ -191,7 +191,7 @@ func (o *ErrorList) SetPage(v int32) {
 
 func (o ErrorList) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Kind) {
+	if o.Kind != nil {
 		toSerialize["kind"] = o.Kind
 	}
 	if true {
@@ -200,10 +200,10 @@ func (o ErrorList) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["total"] = o.Total
 	}
-	if !isNil(o.Size) {
+	if o.Size != nil {
 		toSerialize["size"] = o.Size
 	}
-	if !isNil(o.Page) {
+	if o.Page != nil {
 		toSerialize["page"] = o.Page
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/model_error_list_all_of.go b/app-services-sdk-go/kafkainstance/apiv1/client/model_error_list_all_of.go
index e42a36d4..0fe61bc4 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/model_error_list_all_of.go
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/model_error_list_all_of.go
@@ -1,10 +1,10 @@
 /*
-Kafka Instance API
-
-API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
-
-API version: 0.13.0-SNAPSHOT
-*/
+ * Kafka Instance API
+ *
+ * API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
+ *
+ * API version: 0.13.0-SNAPSHOT
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -16,7 +16,7 @@ import (
 
 // ErrorListAllOf List of errors
 type ErrorListAllOf struct {
-	Items []Error `json:"items,omitempty"`
+	Items *[]Error `json:"items,omitempty"`
 	// Total number of errors returned in this request
 	Total *int32 `json:"total,omitempty"`
 }
@@ -40,25 +40,25 @@ func NewErrorListAllOfWithDefaults() *ErrorListAllOf {
 
 // GetItems returns the Items field value if set, zero value otherwise.
 func (o *ErrorListAllOf) GetItems() []Error {
-	if o == nil || isNil(o.Items) {
+	if o == nil || o.Items == nil {
 		var ret []Error
 		return ret
 	}
-	return o.Items
+	return *o.Items
 }
 
 // GetItemsOk returns a tuple with the Items field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *ErrorListAllOf) GetItemsOk() ([]Error, bool) {
-	if o == nil || isNil(o.Items) {
-    return nil, false
+func (o *ErrorListAllOf) GetItemsOk() (*[]Error, bool) {
+	if o == nil || o.Items == nil {
+		return nil, false
 	}
 	return o.Items, true
 }
 
 // HasItems returns a boolean if a field has been set.
 func (o *ErrorListAllOf) HasItems() bool {
-	if o != nil && !isNil(o.Items) {
+	if o != nil && o.Items != nil {
 		return true
 	}
 
@@ -67,12 +67,12 @@ func (o *ErrorListAllOf) HasItems() bool {
 
 // SetItems gets a reference to the given []Error and assigns it to the Items field.
 func (o *ErrorListAllOf) SetItems(v []Error) {
-	o.Items = v
+	o.Items = &v
 }
 
 // GetTotal returns the Total field value if set, zero value otherwise.
 func (o *ErrorListAllOf) GetTotal() int32 {
-	if o == nil || isNil(o.Total) {
+	if o == nil || o.Total == nil {
 		var ret int32
 		return ret
 	}
@@ -82,15 +82,15 @@ func (o *ErrorListAllOf) GetTotal() int32 {
 // GetTotalOk returns a tuple with the Total field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ErrorListAllOf) GetTotalOk() (*int32, bool) {
-	if o == nil || isNil(o.Total) {
-    return nil, false
+	if o == nil || o.Total == nil {
+		return nil, false
 	}
 	return o.Total, true
 }
 
 // HasTotal returns a boolean if a field has been set.
 func (o *ErrorListAllOf) HasTotal() bool {
-	if o != nil && !isNil(o.Total) {
+	if o != nil && o.Total != nil {
 		return true
 	}
 
@@ -104,10 +104,10 @@ func (o *ErrorListAllOf) SetTotal(v int32) {
 
 func (o ErrorListAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Items) {
+	if o.Items != nil {
 		toSerialize["items"] = o.Items
 	}
-	if !isNil(o.Total) {
+	if o.Total != nil {
 		toSerialize["total"] = o.Total
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/model_list.go b/app-services-sdk-go/kafkainstance/apiv1/client/model_list.go
index 33ad1601..d79c51da 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/model_list.go
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/model_list.go
@@ -1,10 +1,10 @@
 /*
-Kafka Instance API
-
-API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
-
-API version: 0.13.0-SNAPSHOT
-*/
+ * Kafka Instance API
+ *
+ * API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
+ *
+ * API version: 0.13.0-SNAPSHOT
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -47,7 +47,7 @@ func NewListWithDefaults() *List {
 
 // GetKind returns the Kind field value if set, zero value otherwise.
 func (o *List) GetKind() string {
-	if o == nil || isNil(o.Kind) {
+	if o == nil || o.Kind == nil {
 		var ret string
 		return ret
 	}
@@ -57,15 +57,15 @@ func (o *List) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *List) GetKindOk() (*string, bool) {
-	if o == nil || isNil(o.Kind) {
-    return nil, false
+	if o == nil || o.Kind == nil {
+		return nil, false
 	}
 	return o.Kind, true
 }
 
 // HasKind returns a boolean if a field has been set.
 func (o *List) HasKind() bool {
-	if o != nil && !isNil(o.Kind) {
+	if o != nil && o.Kind != nil {
 		return true
 	}
 
@@ -89,11 +89,11 @@ func (o *List) GetItems() []map[string]interface{} {
 
 // GetItemsOk returns a tuple with the Items field value
 // and a boolean to check if the value has been set.
-func (o *List) GetItemsOk() ([]map[string]interface{}, bool) {
-	if o == nil {
-    return nil, false
+func (o *List) GetItemsOk() (*[]map[string]interface{}, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Items, true
+	return &o.Items, true
 }
 
 // SetItems sets field value
@@ -114,8 +114,8 @@ func (o *List) GetTotal() int32 {
 // GetTotalOk returns a tuple with the Total field value
 // and a boolean to check if the value has been set.
 func (o *List) GetTotalOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Total, true
 }
@@ -127,7 +127,7 @@ func (o *List) SetTotal(v int32) {
 
 // GetSize returns the Size field value if set, zero value otherwise.
 func (o *List) GetSize() int32 {
-	if o == nil || isNil(o.Size) {
+	if o == nil || o.Size == nil {
 		var ret int32
 		return ret
 	}
@@ -137,15 +137,15 @@ func (o *List) GetSize() int32 {
 // GetSizeOk returns a tuple with the Size field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *List) GetSizeOk() (*int32, bool) {
-	if o == nil || isNil(o.Size) {
-    return nil, false
+	if o == nil || o.Size == nil {
+		return nil, false
 	}
 	return o.Size, true
 }
 
 // HasSize returns a boolean if a field has been set.
 func (o *List) HasSize() bool {
-	if o != nil && !isNil(o.Size) {
+	if o != nil && o.Size != nil {
 		return true
 	}
 
@@ -159,7 +159,7 @@ func (o *List) SetSize(v int32) {
 
 // GetPage returns the Page field value if set, zero value otherwise.
 func (o *List) GetPage() int32 {
-	if o == nil || isNil(o.Page) {
+	if o == nil || o.Page == nil {
 		var ret int32
 		return ret
 	}
@@ -169,15 +169,15 @@ func (o *List) GetPage() int32 {
 // GetPageOk returns a tuple with the Page field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *List) GetPageOk() (*int32, bool) {
-	if o == nil || isNil(o.Page) {
-    return nil, false
+	if o == nil || o.Page == nil {
+		return nil, false
 	}
 	return o.Page, true
 }
 
 // HasPage returns a boolean if a field has been set.
 func (o *List) HasPage() bool {
-	if o != nil && !isNil(o.Page) {
+	if o != nil && o.Page != nil {
 		return true
 	}
 
@@ -191,7 +191,7 @@ func (o *List) SetPage(v int32) {
 
 func (o List) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Kind) {
+	if o.Kind != nil {
 		toSerialize["kind"] = o.Kind
 	}
 	if true {
@@ -200,10 +200,10 @@ func (o List) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["total"] = o.Total
 	}
-	if !isNil(o.Size) {
+	if o.Size != nil {
 		toSerialize["size"] = o.Size
 	}
-	if !isNil(o.Page) {
+	if o.Page != nil {
 		toSerialize["page"] = o.Page
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/model_list_deprecated.go b/app-services-sdk-go/kafkainstance/apiv1/client/model_list_deprecated.go
index cc48e180..fff6c36b 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/model_list_deprecated.go
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/model_list_deprecated.go
@@ -1,10 +1,10 @@
 /*
-Kafka Instance API
-
-API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
-
-API version: 0.13.0-SNAPSHOT
-*/
+ * Kafka Instance API
+ *
+ * API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
+ *
+ * API version: 0.13.0-SNAPSHOT
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -25,13 +25,10 @@ type ListDeprecated struct {
 	// Current page number (returned for fetch requests)
 	Page *int32 `json:"page,omitempty"`
 	// Offset of the first record returned, zero-based
-	// Deprecated
 	Offset *int32 `json:"offset,omitempty"`
 	// Maximum number of records to return, from request
-	// Deprecated
 	Limit *int32 `json:"limit,omitempty"`
 	// Total number of entries in the full result set
-	// Deprecated
 	Count *int32 `json:"count,omitempty"`
 }
 
@@ -56,7 +53,7 @@ func NewListDeprecatedWithDefaults() *ListDeprecated {
 
 // GetKind returns the Kind field value if set, zero value otherwise.
 func (o *ListDeprecated) GetKind() string {
-	if o == nil || isNil(o.Kind) {
+	if o == nil || o.Kind == nil {
 		var ret string
 		return ret
 	}
@@ -66,15 +63,15 @@ func (o *ListDeprecated) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ListDeprecated) GetKindOk() (*string, bool) {
-	if o == nil || isNil(o.Kind) {
-    return nil, false
+	if o == nil || o.Kind == nil {
+		return nil, false
 	}
 	return o.Kind, true
 }
 
 // HasKind returns a boolean if a field has been set.
 func (o *ListDeprecated) HasKind() bool {
-	if o != nil && !isNil(o.Kind) {
+	if o != nil && o.Kind != nil {
 		return true
 	}
 
@@ -98,11 +95,11 @@ func (o *ListDeprecated) GetItems() []map[string]interface{} {
 
 // GetItemsOk returns a tuple with the Items field value
 // and a boolean to check if the value has been set.
-func (o *ListDeprecated) GetItemsOk() ([]map[string]interface{}, bool) {
-	if o == nil {
-    return nil, false
+func (o *ListDeprecated) GetItemsOk() (*[]map[string]interface{}, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Items, true
+	return &o.Items, true
 }
 
 // SetItems sets field value
@@ -123,8 +120,8 @@ func (o *ListDeprecated) GetTotal() int32 {
 // GetTotalOk returns a tuple with the Total field value
 // and a boolean to check if the value has been set.
 func (o *ListDeprecated) GetTotalOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Total, true
 }
@@ -136,7 +133,7 @@ func (o *ListDeprecated) SetTotal(v int32) {
 
 // GetSize returns the Size field value if set, zero value otherwise.
 func (o *ListDeprecated) GetSize() int32 {
-	if o == nil || isNil(o.Size) {
+	if o == nil || o.Size == nil {
 		var ret int32
 		return ret
 	}
@@ -146,15 +143,15 @@ func (o *ListDeprecated) GetSize() int32 {
 // GetSizeOk returns a tuple with the Size field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ListDeprecated) GetSizeOk() (*int32, bool) {
-	if o == nil || isNil(o.Size) {
-    return nil, false
+	if o == nil || o.Size == nil {
+		return nil, false
 	}
 	return o.Size, true
 }
 
 // HasSize returns a boolean if a field has been set.
 func (o *ListDeprecated) HasSize() bool {
-	if o != nil && !isNil(o.Size) {
+	if o != nil && o.Size != nil {
 		return true
 	}
 
@@ -168,7 +165,7 @@ func (o *ListDeprecated) SetSize(v int32) {
 
 // GetPage returns the Page field value if set, zero value otherwise.
 func (o *ListDeprecated) GetPage() int32 {
-	if o == nil || isNil(o.Page) {
+	if o == nil || o.Page == nil {
 		var ret int32
 		return ret
 	}
@@ -178,15 +175,15 @@ func (o *ListDeprecated) GetPage() int32 {
 // GetPageOk returns a tuple with the Page field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ListDeprecated) GetPageOk() (*int32, bool) {
-	if o == nil || isNil(o.Page) {
-    return nil, false
+	if o == nil || o.Page == nil {
+		return nil, false
 	}
 	return o.Page, true
 }
 
 // HasPage returns a boolean if a field has been set.
 func (o *ListDeprecated) HasPage() bool {
-	if o != nil && !isNil(o.Page) {
+	if o != nil && o.Page != nil {
 		return true
 	}
 
@@ -199,9 +196,8 @@ func (o *ListDeprecated) SetPage(v int32) {
 }
 
 // GetOffset returns the Offset field value if set, zero value otherwise.
-// Deprecated
 func (o *ListDeprecated) GetOffset() int32 {
-	if o == nil || isNil(o.Offset) {
+	if o == nil || o.Offset == nil {
 		var ret int32
 		return ret
 	}
@@ -210,17 +206,16 @@ func (o *ListDeprecated) GetOffset() int32 {
 
 // GetOffsetOk returns a tuple with the Offset field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-// Deprecated
 func (o *ListDeprecated) GetOffsetOk() (*int32, bool) {
-	if o == nil || isNil(o.Offset) {
-    return nil, false
+	if o == nil || o.Offset == nil {
+		return nil, false
 	}
 	return o.Offset, true
 }
 
 // HasOffset returns a boolean if a field has been set.
 func (o *ListDeprecated) HasOffset() bool {
-	if o != nil && !isNil(o.Offset) {
+	if o != nil && o.Offset != nil {
 		return true
 	}
 
@@ -228,15 +223,13 @@ func (o *ListDeprecated) HasOffset() bool {
 }
 
 // SetOffset gets a reference to the given int32 and assigns it to the Offset field.
-// Deprecated
 func (o *ListDeprecated) SetOffset(v int32) {
 	o.Offset = &v
 }
 
 // GetLimit returns the Limit field value if set, zero value otherwise.
-// Deprecated
 func (o *ListDeprecated) GetLimit() int32 {
-	if o == nil || isNil(o.Limit) {
+	if o == nil || o.Limit == nil {
 		var ret int32
 		return ret
 	}
@@ -245,17 +238,16 @@ func (o *ListDeprecated) GetLimit() int32 {
 
 // GetLimitOk returns a tuple with the Limit field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-// Deprecated
 func (o *ListDeprecated) GetLimitOk() (*int32, bool) {
-	if o == nil || isNil(o.Limit) {
-    return nil, false
+	if o == nil || o.Limit == nil {
+		return nil, false
 	}
 	return o.Limit, true
 }
 
 // HasLimit returns a boolean if a field has been set.
 func (o *ListDeprecated) HasLimit() bool {
-	if o != nil && !isNil(o.Limit) {
+	if o != nil && o.Limit != nil {
 		return true
 	}
 
@@ -263,15 +255,13 @@ func (o *ListDeprecated) HasLimit() bool {
 }
 
 // SetLimit gets a reference to the given int32 and assigns it to the Limit field.
-// Deprecated
 func (o *ListDeprecated) SetLimit(v int32) {
 	o.Limit = &v
 }
 
 // GetCount returns the Count field value if set, zero value otherwise.
-// Deprecated
 func (o *ListDeprecated) GetCount() int32 {
-	if o == nil || isNil(o.Count) {
+	if o == nil || o.Count == nil {
 		var ret int32
 		return ret
 	}
@@ -280,17 +270,16 @@ func (o *ListDeprecated) GetCount() int32 {
 
 // GetCountOk returns a tuple with the Count field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-// Deprecated
 func (o *ListDeprecated) GetCountOk() (*int32, bool) {
-	if o == nil || isNil(o.Count) {
-    return nil, false
+	if o == nil || o.Count == nil {
+		return nil, false
 	}
 	return o.Count, true
 }
 
 // HasCount returns a boolean if a field has been set.
 func (o *ListDeprecated) HasCount() bool {
-	if o != nil && !isNil(o.Count) {
+	if o != nil && o.Count != nil {
 		return true
 	}
 
@@ -298,14 +287,13 @@ func (o *ListDeprecated) HasCount() bool {
 }
 
 // SetCount gets a reference to the given int32 and assigns it to the Count field.
-// Deprecated
 func (o *ListDeprecated) SetCount(v int32) {
 	o.Count = &v
 }
 
 func (o ListDeprecated) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Kind) {
+	if o.Kind != nil {
 		toSerialize["kind"] = o.Kind
 	}
 	if true {
@@ -314,19 +302,19 @@ func (o ListDeprecated) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["total"] = o.Total
 	}
-	if !isNil(o.Size) {
+	if o.Size != nil {
 		toSerialize["size"] = o.Size
 	}
-	if !isNil(o.Page) {
+	if o.Page != nil {
 		toSerialize["page"] = o.Page
 	}
-	if !isNil(o.Offset) {
+	if o.Offset != nil {
 		toSerialize["offset"] = o.Offset
 	}
-	if !isNil(o.Limit) {
+	if o.Limit != nil {
 		toSerialize["limit"] = o.Limit
 	}
-	if !isNil(o.Count) {
+	if o.Count != nil {
 		toSerialize["count"] = o.Count
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/model_list_deprecated_all_of.go b/app-services-sdk-go/kafkainstance/apiv1/client/model_list_deprecated_all_of.go
index b6ce3ec6..92303e92 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/model_list_deprecated_all_of.go
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/model_list_deprecated_all_of.go
@@ -1,10 +1,10 @@
 /*
-Kafka Instance API
-
-API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
-
-API version: 0.13.0-SNAPSHOT
-*/
+ * Kafka Instance API
+ *
+ * API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
+ *
+ * API version: 0.13.0-SNAPSHOT
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -17,13 +17,10 @@ import (
 // ListDeprecatedAllOf struct for ListDeprecatedAllOf
 type ListDeprecatedAllOf struct {
 	// Offset of the first record returned, zero-based
-	// Deprecated
 	Offset *int32 `json:"offset,omitempty"`
 	// Maximum number of records to return, from request
-	// Deprecated
 	Limit *int32 `json:"limit,omitempty"`
 	// Total number of entries in the full result set
-	// Deprecated
 	Count *int32 `json:"count,omitempty"`
 }
 
@@ -45,9 +42,8 @@ func NewListDeprecatedAllOfWithDefaults() *ListDeprecatedAllOf {
 }
 
 // GetOffset returns the Offset field value if set, zero value otherwise.
-// Deprecated
 func (o *ListDeprecatedAllOf) GetOffset() int32 {
-	if o == nil || isNil(o.Offset) {
+	if o == nil || o.Offset == nil {
 		var ret int32
 		return ret
 	}
@@ -56,17 +52,16 @@ func (o *ListDeprecatedAllOf) GetOffset() int32 {
 
 // GetOffsetOk returns a tuple with the Offset field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-// Deprecated
 func (o *ListDeprecatedAllOf) GetOffsetOk() (*int32, bool) {
-	if o == nil || isNil(o.Offset) {
-    return nil, false
+	if o == nil || o.Offset == nil {
+		return nil, false
 	}
 	return o.Offset, true
 }
 
 // HasOffset returns a boolean if a field has been set.
 func (o *ListDeprecatedAllOf) HasOffset() bool {
-	if o != nil && !isNil(o.Offset) {
+	if o != nil && o.Offset != nil {
 		return true
 	}
 
@@ -74,15 +69,13 @@ func (o *ListDeprecatedAllOf) HasOffset() bool {
 }
 
 // SetOffset gets a reference to the given int32 and assigns it to the Offset field.
-// Deprecated
 func (o *ListDeprecatedAllOf) SetOffset(v int32) {
 	o.Offset = &v
 }
 
 // GetLimit returns the Limit field value if set, zero value otherwise.
-// Deprecated
 func (o *ListDeprecatedAllOf) GetLimit() int32 {
-	if o == nil || isNil(o.Limit) {
+	if o == nil || o.Limit == nil {
 		var ret int32
 		return ret
 	}
@@ -91,17 +84,16 @@ func (o *ListDeprecatedAllOf) GetLimit() int32 {
 
 // GetLimitOk returns a tuple with the Limit field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-// Deprecated
 func (o *ListDeprecatedAllOf) GetLimitOk() (*int32, bool) {
-	if o == nil || isNil(o.Limit) {
-    return nil, false
+	if o == nil || o.Limit == nil {
+		return nil, false
 	}
 	return o.Limit, true
 }
 
 // HasLimit returns a boolean if a field has been set.
 func (o *ListDeprecatedAllOf) HasLimit() bool {
-	if o != nil && !isNil(o.Limit) {
+	if o != nil && o.Limit != nil {
 		return true
 	}
 
@@ -109,15 +101,13 @@ func (o *ListDeprecatedAllOf) HasLimit() bool {
 }
 
 // SetLimit gets a reference to the given int32 and assigns it to the Limit field.
-// Deprecated
 func (o *ListDeprecatedAllOf) SetLimit(v int32) {
 	o.Limit = &v
 }
 
 // GetCount returns the Count field value if set, zero value otherwise.
-// Deprecated
 func (o *ListDeprecatedAllOf) GetCount() int32 {
-	if o == nil || isNil(o.Count) {
+	if o == nil || o.Count == nil {
 		var ret int32
 		return ret
 	}
@@ -126,17 +116,16 @@ func (o *ListDeprecatedAllOf) GetCount() int32 {
 
 // GetCountOk returns a tuple with the Count field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-// Deprecated
 func (o *ListDeprecatedAllOf) GetCountOk() (*int32, bool) {
-	if o == nil || isNil(o.Count) {
-    return nil, false
+	if o == nil || o.Count == nil {
+		return nil, false
 	}
 	return o.Count, true
 }
 
 // HasCount returns a boolean if a field has been set.
 func (o *ListDeprecatedAllOf) HasCount() bool {
-	if o != nil && !isNil(o.Count) {
+	if o != nil && o.Count != nil {
 		return true
 	}
 
@@ -144,20 +133,19 @@ func (o *ListDeprecatedAllOf) HasCount() bool {
 }
 
 // SetCount gets a reference to the given int32 and assigns it to the Count field.
-// Deprecated
 func (o *ListDeprecatedAllOf) SetCount(v int32) {
 	o.Count = &v
 }
 
 func (o ListDeprecatedAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Offset) {
+	if o.Offset != nil {
 		toSerialize["offset"] = o.Offset
 	}
-	if !isNil(o.Limit) {
+	if o.Limit != nil {
 		toSerialize["limit"] = o.Limit
 	}
-	if !isNil(o.Count) {
+	if o.Count != nil {
 		toSerialize["count"] = o.Count
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/model_new_topic_input.go b/app-services-sdk-go/kafkainstance/apiv1/client/model_new_topic_input.go
index 6aba3683..11293ced 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/model_new_topic_input.go
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/model_new_topic_input.go
@@ -1,10 +1,10 @@
 /*
-Kafka Instance API
-
-API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
-
-API version: 0.13.0-SNAPSHOT
-*/
+ * Kafka Instance API
+ *
+ * API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
+ *
+ * API version: 0.13.0-SNAPSHOT
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -53,8 +53,8 @@ func (o *NewTopicInput) GetName() string {
 // GetNameOk returns a tuple with the Name field value
 // and a boolean to check if the value has been set.
 func (o *NewTopicInput) GetNameOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Name, true
 }
@@ -77,8 +77,8 @@ func (o *NewTopicInput) GetSettings() TopicSettings {
 // GetSettingsOk returns a tuple with the Settings field value
 // and a boolean to check if the value has been set.
 func (o *NewTopicInput) GetSettingsOk() (*TopicSettings, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Settings, true
 }
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/model_node.go b/app-services-sdk-go/kafkainstance/apiv1/client/model_node.go
index e36ffe34..185bf814 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/model_node.go
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/model_node.go
@@ -1,10 +1,10 @@
 /*
-Kafka Instance API
-
-API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
-
-API version: 0.13.0-SNAPSHOT
-*/
+ * Kafka Instance API
+ *
+ * API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
+ *
+ * API version: 0.13.0-SNAPSHOT
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -38,7 +38,7 @@ func NewNodeWithDefaults() *Node {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *Node) GetId() int32 {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret int32
 		return ret
 	}
@@ -48,15 +48,15 @@ func (o *Node) GetId() int32 {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Node) GetIdOk() (*int32, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *Node) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -70,7 +70,7 @@ func (o *Node) SetId(v int32) {
 
 func (o Node) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/model_object_reference.go b/app-services-sdk-go/kafkainstance/apiv1/client/model_object_reference.go
index ae9639aa..6219a8fa 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/model_object_reference.go
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/model_object_reference.go
@@ -1,10 +1,10 @@
 /*
-Kafka Instance API
-
-API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
-
-API version: 0.13.0-SNAPSHOT
-*/
+ * Kafka Instance API
+ *
+ * API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
+ *
+ * API version: 0.13.0-SNAPSHOT
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -42,7 +42,7 @@ func NewObjectReferenceWithDefaults() *ObjectReference {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *ObjectReference) GetId() string {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret string
 		return ret
 	}
@@ -52,15 +52,15 @@ func (o *ObjectReference) GetId() string {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ObjectReference) GetIdOk() (*string, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *ObjectReference) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -74,7 +74,7 @@ func (o *ObjectReference) SetId(v string) {
 
 // GetKind returns the Kind field value if set, zero value otherwise.
 func (o *ObjectReference) GetKind() string {
-	if o == nil || isNil(o.Kind) {
+	if o == nil || o.Kind == nil {
 		var ret string
 		return ret
 	}
@@ -84,15 +84,15 @@ func (o *ObjectReference) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ObjectReference) GetKindOk() (*string, bool) {
-	if o == nil || isNil(o.Kind) {
-    return nil, false
+	if o == nil || o.Kind == nil {
+		return nil, false
 	}
 	return o.Kind, true
 }
 
 // HasKind returns a boolean if a field has been set.
 func (o *ObjectReference) HasKind() bool {
-	if o != nil && !isNil(o.Kind) {
+	if o != nil && o.Kind != nil {
 		return true
 	}
 
@@ -106,7 +106,7 @@ func (o *ObjectReference) SetKind(v string) {
 
 // GetHref returns the Href field value if set, zero value otherwise.
 func (o *ObjectReference) GetHref() string {
-	if o == nil || isNil(o.Href) {
+	if o == nil || o.Href == nil {
 		var ret string
 		return ret
 	}
@@ -116,15 +116,15 @@ func (o *ObjectReference) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ObjectReference) GetHrefOk() (*string, bool) {
-	if o == nil || isNil(o.Href) {
-    return nil, false
+	if o == nil || o.Href == nil {
+		return nil, false
 	}
 	return o.Href, true
 }
 
 // HasHref returns a boolean if a field has been set.
 func (o *ObjectReference) HasHref() bool {
-	if o != nil && !isNil(o.Href) {
+	if o != nil && o.Href != nil {
 		return true
 	}
 
@@ -138,13 +138,13 @@ func (o *ObjectReference) SetHref(v string) {
 
 func (o ObjectReference) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.Kind) {
+	if o.Kind != nil {
 		toSerialize["kind"] = o.Kind
 	}
-	if !isNil(o.Href) {
+	if o.Href != nil {
 		toSerialize["href"] = o.Href
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/model_offset_type.go b/app-services-sdk-go/kafkainstance/apiv1/client/model_offset_type.go
index 6c8a6e69..edf21562 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/model_offset_type.go
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/model_offset_type.go
@@ -1,10 +1,10 @@
 /*
-Kafka Instance API
-
-API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
-
-API version: 0.13.0-SNAPSHOT
-*/
+ * Kafka Instance API
+ *
+ * API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
+ *
+ * API version: 0.13.0-SNAPSHOT
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -26,8 +26,7 @@ const (
 	OFFSETTYPE_EARLIEST OffsetType = "earliest"
 )
 
-// All allowed values of OffsetType enum
-var AllowedOffsetTypeEnumValues = []OffsetType{
+var allowedOffsetTypeEnumValues = []OffsetType{
 	"timestamp",
 	"absolute",
 	"latest",
@@ -41,7 +40,7 @@ func (v *OffsetType) UnmarshalJSON(src []byte) error {
 		return err
 	}
 	enumTypeValue := OffsetType(value)
-	for _, existing := range AllowedOffsetTypeEnumValues {
+	for _, existing := range allowedOffsetTypeEnumValues {
 		if existing == enumTypeValue {
 			*v = enumTypeValue
 			return nil
@@ -58,13 +57,13 @@ func NewOffsetTypeFromValue(v string) (*OffsetType, error) {
 	if ev.IsValid() {
 		return &ev, nil
 	} else {
-		return nil, fmt.Errorf("invalid value '%v' for OffsetType: valid values are %v", v, AllowedOffsetTypeEnumValues)
+		return nil, fmt.Errorf("invalid value '%v' for OffsetType: valid values are %v", v, allowedOffsetTypeEnumValues)
 	}
 }
 
 // IsValid return true if the value is valid for the enum, false otherwise
 func (v OffsetType) IsValid() bool {
-	for _, existing := range AllowedOffsetTypeEnumValues {
+	for _, existing := range allowedOffsetTypeEnumValues {
 		if existing == v {
 			return true
 		}
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/model_partition.go b/app-services-sdk-go/kafkainstance/apiv1/client/model_partition.go
index 250177d4..7aeb447a 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/model_partition.go
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/model_partition.go
@@ -1,10 +1,10 @@
 /*
-Kafka Instance API
-
-API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
-
-API version: 0.13.0-SNAPSHOT
-*/
+ * Kafka Instance API
+ *
+ * API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
+ *
+ * API version: 0.13.0-SNAPSHOT
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -19,12 +19,11 @@ type Partition struct {
 	// The partition id, unique among partitions of the same topic
 	Partition int32 `json:"partition"`
 	// List of replicas for the partition
-	Replicas []Node `json:"replicas,omitempty"`
+	Replicas *[]Node `json:"replicas,omitempty"`
 	// List in-sync replicas for this partition.
-	Isr []Node `json:"isr,omitempty"`
-	Leader *PartitionLeader `json:"leader,omitempty"`
+	Isr *[]Node `json:"isr,omitempty"`
+	Leader *Node `json:"leader,omitempty"`
 	// Unique id for the partition (deprecated, use `partition` instead)
-	// Deprecated
 	Id *int32 `json:"id,omitempty"`
 }
 
@@ -59,8 +58,8 @@ func (o *Partition) GetPartition() int32 {
 // GetPartitionOk returns a tuple with the Partition field value
 // and a boolean to check if the value has been set.
 func (o *Partition) GetPartitionOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Partition, true
 }
@@ -72,25 +71,25 @@ func (o *Partition) SetPartition(v int32) {
 
 // GetReplicas returns the Replicas field value if set, zero value otherwise.
 func (o *Partition) GetReplicas() []Node {
-	if o == nil || isNil(o.Replicas) {
+	if o == nil || o.Replicas == nil {
 		var ret []Node
 		return ret
 	}
-	return o.Replicas
+	return *o.Replicas
 }
 
 // GetReplicasOk returns a tuple with the Replicas field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *Partition) GetReplicasOk() ([]Node, bool) {
-	if o == nil || isNil(o.Replicas) {
-    return nil, false
+func (o *Partition) GetReplicasOk() (*[]Node, bool) {
+	if o == nil || o.Replicas == nil {
+		return nil, false
 	}
 	return o.Replicas, true
 }
 
 // HasReplicas returns a boolean if a field has been set.
 func (o *Partition) HasReplicas() bool {
-	if o != nil && !isNil(o.Replicas) {
+	if o != nil && o.Replicas != nil {
 		return true
 	}
 
@@ -99,30 +98,30 @@ func (o *Partition) HasReplicas() bool {
 
 // SetReplicas gets a reference to the given []Node and assigns it to the Replicas field.
 func (o *Partition) SetReplicas(v []Node) {
-	o.Replicas = v
+	o.Replicas = &v
 }
 
 // GetIsr returns the Isr field value if set, zero value otherwise.
 func (o *Partition) GetIsr() []Node {
-	if o == nil || isNil(o.Isr) {
+	if o == nil || o.Isr == nil {
 		var ret []Node
 		return ret
 	}
-	return o.Isr
+	return *o.Isr
 }
 
 // GetIsrOk returns a tuple with the Isr field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *Partition) GetIsrOk() ([]Node, bool) {
-	if o == nil || isNil(o.Isr) {
-    return nil, false
+func (o *Partition) GetIsrOk() (*[]Node, bool) {
+	if o == nil || o.Isr == nil {
+		return nil, false
 	}
 	return o.Isr, true
 }
 
 // HasIsr returns a boolean if a field has been set.
 func (o *Partition) HasIsr() bool {
-	if o != nil && !isNil(o.Isr) {
+	if o != nil && o.Isr != nil {
 		return true
 	}
 
@@ -131,13 +130,13 @@ func (o *Partition) HasIsr() bool {
 
 // SetIsr gets a reference to the given []Node and assigns it to the Isr field.
 func (o *Partition) SetIsr(v []Node) {
-	o.Isr = v
+	o.Isr = &v
 }
 
 // GetLeader returns the Leader field value if set, zero value otherwise.
-func (o *Partition) GetLeader() PartitionLeader {
-	if o == nil || isNil(o.Leader) {
-		var ret PartitionLeader
+func (o *Partition) GetLeader() Node {
+	if o == nil || o.Leader == nil {
+		var ret Node
 		return ret
 	}
 	return *o.Leader
@@ -145,31 +144,30 @@ func (o *Partition) GetLeader() PartitionLeader {
 
 // GetLeaderOk returns a tuple with the Leader field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *Partition) GetLeaderOk() (*PartitionLeader, bool) {
-	if o == nil || isNil(o.Leader) {
-    return nil, false
+func (o *Partition) GetLeaderOk() (*Node, bool) {
+	if o == nil || o.Leader == nil {
+		return nil, false
 	}
 	return o.Leader, true
 }
 
 // HasLeader returns a boolean if a field has been set.
 func (o *Partition) HasLeader() bool {
-	if o != nil && !isNil(o.Leader) {
+	if o != nil && o.Leader != nil {
 		return true
 	}
 
 	return false
 }
 
-// SetLeader gets a reference to the given PartitionLeader and assigns it to the Leader field.
-func (o *Partition) SetLeader(v PartitionLeader) {
+// SetLeader gets a reference to the given Node and assigns it to the Leader field.
+func (o *Partition) SetLeader(v Node) {
 	o.Leader = &v
 }
 
 // GetId returns the Id field value if set, zero value otherwise.
-// Deprecated
 func (o *Partition) GetId() int32 {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret int32
 		return ret
 	}
@@ -178,17 +176,16 @@ func (o *Partition) GetId() int32 {
 
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-// Deprecated
 func (o *Partition) GetIdOk() (*int32, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *Partition) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -196,7 +193,6 @@ func (o *Partition) HasId() bool {
 }
 
 // SetId gets a reference to the given int32 and assigns it to the Id field.
-// Deprecated
 func (o *Partition) SetId(v int32) {
 	o.Id = &v
 }
@@ -206,16 +202,16 @@ func (o Partition) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["partition"] = o.Partition
 	}
-	if !isNil(o.Replicas) {
+	if o.Replicas != nil {
 		toSerialize["replicas"] = o.Replicas
 	}
-	if !isNil(o.Isr) {
+	if o.Isr != nil {
 		toSerialize["isr"] = o.Isr
 	}
-	if !isNil(o.Leader) {
+	if o.Leader != nil {
 		toSerialize["leader"] = o.Leader
 	}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/model_partition_leader.go b/app-services-sdk-go/kafkainstance/apiv1/client/model_partition_leader.go
deleted file mode 100644
index 6b7477bf..00000000
--- a/app-services-sdk-go/kafkainstance/apiv1/client/model_partition_leader.go
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
-Kafka Instance API
-
-API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
-
-API version: 0.13.0-SNAPSHOT
-*/
-
-// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
-
-package kafkainstanceclient
-
-import (
-	"encoding/json"
-)
-
-// PartitionLeader struct for PartitionLeader
-type PartitionLeader struct {
-	Id *int32 `json:"id,omitempty"`
-}
-
-// NewPartitionLeader instantiates a new PartitionLeader object
-// This constructor will assign default values to properties that have it defined,
-// and makes sure properties required by API are set, but the set of arguments
-// will change when the set of required properties is changed
-func NewPartitionLeader() *PartitionLeader {
-	this := PartitionLeader{}
-	return &this
-}
-
-// NewPartitionLeaderWithDefaults instantiates a new PartitionLeader object
-// This constructor will only assign default values to properties that have it defined,
-// but it doesn't guarantee that properties required by API are set
-func NewPartitionLeaderWithDefaults() *PartitionLeader {
-	this := PartitionLeader{}
-	return &this
-}
-
-// GetId returns the Id field value if set, zero value otherwise.
-func (o *PartitionLeader) GetId() int32 {
-	if o == nil || isNil(o.Id) {
-		var ret int32
-		return ret
-	}
-	return *o.Id
-}
-
-// GetIdOk returns a tuple with the Id field value if set, nil otherwise
-// and a boolean to check if the value has been set.
-func (o *PartitionLeader) GetIdOk() (*int32, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
-	}
-	return o.Id, true
-}
-
-// HasId returns a boolean if a field has been set.
-func (o *PartitionLeader) HasId() bool {
-	if o != nil && !isNil(o.Id) {
-		return true
-	}
-
-	return false
-}
-
-// SetId gets a reference to the given int32 and assigns it to the Id field.
-func (o *PartitionLeader) SetId(v int32) {
-	o.Id = &v
-}
-
-func (o PartitionLeader) MarshalJSON() ([]byte, error) {
-	toSerialize := map[string]interface{}{}
-	if !isNil(o.Id) {
-		toSerialize["id"] = o.Id
-	}
-	return json.Marshal(toSerialize)
-}
-
-type NullablePartitionLeader struct {
-	value *PartitionLeader
-	isSet bool
-}
-
-func (v NullablePartitionLeader) Get() *PartitionLeader {
-	return v.value
-}
-
-func (v *NullablePartitionLeader) Set(val *PartitionLeader) {
-	v.value = val
-	v.isSet = true
-}
-
-func (v NullablePartitionLeader) IsSet() bool {
-	return v.isSet
-}
-
-func (v *NullablePartitionLeader) Unset() {
-	v.value = nil
-	v.isSet = false
-}
-
-func NewNullablePartitionLeader(val *PartitionLeader) *NullablePartitionLeader {
-	return &NullablePartitionLeader{value: val, isSet: true}
-}
-
-func (v NullablePartitionLeader) MarshalJSON() ([]byte, error) {
-	return json.Marshal(v.value)
-}
-
-func (v *NullablePartitionLeader) UnmarshalJSON(src []byte) error {
-	v.isSet = true
-	return json.Unmarshal(src, &v.value)
-}
-
-
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/model_record.go b/app-services-sdk-go/kafkainstance/apiv1/client/model_record.go
index a0fdb643..61315f54 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/model_record.go
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/model_record.go
@@ -1,10 +1,10 @@
 /*
-Kafka Instance API
-
-API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
-
-API version: 0.13.0-SNAPSHOT
-*/
+ * Kafka Instance API
+ *
+ * API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
+ *
+ * API version: 0.13.0-SNAPSHOT
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -12,6 +12,7 @@ package kafkainstanceclient
 
 import (
 	"encoding/json"
+	"time"
 )
 
 // Record struct for Record
@@ -57,7 +58,7 @@ func NewRecordWithDefaults() *Record {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *Record) GetId() string {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret string
 		return ret
 	}
@@ -67,15 +68,15 @@ func (o *Record) GetId() string {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Record) GetIdOk() (*string, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *Record) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -89,7 +90,7 @@ func (o *Record) SetId(v string) {
 
 // GetKind returns the Kind field value if set, zero value otherwise.
 func (o *Record) GetKind() string {
-	if o == nil || isNil(o.Kind) {
+	if o == nil || o.Kind == nil {
 		var ret string
 		return ret
 	}
@@ -99,15 +100,15 @@ func (o *Record) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Record) GetKindOk() (*string, bool) {
-	if o == nil || isNil(o.Kind) {
-    return nil, false
+	if o == nil || o.Kind == nil {
+		return nil, false
 	}
 	return o.Kind, true
 }
 
 // HasKind returns a boolean if a field has been set.
 func (o *Record) HasKind() bool {
-	if o != nil && !isNil(o.Kind) {
+	if o != nil && o.Kind != nil {
 		return true
 	}
 
@@ -121,7 +122,7 @@ func (o *Record) SetKind(v string) {
 
 // GetHref returns the Href field value if set, zero value otherwise.
 func (o *Record) GetHref() string {
-	if o == nil || isNil(o.Href) {
+	if o == nil || o.Href == nil {
 		var ret string
 		return ret
 	}
@@ -131,15 +132,15 @@ func (o *Record) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Record) GetHrefOk() (*string, bool) {
-	if o == nil || isNil(o.Href) {
-    return nil, false
+	if o == nil || o.Href == nil {
+		return nil, false
 	}
 	return o.Href, true
 }
 
 // HasHref returns a boolean if a field has been set.
 func (o *Record) HasHref() bool {
-	if o != nil && !isNil(o.Href) {
+	if o != nil && o.Href != nil {
 		return true
 	}
 
@@ -153,7 +154,7 @@ func (o *Record) SetHref(v string) {
 
 // GetPartition returns the Partition field value if set, zero value otherwise.
 func (o *Record) GetPartition() int32 {
-	if o == nil || isNil(o.Partition) {
+	if o == nil || o.Partition == nil {
 		var ret int32
 		return ret
 	}
@@ -163,15 +164,15 @@ func (o *Record) GetPartition() int32 {
 // GetPartitionOk returns a tuple with the Partition field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Record) GetPartitionOk() (*int32, bool) {
-	if o == nil || isNil(o.Partition) {
-    return nil, false
+	if o == nil || o.Partition == nil {
+		return nil, false
 	}
 	return o.Partition, true
 }
 
 // HasPartition returns a boolean if a field has been set.
 func (o *Record) HasPartition() bool {
-	if o != nil && !isNil(o.Partition) {
+	if o != nil && o.Partition != nil {
 		return true
 	}
 
@@ -185,7 +186,7 @@ func (o *Record) SetPartition(v int32) {
 
 // GetOffset returns the Offset field value if set, zero value otherwise.
 func (o *Record) GetOffset() int64 {
-	if o == nil || isNil(o.Offset) {
+	if o == nil || o.Offset == nil {
 		var ret int64
 		return ret
 	}
@@ -195,15 +196,15 @@ func (o *Record) GetOffset() int64 {
 // GetOffsetOk returns a tuple with the Offset field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Record) GetOffsetOk() (*int64, bool) {
-	if o == nil || isNil(o.Offset) {
-    return nil, false
+	if o == nil || o.Offset == nil {
+		return nil, false
 	}
 	return o.Offset, true
 }
 
 // HasOffset returns a boolean if a field has been set.
 func (o *Record) HasOffset() bool {
-	if o != nil && !isNil(o.Offset) {
+	if o != nil && o.Offset != nil {
 		return true
 	}
 
@@ -217,7 +218,7 @@ func (o *Record) SetOffset(v int64) {
 
 // GetTimestamp returns the Timestamp field value if set, zero value otherwise.
 func (o *Record) GetTimestamp() time.Time {
-	if o == nil || isNil(o.Timestamp) {
+	if o == nil || o.Timestamp == nil {
 		var ret time.Time
 		return ret
 	}
@@ -227,15 +228,15 @@ func (o *Record) GetTimestamp() time.Time {
 // GetTimestampOk returns a tuple with the Timestamp field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Record) GetTimestampOk() (*time.Time, bool) {
-	if o == nil || isNil(o.Timestamp) {
-    return nil, false
+	if o == nil || o.Timestamp == nil {
+		return nil, false
 	}
 	return o.Timestamp, true
 }
 
 // HasTimestamp returns a boolean if a field has been set.
 func (o *Record) HasTimestamp() bool {
-	if o != nil && !isNil(o.Timestamp) {
+	if o != nil && o.Timestamp != nil {
 		return true
 	}
 
@@ -249,7 +250,7 @@ func (o *Record) SetTimestamp(v time.Time) {
 
 // GetTimestampType returns the TimestampType field value if set, zero value otherwise.
 func (o *Record) GetTimestampType() string {
-	if o == nil || isNil(o.TimestampType) {
+	if o == nil || o.TimestampType == nil {
 		var ret string
 		return ret
 	}
@@ -259,15 +260,15 @@ func (o *Record) GetTimestampType() string {
 // GetTimestampTypeOk returns a tuple with the TimestampType field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Record) GetTimestampTypeOk() (*string, bool) {
-	if o == nil || isNil(o.TimestampType) {
-    return nil, false
+	if o == nil || o.TimestampType == nil {
+		return nil, false
 	}
 	return o.TimestampType, true
 }
 
 // HasTimestampType returns a boolean if a field has been set.
 func (o *Record) HasTimestampType() bool {
-	if o != nil && !isNil(o.TimestampType) {
+	if o != nil && o.TimestampType != nil {
 		return true
 	}
 
@@ -281,7 +282,7 @@ func (o *Record) SetTimestampType(v string) {
 
 // GetHeaders returns the Headers field value if set, zero value otherwise.
 func (o *Record) GetHeaders() map[string]string {
-	if o == nil || isNil(o.Headers) {
+	if o == nil || o.Headers == nil {
 		var ret map[string]string
 		return ret
 	}
@@ -291,15 +292,15 @@ func (o *Record) GetHeaders() map[string]string {
 // GetHeadersOk returns a tuple with the Headers field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Record) GetHeadersOk() (*map[string]string, bool) {
-	if o == nil || isNil(o.Headers) {
-    return nil, false
+	if o == nil || o.Headers == nil {
+		return nil, false
 	}
 	return o.Headers, true
 }
 
 // HasHeaders returns a boolean if a field has been set.
 func (o *Record) HasHeaders() bool {
-	if o != nil && !isNil(o.Headers) {
+	if o != nil && o.Headers != nil {
 		return true
 	}
 
@@ -313,7 +314,7 @@ func (o *Record) SetHeaders(v map[string]string) {
 
 // GetKey returns the Key field value if set, zero value otherwise.
 func (o *Record) GetKey() string {
-	if o == nil || isNil(o.Key) {
+	if o == nil || o.Key == nil {
 		var ret string
 		return ret
 	}
@@ -323,15 +324,15 @@ func (o *Record) GetKey() string {
 // GetKeyOk returns a tuple with the Key field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Record) GetKeyOk() (*string, bool) {
-	if o == nil || isNil(o.Key) {
-    return nil, false
+	if o == nil || o.Key == nil {
+		return nil, false
 	}
 	return o.Key, true
 }
 
 // HasKey returns a boolean if a field has been set.
 func (o *Record) HasKey() bool {
-	if o != nil && !isNil(o.Key) {
+	if o != nil && o.Key != nil {
 		return true
 	}
 
@@ -356,8 +357,8 @@ func (o *Record) GetValue() string {
 // GetValueOk returns a tuple with the Value field value
 // and a boolean to check if the value has been set.
 func (o *Record) GetValueOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Value, true
 }
@@ -369,31 +370,31 @@ func (o *Record) SetValue(v string) {
 
 func (o Record) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.Kind) {
+	if o.Kind != nil {
 		toSerialize["kind"] = o.Kind
 	}
-	if !isNil(o.Href) {
+	if o.Href != nil {
 		toSerialize["href"] = o.Href
 	}
-	if !isNil(o.Partition) {
+	if o.Partition != nil {
 		toSerialize["partition"] = o.Partition
 	}
-	if !isNil(o.Offset) {
+	if o.Offset != nil {
 		toSerialize["offset"] = o.Offset
 	}
-	if !isNil(o.Timestamp) {
+	if o.Timestamp != nil {
 		toSerialize["timestamp"] = o.Timestamp
 	}
-	if !isNil(o.TimestampType) {
+	if o.TimestampType != nil {
 		toSerialize["timestampType"] = o.TimestampType
 	}
-	if !isNil(o.Headers) {
+	if o.Headers != nil {
 		toSerialize["headers"] = o.Headers
 	}
-	if !isNil(o.Key) {
+	if o.Key != nil {
 		toSerialize["key"] = o.Key
 	}
 	if true {
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/model_record_all_of.go b/app-services-sdk-go/kafkainstance/apiv1/client/model_record_all_of.go
index 2861b2a4..3e5c18bb 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/model_record_all_of.go
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/model_record_all_of.go
@@ -1,10 +1,10 @@
 /*
-Kafka Instance API
-
-API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
-
-API version: 0.13.0-SNAPSHOT
-*/
+ * Kafka Instance API
+ *
+ * API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
+ *
+ * API version: 0.13.0-SNAPSHOT
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -53,7 +53,7 @@ func NewRecordAllOfWithDefaults() *RecordAllOf {
 
 // GetPartition returns the Partition field value if set, zero value otherwise.
 func (o *RecordAllOf) GetPartition() int32 {
-	if o == nil || isNil(o.Partition) {
+	if o == nil || o.Partition == nil {
 		var ret int32
 		return ret
 	}
@@ -63,15 +63,15 @@ func (o *RecordAllOf) GetPartition() int32 {
 // GetPartitionOk returns a tuple with the Partition field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RecordAllOf) GetPartitionOk() (*int32, bool) {
-	if o == nil || isNil(o.Partition) {
-    return nil, false
+	if o == nil || o.Partition == nil {
+		return nil, false
 	}
 	return o.Partition, true
 }
 
 // HasPartition returns a boolean if a field has been set.
 func (o *RecordAllOf) HasPartition() bool {
-	if o != nil && !isNil(o.Partition) {
+	if o != nil && o.Partition != nil {
 		return true
 	}
 
@@ -85,7 +85,7 @@ func (o *RecordAllOf) SetPartition(v int32) {
 
 // GetOffset returns the Offset field value if set, zero value otherwise.
 func (o *RecordAllOf) GetOffset() int64 {
-	if o == nil || isNil(o.Offset) {
+	if o == nil || o.Offset == nil {
 		var ret int64
 		return ret
 	}
@@ -95,15 +95,15 @@ func (o *RecordAllOf) GetOffset() int64 {
 // GetOffsetOk returns a tuple with the Offset field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RecordAllOf) GetOffsetOk() (*int64, bool) {
-	if o == nil || isNil(o.Offset) {
-    return nil, false
+	if o == nil || o.Offset == nil {
+		return nil, false
 	}
 	return o.Offset, true
 }
 
 // HasOffset returns a boolean if a field has been set.
 func (o *RecordAllOf) HasOffset() bool {
-	if o != nil && !isNil(o.Offset) {
+	if o != nil && o.Offset != nil {
 		return true
 	}
 
@@ -117,7 +117,7 @@ func (o *RecordAllOf) SetOffset(v int64) {
 
 // GetTimestamp returns the Timestamp field value if set, zero value otherwise.
 func (o *RecordAllOf) GetTimestamp() time.Time {
-	if o == nil || isNil(o.Timestamp) {
+	if o == nil || o.Timestamp == nil {
 		var ret time.Time
 		return ret
 	}
@@ -127,15 +127,15 @@ func (o *RecordAllOf) GetTimestamp() time.Time {
 // GetTimestampOk returns a tuple with the Timestamp field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RecordAllOf) GetTimestampOk() (*time.Time, bool) {
-	if o == nil || isNil(o.Timestamp) {
-    return nil, false
+	if o == nil || o.Timestamp == nil {
+		return nil, false
 	}
 	return o.Timestamp, true
 }
 
 // HasTimestamp returns a boolean if a field has been set.
 func (o *RecordAllOf) HasTimestamp() bool {
-	if o != nil && !isNil(o.Timestamp) {
+	if o != nil && o.Timestamp != nil {
 		return true
 	}
 
@@ -149,7 +149,7 @@ func (o *RecordAllOf) SetTimestamp(v time.Time) {
 
 // GetTimestampType returns the TimestampType field value if set, zero value otherwise.
 func (o *RecordAllOf) GetTimestampType() string {
-	if o == nil || isNil(o.TimestampType) {
+	if o == nil || o.TimestampType == nil {
 		var ret string
 		return ret
 	}
@@ -159,15 +159,15 @@ func (o *RecordAllOf) GetTimestampType() string {
 // GetTimestampTypeOk returns a tuple with the TimestampType field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RecordAllOf) GetTimestampTypeOk() (*string, bool) {
-	if o == nil || isNil(o.TimestampType) {
-    return nil, false
+	if o == nil || o.TimestampType == nil {
+		return nil, false
 	}
 	return o.TimestampType, true
 }
 
 // HasTimestampType returns a boolean if a field has been set.
 func (o *RecordAllOf) HasTimestampType() bool {
-	if o != nil && !isNil(o.TimestampType) {
+	if o != nil && o.TimestampType != nil {
 		return true
 	}
 
@@ -181,7 +181,7 @@ func (o *RecordAllOf) SetTimestampType(v string) {
 
 // GetHeaders returns the Headers field value if set, zero value otherwise.
 func (o *RecordAllOf) GetHeaders() map[string]string {
-	if o == nil || isNil(o.Headers) {
+	if o == nil || o.Headers == nil {
 		var ret map[string]string
 		return ret
 	}
@@ -191,15 +191,15 @@ func (o *RecordAllOf) GetHeaders() map[string]string {
 // GetHeadersOk returns a tuple with the Headers field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RecordAllOf) GetHeadersOk() (*map[string]string, bool) {
-	if o == nil || isNil(o.Headers) {
-    return nil, false
+	if o == nil || o.Headers == nil {
+		return nil, false
 	}
 	return o.Headers, true
 }
 
 // HasHeaders returns a boolean if a field has been set.
 func (o *RecordAllOf) HasHeaders() bool {
-	if o != nil && !isNil(o.Headers) {
+	if o != nil && o.Headers != nil {
 		return true
 	}
 
@@ -213,7 +213,7 @@ func (o *RecordAllOf) SetHeaders(v map[string]string) {
 
 // GetKey returns the Key field value if set, zero value otherwise.
 func (o *RecordAllOf) GetKey() string {
-	if o == nil || isNil(o.Key) {
+	if o == nil || o.Key == nil {
 		var ret string
 		return ret
 	}
@@ -223,15 +223,15 @@ func (o *RecordAllOf) GetKey() string {
 // GetKeyOk returns a tuple with the Key field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RecordAllOf) GetKeyOk() (*string, bool) {
-	if o == nil || isNil(o.Key) {
-    return nil, false
+	if o == nil || o.Key == nil {
+		return nil, false
 	}
 	return o.Key, true
 }
 
 // HasKey returns a boolean if a field has been set.
 func (o *RecordAllOf) HasKey() bool {
-	if o != nil && !isNil(o.Key) {
+	if o != nil && o.Key != nil {
 		return true
 	}
 
@@ -256,8 +256,8 @@ func (o *RecordAllOf) GetValue() string {
 // GetValueOk returns a tuple with the Value field value
 // and a boolean to check if the value has been set.
 func (o *RecordAllOf) GetValueOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Value, true
 }
@@ -269,22 +269,22 @@ func (o *RecordAllOf) SetValue(v string) {
 
 func (o RecordAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Partition) {
+	if o.Partition != nil {
 		toSerialize["partition"] = o.Partition
 	}
-	if !isNil(o.Offset) {
+	if o.Offset != nil {
 		toSerialize["offset"] = o.Offset
 	}
-	if !isNil(o.Timestamp) {
+	if o.Timestamp != nil {
 		toSerialize["timestamp"] = o.Timestamp
 	}
-	if !isNil(o.TimestampType) {
+	if o.TimestampType != nil {
 		toSerialize["timestampType"] = o.TimestampType
 	}
-	if !isNil(o.Headers) {
+	if o.Headers != nil {
 		toSerialize["headers"] = o.Headers
 	}
-	if !isNil(o.Key) {
+	if o.Key != nil {
 		toSerialize["key"] = o.Key
 	}
 	if true {
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/model_record_included_property.go b/app-services-sdk-go/kafkainstance/apiv1/client/model_record_included_property.go
index e4bdf986..25ee169b 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/model_record_included_property.go
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/model_record_included_property.go
@@ -1,10 +1,10 @@
 /*
-Kafka Instance API
-
-API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
-
-API version: 0.13.0-SNAPSHOT
-*/
+ * Kafka Instance API
+ *
+ * API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
+ *
+ * API version: 0.13.0-SNAPSHOT
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -29,8 +29,7 @@ const (
 	RECORDINCLUDEDPROPERTY_VALUE RecordIncludedProperty = "value"
 )
 
-// All allowed values of RecordIncludedProperty enum
-var AllowedRecordIncludedPropertyEnumValues = []RecordIncludedProperty{
+var allowedRecordIncludedPropertyEnumValues = []RecordIncludedProperty{
 	"partition",
 	"offset",
 	"timestamp",
@@ -47,7 +46,7 @@ func (v *RecordIncludedProperty) UnmarshalJSON(src []byte) error {
 		return err
 	}
 	enumTypeValue := RecordIncludedProperty(value)
-	for _, existing := range AllowedRecordIncludedPropertyEnumValues {
+	for _, existing := range allowedRecordIncludedPropertyEnumValues {
 		if existing == enumTypeValue {
 			*v = enumTypeValue
 			return nil
@@ -64,13 +63,13 @@ func NewRecordIncludedPropertyFromValue(v string) (*RecordIncludedProperty, erro
 	if ev.IsValid() {
 		return &ev, nil
 	} else {
-		return nil, fmt.Errorf("invalid value '%v' for RecordIncludedProperty: valid values are %v", v, AllowedRecordIncludedPropertyEnumValues)
+		return nil, fmt.Errorf("invalid value '%v' for RecordIncludedProperty: valid values are %v", v, allowedRecordIncludedPropertyEnumValues)
 	}
 }
 
 // IsValid return true if the value is valid for the enum, false otherwise
 func (v RecordIncludedProperty) IsValid() bool {
-	for _, existing := range AllowedRecordIncludedPropertyEnumValues {
+	for _, existing := range allowedRecordIncludedPropertyEnumValues {
 		if existing == v {
 			return true
 		}
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/model_record_list.go b/app-services-sdk-go/kafkainstance/apiv1/client/model_record_list.go
index c4a28f17..945f26e2 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/model_record_list.go
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/model_record_list.go
@@ -1,10 +1,10 @@
 /*
-Kafka Instance API
-
-API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
-
-API version: 0.13.0-SNAPSHOT
-*/
+ * Kafka Instance API
+ *
+ * API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
+ *
+ * API version: 0.13.0-SNAPSHOT
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -47,7 +47,7 @@ func NewRecordListWithDefaults() *RecordList {
 
 // GetKind returns the Kind field value if set, zero value otherwise.
 func (o *RecordList) GetKind() string {
-	if o == nil || isNil(o.Kind) {
+	if o == nil || o.Kind == nil {
 		var ret string
 		return ret
 	}
@@ -57,15 +57,15 @@ func (o *RecordList) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RecordList) GetKindOk() (*string, bool) {
-	if o == nil || isNil(o.Kind) {
-    return nil, false
+	if o == nil || o.Kind == nil {
+		return nil, false
 	}
 	return o.Kind, true
 }
 
 // HasKind returns a boolean if a field has been set.
 func (o *RecordList) HasKind() bool {
-	if o != nil && !isNil(o.Kind) {
+	if o != nil && o.Kind != nil {
 		return true
 	}
 
@@ -89,11 +89,11 @@ func (o *RecordList) GetItems() []Record {
 
 // GetItemsOk returns a tuple with the Items field value
 // and a boolean to check if the value has been set.
-func (o *RecordList) GetItemsOk() ([]Record, bool) {
-	if o == nil {
-    return nil, false
+func (o *RecordList) GetItemsOk() (*[]Record, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Items, true
+	return &o.Items, true
 }
 
 // SetItems sets field value
@@ -114,8 +114,8 @@ func (o *RecordList) GetTotal() int32 {
 // GetTotalOk returns a tuple with the Total field value
 // and a boolean to check if the value has been set.
 func (o *RecordList) GetTotalOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Total, true
 }
@@ -127,7 +127,7 @@ func (o *RecordList) SetTotal(v int32) {
 
 // GetSize returns the Size field value if set, zero value otherwise.
 func (o *RecordList) GetSize() int32 {
-	if o == nil || isNil(o.Size) {
+	if o == nil || o.Size == nil {
 		var ret int32
 		return ret
 	}
@@ -137,15 +137,15 @@ func (o *RecordList) GetSize() int32 {
 // GetSizeOk returns a tuple with the Size field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RecordList) GetSizeOk() (*int32, bool) {
-	if o == nil || isNil(o.Size) {
-    return nil, false
+	if o == nil || o.Size == nil {
+		return nil, false
 	}
 	return o.Size, true
 }
 
 // HasSize returns a boolean if a field has been set.
 func (o *RecordList) HasSize() bool {
-	if o != nil && !isNil(o.Size) {
+	if o != nil && o.Size != nil {
 		return true
 	}
 
@@ -159,7 +159,7 @@ func (o *RecordList) SetSize(v int32) {
 
 // GetPage returns the Page field value if set, zero value otherwise.
 func (o *RecordList) GetPage() int32 {
-	if o == nil || isNil(o.Page) {
+	if o == nil || o.Page == nil {
 		var ret int32
 		return ret
 	}
@@ -169,15 +169,15 @@ func (o *RecordList) GetPage() int32 {
 // GetPageOk returns a tuple with the Page field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RecordList) GetPageOk() (*int32, bool) {
-	if o == nil || isNil(o.Page) {
-    return nil, false
+	if o == nil || o.Page == nil {
+		return nil, false
 	}
 	return o.Page, true
 }
 
 // HasPage returns a boolean if a field has been set.
 func (o *RecordList) HasPage() bool {
-	if o != nil && !isNil(o.Page) {
+	if o != nil && o.Page != nil {
 		return true
 	}
 
@@ -191,7 +191,7 @@ func (o *RecordList) SetPage(v int32) {
 
 func (o RecordList) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Kind) {
+	if o.Kind != nil {
 		toSerialize["kind"] = o.Kind
 	}
 	if true {
@@ -200,10 +200,10 @@ func (o RecordList) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["total"] = o.Total
 	}
-	if !isNil(o.Size) {
+	if o.Size != nil {
 		toSerialize["size"] = o.Size
 	}
-	if !isNil(o.Page) {
+	if o.Page != nil {
 		toSerialize["page"] = o.Page
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/model_record_list_all_of.go b/app-services-sdk-go/kafkainstance/apiv1/client/model_record_list_all_of.go
index 0d40684f..34d3a802 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/model_record_list_all_of.go
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/model_record_list_all_of.go
@@ -1,10 +1,10 @@
 /*
-Kafka Instance API
-
-API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
-
-API version: 0.13.0-SNAPSHOT
-*/
+ * Kafka Instance API
+ *
+ * API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
+ *
+ * API version: 0.13.0-SNAPSHOT
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -16,7 +16,7 @@ import (
 
 // RecordListAllOf A page of records consumed from a topic
 type RecordListAllOf struct {
-	Items []Record `json:"items,omitempty"`
+	Items *[]Record `json:"items,omitempty"`
 	// Total number of records returned in this request. This value does not indicate the total number of records in the topic.
 	Total *int32 `json:"total,omitempty"`
 	// Not used
@@ -44,25 +44,25 @@ func NewRecordListAllOfWithDefaults() *RecordListAllOf {
 
 // GetItems returns the Items field value if set, zero value otherwise.
 func (o *RecordListAllOf) GetItems() []Record {
-	if o == nil || isNil(o.Items) {
+	if o == nil || o.Items == nil {
 		var ret []Record
 		return ret
 	}
-	return o.Items
+	return *o.Items
 }
 
 // GetItemsOk returns a tuple with the Items field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *RecordListAllOf) GetItemsOk() ([]Record, bool) {
-	if o == nil || isNil(o.Items) {
-    return nil, false
+func (o *RecordListAllOf) GetItemsOk() (*[]Record, bool) {
+	if o == nil || o.Items == nil {
+		return nil, false
 	}
 	return o.Items, true
 }
 
 // HasItems returns a boolean if a field has been set.
 func (o *RecordListAllOf) HasItems() bool {
-	if o != nil && !isNil(o.Items) {
+	if o != nil && o.Items != nil {
 		return true
 	}
 
@@ -71,12 +71,12 @@ func (o *RecordListAllOf) HasItems() bool {
 
 // SetItems gets a reference to the given []Record and assigns it to the Items field.
 func (o *RecordListAllOf) SetItems(v []Record) {
-	o.Items = v
+	o.Items = &v
 }
 
 // GetTotal returns the Total field value if set, zero value otherwise.
 func (o *RecordListAllOf) GetTotal() int32 {
-	if o == nil || isNil(o.Total) {
+	if o == nil || o.Total == nil {
 		var ret int32
 		return ret
 	}
@@ -86,15 +86,15 @@ func (o *RecordListAllOf) GetTotal() int32 {
 // GetTotalOk returns a tuple with the Total field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RecordListAllOf) GetTotalOk() (*int32, bool) {
-	if o == nil || isNil(o.Total) {
-    return nil, false
+	if o == nil || o.Total == nil {
+		return nil, false
 	}
 	return o.Total, true
 }
 
 // HasTotal returns a boolean if a field has been set.
 func (o *RecordListAllOf) HasTotal() bool {
-	if o != nil && !isNil(o.Total) {
+	if o != nil && o.Total != nil {
 		return true
 	}
 
@@ -108,7 +108,7 @@ func (o *RecordListAllOf) SetTotal(v int32) {
 
 // GetSize returns the Size field value if set, zero value otherwise.
 func (o *RecordListAllOf) GetSize() int32 {
-	if o == nil || isNil(o.Size) {
+	if o == nil || o.Size == nil {
 		var ret int32
 		return ret
 	}
@@ -118,15 +118,15 @@ func (o *RecordListAllOf) GetSize() int32 {
 // GetSizeOk returns a tuple with the Size field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RecordListAllOf) GetSizeOk() (*int32, bool) {
-	if o == nil || isNil(o.Size) {
-    return nil, false
+	if o == nil || o.Size == nil {
+		return nil, false
 	}
 	return o.Size, true
 }
 
 // HasSize returns a boolean if a field has been set.
 func (o *RecordListAllOf) HasSize() bool {
-	if o != nil && !isNil(o.Size) {
+	if o != nil && o.Size != nil {
 		return true
 	}
 
@@ -140,7 +140,7 @@ func (o *RecordListAllOf) SetSize(v int32) {
 
 // GetPage returns the Page field value if set, zero value otherwise.
 func (o *RecordListAllOf) GetPage() int32 {
-	if o == nil || isNil(o.Page) {
+	if o == nil || o.Page == nil {
 		var ret int32
 		return ret
 	}
@@ -150,15 +150,15 @@ func (o *RecordListAllOf) GetPage() int32 {
 // GetPageOk returns a tuple with the Page field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RecordListAllOf) GetPageOk() (*int32, bool) {
-	if o == nil || isNil(o.Page) {
-    return nil, false
+	if o == nil || o.Page == nil {
+		return nil, false
 	}
 	return o.Page, true
 }
 
 // HasPage returns a boolean if a field has been set.
 func (o *RecordListAllOf) HasPage() bool {
-	if o != nil && !isNil(o.Page) {
+	if o != nil && o.Page != nil {
 		return true
 	}
 
@@ -172,16 +172,16 @@ func (o *RecordListAllOf) SetPage(v int32) {
 
 func (o RecordListAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Items) {
+	if o.Items != nil {
 		toSerialize["items"] = o.Items
 	}
-	if !isNil(o.Total) {
+	if o.Total != nil {
 		toSerialize["total"] = o.Total
 	}
-	if !isNil(o.Size) {
+	if o.Size != nil {
 		toSerialize["size"] = o.Size
 	}
-	if !isNil(o.Page) {
+	if o.Page != nil {
 		toSerialize["page"] = o.Page
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/model_sort_direction.go b/app-services-sdk-go/kafkainstance/apiv1/client/model_sort_direction.go
index 1d94593d..51ac4e88 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/model_sort_direction.go
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/model_sort_direction.go
@@ -1,10 +1,10 @@
 /*
-Kafka Instance API
-
-API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
-
-API version: 0.13.0-SNAPSHOT
-*/
+ * Kafka Instance API
+ *
+ * API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
+ *
+ * API version: 0.13.0-SNAPSHOT
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -24,8 +24,7 @@ const (
 	SORTDIRECTION_DESC SortDirection = "desc"
 )
 
-// All allowed values of SortDirection enum
-var AllowedSortDirectionEnumValues = []SortDirection{
+var allowedSortDirectionEnumValues = []SortDirection{
 	"asc",
 	"desc",
 }
@@ -37,7 +36,7 @@ func (v *SortDirection) UnmarshalJSON(src []byte) error {
 		return err
 	}
 	enumTypeValue := SortDirection(value)
-	for _, existing := range AllowedSortDirectionEnumValues {
+	for _, existing := range allowedSortDirectionEnumValues {
 		if existing == enumTypeValue {
 			*v = enumTypeValue
 			return nil
@@ -54,13 +53,13 @@ func NewSortDirectionFromValue(v string) (*SortDirection, error) {
 	if ev.IsValid() {
 		return &ev, nil
 	} else {
-		return nil, fmt.Errorf("invalid value '%v' for SortDirection: valid values are %v", v, AllowedSortDirectionEnumValues)
+		return nil, fmt.Errorf("invalid value '%v' for SortDirection: valid values are %v", v, allowedSortDirectionEnumValues)
 	}
 }
 
 // IsValid return true if the value is valid for the enum, false otherwise
 func (v SortDirection) IsValid() bool {
-	for _, existing := range AllowedSortDirectionEnumValues {
+	for _, existing := range allowedSortDirectionEnumValues {
 		if existing == v {
 			return true
 		}
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/model_topic.go b/app-services-sdk-go/kafkainstance/apiv1/client/model_topic.go
index ba624b16..49545151 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/model_topic.go
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/model_topic.go
@@ -1,10 +1,10 @@
 /*
-Kafka Instance API
-
-API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
-
-API version: 0.13.0-SNAPSHOT
-*/
+ * Kafka Instance API
+ *
+ * API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
+ *
+ * API version: 0.13.0-SNAPSHOT
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -25,9 +25,9 @@ type Topic struct {
 	Name *string `json:"name,omitempty"`
 	IsInternal *bool `json:"isInternal,omitempty"`
 	// Partitions for this topic.
-	Partitions []Partition `json:"partitions,omitempty"`
+	Partitions *[]Partition `json:"partitions,omitempty"`
 	// Topic configuration entry.
-	Config []ConfigEntry `json:"config,omitempty"`
+	Config *[]ConfigEntry `json:"config,omitempty"`
 }
 
 // NewTopic instantiates a new Topic object
@@ -49,7 +49,7 @@ func NewTopicWithDefaults() *Topic {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *Topic) GetId() string {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret string
 		return ret
 	}
@@ -59,15 +59,15 @@ func (o *Topic) GetId() string {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Topic) GetIdOk() (*string, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *Topic) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -81,7 +81,7 @@ func (o *Topic) SetId(v string) {
 
 // GetKind returns the Kind field value if set, zero value otherwise.
 func (o *Topic) GetKind() string {
-	if o == nil || isNil(o.Kind) {
+	if o == nil || o.Kind == nil {
 		var ret string
 		return ret
 	}
@@ -91,15 +91,15 @@ func (o *Topic) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Topic) GetKindOk() (*string, bool) {
-	if o == nil || isNil(o.Kind) {
-    return nil, false
+	if o == nil || o.Kind == nil {
+		return nil, false
 	}
 	return o.Kind, true
 }
 
 // HasKind returns a boolean if a field has been set.
 func (o *Topic) HasKind() bool {
-	if o != nil && !isNil(o.Kind) {
+	if o != nil && o.Kind != nil {
 		return true
 	}
 
@@ -113,7 +113,7 @@ func (o *Topic) SetKind(v string) {
 
 // GetHref returns the Href field value if set, zero value otherwise.
 func (o *Topic) GetHref() string {
-	if o == nil || isNil(o.Href) {
+	if o == nil || o.Href == nil {
 		var ret string
 		return ret
 	}
@@ -123,15 +123,15 @@ func (o *Topic) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Topic) GetHrefOk() (*string, bool) {
-	if o == nil || isNil(o.Href) {
-    return nil, false
+	if o == nil || o.Href == nil {
+		return nil, false
 	}
 	return o.Href, true
 }
 
 // HasHref returns a boolean if a field has been set.
 func (o *Topic) HasHref() bool {
-	if o != nil && !isNil(o.Href) {
+	if o != nil && o.Href != nil {
 		return true
 	}
 
@@ -145,7 +145,7 @@ func (o *Topic) SetHref(v string) {
 
 // GetName returns the Name field value if set, zero value otherwise.
 func (o *Topic) GetName() string {
-	if o == nil || isNil(o.Name) {
+	if o == nil || o.Name == nil {
 		var ret string
 		return ret
 	}
@@ -155,15 +155,15 @@ func (o *Topic) GetName() string {
 // GetNameOk returns a tuple with the Name field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Topic) GetNameOk() (*string, bool) {
-	if o == nil || isNil(o.Name) {
-    return nil, false
+	if o == nil || o.Name == nil {
+		return nil, false
 	}
 	return o.Name, true
 }
 
 // HasName returns a boolean if a field has been set.
 func (o *Topic) HasName() bool {
-	if o != nil && !isNil(o.Name) {
+	if o != nil && o.Name != nil {
 		return true
 	}
 
@@ -177,7 +177,7 @@ func (o *Topic) SetName(v string) {
 
 // GetIsInternal returns the IsInternal field value if set, zero value otherwise.
 func (o *Topic) GetIsInternal() bool {
-	if o == nil || isNil(o.IsInternal) {
+	if o == nil || o.IsInternal == nil {
 		var ret bool
 		return ret
 	}
@@ -187,15 +187,15 @@ func (o *Topic) GetIsInternal() bool {
 // GetIsInternalOk returns a tuple with the IsInternal field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Topic) GetIsInternalOk() (*bool, bool) {
-	if o == nil || isNil(o.IsInternal) {
-    return nil, false
+	if o == nil || o.IsInternal == nil {
+		return nil, false
 	}
 	return o.IsInternal, true
 }
 
 // HasIsInternal returns a boolean if a field has been set.
 func (o *Topic) HasIsInternal() bool {
-	if o != nil && !isNil(o.IsInternal) {
+	if o != nil && o.IsInternal != nil {
 		return true
 	}
 
@@ -209,25 +209,25 @@ func (o *Topic) SetIsInternal(v bool) {
 
 // GetPartitions returns the Partitions field value if set, zero value otherwise.
 func (o *Topic) GetPartitions() []Partition {
-	if o == nil || isNil(o.Partitions) {
+	if o == nil || o.Partitions == nil {
 		var ret []Partition
 		return ret
 	}
-	return o.Partitions
+	return *o.Partitions
 }
 
 // GetPartitionsOk returns a tuple with the Partitions field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *Topic) GetPartitionsOk() ([]Partition, bool) {
-	if o == nil || isNil(o.Partitions) {
-    return nil, false
+func (o *Topic) GetPartitionsOk() (*[]Partition, bool) {
+	if o == nil || o.Partitions == nil {
+		return nil, false
 	}
 	return o.Partitions, true
 }
 
 // HasPartitions returns a boolean if a field has been set.
 func (o *Topic) HasPartitions() bool {
-	if o != nil && !isNil(o.Partitions) {
+	if o != nil && o.Partitions != nil {
 		return true
 	}
 
@@ -236,30 +236,30 @@ func (o *Topic) HasPartitions() bool {
 
 // SetPartitions gets a reference to the given []Partition and assigns it to the Partitions field.
 func (o *Topic) SetPartitions(v []Partition) {
-	o.Partitions = v
+	o.Partitions = &v
 }
 
 // GetConfig returns the Config field value if set, zero value otherwise.
 func (o *Topic) GetConfig() []ConfigEntry {
-	if o == nil || isNil(o.Config) {
+	if o == nil || o.Config == nil {
 		var ret []ConfigEntry
 		return ret
 	}
-	return o.Config
+	return *o.Config
 }
 
 // GetConfigOk returns a tuple with the Config field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *Topic) GetConfigOk() ([]ConfigEntry, bool) {
-	if o == nil || isNil(o.Config) {
-    return nil, false
+func (o *Topic) GetConfigOk() (*[]ConfigEntry, bool) {
+	if o == nil || o.Config == nil {
+		return nil, false
 	}
 	return o.Config, true
 }
 
 // HasConfig returns a boolean if a field has been set.
 func (o *Topic) HasConfig() bool {
-	if o != nil && !isNil(o.Config) {
+	if o != nil && o.Config != nil {
 		return true
 	}
 
@@ -268,30 +268,30 @@ func (o *Topic) HasConfig() bool {
 
 // SetConfig gets a reference to the given []ConfigEntry and assigns it to the Config field.
 func (o *Topic) SetConfig(v []ConfigEntry) {
-	o.Config = v
+	o.Config = &v
 }
 
 func (o Topic) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.Kind) {
+	if o.Kind != nil {
 		toSerialize["kind"] = o.Kind
 	}
-	if !isNil(o.Href) {
+	if o.Href != nil {
 		toSerialize["href"] = o.Href
 	}
-	if !isNil(o.Name) {
+	if o.Name != nil {
 		toSerialize["name"] = o.Name
 	}
-	if !isNil(o.IsInternal) {
+	if o.IsInternal != nil {
 		toSerialize["isInternal"] = o.IsInternal
 	}
-	if !isNil(o.Partitions) {
+	if o.Partitions != nil {
 		toSerialize["partitions"] = o.Partitions
 	}
-	if !isNil(o.Config) {
+	if o.Config != nil {
 		toSerialize["config"] = o.Config
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/model_topic_all_of.go b/app-services-sdk-go/kafkainstance/apiv1/client/model_topic_all_of.go
index 440b3ce6..d0fc76b2 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/model_topic_all_of.go
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/model_topic_all_of.go
@@ -1,10 +1,10 @@
 /*
-Kafka Instance API
-
-API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
-
-API version: 0.13.0-SNAPSHOT
-*/
+ * Kafka Instance API
+ *
+ * API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
+ *
+ * API version: 0.13.0-SNAPSHOT
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -20,9 +20,9 @@ type TopicAllOf struct {
 	Name *string `json:"name,omitempty"`
 	IsInternal *bool `json:"isInternal,omitempty"`
 	// Partitions for this topic.
-	Partitions []Partition `json:"partitions,omitempty"`
+	Partitions *[]Partition `json:"partitions,omitempty"`
 	// Topic configuration entry.
-	Config []ConfigEntry `json:"config,omitempty"`
+	Config *[]ConfigEntry `json:"config,omitempty"`
 }
 
 // NewTopicAllOf instantiates a new TopicAllOf object
@@ -44,7 +44,7 @@ func NewTopicAllOfWithDefaults() *TopicAllOf {
 
 // GetName returns the Name field value if set, zero value otherwise.
 func (o *TopicAllOf) GetName() string {
-	if o == nil || isNil(o.Name) {
+	if o == nil || o.Name == nil {
 		var ret string
 		return ret
 	}
@@ -54,15 +54,15 @@ func (o *TopicAllOf) GetName() string {
 // GetNameOk returns a tuple with the Name field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *TopicAllOf) GetNameOk() (*string, bool) {
-	if o == nil || isNil(o.Name) {
-    return nil, false
+	if o == nil || o.Name == nil {
+		return nil, false
 	}
 	return o.Name, true
 }
 
 // HasName returns a boolean if a field has been set.
 func (o *TopicAllOf) HasName() bool {
-	if o != nil && !isNil(o.Name) {
+	if o != nil && o.Name != nil {
 		return true
 	}
 
@@ -76,7 +76,7 @@ func (o *TopicAllOf) SetName(v string) {
 
 // GetIsInternal returns the IsInternal field value if set, zero value otherwise.
 func (o *TopicAllOf) GetIsInternal() bool {
-	if o == nil || isNil(o.IsInternal) {
+	if o == nil || o.IsInternal == nil {
 		var ret bool
 		return ret
 	}
@@ -86,15 +86,15 @@ func (o *TopicAllOf) GetIsInternal() bool {
 // GetIsInternalOk returns a tuple with the IsInternal field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *TopicAllOf) GetIsInternalOk() (*bool, bool) {
-	if o == nil || isNil(o.IsInternal) {
-    return nil, false
+	if o == nil || o.IsInternal == nil {
+		return nil, false
 	}
 	return o.IsInternal, true
 }
 
 // HasIsInternal returns a boolean if a field has been set.
 func (o *TopicAllOf) HasIsInternal() bool {
-	if o != nil && !isNil(o.IsInternal) {
+	if o != nil && o.IsInternal != nil {
 		return true
 	}
 
@@ -108,25 +108,25 @@ func (o *TopicAllOf) SetIsInternal(v bool) {
 
 // GetPartitions returns the Partitions field value if set, zero value otherwise.
 func (o *TopicAllOf) GetPartitions() []Partition {
-	if o == nil || isNil(o.Partitions) {
+	if o == nil || o.Partitions == nil {
 		var ret []Partition
 		return ret
 	}
-	return o.Partitions
+	return *o.Partitions
 }
 
 // GetPartitionsOk returns a tuple with the Partitions field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *TopicAllOf) GetPartitionsOk() ([]Partition, bool) {
-	if o == nil || isNil(o.Partitions) {
-    return nil, false
+func (o *TopicAllOf) GetPartitionsOk() (*[]Partition, bool) {
+	if o == nil || o.Partitions == nil {
+		return nil, false
 	}
 	return o.Partitions, true
 }
 
 // HasPartitions returns a boolean if a field has been set.
 func (o *TopicAllOf) HasPartitions() bool {
-	if o != nil && !isNil(o.Partitions) {
+	if o != nil && o.Partitions != nil {
 		return true
 	}
 
@@ -135,30 +135,30 @@ func (o *TopicAllOf) HasPartitions() bool {
 
 // SetPartitions gets a reference to the given []Partition and assigns it to the Partitions field.
 func (o *TopicAllOf) SetPartitions(v []Partition) {
-	o.Partitions = v
+	o.Partitions = &v
 }
 
 // GetConfig returns the Config field value if set, zero value otherwise.
 func (o *TopicAllOf) GetConfig() []ConfigEntry {
-	if o == nil || isNil(o.Config) {
+	if o == nil || o.Config == nil {
 		var ret []ConfigEntry
 		return ret
 	}
-	return o.Config
+	return *o.Config
 }
 
 // GetConfigOk returns a tuple with the Config field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *TopicAllOf) GetConfigOk() ([]ConfigEntry, bool) {
-	if o == nil || isNil(o.Config) {
-    return nil, false
+func (o *TopicAllOf) GetConfigOk() (*[]ConfigEntry, bool) {
+	if o == nil || o.Config == nil {
+		return nil, false
 	}
 	return o.Config, true
 }
 
 // HasConfig returns a boolean if a field has been set.
 func (o *TopicAllOf) HasConfig() bool {
-	if o != nil && !isNil(o.Config) {
+	if o != nil && o.Config != nil {
 		return true
 	}
 
@@ -167,21 +167,21 @@ func (o *TopicAllOf) HasConfig() bool {
 
 // SetConfig gets a reference to the given []ConfigEntry and assigns it to the Config field.
 func (o *TopicAllOf) SetConfig(v []ConfigEntry) {
-	o.Config = v
+	o.Config = &v
 }
 
 func (o TopicAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Name) {
+	if o.Name != nil {
 		toSerialize["name"] = o.Name
 	}
-	if !isNil(o.IsInternal) {
+	if o.IsInternal != nil {
 		toSerialize["isInternal"] = o.IsInternal
 	}
-	if !isNil(o.Partitions) {
+	if o.Partitions != nil {
 		toSerialize["partitions"] = o.Partitions
 	}
-	if !isNil(o.Config) {
+	if o.Config != nil {
 		toSerialize["config"] = o.Config
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/model_topic_order_key.go b/app-services-sdk-go/kafkainstance/apiv1/client/model_topic_order_key.go
index 621f2641..822b2494 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/model_topic_order_key.go
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/model_topic_order_key.go
@@ -1,10 +1,10 @@
 /*
-Kafka Instance API
-
-API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
-
-API version: 0.13.0-SNAPSHOT
-*/
+ * Kafka Instance API
+ *
+ * API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
+ *
+ * API version: 0.13.0-SNAPSHOT
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -26,8 +26,7 @@ const (
 	TOPICORDERKEY_RETENTION_BYTES TopicOrderKey = "retention.bytes"
 )
 
-// All allowed values of TopicOrderKey enum
-var AllowedTopicOrderKeyEnumValues = []TopicOrderKey{
+var allowedTopicOrderKeyEnumValues = []TopicOrderKey{
 	"name",
 	"partitions",
 	"retention.ms",
@@ -41,7 +40,7 @@ func (v *TopicOrderKey) UnmarshalJSON(src []byte) error {
 		return err
 	}
 	enumTypeValue := TopicOrderKey(value)
-	for _, existing := range AllowedTopicOrderKeyEnumValues {
+	for _, existing := range allowedTopicOrderKeyEnumValues {
 		if existing == enumTypeValue {
 			*v = enumTypeValue
 			return nil
@@ -58,13 +57,13 @@ func NewTopicOrderKeyFromValue(v string) (*TopicOrderKey, error) {
 	if ev.IsValid() {
 		return &ev, nil
 	} else {
-		return nil, fmt.Errorf("invalid value '%v' for TopicOrderKey: valid values are %v", v, AllowedTopicOrderKeyEnumValues)
+		return nil, fmt.Errorf("invalid value '%v' for TopicOrderKey: valid values are %v", v, allowedTopicOrderKeyEnumValues)
 	}
 }
 
 // IsValid return true if the value is valid for the enum, false otherwise
 func (v TopicOrderKey) IsValid() bool {
-	for _, existing := range AllowedTopicOrderKeyEnumValues {
+	for _, existing := range allowedTopicOrderKeyEnumValues {
 		if existing == v {
 			return true
 		}
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/model_topic_settings.go b/app-services-sdk-go/kafkainstance/apiv1/client/model_topic_settings.go
index b08d09b0..745c9139 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/model_topic_settings.go
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/model_topic_settings.go
@@ -1,10 +1,10 @@
 /*
-Kafka Instance API
-
-API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
-
-API version: 0.13.0-SNAPSHOT
-*/
+ * Kafka Instance API
+ *
+ * API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
+ *
+ * API version: 0.13.0-SNAPSHOT
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -19,7 +19,7 @@ type TopicSettings struct {
 	// Number of partitions for this topic. If not specified, the default for new topics is `1`. Number of partitions may not be reduced when updating existing topics
 	NumPartitions *int32 `json:"numPartitions,omitempty"`
 	// Topic configuration entries.
-	Config []ConfigEntry `json:"config,omitempty"`
+	Config *[]ConfigEntry `json:"config,omitempty"`
 }
 
 // NewTopicSettings instantiates a new TopicSettings object
@@ -41,7 +41,7 @@ func NewTopicSettingsWithDefaults() *TopicSettings {
 
 // GetNumPartitions returns the NumPartitions field value if set, zero value otherwise.
 func (o *TopicSettings) GetNumPartitions() int32 {
-	if o == nil || isNil(o.NumPartitions) {
+	if o == nil || o.NumPartitions == nil {
 		var ret int32
 		return ret
 	}
@@ -51,15 +51,15 @@ func (o *TopicSettings) GetNumPartitions() int32 {
 // GetNumPartitionsOk returns a tuple with the NumPartitions field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *TopicSettings) GetNumPartitionsOk() (*int32, bool) {
-	if o == nil || isNil(o.NumPartitions) {
-    return nil, false
+	if o == nil || o.NumPartitions == nil {
+		return nil, false
 	}
 	return o.NumPartitions, true
 }
 
 // HasNumPartitions returns a boolean if a field has been set.
 func (o *TopicSettings) HasNumPartitions() bool {
-	if o != nil && !isNil(o.NumPartitions) {
+	if o != nil && o.NumPartitions != nil {
 		return true
 	}
 
@@ -73,25 +73,25 @@ func (o *TopicSettings) SetNumPartitions(v int32) {
 
 // GetConfig returns the Config field value if set, zero value otherwise.
 func (o *TopicSettings) GetConfig() []ConfigEntry {
-	if o == nil || isNil(o.Config) {
+	if o == nil || o.Config == nil {
 		var ret []ConfigEntry
 		return ret
 	}
-	return o.Config
+	return *o.Config
 }
 
 // GetConfigOk returns a tuple with the Config field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *TopicSettings) GetConfigOk() ([]ConfigEntry, bool) {
-	if o == nil || isNil(o.Config) {
-    return nil, false
+func (o *TopicSettings) GetConfigOk() (*[]ConfigEntry, bool) {
+	if o == nil || o.Config == nil {
+		return nil, false
 	}
 	return o.Config, true
 }
 
 // HasConfig returns a boolean if a field has been set.
 func (o *TopicSettings) HasConfig() bool {
-	if o != nil && !isNil(o.Config) {
+	if o != nil && o.Config != nil {
 		return true
 	}
 
@@ -100,15 +100,15 @@ func (o *TopicSettings) HasConfig() bool {
 
 // SetConfig gets a reference to the given []ConfigEntry and assigns it to the Config field.
 func (o *TopicSettings) SetConfig(v []ConfigEntry) {
-	o.Config = v
+	o.Config = &v
 }
 
 func (o TopicSettings) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.NumPartitions) {
+	if o.NumPartitions != nil {
 		toSerialize["numPartitions"] = o.NumPartitions
 	}
-	if !isNil(o.Config) {
+	if o.Config != nil {
 		toSerialize["config"] = o.Config
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/model_topics_list.go b/app-services-sdk-go/kafkainstance/apiv1/client/model_topics_list.go
index fe29daf3..abe73c2f 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/model_topics_list.go
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/model_topics_list.go
@@ -1,10 +1,10 @@
 /*
-Kafka Instance API
-
-API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
-
-API version: 0.13.0-SNAPSHOT
-*/
+ * Kafka Instance API
+ *
+ * API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
+ *
+ * API version: 0.13.0-SNAPSHOT
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -25,13 +25,10 @@ type TopicsList struct {
 	// Current page number (returned for fetch requests)
 	Page *int32 `json:"page,omitempty"`
 	// Offset of the first record returned, zero-based
-	// Deprecated
 	Offset *int32 `json:"offset,omitempty"`
 	// Maximum number of records to return, from request
-	// Deprecated
 	Limit *int32 `json:"limit,omitempty"`
 	// Total number of entries in the full result set
-	// Deprecated
 	Count *int32 `json:"count,omitempty"`
 }
 
@@ -56,7 +53,7 @@ func NewTopicsListWithDefaults() *TopicsList {
 
 // GetKind returns the Kind field value if set, zero value otherwise.
 func (o *TopicsList) GetKind() string {
-	if o == nil || isNil(o.Kind) {
+	if o == nil || o.Kind == nil {
 		var ret string
 		return ret
 	}
@@ -66,15 +63,15 @@ func (o *TopicsList) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *TopicsList) GetKindOk() (*string, bool) {
-	if o == nil || isNil(o.Kind) {
-    return nil, false
+	if o == nil || o.Kind == nil {
+		return nil, false
 	}
 	return o.Kind, true
 }
 
 // HasKind returns a boolean if a field has been set.
 func (o *TopicsList) HasKind() bool {
-	if o != nil && !isNil(o.Kind) {
+	if o != nil && o.Kind != nil {
 		return true
 	}
 
@@ -98,11 +95,11 @@ func (o *TopicsList) GetItems() []Topic {
 
 // GetItemsOk returns a tuple with the Items field value
 // and a boolean to check if the value has been set.
-func (o *TopicsList) GetItemsOk() ([]Topic, bool) {
-	if o == nil {
-    return nil, false
+func (o *TopicsList) GetItemsOk() (*[]Topic, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Items, true
+	return &o.Items, true
 }
 
 // SetItems sets field value
@@ -123,8 +120,8 @@ func (o *TopicsList) GetTotal() int32 {
 // GetTotalOk returns a tuple with the Total field value
 // and a boolean to check if the value has been set.
 func (o *TopicsList) GetTotalOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Total, true
 }
@@ -136,7 +133,7 @@ func (o *TopicsList) SetTotal(v int32) {
 
 // GetSize returns the Size field value if set, zero value otherwise.
 func (o *TopicsList) GetSize() int32 {
-	if o == nil || isNil(o.Size) {
+	if o == nil || o.Size == nil {
 		var ret int32
 		return ret
 	}
@@ -146,15 +143,15 @@ func (o *TopicsList) GetSize() int32 {
 // GetSizeOk returns a tuple with the Size field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *TopicsList) GetSizeOk() (*int32, bool) {
-	if o == nil || isNil(o.Size) {
-    return nil, false
+	if o == nil || o.Size == nil {
+		return nil, false
 	}
 	return o.Size, true
 }
 
 // HasSize returns a boolean if a field has been set.
 func (o *TopicsList) HasSize() bool {
-	if o != nil && !isNil(o.Size) {
+	if o != nil && o.Size != nil {
 		return true
 	}
 
@@ -168,7 +165,7 @@ func (o *TopicsList) SetSize(v int32) {
 
 // GetPage returns the Page field value if set, zero value otherwise.
 func (o *TopicsList) GetPage() int32 {
-	if o == nil || isNil(o.Page) {
+	if o == nil || o.Page == nil {
 		var ret int32
 		return ret
 	}
@@ -178,15 +175,15 @@ func (o *TopicsList) GetPage() int32 {
 // GetPageOk returns a tuple with the Page field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *TopicsList) GetPageOk() (*int32, bool) {
-	if o == nil || isNil(o.Page) {
-    return nil, false
+	if o == nil || o.Page == nil {
+		return nil, false
 	}
 	return o.Page, true
 }
 
 // HasPage returns a boolean if a field has been set.
 func (o *TopicsList) HasPage() bool {
-	if o != nil && !isNil(o.Page) {
+	if o != nil && o.Page != nil {
 		return true
 	}
 
@@ -199,9 +196,8 @@ func (o *TopicsList) SetPage(v int32) {
 }
 
 // GetOffset returns the Offset field value if set, zero value otherwise.
-// Deprecated
 func (o *TopicsList) GetOffset() int32 {
-	if o == nil || isNil(o.Offset) {
+	if o == nil || o.Offset == nil {
 		var ret int32
 		return ret
 	}
@@ -210,17 +206,16 @@ func (o *TopicsList) GetOffset() int32 {
 
 // GetOffsetOk returns a tuple with the Offset field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-// Deprecated
 func (o *TopicsList) GetOffsetOk() (*int32, bool) {
-	if o == nil || isNil(o.Offset) {
-    return nil, false
+	if o == nil || o.Offset == nil {
+		return nil, false
 	}
 	return o.Offset, true
 }
 
 // HasOffset returns a boolean if a field has been set.
 func (o *TopicsList) HasOffset() bool {
-	if o != nil && !isNil(o.Offset) {
+	if o != nil && o.Offset != nil {
 		return true
 	}
 
@@ -228,15 +223,13 @@ func (o *TopicsList) HasOffset() bool {
 }
 
 // SetOffset gets a reference to the given int32 and assigns it to the Offset field.
-// Deprecated
 func (o *TopicsList) SetOffset(v int32) {
 	o.Offset = &v
 }
 
 // GetLimit returns the Limit field value if set, zero value otherwise.
-// Deprecated
 func (o *TopicsList) GetLimit() int32 {
-	if o == nil || isNil(o.Limit) {
+	if o == nil || o.Limit == nil {
 		var ret int32
 		return ret
 	}
@@ -245,17 +238,16 @@ func (o *TopicsList) GetLimit() int32 {
 
 // GetLimitOk returns a tuple with the Limit field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-// Deprecated
 func (o *TopicsList) GetLimitOk() (*int32, bool) {
-	if o == nil || isNil(o.Limit) {
-    return nil, false
+	if o == nil || o.Limit == nil {
+		return nil, false
 	}
 	return o.Limit, true
 }
 
 // HasLimit returns a boolean if a field has been set.
 func (o *TopicsList) HasLimit() bool {
-	if o != nil && !isNil(o.Limit) {
+	if o != nil && o.Limit != nil {
 		return true
 	}
 
@@ -263,15 +255,13 @@ func (o *TopicsList) HasLimit() bool {
 }
 
 // SetLimit gets a reference to the given int32 and assigns it to the Limit field.
-// Deprecated
 func (o *TopicsList) SetLimit(v int32) {
 	o.Limit = &v
 }
 
 // GetCount returns the Count field value if set, zero value otherwise.
-// Deprecated
 func (o *TopicsList) GetCount() int32 {
-	if o == nil || isNil(o.Count) {
+	if o == nil || o.Count == nil {
 		var ret int32
 		return ret
 	}
@@ -280,17 +270,16 @@ func (o *TopicsList) GetCount() int32 {
 
 // GetCountOk returns a tuple with the Count field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-// Deprecated
 func (o *TopicsList) GetCountOk() (*int32, bool) {
-	if o == nil || isNil(o.Count) {
-    return nil, false
+	if o == nil || o.Count == nil {
+		return nil, false
 	}
 	return o.Count, true
 }
 
 // HasCount returns a boolean if a field has been set.
 func (o *TopicsList) HasCount() bool {
-	if o != nil && !isNil(o.Count) {
+	if o != nil && o.Count != nil {
 		return true
 	}
 
@@ -298,14 +287,13 @@ func (o *TopicsList) HasCount() bool {
 }
 
 // SetCount gets a reference to the given int32 and assigns it to the Count field.
-// Deprecated
 func (o *TopicsList) SetCount(v int32) {
 	o.Count = &v
 }
 
 func (o TopicsList) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Kind) {
+	if o.Kind != nil {
 		toSerialize["kind"] = o.Kind
 	}
 	if true {
@@ -314,19 +302,19 @@ func (o TopicsList) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["total"] = o.Total
 	}
-	if !isNil(o.Size) {
+	if o.Size != nil {
 		toSerialize["size"] = o.Size
 	}
-	if !isNil(o.Page) {
+	if o.Page != nil {
 		toSerialize["page"] = o.Page
 	}
-	if !isNil(o.Offset) {
+	if o.Offset != nil {
 		toSerialize["offset"] = o.Offset
 	}
-	if !isNil(o.Limit) {
+	if o.Limit != nil {
 		toSerialize["limit"] = o.Limit
 	}
-	if !isNil(o.Count) {
+	if o.Count != nil {
 		toSerialize["count"] = o.Count
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/model_topics_list_all_of.go b/app-services-sdk-go/kafkainstance/apiv1/client/model_topics_list_all_of.go
index cf6d82e1..1be52295 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/model_topics_list_all_of.go
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/model_topics_list_all_of.go
@@ -1,10 +1,10 @@
 /*
-Kafka Instance API
-
-API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
-
-API version: 0.13.0-SNAPSHOT
-*/
+ * Kafka Instance API
+ *
+ * API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
+ *
+ * API version: 0.13.0-SNAPSHOT
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -16,7 +16,7 @@ import (
 
 // TopicsListAllOf A list of topics.
 type TopicsListAllOf struct {
-	Items []Topic `json:"items,omitempty"`
+	Items *[]Topic `json:"items,omitempty"`
 }
 
 // NewTopicsListAllOf instantiates a new TopicsListAllOf object
@@ -38,25 +38,25 @@ func NewTopicsListAllOfWithDefaults() *TopicsListAllOf {
 
 // GetItems returns the Items field value if set, zero value otherwise.
 func (o *TopicsListAllOf) GetItems() []Topic {
-	if o == nil || isNil(o.Items) {
+	if o == nil || o.Items == nil {
 		var ret []Topic
 		return ret
 	}
-	return o.Items
+	return *o.Items
 }
 
 // GetItemsOk returns a tuple with the Items field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *TopicsListAllOf) GetItemsOk() ([]Topic, bool) {
-	if o == nil || isNil(o.Items) {
-    return nil, false
+func (o *TopicsListAllOf) GetItemsOk() (*[]Topic, bool) {
+	if o == nil || o.Items == nil {
+		return nil, false
 	}
 	return o.Items, true
 }
 
 // HasItems returns a boolean if a field has been set.
 func (o *TopicsListAllOf) HasItems() bool {
-	if o != nil && !isNil(o.Items) {
+	if o != nil && o.Items != nil {
 		return true
 	}
 
@@ -65,12 +65,12 @@ func (o *TopicsListAllOf) HasItems() bool {
 
 // SetItems gets a reference to the given []Topic and assigns it to the Items field.
 func (o *TopicsListAllOf) SetItems(v []Topic) {
-	o.Items = v
+	o.Items = &v
 }
 
 func (o TopicsListAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Items) {
+	if o.Items != nil {
 		toSerialize["items"] = o.Items
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/model_topics_to_reset_offset.go b/app-services-sdk-go/kafkainstance/apiv1/client/model_topics_to_reset_offset.go
index edd54fb6..5bd89ec3 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/model_topics_to_reset_offset.go
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/model_topics_to_reset_offset.go
@@ -1,10 +1,10 @@
 /*
-Kafka Instance API
-
-API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
-
-API version: 0.13.0-SNAPSHOT
-*/
+ * Kafka Instance API
+ *
+ * API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
+ *
+ * API version: 0.13.0-SNAPSHOT
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -17,7 +17,7 @@ import (
 // TopicsToResetOffset struct for TopicsToResetOffset
 type TopicsToResetOffset struct {
 	Topic string `json:"topic"`
-	Partitions []int32 `json:"partitions,omitempty"`
+	Partitions *[]int32 `json:"partitions,omitempty"`
 }
 
 // NewTopicsToResetOffset instantiates a new TopicsToResetOffset object
@@ -51,8 +51,8 @@ func (o *TopicsToResetOffset) GetTopic() string {
 // GetTopicOk returns a tuple with the Topic field value
 // and a boolean to check if the value has been set.
 func (o *TopicsToResetOffset) GetTopicOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Topic, true
 }
@@ -64,25 +64,25 @@ func (o *TopicsToResetOffset) SetTopic(v string) {
 
 // GetPartitions returns the Partitions field value if set, zero value otherwise.
 func (o *TopicsToResetOffset) GetPartitions() []int32 {
-	if o == nil || isNil(o.Partitions) {
+	if o == nil || o.Partitions == nil {
 		var ret []int32
 		return ret
 	}
-	return o.Partitions
+	return *o.Partitions
 }
 
 // GetPartitionsOk returns a tuple with the Partitions field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *TopicsToResetOffset) GetPartitionsOk() ([]int32, bool) {
-	if o == nil || isNil(o.Partitions) {
-    return nil, false
+func (o *TopicsToResetOffset) GetPartitionsOk() (*[]int32, bool) {
+	if o == nil || o.Partitions == nil {
+		return nil, false
 	}
 	return o.Partitions, true
 }
 
 // HasPartitions returns a boolean if a field has been set.
 func (o *TopicsToResetOffset) HasPartitions() bool {
-	if o != nil && !isNil(o.Partitions) {
+	if o != nil && o.Partitions != nil {
 		return true
 	}
 
@@ -91,7 +91,7 @@ func (o *TopicsToResetOffset) HasPartitions() bool {
 
 // SetPartitions gets a reference to the given []int32 and assigns it to the Partitions field.
 func (o *TopicsToResetOffset) SetPartitions(v []int32) {
-	o.Partitions = v
+	o.Partitions = &v
 }
 
 func (o TopicsToResetOffset) MarshalJSON() ([]byte, error) {
@@ -99,7 +99,7 @@ func (o TopicsToResetOffset) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["topic"] = o.Topic
 	}
-	if !isNil(o.Partitions) {
+	if o.Partitions != nil {
 		toSerialize["partitions"] = o.Partitions
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/response.go b/app-services-sdk-go/kafkainstance/apiv1/client/response.go
index 0cc700ee..0d7a08db 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/response.go
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/response.go
@@ -1,10 +1,10 @@
 /*
-Kafka Instance API
-
-API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
-
-API version: 0.13.0-SNAPSHOT
-*/
+ * Kafka Instance API
+ *
+ * API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
+ *
+ * API version: 0.13.0-SNAPSHOT
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/test/api_acls_test.go b/app-services-sdk-go/kafkainstance/apiv1/client/test/api_acls_test.go
deleted file mode 100644
index a31ae0e7..00000000
--- a/app-services-sdk-go/kafkainstance/apiv1/client/test/api_acls_test.go
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-Kafka Instance API
-
-Testing AclsApiService
-
-*/
-
-// Code generated by OpenAPI Generator (https://openapi-generator.tech);
-
-package kafkainstanceclient
-
-import (
-    "context"
-    "github.com/stretchr/testify/assert"
-    "github.com/stretchr/testify/require"
-    "testing"
-    openapiclient "./openapi"
-)
-
-func Test_kafkainstanceclient_AclsApiService(t *testing.T) {
-
-    configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-
-    t.Run("Test AclsApiService CreateAcl", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.AclsApi.CreateAcl(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test AclsApiService DeleteAcls", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.AclsApi.DeleteAcls(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test AclsApiService GetAclResourceOperations", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.AclsApi.GetAclResourceOperations(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test AclsApiService GetAcls", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.AclsApi.GetAcls(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-}
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/test/api_errors_test.go b/app-services-sdk-go/kafkainstance/apiv1/client/test/api_errors_test.go
deleted file mode 100644
index 783f0194..00000000
--- a/app-services-sdk-go/kafkainstance/apiv1/client/test/api_errors_test.go
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-Kafka Instance API
-
-Testing ErrorsApiService
-
-*/
-
-// Code generated by OpenAPI Generator (https://openapi-generator.tech);
-
-package kafkainstanceclient
-
-import (
-    "context"
-    "github.com/stretchr/testify/assert"
-    "github.com/stretchr/testify/require"
-    "testing"
-    openapiclient "./openapi"
-)
-
-func Test_kafkainstanceclient_ErrorsApiService(t *testing.T) {
-
-    configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-
-    t.Run("Test ErrorsApiService GetError", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var errorId string
-
-        resp, httpRes, err := apiClient.ErrorsApi.GetError(context.Background(), errorId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test ErrorsApiService GetErrors", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.ErrorsApi.GetErrors(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-}
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/test/api_groups_test.go b/app-services-sdk-go/kafkainstance/apiv1/client/test/api_groups_test.go
deleted file mode 100644
index 6947d2b3..00000000
--- a/app-services-sdk-go/kafkainstance/apiv1/client/test/api_groups_test.go
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
-Kafka Instance API
-
-Testing GroupsApiService
-
-*/
-
-// Code generated by OpenAPI Generator (https://openapi-generator.tech);
-
-package kafkainstanceclient
-
-import (
-    "context"
-    "github.com/stretchr/testify/assert"
-    "github.com/stretchr/testify/require"
-    "testing"
-    openapiclient "./openapi"
-)
-
-func Test_kafkainstanceclient_GroupsApiService(t *testing.T) {
-
-    configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-
-    t.Run("Test GroupsApiService DeleteConsumerGroupById", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var consumerGroupId string
-
-        resp, httpRes, err := apiClient.GroupsApi.DeleteConsumerGroupById(context.Background(), consumerGroupId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test GroupsApiService GetConsumerGroupById", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var consumerGroupId string
-
-        resp, httpRes, err := apiClient.GroupsApi.GetConsumerGroupById(context.Background(), consumerGroupId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test GroupsApiService GetConsumerGroups", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.GroupsApi.GetConsumerGroups(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test GroupsApiService ResetConsumerGroupOffset", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var consumerGroupId string
-
-        resp, httpRes, err := apiClient.GroupsApi.ResetConsumerGroupOffset(context.Background(), consumerGroupId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-}
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/test/api_records_test.go b/app-services-sdk-go/kafkainstance/apiv1/client/test/api_records_test.go
deleted file mode 100644
index 90f47516..00000000
--- a/app-services-sdk-go/kafkainstance/apiv1/client/test/api_records_test.go
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-Kafka Instance API
-
-Testing RecordsApiService
-
-*/
-
-// Code generated by OpenAPI Generator (https://openapi-generator.tech);
-
-package kafkainstanceclient
-
-import (
-    "context"
-    "github.com/stretchr/testify/assert"
-    "github.com/stretchr/testify/require"
-    "testing"
-    openapiclient "./openapi"
-)
-
-func Test_kafkainstanceclient_RecordsApiService(t *testing.T) {
-
-    configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-
-    t.Run("Test RecordsApiService ConsumeRecords", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var topicName string
-
-        resp, httpRes, err := apiClient.RecordsApi.ConsumeRecords(context.Background(), topicName).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test RecordsApiService ProduceRecord", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var topicName string
-
-        resp, httpRes, err := apiClient.RecordsApi.ProduceRecord(context.Background(), topicName).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-}
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/test/api_topics_test.go b/app-services-sdk-go/kafkainstance/apiv1/client/test/api_topics_test.go
deleted file mode 100644
index 6c165375..00000000
--- a/app-services-sdk-go/kafkainstance/apiv1/client/test/api_topics_test.go
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
-Kafka Instance API
-
-Testing TopicsApiService
-
-*/
-
-// Code generated by OpenAPI Generator (https://openapi-generator.tech);
-
-package kafkainstanceclient
-
-import (
-    "context"
-    "github.com/stretchr/testify/assert"
-    "github.com/stretchr/testify/require"
-    "testing"
-    openapiclient "./openapi"
-)
-
-func Test_kafkainstanceclient_TopicsApiService(t *testing.T) {
-
-    configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-
-    t.Run("Test TopicsApiService CreateTopic", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.TopicsApi.CreateTopic(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test TopicsApiService DeleteTopic", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var topicName string
-
-        resp, httpRes, err := apiClient.TopicsApi.DeleteTopic(context.Background(), topicName).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test TopicsApiService GetTopic", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var topicName string
-
-        resp, httpRes, err := apiClient.TopicsApi.GetTopic(context.Background(), topicName).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test TopicsApiService GetTopics", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.TopicsApi.GetTopics(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test TopicsApiService UpdateTopic", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var topicName string
-
-        resp, httpRes, err := apiClient.TopicsApi.UpdateTopic(context.Background(), topicName).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-}
diff --git a/app-services-sdk-go/kafkainstance/apiv1/client/utils.go b/app-services-sdk-go/kafkainstance/apiv1/client/utils.go
index 94e74465..34f4a18d 100644
--- a/app-services-sdk-go/kafkainstance/apiv1/client/utils.go
+++ b/app-services-sdk-go/kafkainstance/apiv1/client/utils.go
@@ -1,10 +1,10 @@
 /*
-Kafka Instance API
-
-API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
-
-API version: 0.13.0-SNAPSHOT
-*/
+ * Kafka Instance API
+ *
+ * API for interacting with Kafka Instance. Includes Produce, Consume and Admin APIs
+ *
+ * API version: 0.13.0-SNAPSHOT
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -12,7 +12,6 @@ package kafkainstanceclient
 
 import (
 	"encoding/json"
-    "reflect"
 	"time"
 )
 
@@ -327,17 +326,3 @@ func (v *NullableTime) UnmarshalJSON(src []byte) error {
 	v.isSet = true
 	return json.Unmarshal(src, &v.value)
 }
-
-// isNil checks if an input is nil
-func isNil(i interface{}) bool {
-    if i == nil {
-        return true
-    }
-    switch reflect.TypeOf(i).Kind() {
-    case reflect.Chan, reflect.Func, reflect.Map, reflect.Ptr, reflect.UnsafePointer, reflect.Interface, reflect.Slice:
-        return reflect.ValueOf(i).IsNil()
-    case reflect.Array:
-        return reflect.ValueOf(i).IsZero()
-    }
-    return false
-}
\ No newline at end of file
diff --git a/app-services-sdk-go/kafkainstance/go.mod b/app-services-sdk-go/kafkainstance/go.mod
index 1c488feb..15c00f99 100644
--- a/app-services-sdk-go/kafkainstance/go.mod
+++ b/app-services-sdk-go/kafkainstance/go.mod
@@ -1,8 +1,8 @@
-module github.com/redhat-developer/app-services-sdk-go/kafkainstance
+module github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go/kafkainstance
 
 go 1.15
 
 require (
-	github.com/redhat-developer/app-services-sdk-go v0.10.0
+	github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go v0.1.0
 	golang.org/x/oauth2 v0.0.0-20220630143837-2104d58473e0
 )
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/api_client.go b/app-services-sdk-go/kafkamgmt/apiv1/api_client.go
index 293abc44..1ecb66ce 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/api_client.go
+++ b/app-services-sdk-go/kafkamgmt/apiv1/api_client.go
@@ -1,9 +1,9 @@
 package kafkamgmt
 
 import (
-	"github.com/redhat-developer/app-services-sdk-go/core"
+	"github.com/jackdelahunt/app-services-sdk-core/app-services-sdk-go/core"
 
-	apiv1 "github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client"
+	apiv1 "github.com/jackdelahunt/app-services-sdk-core/app-services-sdk-go/kafkamgmt/apiv1/client"
 )
 
 // Config defines the available configuration options
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/.openapi-generator/FILES b/app-services-sdk-go/kafkamgmt/apiv1/client/.openapi-generator/FILES
index 5230a268..327b19a3 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/.openapi-generator/FILES
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/.openapi-generator/FILES
@@ -52,7 +52,6 @@ docs/SsoProvider.md
 docs/SsoProviderAllOf.md
 docs/SupportedKafkaBillingModel.md
 docs/SupportedKafkaInstanceType.md
-docs/SupportedKafkaInstanceTypeSizesInner.md
 docs/SupportedKafkaInstanceTypesList.md
 docs/SupportedKafkaInstanceTypesListAllOf.md
 docs/SupportedKafkaSize.md
@@ -60,8 +59,6 @@ docs/SupportedKafkaSizeBytesValueItem.md
 docs/Values.md
 docs/VersionMetadata.md
 docs/VersionMetadataAllOf.md
-go.mod
-go.sum
 model_cloud_provider.go
 model_cloud_provider_list.go
 model_cloud_provider_list_all_of.go
@@ -105,7 +102,6 @@ model_sso_provider.go
 model_sso_provider_all_of.go
 model_supported_kafka_billing_model.go
 model_supported_kafka_instance_type.go
-model_supported_kafka_instance_type_sizes_inner.go
 model_supported_kafka_instance_types_list.go
 model_supported_kafka_instance_types_list_all_of.go
 model_supported_kafka_size.go
@@ -114,8 +110,4 @@ model_values.go
 model_version_metadata.go
 model_version_metadata_all_of.go
 response.go
-test/api_default_test.go
-test/api_enterprise_dataplane_clusters_test.go
-test/api_errors_test.go
-test/api_security_test.go
 utils.go
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/.openapi-generator/VERSION b/app-services-sdk-go/kafkamgmt/apiv1/client/.openapi-generator/VERSION
index 0df17dd0..7cbea073 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/.openapi-generator/VERSION
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/.openapi-generator/VERSION
@@ -1 +1 @@
-6.2.1
\ No newline at end of file
+5.2.0
\ No newline at end of file
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/api/openapi.yaml b/app-services-sdk-go/kafkamgmt/apiv1/client/api/openapi.yaml
index a510f4e9..de19e491 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/api/openapi.yaml
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/api/openapi.yaml
@@ -99,7 +99,6 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/Error'
-              example: null
           description: Deleted
         "400":
           content:
@@ -1572,7 +1571,7 @@ components:
         owner: api_kafka_service
         name: serviceapi
         bootstrap_server_host: serviceapi-1isy6rq3jki8q0otmjqfd3ocfrg.apps.mk-bttg0jn170hp.x5u8.s1.devshift.org
-        admin_api_server_url: "https://admin-server-mk-e-e-e-e-c---{}ld{-}-n-vp--bltg.rhcloud.com"
+        admin_api_server_url: https://admin-server-mk-e-e-e-e-c---{}ld{-}-n-vp--bltg.rhcloud.com
         created_at: 2020-10-05T12:51:24.053142Z
         updated_at: 2020-10-05T12:56:36.362208Z
         version: 2.6.0
@@ -1603,7 +1602,7 @@ components:
         owner: api_kafka_service
         name: serviceapi
         bootstrap_server_host: serviceapi-1isy6rq3jki8q0otmjqfd3ocfrg.apps.mk-bttg0jn170hp.x5u8.s1.devshift.org
-        admin_api_server_url: "https://admin-server-mk-e-e-e-e-c---{}ld{-}-n-vp--bltg.rhcloud.com"
+        admin_api_server_url: https://admin-server-mk-e-e-e-e-c---{}ld{-}-n-vp--bltg.rhcloud.com
         created_at: 2020-10-05T12:51:24.053142Z
         updated_at: 2020-10-05T12:56:36.362208Z
         failed_reason: a reason the Kafka request creation failed
@@ -1654,7 +1653,7 @@ components:
       value:
         kind: CloudRegion
         id: us-east-1
-        display_name: "US East, N. Virginia"
+        display_name: US East, N. Virginia
         enabled: true
         capacity:
         - instance_type: standard
@@ -1733,7 +1732,7 @@ components:
         kind: Error
         href: /api/kafkas_mgmt/v1/errors/103
         code: KAFKAS-MGMT-103
-        reason: "Synchronous action is not supported, use async=true parameter"
+        reason: Synchronous action is not supported, use async=true parameter
         operation_id: 1iWIimqGcrDuL61aUxIZqBTqNRa
     "400CreationExample":
       value:
@@ -1741,7 +1740,7 @@ components:
         kind: Error
         href: /api/kafkas_mgmt/v1/errors/103
         code: KAFKAS-MGMT-103
-        reason: "Synchronous action is not supported, use async=true parameter"
+        reason: Synchronous action is not supported, use async=true parameter
         operation_id: 1iWIimqGcrDuL61aUxIZqBTqNRa
     "400InvalidQueryExample":
       value:
@@ -1749,10 +1748,10 @@ components:
         kind: Error
         href: /api/kafkas_mgmt/v1/errors/23
         code: KAFKAS-MGMT-23
-        reason: "Failed to parse search query: Unable to list Kafka requests for api_kafka_service:\
-          \ KAFKAS-MGMT-23: Failed to parse search query: Unsupported column name\
-          \ for search: 'id'. Supported column names are: region, name, cloud_provider,\
-          \ name, status. Query invalid: id = 123"
+        reason: 'Failed to parse search query: Unable to list Kafka requests for api_kafka_service:
+          KAFKAS-MGMT-23: Failed to parse search query: Unsupported column name for
+          search: ''id''. Supported column names are: region, name, cloud_provider,
+          name, status. Query invalid: id = 123'
         operation_id: 1lWDGuybIrEnxrAem724gqkkiDv
     "400UnsupportedProviderExample":
       value:
@@ -1776,7 +1775,7 @@ components:
         kind: Error
         href: /api/kafkas_mgmt/v1/errors/21
         code: KAFKAS-MGMT-21
-        reason: "missing path parameter: kafka id"
+        reason: 'missing path parameter: kafka id'
         operation_id: 1lWDGuybIrEnxrAem724gqkkiDv
     "400InvalidClusterIdExample":
       value:
@@ -1815,7 +1814,7 @@ components:
         kind: Error
         href: /api/kafkas_mgmt/v1/errors/11
         code: KAFKAS-MGMT-11
-        reason: "Unable to verify JWT token: Required authorization token not found"
+        reason: 'Unable to verify JWT token: Required authorization token not found'
         operation_id: 1iY3UhEhwmXBpWPfI2lNekpd4ZD
     "403Example":
       value:
@@ -1872,10 +1871,10 @@ components:
         kind: Error
         href: /api/kafkas_mgmt/v1/errors/9
         code: KAFKAS-MGMT-9
-        reason: "error deleting syncset: OCM-EX-9: failed to delete syncset: ext-serviceapi-1ix03lndlmq0qfc7sita5sljv8e\
-          \ for cluster id: 1g5d88q0lrcdv4g7alb7slfgnj3dhbsj%!(EXTRA *errors.Error=identifier\
-          \ is '404', code is 'CLUSTERS-MGMT-404' and operation identifier is '1g5or50viu07oealuehrkc26dgftj1ac':\
-          \ Cluster '1g5d88q0lrcdv4g7alb7slfgnj3dhbsj' not found)"
+        reason: 'error deleting syncset: OCM-EX-9: failed to delete syncset: ext-serviceapi-1ix03lndlmq0qfc7sita5sljv8e
+          for cluster id: 1g5d88q0lrcdv4g7alb7slfgnj3dhbsj%!(EXTRA *errors.Error=identifier
+          is ''404'', code is ''CLUSTERS-MGMT-404'' and operation identifier is ''1g5or50viu07oealuehrkc26dgftj1ac'':
+          Cluster ''1g5d88q0lrcdv4g7alb7slfgnj3dhbsj'' not found)'
         operation_id: 1iYTsWry6nsqb2sNmFj5bXpD7Ca
     EnterpriseOsdClusterPayloadExample:
       value:
@@ -2165,18 +2164,17 @@ components:
             in
           type: string
         name:
-          description: "The name of the Kafka cluster. It must consist of lower-case\
-            \ alphanumeric characters or '-', start with an alphabetic character,\
-            \ and end with an alphanumeric character, and can not be longer than 32\
-            \ characters."
+          description: The name of the Kafka cluster. It must consist of lower-case
+            alphanumeric characters or '-', start with an alphabetic character, and
+            end with an alphanumeric character, and can not be longer than 32 characters.
           type: string
         region:
           description: The region where the Kafka cluster will be created in
           type: string
         reauthentication_enabled:
-          description: "Whether connection reauthentication is enabled or not. If\
-            \ set to true, connection reauthentication on the Kafka instance will\
-            \ be required every 5 minutes. The default value is true"
+          description: Whether connection reauthentication is enabled or not. If set
+            to true, connection reauthentication on the Kafka instance will be required
+            every 5 minutes. The default value is true
           nullable: true
           type: boolean
         plan:
@@ -2220,7 +2218,8 @@ components:
           description: A list of Kafka instance sizes available for this instance
             type
           items:
-            $ref: '#/components/schemas/SupportedKafkaInstanceType_sizes_inner'
+            allOf:
+            - $ref: '#/components/schemas/SupportedKafkaSize'
           type: array
       required:
       - supported_billing_models
@@ -2233,17 +2232,17 @@ components:
           minLength: 1
           type: string
         ams_resource:
-          description: "AMS resource to be used. Accepted values: ['rhosak']"
+          description: 'AMS resource to be used. Accepted values: [''rhosak'']'
           minLength: 1
           type: string
         ams_product:
-          description: "AMS product to be used. Accepted values: ['RHOSAK', 'RHOSAKTrial',\
-            \ 'RHOSAKEval']"
+          description: 'AMS product to be used. Accepted values: [''RHOSAK'', ''RHOSAKTrial'',
+            ''RHOSAKEval'']'
           minLength: 1
           type: string
         ams_billing_models:
-          description: "List of AMS available billing models: Accepted values: ['marketplace',\
-            \ 'marketplace-rhm', 'marketplace-aws']"
+          description: 'List of AMS available billing models: Accepted values: [''marketplace'',
+            ''marketplace-rhm'', ''marketplace-aws'']'
           items:
             minLength: 1
             type: string
@@ -2295,8 +2294,8 @@ components:
           description: Replication factor available to this Kafka instance size.
           type: integer
         supported_az_modes:
-          description: "List of Availability Zone modes that this Kafka instance size\
-            \ supports. The possible values are \"single\", \"multi\"."
+          description: List of Availability Zone modes that this Kafka instance size
+            supports. The possible values are "single", "multi".
           items:
             type: string
           type: array
@@ -2310,8 +2309,8 @@ components:
           type: integer
         quota_type:
           deprecated: true
-          description: "Quota type used by this Kafka instance size. This is now deprecated,\
-            \ please refer to supported_billing_models at instance-type level instead."
+          description: Quota type used by this Kafka instance size. This is now deprecated,
+            please refer to supported_billing_models at instance-type level instead.
           type: string
         capacity_consumed:
           description: Data plane cluster capacity consumed by this Kafka instance
@@ -2349,8 +2348,8 @@ components:
           description: Name of the cloud provider for display purposes.
           type: string
         name:
-          description: "Human friendly identifier of the cloud provider, for example\
-            \ `aws`."
+          description: Human friendly identifier of the cloud provider, for example
+            `aws`.
           type: string
         enabled:
           description: Whether the cloud provider is enabled for deploying an OSD
@@ -2368,7 +2367,7 @@ components:
           description: Unique identifier of the object.
           type: string
         display_name:
-          description: "Name of the region for display purposes, for example `N. Virginia`."
+          description: Name of the region for display purposes, for example `N. Virginia`.
           type: string
         enabled:
           default: false
@@ -2421,7 +2420,6 @@ components:
       allOf:
       - $ref: '#/components/schemas/ObjectReference'
       - $ref: '#/components/schemas/ServiceAccountListItem_allOf'
-      description: ""
     ServiceAccountList:
       allOf:
       - $ref: '#/components/schemas/ServiceAccountList_allOf'
@@ -2482,9 +2480,9 @@ components:
           nullable: true
           type: string
         reauthentication_enabled:
-          description: "Whether connection reauthentication is enabled or not. If\
-            \ set to true, connection reauthentication on the Kafka instance will\
-            \ be required every 5 minutes."
+          description: Whether connection reauthentication is enabled or not. If set
+            to true, connection reauthentication on the Kafka instance will be required
+            every 5 minutes.
           nullable: true
           type: boolean
       type: object
@@ -2549,13 +2547,13 @@ components:
             $ref: '#/components/schemas/Error'
           type: array
       type: object
-      example: null
     KafkaRequest_allOf:
-      example: "{\"$ref\":\"#/components/examples/KafkaRequestExample\"}"
+      example:
+        $ref: '#/components/examples/KafkaRequestExample'
       properties:
         status:
-          description: "Values: [accepted, preparing, provisioning, ready, failed,\
-            \ deprovision, deleting, suspending, suspended, resuming] "
+          description: 'Values: [accepted, preparing, provisioning, ready, failed,
+            deprovision, deleting, suspending, suspended, resuming] '
           type: string
         cloud_provider:
           description: Name of Cloud used to deploy. For example AWS
@@ -2563,8 +2561,8 @@ components:
         multi_az:
           type: boolean
         region:
-          description: "Values will be regions of specific cloud provider. For example:\
-            \ us-east-1 for AWS"
+          description: 'Values will be regions of specific cloud provider. For example:
+            us-east-1 for AWS'
           type: string
         owner:
           type: string
@@ -2595,15 +2593,15 @@ components:
           type: string
         instance_type_name:
           deprecated: true
-          description: "This field is now deprecated, please use the /api/kafkas_mgmt/v1/instance_types/{cloud_provider}/{cloud_region}\
-            \ endpoint to retrieve the field instead."
+          description: This field is now deprecated, please use the /api/kafkas_mgmt/v1/instance_types/{cloud_provider}/{cloud_region}
+            endpoint to retrieve the field instead.
           type: string
         reauthentication_enabled:
           type: boolean
         kafka_storage_size:
           deprecated: true
-          description: "Maximum data storage available to this Kafka. This is now\
-            \ deprecated, please use max_data_retention_size instead."
+          description: Maximum data storage available to this Kafka. This is now deprecated,
+            please use max_data_retention_size instead.
           type: string
         max_data_retention_size:
           $ref: '#/components/schemas/SupportedKafkaSizeBytesValueItem'
@@ -2613,33 +2611,33 @@ components:
           type: string
         ingress_throughput_per_sec:
           deprecated: true
-          description: "This field is now deprecated, please use the /api/kafkas_mgmt/v1/instance_types/{cloud_provider}/{cloud_region}\
-            \ endpoint to retrieve the field instead."
+          description: This field is now deprecated, please use the /api/kafkas_mgmt/v1/instance_types/{cloud_provider}/{cloud_region}
+            endpoint to retrieve the field instead.
           type: string
         egress_throughput_per_sec:
           deprecated: true
-          description: "This field is now deprecated, please use the /api/kafkas_mgmt/v1/instance_types/{cloud_provider}/{cloud_region}\
-            \ endpoint to retrieve the field instead."
+          description: This field is now deprecated, please use the /api/kafkas_mgmt/v1/instance_types/{cloud_provider}/{cloud_region}
+            endpoint to retrieve the field instead.
           type: string
         total_max_connections:
           deprecated: true
-          description: "This field is now deprecated, please use the /api/kafkas_mgmt/v1/instance_types/{cloud_provider}/{cloud_region}\
-            \ endpoint to retrieve the field instead."
+          description: This field is now deprecated, please use the /api/kafkas_mgmt/v1/instance_types/{cloud_provider}/{cloud_region}
+            endpoint to retrieve the field instead.
           type: integer
         max_partitions:
           deprecated: true
-          description: "This field is now deprecated, please use the /api/kafkas_mgmt/v1/instance_types/{cloud_provider}/{cloud_region}\
-            \ endpoint to retrieve the field instead."
+          description: This field is now deprecated, please use the /api/kafkas_mgmt/v1/instance_types/{cloud_provider}/{cloud_region}
+            endpoint to retrieve the field instead.
           type: integer
         max_data_retention_period:
           deprecated: true
-          description: "This field is now deprecated, please use the /api/kafkas_mgmt/v1/instance_types/{cloud_provider}/{cloud_region}\
-            \ endpoint to retrieve the field instead."
+          description: This field is now deprecated, please use the /api/kafkas_mgmt/v1/instance_types/{cloud_provider}/{cloud_region}
+            endpoint to retrieve the field instead.
           type: string
         max_connection_attempts_per_sec:
           deprecated: true
-          description: "This field is now deprecated, please use the /api/kafkas_mgmt/v1/instance_types/{cloud_provider}/{cloud_region}\
-            \ endpoint to retrieve the field instead."
+          description: This field is now deprecated, please use the /api/kafkas_mgmt/v1/instance_types/{cloud_provider}/{cloud_region}
+            endpoint to retrieve the field instead.
           type: integer
         billing_cloud_account_id:
           type: string
@@ -2652,8 +2650,13 @@ components:
       - reauthentication_enabled
       type: object
     KafkaRequestList_allOf:
-      example: "{\"kind\":\"KafkaRequestList\",\"page\":\"1\",\"size\":\"1\",\"total\"\
-        :\"1\",\"item\":{\"$ref\":\"#/components/examples/KafkaRequestExample\"}}"
+      example:
+        kind: KafkaRequestList
+        page: "1"
+        size: "1"
+        total: "1"
+        item:
+          $ref: '#/components/examples/KafkaRequestExample'
       properties:
         items:
           items:
@@ -2662,9 +2665,13 @@ components:
           type: array
       type: object
     EnterpriseClusterList_allOf:
-      example: "{\"kind\":\"ClusterList\",\"page\":\"1\",\"size\":\"1\",\"total\"\
-        :\"1\",\"item\":{\"$ref\":\"#/components/examples/EnterpriseClusterExample\"\
-        }}"
+      example:
+        kind: ClusterList
+        page: "1"
+        size: "1"
+        total: "1"
+        item:
+          $ref: '#/components/examples/EnterpriseClusterExample'
       properties:
         items:
           items:
@@ -2687,12 +2694,16 @@ components:
       required:
       - access_kafkas_via_private_network
       type: object
-      example: null
     VersionMetadata_allOf:
-      example: "{\"kind\":\"APIVersion\",\"id\":\"v1\",\"href\":\"/api/kafkas_mgmt/v1\"\
-        ,\"server_version\":\"24a263e8631d713b3104c1a70c143644ab91de6f\",\"collections\"\
-        :[{\"id\":\"kafkas\",\"href\":\"/api/kafkas_mgmt/v1/kafkas\",\"kind\":\"KafkaList\"\
-        }]}"
+      example:
+        kind: APIVersion
+        id: v1
+        href: /api/kafkas_mgmt/v1
+        server_version: 24a263e8631d713b3104c1a70c143644ab91de6f
+        collections:
+        - id: kafkas
+          href: /api/kafkas_mgmt/v1/kafkas
+          kind: KafkaList
       properties:
         server_version:
           type: string
@@ -2703,8 +2714,9 @@ components:
           type: array
       type: object
     SupportedKafkaInstanceTypesList_allOf:
-      example: "{\"instance_types\":{\"$ref\":\"#/components/examples/SupportedKafkaInstanceTypeListExample\"\
-        }}"
+      example:
+        instance_types:
+          $ref: '#/components/examples/SupportedKafkaInstanceTypeListExample'
       properties:
         instance_types:
           items:
@@ -2712,12 +2724,14 @@ components:
             - $ref: '#/components/schemas/SupportedKafkaInstanceType'
           type: array
       type: object
-    SupportedKafkaInstanceType_sizes_inner:
-      allOf:
-      - $ref: '#/components/schemas/SupportedKafkaSize'
     CloudProviderList_allOf:
-      example: "{\"kind\":\"CloudProviderList\",\"page\":\"1\",\"size\":\"1\",\"total\"\
-        :\"1\",\"item\":{\"$ref\":\"#/components/examples/CloudProviderExample\"}}"
+      example:
+        kind: CloudProviderList
+        page: "1"
+        size: "1"
+        total: "1"
+        item:
+          $ref: '#/components/examples/CloudProviderExample'
       properties:
         items:
           items:
@@ -2726,8 +2740,13 @@ components:
           type: array
       type: object
     CloudRegionList_allOf:
-      example: "{\"kind\":\"CloudRegionList\",\"page\":\"1\",\"size\":\"1\",\"total\"\
-        :\"1\",\"item\":{\"$ref\":\"#/components/examples/CloudRegionExample\"}}"
+      example:
+        kind: CloudRegionList
+        page: "1"
+        size: "1"
+        total: "1"
+        item:
+          $ref: '#/components/examples/CloudRegionExample'
       properties:
         items:
           items:
@@ -2736,16 +2755,15 @@ components:
           type: array
       type: object
     ServiceAccount_allOf:
-      example: "{\"$ref\":\"#/components/examples/ServiceAccountExample\"}"
+      example:
+        $ref: '#/components/examples/ServiceAccountExample'
       properties:
         id:
           description: server generated unique id of the service account
           type: string
         name:
-          description: ""
           type: string
         description:
-          description: ""
           type: string
         client_id:
           type: string
@@ -2786,10 +2804,11 @@ components:
           description: description of the service account
           type: string
       type: object
-      example: null
     ServiceAccountList_allOf:
-      example: "{\"kind\":\"ServiceAccountList\",\"items\":[{\"$ref\":\"#/components/examples/ServiceAccountListItemExample\"\
-        }]}"
+      example:
+        kind: ServiceAccountList
+        items:
+        - $ref: '#/components/examples/ServiceAccountListItemExample'
       properties:
         kind:
           type: string
@@ -2803,7 +2822,8 @@ components:
       - kind
       type: object
     SsoProvider_allOf:
-      example: "{\"$ref\":\"#/components/examples/SsoProviderExample\"}"
+      example:
+        $ref: '#/components/examples/SsoProviderExample'
       properties:
         name:
           description: name of the sso provider
@@ -2819,8 +2839,11 @@ components:
           type: string
       type: object
     MetricsRangeQueryList_allOf:
-      example: "{\"kind\":\"MetricsRangeQueryList\",\"id\":\"1nbpS70HduPe4l0to8jSg2CLzfu\"\
-        ,\"items\":{\"$ref\":\"#/components/examples/MetricsRangeQueryExample\"}}"
+      example:
+        kind: MetricsRangeQueryList
+        id: 1nbpS70HduPe4l0to8jSg2CLzfu
+        items:
+          $ref: '#/components/examples/MetricsRangeQueryExample'
       properties:
         kind:
           type: string
@@ -2833,9 +2856,11 @@ components:
           type: array
       type: object
     MetricsInstantQueryList_allOf:
-      example: "{\"kind\":\"MetricsInstantQueryList\",\"id\":\"1nbpS70HduPe4l0to8jSg2CLzfu\"\
-        ,\"items\":{\"$ref\":\"#/components/examples/MetricsInstantQueryExample\"\
-        }}"
+      example:
+        kind: MetricsInstantQueryList
+        id: 1nbpS70HduPe4l0to8jSg2CLzfu
+        items:
+          $ref: '#/components/examples/MetricsInstantQueryExample'
       properties:
         kind:
           type: string
@@ -2867,7 +2892,6 @@ components:
       required:
       - access_kafkas_via_private_network
       type: object
-      example: null
   securitySchemes:
     Bearer:
       bearerFormat: JWT
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/api_default.go b/app-services-sdk-go/kafkamgmt/apiv1/client/api_default.go
index 27af8040..9906608f 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/api_default.go
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/api_default.go
@@ -1,11 +1,11 @@
 /*
-Kafka Management API
-
-Kafka Management API is a REST API to manage Kafka instances
-
-API version: 1.14.0
-Contact: rhosak-support@redhat.com
-*/
+ * Kafka Management API
+ *
+ * Kafka Management API is a REST API to manage Kafka instances
+ *
+ * API version: 1.14.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -13,256 +13,259 @@ package kafkamgmtclient
 
 import (
 	"bytes"
-	"context"
-	"io/ioutil"
-	"net/http"
-	"net/url"
+	_context "context"
+	_ioutil "io/ioutil"
+	_nethttp "net/http"
+	_neturl "net/url"
 	"strings"
 	"reflect"
 )
 
+// Linger please
+var (
+	_ _context.Context
+)
 
 type DefaultApi interface {
 
 	/*
-	CreateKafka Method for CreateKafka
-
-	Creates a Kafka request
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiCreateKafkaRequest
-	*/
-	CreateKafka(ctx context.Context) ApiCreateKafkaRequest
-
-	// CreateKafkaExecute executes the request
-	//  @return KafkaRequest
-	CreateKafkaExecute(r ApiCreateKafkaRequest) (*KafkaRequest, *http.Response, error)
+	 * CreateKafka Method for CreateKafka
+	 * Creates a Kafka request
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiCreateKafkaRequest
+	 */
+	CreateKafka(ctx _context.Context) ApiCreateKafkaRequest
 
 	/*
-	DeleteKafkaById Method for DeleteKafkaById
-
-	Deletes a Kafka request by ID
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The ID of record
-	@return ApiDeleteKafkaByIdRequest
-	*/
-	DeleteKafkaById(ctx context.Context, id string) ApiDeleteKafkaByIdRequest
-
-	// DeleteKafkaByIdExecute executes the request
-	//  @return Error
-	DeleteKafkaByIdExecute(r ApiDeleteKafkaByIdRequest) (*Error, *http.Response, error)
+	 * CreateKafkaExecute executes the request
+	 * @return KafkaRequest
+	 */
+	CreateKafkaExecute(r ApiCreateKafkaRequest) (KafkaRequest, *_nethttp.Response, error)
 
 	/*
-	FederateMetrics Method for FederateMetrics
-
-	Returns all metrics in scrapeable format for a given kafka id
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The ID of record
-	@return ApiFederateMetricsRequest
-	*/
-	FederateMetrics(ctx context.Context, id string) ApiFederateMetricsRequest
-
-	// FederateMetricsExecute executes the request
-	//  @return string
-	FederateMetricsExecute(r ApiFederateMetricsRequest) (string, *http.Response, error)
+	 * DeleteKafkaById Method for DeleteKafkaById
+	 * Deletes a Kafka request by ID
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The ID of record
+	 * @return ApiDeleteKafkaByIdRequest
+	 */
+	DeleteKafkaById(ctx _context.Context, id string) ApiDeleteKafkaByIdRequest
 
 	/*
-	GetCloudProviderRegions Method for GetCloudProviderRegions
-
-	Returns the list of supported regions of the supported cloud provider
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The ID of record
-	@return ApiGetCloudProviderRegionsRequest
-	*/
-	GetCloudProviderRegions(ctx context.Context, id string) ApiGetCloudProviderRegionsRequest
-
-	// GetCloudProviderRegionsExecute executes the request
-	//  @return CloudRegionList
-	GetCloudProviderRegionsExecute(r ApiGetCloudProviderRegionsRequest) (*CloudRegionList, *http.Response, error)
+	 * DeleteKafkaByIdExecute executes the request
+	 * @return Error
+	 */
+	DeleteKafkaByIdExecute(r ApiDeleteKafkaByIdRequest) (Error, *_nethttp.Response, error)
 
 	/*
-	GetCloudProviders Method for GetCloudProviders
-
-	Returns the list of supported cloud providers
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiGetCloudProvidersRequest
-	*/
-	GetCloudProviders(ctx context.Context) ApiGetCloudProvidersRequest
-
-	// GetCloudProvidersExecute executes the request
-	//  @return CloudProviderList
-	GetCloudProvidersExecute(r ApiGetCloudProvidersRequest) (*CloudProviderList, *http.Response, error)
+	 * FederateMetrics Method for FederateMetrics
+	 * Returns all metrics in scrapeable format for a given kafka id
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The ID of record
+	 * @return ApiFederateMetricsRequest
+	 */
+	FederateMetrics(ctx _context.Context, id string) ApiFederateMetricsRequest
 
 	/*
-	GetInstanceTypesByCloudProviderAndRegion Method for GetInstanceTypesByCloudProviderAndRegion
-
-	Returns the list of supported Kafka instance types and sizes filtered by cloud provider and region
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param cloudProvider ID of the supported cloud provider
-	@param cloudRegion Name of the supported cloud provider region
-	@return ApiGetInstanceTypesByCloudProviderAndRegionRequest
-	*/
-	GetInstanceTypesByCloudProviderAndRegion(ctx context.Context, cloudProvider string, cloudRegion string) ApiGetInstanceTypesByCloudProviderAndRegionRequest
-
-	// GetInstanceTypesByCloudProviderAndRegionExecute executes the request
-	//  @return SupportedKafkaInstanceTypesList
-	GetInstanceTypesByCloudProviderAndRegionExecute(r ApiGetInstanceTypesByCloudProviderAndRegionRequest) (*SupportedKafkaInstanceTypesList, *http.Response, error)
+	 * FederateMetricsExecute executes the request
+	 * @return string
+	 */
+	FederateMetricsExecute(r ApiFederateMetricsRequest) (string, *_nethttp.Response, error)
 
 	/*
-	GetKafkaById Method for GetKafkaById
-
-	Returns a Kafka request by ID
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The ID of record
-	@return ApiGetKafkaByIdRequest
-	*/
-	GetKafkaById(ctx context.Context, id string) ApiGetKafkaByIdRequest
-
-	// GetKafkaByIdExecute executes the request
-	//  @return KafkaRequest
-	GetKafkaByIdExecute(r ApiGetKafkaByIdRequest) (*KafkaRequest, *http.Response, error)
+	 * GetCloudProviderRegions Method for GetCloudProviderRegions
+	 * Returns the list of supported regions of the supported cloud provider
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The ID of record
+	 * @return ApiGetCloudProviderRegionsRequest
+	 */
+	GetCloudProviderRegions(ctx _context.Context, id string) ApiGetCloudProviderRegionsRequest
 
 	/*
-	GetKafkas Method for GetKafkas
-
-	Returns a list of Kafka requests
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiGetKafkasRequest
-	*/
-	GetKafkas(ctx context.Context) ApiGetKafkasRequest
-
-	// GetKafkasExecute executes the request
-	//  @return KafkaRequestList
-	GetKafkasExecute(r ApiGetKafkasRequest) (*KafkaRequestList, *http.Response, error)
+	 * GetCloudProviderRegionsExecute executes the request
+	 * @return CloudRegionList
+	 */
+	GetCloudProviderRegionsExecute(r ApiGetCloudProviderRegionsRequest) (CloudRegionList, *_nethttp.Response, error)
 
 	/*
-	GetMetricsByInstantQuery Method for GetMetricsByInstantQuery
+	 * GetCloudProviders Method for GetCloudProviders
+	 * Returns the list of supported cloud providers
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiGetCloudProvidersRequest
+	 */
+	GetCloudProviders(ctx _context.Context) ApiGetCloudProvidersRequest
 
-	Returns metrics with instant query by Kafka ID
+	/*
+	 * GetCloudProvidersExecute executes the request
+	 * @return CloudProviderList
+	 */
+	GetCloudProvidersExecute(r ApiGetCloudProvidersRequest) (CloudProviderList, *_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The ID of record
-	@return ApiGetMetricsByInstantQueryRequest
-	*/
-	GetMetricsByInstantQuery(ctx context.Context, id string) ApiGetMetricsByInstantQueryRequest
+	/*
+	 * GetInstanceTypesByCloudProviderAndRegion Method for GetInstanceTypesByCloudProviderAndRegion
+	 * Returns the list of supported Kafka instance types and sizes filtered by cloud provider and region
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param cloudProvider ID of the supported cloud provider
+	 * @param cloudRegion Name of the supported cloud provider region
+	 * @return ApiGetInstanceTypesByCloudProviderAndRegionRequest
+	 */
+	GetInstanceTypesByCloudProviderAndRegion(ctx _context.Context, cloudProvider string, cloudRegion string) ApiGetInstanceTypesByCloudProviderAndRegionRequest
 
-	// GetMetricsByInstantQueryExecute executes the request
-	//  @return MetricsInstantQueryList
-	GetMetricsByInstantQueryExecute(r ApiGetMetricsByInstantQueryRequest) (*MetricsInstantQueryList, *http.Response, error)
+	/*
+	 * GetInstanceTypesByCloudProviderAndRegionExecute executes the request
+	 * @return SupportedKafkaInstanceTypesList
+	 */
+	GetInstanceTypesByCloudProviderAndRegionExecute(r ApiGetInstanceTypesByCloudProviderAndRegionRequest) (SupportedKafkaInstanceTypesList, *_nethttp.Response, error)
 
 	/*
-	GetMetricsByRangeQuery Method for GetMetricsByRangeQuery
+	 * GetKafkaById Method for GetKafkaById
+	 * Returns a Kafka request by ID
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The ID of record
+	 * @return ApiGetKafkaByIdRequest
+	 */
+	GetKafkaById(ctx _context.Context, id string) ApiGetKafkaByIdRequest
 
-	Returns metrics with timeseries range query by Kafka ID
+	/*
+	 * GetKafkaByIdExecute executes the request
+	 * @return KafkaRequest
+	 */
+	GetKafkaByIdExecute(r ApiGetKafkaByIdRequest) (KafkaRequest, *_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The ID of record
-	@return ApiGetMetricsByRangeQueryRequest
-	*/
-	GetMetricsByRangeQuery(ctx context.Context, id string) ApiGetMetricsByRangeQueryRequest
+	/*
+	 * GetKafkas Method for GetKafkas
+	 * Returns a list of Kafka requests
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiGetKafkasRequest
+	 */
+	GetKafkas(ctx _context.Context) ApiGetKafkasRequest
 
-	// GetMetricsByRangeQueryExecute executes the request
-	//  @return MetricsRangeQueryList
-	GetMetricsByRangeQueryExecute(r ApiGetMetricsByRangeQueryRequest) (*MetricsRangeQueryList, *http.Response, error)
+	/*
+	 * GetKafkasExecute executes the request
+	 * @return KafkaRequestList
+	 */
+	GetKafkasExecute(r ApiGetKafkasRequest) (KafkaRequestList, *_nethttp.Response, error)
 
 	/*
-	GetVersionMetadata Method for GetVersionMetadata
+	 * GetMetricsByInstantQuery Method for GetMetricsByInstantQuery
+	 * Returns metrics with instant query by Kafka ID
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The ID of record
+	 * @return ApiGetMetricsByInstantQueryRequest
+	 */
+	GetMetricsByInstantQuery(ctx _context.Context, id string) ApiGetMetricsByInstantQueryRequest
 
-	Returns the kafka Service Fleet Manager API version metadata
+	/*
+	 * GetMetricsByInstantQueryExecute executes the request
+	 * @return MetricsInstantQueryList
+	 */
+	GetMetricsByInstantQueryExecute(r ApiGetMetricsByInstantQueryRequest) (MetricsInstantQueryList, *_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiGetVersionMetadataRequest
-	*/
-	GetVersionMetadata(ctx context.Context) ApiGetVersionMetadataRequest
+	/*
+	 * GetMetricsByRangeQuery Method for GetMetricsByRangeQuery
+	 * Returns metrics with timeseries range query by Kafka ID
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The ID of record
+	 * @return ApiGetMetricsByRangeQueryRequest
+	 */
+	GetMetricsByRangeQuery(ctx _context.Context, id string) ApiGetMetricsByRangeQueryRequest
 
-	// GetVersionMetadataExecute executes the request
-	//  @return VersionMetadata
-	GetVersionMetadataExecute(r ApiGetVersionMetadataRequest) (*VersionMetadata, *http.Response, error)
+	/*
+	 * GetMetricsByRangeQueryExecute executes the request
+	 * @return MetricsRangeQueryList
+	 */
+	GetMetricsByRangeQueryExecute(r ApiGetMetricsByRangeQueryRequest) (MetricsRangeQueryList, *_nethttp.Response, error)
 
 	/*
-	UpdateKafkaById Method for UpdateKafkaById
+	 * GetVersionMetadata Method for GetVersionMetadata
+	 * Returns the kafka Service Fleet Manager API version metadata
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiGetVersionMetadataRequest
+	 */
+	GetVersionMetadata(ctx _context.Context) ApiGetVersionMetadataRequest
 
-	Update a Kafka instance by id
+	/*
+	 * GetVersionMetadataExecute executes the request
+	 * @return VersionMetadata
+	 */
+	GetVersionMetadataExecute(r ApiGetVersionMetadataRequest) (VersionMetadata, *_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The ID of record
-	@return ApiUpdateKafkaByIdRequest
-	*/
-	UpdateKafkaById(ctx context.Context, id string) ApiUpdateKafkaByIdRequest
+	/*
+	 * UpdateKafkaById Method for UpdateKafkaById
+	 * Update a Kafka instance by id
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The ID of record
+	 * @return ApiUpdateKafkaByIdRequest
+	 */
+	UpdateKafkaById(ctx _context.Context, id string) ApiUpdateKafkaByIdRequest
 
-	// UpdateKafkaByIdExecute executes the request
-	//  @return KafkaRequest
-	UpdateKafkaByIdExecute(r ApiUpdateKafkaByIdRequest) (*KafkaRequest, *http.Response, error)
+	/*
+	 * UpdateKafkaByIdExecute executes the request
+	 * @return KafkaRequest
+	 */
+	UpdateKafkaByIdExecute(r ApiUpdateKafkaByIdRequest) (KafkaRequest, *_nethttp.Response, error)
 }
 
 // DefaultApiService DefaultApi service
 type DefaultApiService service
 
 type ApiCreateKafkaRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	async *bool
 	kafkaRequestPayload *KafkaRequestPayload
 }
 
-// Perform the action in an asynchronous manner
 func (r ApiCreateKafkaRequest) Async(async bool) ApiCreateKafkaRequest {
 	r.async = &async
 	return r
 }
-
-// Kafka data
 func (r ApiCreateKafkaRequest) KafkaRequestPayload(kafkaRequestPayload KafkaRequestPayload) ApiCreateKafkaRequest {
 	r.kafkaRequestPayload = &kafkaRequestPayload
 	return r
 }
 
-func (r ApiCreateKafkaRequest) Execute() (*KafkaRequest, *http.Response, error) {
+func (r ApiCreateKafkaRequest) Execute() (KafkaRequest, *_nethttp.Response, error) {
 	return r.ApiService.CreateKafkaExecute(r)
 }
 
 /*
-CreateKafka Method for CreateKafka
-
-Creates a Kafka request
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiCreateKafkaRequest
-*/
-func (a *DefaultApiService) CreateKafka(ctx context.Context) ApiCreateKafkaRequest {
+ * CreateKafka Method for CreateKafka
+ * Creates a Kafka request
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiCreateKafkaRequest
+ */
+func (a *DefaultApiService) CreateKafka(ctx _context.Context) ApiCreateKafkaRequest {
 	return ApiCreateKafkaRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return KafkaRequest
-func (a *DefaultApiService) CreateKafkaExecute(r ApiCreateKafkaRequest) (*KafkaRequest, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return KafkaRequest
+ */
+func (a *DefaultApiService) CreateKafkaExecute(r ApiCreateKafkaRequest) (KafkaRequest, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *KafkaRequest
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  KafkaRequest
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.CreateKafka")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/kafkas_mgmt/v1/kafkas"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.async == nil {
 		return localVarReturnValue, nil, reportError("async is required and must be specified")
 	}
@@ -290,7 +293,7 @@ func (a *DefaultApiService) CreateKafkaExecute(r ApiCreateKafkaRequest) (*KafkaR
 	}
 	// body params
 	localVarPostBody = r.kafkaRequestPayload
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -300,15 +303,15 @@ func (a *DefaultApiService) CreateKafkaExecute(r ApiCreateKafkaRequest) (*KafkaR
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -319,8 +322,7 @@ func (a *DefaultApiService) CreateKafkaExecute(r ApiCreateKafkaRequest) (*KafkaR
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -330,8 +332,7 @@ func (a *DefaultApiService) CreateKafkaExecute(r ApiCreateKafkaRequest) (*KafkaR
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -341,8 +342,7 @@ func (a *DefaultApiService) CreateKafkaExecute(r ApiCreateKafkaRequest) (*KafkaR
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -352,8 +352,7 @@ func (a *DefaultApiService) CreateKafkaExecute(r ApiCreateKafkaRequest) (*KafkaR
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 409 {
@@ -363,8 +362,7 @@ func (a *DefaultApiService) CreateKafkaExecute(r ApiCreateKafkaRequest) (*KafkaR
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -374,15 +372,14 @@ func (a *DefaultApiService) CreateKafkaExecute(r ApiCreateKafkaRequest) (*KafkaR
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -393,32 +390,29 @@ func (a *DefaultApiService) CreateKafkaExecute(r ApiCreateKafkaRequest) (*KafkaR
 }
 
 type ApiDeleteKafkaByIdRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	id string
 	async *bool
 }
 
-// Perform the action in an asynchronous manner
 func (r ApiDeleteKafkaByIdRequest) Async(async bool) ApiDeleteKafkaByIdRequest {
 	r.async = &async
 	return r
 }
 
-func (r ApiDeleteKafkaByIdRequest) Execute() (*Error, *http.Response, error) {
+func (r ApiDeleteKafkaByIdRequest) Execute() (Error, *_nethttp.Response, error) {
 	return r.ApiService.DeleteKafkaByIdExecute(r)
 }
 
 /*
-DeleteKafkaById Method for DeleteKafkaById
-
-Deletes a Kafka request by ID
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The ID of record
- @return ApiDeleteKafkaByIdRequest
-*/
-func (a *DefaultApiService) DeleteKafkaById(ctx context.Context, id string) ApiDeleteKafkaByIdRequest {
+ * DeleteKafkaById Method for DeleteKafkaById
+ * Deletes a Kafka request by ID
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The ID of record
+ * @return ApiDeleteKafkaByIdRequest
+ */
+func (a *DefaultApiService) DeleteKafkaById(ctx _context.Context, id string) ApiDeleteKafkaByIdRequest {
 	return ApiDeleteKafkaByIdRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -426,27 +420,31 @@ func (a *DefaultApiService) DeleteKafkaById(ctx context.Context, id string) ApiD
 	}
 }
 
-// Execute executes the request
-//  @return Error
-func (a *DefaultApiService) DeleteKafkaByIdExecute(r ApiDeleteKafkaByIdRequest) (*Error, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return Error
+ */
+func (a *DefaultApiService) DeleteKafkaByIdExecute(r ApiDeleteKafkaByIdRequest) (Error, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodDelete
+		localVarHTTPMethod   = _nethttp.MethodDelete
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *Error
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  Error
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.DeleteKafkaById")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/kafkas_mgmt/v1/kafkas/{id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.async == nil {
 		return localVarReturnValue, nil, reportError("async is required and must be specified")
 	}
@@ -469,7 +467,7 @@ func (a *DefaultApiService) DeleteKafkaByIdExecute(r ApiDeleteKafkaByIdRequest)
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -479,15 +477,15 @@ func (a *DefaultApiService) DeleteKafkaByIdExecute(r ApiDeleteKafkaByIdRequest)
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -498,8 +496,7 @@ func (a *DefaultApiService) DeleteKafkaByIdExecute(r ApiDeleteKafkaByIdRequest)
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -509,8 +506,7 @@ func (a *DefaultApiService) DeleteKafkaByIdExecute(r ApiDeleteKafkaByIdRequest)
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -520,8 +516,7 @@ func (a *DefaultApiService) DeleteKafkaByIdExecute(r ApiDeleteKafkaByIdRequest)
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -531,8 +526,7 @@ func (a *DefaultApiService) DeleteKafkaByIdExecute(r ApiDeleteKafkaByIdRequest)
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -542,15 +536,14 @@ func (a *DefaultApiService) DeleteKafkaByIdExecute(r ApiDeleteKafkaByIdRequest)
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -561,25 +554,24 @@ func (a *DefaultApiService) DeleteKafkaByIdExecute(r ApiDeleteKafkaByIdRequest)
 }
 
 type ApiFederateMetricsRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	id string
 }
 
-func (r ApiFederateMetricsRequest) Execute() (string, *http.Response, error) {
+
+func (r ApiFederateMetricsRequest) Execute() (string, *_nethttp.Response, error) {
 	return r.ApiService.FederateMetricsExecute(r)
 }
 
 /*
-FederateMetrics Method for FederateMetrics
-
-Returns all metrics in scrapeable format for a given kafka id
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The ID of record
- @return ApiFederateMetricsRequest
-*/
-func (a *DefaultApiService) FederateMetrics(ctx context.Context, id string) ApiFederateMetricsRequest {
+ * FederateMetrics Method for FederateMetrics
+ * Returns all metrics in scrapeable format for a given kafka id
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The ID of record
+ * @return ApiFederateMetricsRequest
+ */
+func (a *DefaultApiService) FederateMetrics(ctx _context.Context, id string) ApiFederateMetricsRequest {
 	return ApiFederateMetricsRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -587,27 +579,31 @@ func (a *DefaultApiService) FederateMetrics(ctx context.Context, id string) ApiF
 	}
 }
 
-// Execute executes the request
-//  @return string
-func (a *DefaultApiService) FederateMetricsExecute(r ApiFederateMetricsRequest) (string, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return string
+ */
+func (a *DefaultApiService) FederateMetricsExecute(r ApiFederateMetricsRequest) (string, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 		localVarReturnValue  string
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.FederateMetrics")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/kafkas_mgmt/v1/kafkas/{id}/metrics/federate"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -626,7 +622,7 @@ func (a *DefaultApiService) FederateMetricsExecute(r ApiFederateMetricsRequest)
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -636,15 +632,15 @@ func (a *DefaultApiService) FederateMetricsExecute(r ApiFederateMetricsRequest)
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -655,8 +651,7 @@ func (a *DefaultApiService) FederateMetricsExecute(r ApiFederateMetricsRequest)
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -666,8 +661,7 @@ func (a *DefaultApiService) FederateMetricsExecute(r ApiFederateMetricsRequest)
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -677,8 +671,7 @@ func (a *DefaultApiService) FederateMetricsExecute(r ApiFederateMetricsRequest)
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -688,15 +681,14 @@ func (a *DefaultApiService) FederateMetricsExecute(r ApiFederateMetricsRequest)
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -707,39 +699,34 @@ func (a *DefaultApiService) FederateMetricsExecute(r ApiFederateMetricsRequest)
 }
 
 type ApiGetCloudProviderRegionsRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	id string
 	page *string
 	size *string
 }
 
-// Page index
 func (r ApiGetCloudProviderRegionsRequest) Page(page string) ApiGetCloudProviderRegionsRequest {
 	r.page = &page
 	return r
 }
-
-// Number of items in each page
 func (r ApiGetCloudProviderRegionsRequest) Size(size string) ApiGetCloudProviderRegionsRequest {
 	r.size = &size
 	return r
 }
 
-func (r ApiGetCloudProviderRegionsRequest) Execute() (*CloudRegionList, *http.Response, error) {
+func (r ApiGetCloudProviderRegionsRequest) Execute() (CloudRegionList, *_nethttp.Response, error) {
 	return r.ApiService.GetCloudProviderRegionsExecute(r)
 }
 
 /*
-GetCloudProviderRegions Method for GetCloudProviderRegions
-
-Returns the list of supported regions of the supported cloud provider
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The ID of record
- @return ApiGetCloudProviderRegionsRequest
-*/
-func (a *DefaultApiService) GetCloudProviderRegions(ctx context.Context, id string) ApiGetCloudProviderRegionsRequest {
+ * GetCloudProviderRegions Method for GetCloudProviderRegions
+ * Returns the list of supported regions of the supported cloud provider
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The ID of record
+ * @return ApiGetCloudProviderRegionsRequest
+ */
+func (a *DefaultApiService) GetCloudProviderRegions(ctx _context.Context, id string) ApiGetCloudProviderRegionsRequest {
 	return ApiGetCloudProviderRegionsRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -747,27 +734,31 @@ func (a *DefaultApiService) GetCloudProviderRegions(ctx context.Context, id stri
 	}
 }
 
-// Execute executes the request
-//  @return CloudRegionList
-func (a *DefaultApiService) GetCloudProviderRegionsExecute(r ApiGetCloudProviderRegionsRequest) (*CloudRegionList, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return CloudRegionList
+ */
+func (a *DefaultApiService) GetCloudProviderRegionsExecute(r ApiGetCloudProviderRegionsRequest) (CloudRegionList, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *CloudRegionList
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  CloudRegionList
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.GetCloudProviderRegions")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/kafkas_mgmt/v1/cloud_providers/{id}/regions"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.page != nil {
 		localVarQueryParams.Add("page", parameterToString(*r.page, ""))
@@ -792,7 +783,7 @@ func (a *DefaultApiService) GetCloudProviderRegionsExecute(r ApiGetCloudProvider
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -802,15 +793,15 @@ func (a *DefaultApiService) GetCloudProviderRegionsExecute(r ApiGetCloudProvider
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -821,8 +812,7 @@ func (a *DefaultApiService) GetCloudProviderRegionsExecute(r ApiGetCloudProvider
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -832,15 +822,14 @@ func (a *DefaultApiService) GetCloudProviderRegionsExecute(r ApiGetCloudProvider
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -851,63 +840,62 @@ func (a *DefaultApiService) GetCloudProviderRegionsExecute(r ApiGetCloudProvider
 }
 
 type ApiGetCloudProvidersRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	page *string
 	size *string
 }
 
-// Page index
 func (r ApiGetCloudProvidersRequest) Page(page string) ApiGetCloudProvidersRequest {
 	r.page = &page
 	return r
 }
-
-// Number of items in each page
 func (r ApiGetCloudProvidersRequest) Size(size string) ApiGetCloudProvidersRequest {
 	r.size = &size
 	return r
 }
 
-func (r ApiGetCloudProvidersRequest) Execute() (*CloudProviderList, *http.Response, error) {
+func (r ApiGetCloudProvidersRequest) Execute() (CloudProviderList, *_nethttp.Response, error) {
 	return r.ApiService.GetCloudProvidersExecute(r)
 }
 
 /*
-GetCloudProviders Method for GetCloudProviders
-
-Returns the list of supported cloud providers
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiGetCloudProvidersRequest
-*/
-func (a *DefaultApiService) GetCloudProviders(ctx context.Context) ApiGetCloudProvidersRequest {
+ * GetCloudProviders Method for GetCloudProviders
+ * Returns the list of supported cloud providers
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiGetCloudProvidersRequest
+ */
+func (a *DefaultApiService) GetCloudProviders(ctx _context.Context) ApiGetCloudProvidersRequest {
 	return ApiGetCloudProvidersRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return CloudProviderList
-func (a *DefaultApiService) GetCloudProvidersExecute(r ApiGetCloudProvidersRequest) (*CloudProviderList, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return CloudProviderList
+ */
+func (a *DefaultApiService) GetCloudProvidersExecute(r ApiGetCloudProvidersRequest) (CloudProviderList, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *CloudProviderList
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  CloudProviderList
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.GetCloudProviders")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/kafkas_mgmt/v1/cloud_providers"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.page != nil {
 		localVarQueryParams.Add("page", parameterToString(*r.page, ""))
@@ -932,7 +920,7 @@ func (a *DefaultApiService) GetCloudProvidersExecute(r ApiGetCloudProvidersReque
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -942,15 +930,15 @@ func (a *DefaultApiService) GetCloudProvidersExecute(r ApiGetCloudProvidersReque
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -961,8 +949,7 @@ func (a *DefaultApiService) GetCloudProvidersExecute(r ApiGetCloudProvidersReque
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -972,15 +959,14 @@ func (a *DefaultApiService) GetCloudProvidersExecute(r ApiGetCloudProvidersReque
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -991,27 +977,26 @@ func (a *DefaultApiService) GetCloudProvidersExecute(r ApiGetCloudProvidersReque
 }
 
 type ApiGetInstanceTypesByCloudProviderAndRegionRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	cloudProvider string
 	cloudRegion string
 }
 
-func (r ApiGetInstanceTypesByCloudProviderAndRegionRequest) Execute() (*SupportedKafkaInstanceTypesList, *http.Response, error) {
+
+func (r ApiGetInstanceTypesByCloudProviderAndRegionRequest) Execute() (SupportedKafkaInstanceTypesList, *_nethttp.Response, error) {
 	return r.ApiService.GetInstanceTypesByCloudProviderAndRegionExecute(r)
 }
 
 /*
-GetInstanceTypesByCloudProviderAndRegion Method for GetInstanceTypesByCloudProviderAndRegion
-
-Returns the list of supported Kafka instance types and sizes filtered by cloud provider and region
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param cloudProvider ID of the supported cloud provider
- @param cloudRegion Name of the supported cloud provider region
- @return ApiGetInstanceTypesByCloudProviderAndRegionRequest
-*/
-func (a *DefaultApiService) GetInstanceTypesByCloudProviderAndRegion(ctx context.Context, cloudProvider string, cloudRegion string) ApiGetInstanceTypesByCloudProviderAndRegionRequest {
+ * GetInstanceTypesByCloudProviderAndRegion Method for GetInstanceTypesByCloudProviderAndRegion
+ * Returns the list of supported Kafka instance types and sizes filtered by cloud provider and region
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param cloudProvider ID of the supported cloud provider
+ * @param cloudRegion Name of the supported cloud provider region
+ * @return ApiGetInstanceTypesByCloudProviderAndRegionRequest
+ */
+func (a *DefaultApiService) GetInstanceTypesByCloudProviderAndRegion(ctx _context.Context, cloudProvider string, cloudRegion string) ApiGetInstanceTypesByCloudProviderAndRegionRequest {
 	return ApiGetInstanceTypesByCloudProviderAndRegionRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -1020,28 +1005,32 @@ func (a *DefaultApiService) GetInstanceTypesByCloudProviderAndRegion(ctx context
 	}
 }
 
-// Execute executes the request
-//  @return SupportedKafkaInstanceTypesList
-func (a *DefaultApiService) GetInstanceTypesByCloudProviderAndRegionExecute(r ApiGetInstanceTypesByCloudProviderAndRegionRequest) (*SupportedKafkaInstanceTypesList, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return SupportedKafkaInstanceTypesList
+ */
+func (a *DefaultApiService) GetInstanceTypesByCloudProviderAndRegionExecute(r ApiGetInstanceTypesByCloudProviderAndRegionRequest) (SupportedKafkaInstanceTypesList, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *SupportedKafkaInstanceTypesList
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  SupportedKafkaInstanceTypesList
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.GetInstanceTypesByCloudProviderAndRegion")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/kafkas_mgmt/v1/instance_types/{cloud_provider}/{cloud_region}"
-	localVarPath = strings.Replace(localVarPath, "{"+"cloud_provider"+"}", url.PathEscape(parameterToString(r.cloudProvider, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"cloud_region"+"}", url.PathEscape(parameterToString(r.cloudRegion, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"cloud_provider"+"}", _neturl.PathEscape(parameterToString(r.cloudProvider, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"cloud_region"+"}", _neturl.PathEscape(parameterToString(r.cloudRegion, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -1060,7 +1049,7 @@ func (a *DefaultApiService) GetInstanceTypesByCloudProviderAndRegionExecute(r Ap
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -1070,15 +1059,15 @@ func (a *DefaultApiService) GetInstanceTypesByCloudProviderAndRegionExecute(r Ap
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -1089,8 +1078,7 @@ func (a *DefaultApiService) GetInstanceTypesByCloudProviderAndRegionExecute(r Ap
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -1100,8 +1088,7 @@ func (a *DefaultApiService) GetInstanceTypesByCloudProviderAndRegionExecute(r Ap
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -1111,15 +1098,14 @@ func (a *DefaultApiService) GetInstanceTypesByCloudProviderAndRegionExecute(r Ap
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -1130,25 +1116,24 @@ func (a *DefaultApiService) GetInstanceTypesByCloudProviderAndRegionExecute(r Ap
 }
 
 type ApiGetKafkaByIdRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	id string
 }
 
-func (r ApiGetKafkaByIdRequest) Execute() (*KafkaRequest, *http.Response, error) {
+
+func (r ApiGetKafkaByIdRequest) Execute() (KafkaRequest, *_nethttp.Response, error) {
 	return r.ApiService.GetKafkaByIdExecute(r)
 }
 
 /*
-GetKafkaById Method for GetKafkaById
-
-Returns a Kafka request by ID
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The ID of record
- @return ApiGetKafkaByIdRequest
-*/
-func (a *DefaultApiService) GetKafkaById(ctx context.Context, id string) ApiGetKafkaByIdRequest {
+ * GetKafkaById Method for GetKafkaById
+ * Returns a Kafka request by ID
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The ID of record
+ * @return ApiGetKafkaByIdRequest
+ */
+func (a *DefaultApiService) GetKafkaById(ctx _context.Context, id string) ApiGetKafkaByIdRequest {
 	return ApiGetKafkaByIdRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -1156,27 +1141,31 @@ func (a *DefaultApiService) GetKafkaById(ctx context.Context, id string) ApiGetK
 	}
 }
 
-// Execute executes the request
-//  @return KafkaRequest
-func (a *DefaultApiService) GetKafkaByIdExecute(r ApiGetKafkaByIdRequest) (*KafkaRequest, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return KafkaRequest
+ */
+func (a *DefaultApiService) GetKafkaByIdExecute(r ApiGetKafkaByIdRequest) (KafkaRequest, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *KafkaRequest
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  KafkaRequest
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.GetKafkaById")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/kafkas_mgmt/v1/kafkas/{id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -1195,7 +1184,7 @@ func (a *DefaultApiService) GetKafkaByIdExecute(r ApiGetKafkaByIdRequest) (*Kafk
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -1205,15 +1194,15 @@ func (a *DefaultApiService) GetKafkaByIdExecute(r ApiGetKafkaByIdRequest) (*Kafk
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -1224,8 +1213,7 @@ func (a *DefaultApiService) GetKafkaByIdExecute(r ApiGetKafkaByIdRequest) (*Kafk
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -1235,8 +1223,7 @@ func (a *DefaultApiService) GetKafkaByIdExecute(r ApiGetKafkaByIdRequest) (*Kafk
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -1246,8 +1233,7 @@ func (a *DefaultApiService) GetKafkaByIdExecute(r ApiGetKafkaByIdRequest) (*Kafk
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -1257,15 +1243,14 @@ func (a *DefaultApiService) GetKafkaByIdExecute(r ApiGetKafkaByIdRequest) (*Kafk
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -1276,7 +1261,7 @@ func (a *DefaultApiService) GetKafkaByIdExecute(r ApiGetKafkaByIdRequest) (*Kafk
 }
 
 type ApiGetKafkasRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	page *string
 	size *string
@@ -1284,69 +1269,64 @@ type ApiGetKafkasRequest struct {
 	search *string
 }
 
-// Page index
 func (r ApiGetKafkasRequest) Page(page string) ApiGetKafkasRequest {
 	r.page = &page
 	return r
 }
-
-// Number of items in each page
 func (r ApiGetKafkasRequest) Size(size string) ApiGetKafkasRequest {
 	r.size = &size
 	return r
 }
-
-// Specifies the order by criteria. The syntax of this parameter is similar to the syntax of the &#x60;order by&#x60; clause of an SQL statement. Each query can be ordered by any of the following &#x60;kafkaRequests&#x60; fields:  * bootstrap_server_host * admin_api_server_url * cloud_provider * cluster_id * created_at * href * id * instance_type * multi_az * name * organisation_id * owner * reauthentication_enabled * region * status * updated_at * version  For example, to return all Kafka instances ordered by their name, use the following syntax:  &#x60;&#x60;&#x60;sql name asc &#x60;&#x60;&#x60;  To return all Kafka instances ordered by their name _and_ created date, use the following syntax:  &#x60;&#x60;&#x60;sql name asc, created_at asc &#x60;&#x60;&#x60;  If the parameter isn&#39;t provided, or if the value is empty, then the results are ordered by name.
 func (r ApiGetKafkasRequest) OrderBy(orderBy string) ApiGetKafkasRequest {
 	r.orderBy = &orderBy
 	return r
 }
-
-// Search criteria.  The syntax of this parameter is similar to the syntax of the &#x60;where&#x60; clause of an SQL statement. Allowed fields in the search are &#x60;cloud_provider&#x60;, &#x60;name&#x60;, &#x60;owner&#x60;, &#x60;region&#x60;, and &#x60;status&#x60;. Allowed comparators are &#x60;&lt;&gt;&#x60;, &#x60;&#x3D;&#x60;, &#x60;LIKE&#x60;, or &#x60;ILIKE&#x60;. Allowed joins are &#x60;AND&#x60; and &#x60;OR&#x60;. However, you can use a maximum of 10 joins in a search query.  Examples:  To return a Kafka instance with the name &#x60;my-kafka&#x60; and the region &#x60;aws&#x60;, use the following syntax:  &#x60;&#x60;&#x60; name &#x3D; my-kafka and cloud_provider &#x3D; aws &#x60;&#x60;&#x60;[p-]  To return a Kafka instance with a name that starts with &#x60;my&#x60;, use the following syntax:  &#x60;&#x60;&#x60; name like my%25 &#x60;&#x60;&#x60;  To return a Kafka instance with a name containing &#x60;test&#x60; matching any character case combinations, use the following syntax:  &#x60;&#x60;&#x60; name ilike %25test%25 &#x60;&#x60;&#x60;  If the parameter isn&#39;t provided, or if the value is empty, then all the Kafka instances that the user has permission to see are returned.  Note. If the query is invalid, an error is returned. 
 func (r ApiGetKafkasRequest) Search(search string) ApiGetKafkasRequest {
 	r.search = &search
 	return r
 }
 
-func (r ApiGetKafkasRequest) Execute() (*KafkaRequestList, *http.Response, error) {
+func (r ApiGetKafkasRequest) Execute() (KafkaRequestList, *_nethttp.Response, error) {
 	return r.ApiService.GetKafkasExecute(r)
 }
 
 /*
-GetKafkas Method for GetKafkas
-
-Returns a list of Kafka requests
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiGetKafkasRequest
-*/
-func (a *DefaultApiService) GetKafkas(ctx context.Context) ApiGetKafkasRequest {
+ * GetKafkas Method for GetKafkas
+ * Returns a list of Kafka requests
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiGetKafkasRequest
+ */
+func (a *DefaultApiService) GetKafkas(ctx _context.Context) ApiGetKafkasRequest {
 	return ApiGetKafkasRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return KafkaRequestList
-func (a *DefaultApiService) GetKafkasExecute(r ApiGetKafkasRequest) (*KafkaRequestList, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return KafkaRequestList
+ */
+func (a *DefaultApiService) GetKafkasExecute(r ApiGetKafkasRequest) (KafkaRequestList, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *KafkaRequestList
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  KafkaRequestList
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.GetKafkas")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/kafkas_mgmt/v1/kafkas"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.page != nil {
 		localVarQueryParams.Add("page", parameterToString(*r.page, ""))
@@ -1377,7 +1357,7 @@ func (a *DefaultApiService) GetKafkasExecute(r ApiGetKafkasRequest) (*KafkaReque
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -1387,15 +1367,15 @@ func (a *DefaultApiService) GetKafkasExecute(r ApiGetKafkasRequest) (*KafkaReque
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -1406,8 +1386,7 @@ func (a *DefaultApiService) GetKafkasExecute(r ApiGetKafkasRequest) (*KafkaReque
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -1417,8 +1396,7 @@ func (a *DefaultApiService) GetKafkasExecute(r ApiGetKafkasRequest) (*KafkaReque
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -1428,8 +1406,7 @@ func (a *DefaultApiService) GetKafkasExecute(r ApiGetKafkasRequest) (*KafkaReque
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -1439,15 +1416,14 @@ func (a *DefaultApiService) GetKafkasExecute(r ApiGetKafkasRequest) (*KafkaReque
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -1458,32 +1434,29 @@ func (a *DefaultApiService) GetKafkasExecute(r ApiGetKafkasRequest) (*KafkaReque
 }
 
 type ApiGetMetricsByInstantQueryRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	id string
 	filters *[]string
 }
 
-// List of metrics to fetch. Fetch all metrics when empty. List entries are Kafka internal metric names.
 func (r ApiGetMetricsByInstantQueryRequest) Filters(filters []string) ApiGetMetricsByInstantQueryRequest {
 	r.filters = &filters
 	return r
 }
 
-func (r ApiGetMetricsByInstantQueryRequest) Execute() (*MetricsInstantQueryList, *http.Response, error) {
+func (r ApiGetMetricsByInstantQueryRequest) Execute() (MetricsInstantQueryList, *_nethttp.Response, error) {
 	return r.ApiService.GetMetricsByInstantQueryExecute(r)
 }
 
 /*
-GetMetricsByInstantQuery Method for GetMetricsByInstantQuery
-
-Returns metrics with instant query by Kafka ID
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The ID of record
- @return ApiGetMetricsByInstantQueryRequest
-*/
-func (a *DefaultApiService) GetMetricsByInstantQuery(ctx context.Context, id string) ApiGetMetricsByInstantQueryRequest {
+ * GetMetricsByInstantQuery Method for GetMetricsByInstantQuery
+ * Returns metrics with instant query by Kafka ID
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The ID of record
+ * @return ApiGetMetricsByInstantQueryRequest
+ */
+func (a *DefaultApiService) GetMetricsByInstantQuery(ctx _context.Context, id string) ApiGetMetricsByInstantQueryRequest {
 	return ApiGetMetricsByInstantQueryRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -1491,27 +1464,31 @@ func (a *DefaultApiService) GetMetricsByInstantQuery(ctx context.Context, id str
 	}
 }
 
-// Execute executes the request
-//  @return MetricsInstantQueryList
-func (a *DefaultApiService) GetMetricsByInstantQueryExecute(r ApiGetMetricsByInstantQueryRequest) (*MetricsInstantQueryList, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return MetricsInstantQueryList
+ */
+func (a *DefaultApiService) GetMetricsByInstantQueryExecute(r ApiGetMetricsByInstantQueryRequest) (MetricsInstantQueryList, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *MetricsInstantQueryList
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  MetricsInstantQueryList
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.GetMetricsByInstantQuery")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/kafkas_mgmt/v1/kafkas/{id}/metrics/query"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.filters != nil {
 		t := *r.filters
@@ -1541,7 +1518,7 @@ func (a *DefaultApiService) GetMetricsByInstantQueryExecute(r ApiGetMetricsByIns
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -1551,15 +1528,15 @@ func (a *DefaultApiService) GetMetricsByInstantQueryExecute(r ApiGetMetricsByIns
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -1570,8 +1547,7 @@ func (a *DefaultApiService) GetMetricsByInstantQueryExecute(r ApiGetMetricsByIns
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -1581,15 +1557,14 @@ func (a *DefaultApiService) GetMetricsByInstantQueryExecute(r ApiGetMetricsByIns
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -1600,7 +1575,7 @@ func (a *DefaultApiService) GetMetricsByInstantQueryExecute(r ApiGetMetricsByIns
 }
 
 type ApiGetMetricsByRangeQueryRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	id string
 	duration *int64
@@ -1608,38 +1583,31 @@ type ApiGetMetricsByRangeQueryRequest struct {
 	filters *[]string
 }
 
-// The length of time in minutes for which to return the metrics
 func (r ApiGetMetricsByRangeQueryRequest) Duration(duration int64) ApiGetMetricsByRangeQueryRequest {
 	r.duration = &duration
 	return r
 }
-
-// The interval in seconds between data points
 func (r ApiGetMetricsByRangeQueryRequest) Interval(interval int64) ApiGetMetricsByRangeQueryRequest {
 	r.interval = &interval
 	return r
 }
-
-// List of metrics to fetch. Fetch all metrics when empty. List entries are Kafka internal metric names.
 func (r ApiGetMetricsByRangeQueryRequest) Filters(filters []string) ApiGetMetricsByRangeQueryRequest {
 	r.filters = &filters
 	return r
 }
 
-func (r ApiGetMetricsByRangeQueryRequest) Execute() (*MetricsRangeQueryList, *http.Response, error) {
+func (r ApiGetMetricsByRangeQueryRequest) Execute() (MetricsRangeQueryList, *_nethttp.Response, error) {
 	return r.ApiService.GetMetricsByRangeQueryExecute(r)
 }
 
 /*
-GetMetricsByRangeQuery Method for GetMetricsByRangeQuery
-
-Returns metrics with timeseries range query by Kafka ID
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The ID of record
- @return ApiGetMetricsByRangeQueryRequest
-*/
-func (a *DefaultApiService) GetMetricsByRangeQuery(ctx context.Context, id string) ApiGetMetricsByRangeQueryRequest {
+ * GetMetricsByRangeQuery Method for GetMetricsByRangeQuery
+ * Returns metrics with timeseries range query by Kafka ID
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The ID of record
+ * @return ApiGetMetricsByRangeQueryRequest
+ */
+func (a *DefaultApiService) GetMetricsByRangeQuery(ctx _context.Context, id string) ApiGetMetricsByRangeQueryRequest {
 	return ApiGetMetricsByRangeQueryRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -1647,27 +1615,31 @@ func (a *DefaultApiService) GetMetricsByRangeQuery(ctx context.Context, id strin
 	}
 }
 
-// Execute executes the request
-//  @return MetricsRangeQueryList
-func (a *DefaultApiService) GetMetricsByRangeQueryExecute(r ApiGetMetricsByRangeQueryRequest) (*MetricsRangeQueryList, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return MetricsRangeQueryList
+ */
+func (a *DefaultApiService) GetMetricsByRangeQueryExecute(r ApiGetMetricsByRangeQueryRequest) (MetricsRangeQueryList, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *MetricsRangeQueryList
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  MetricsRangeQueryList
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.GetMetricsByRangeQuery")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/kafkas_mgmt/v1/kafkas/{id}/metrics/query_range"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.duration == nil {
 		return localVarReturnValue, nil, reportError("duration is required and must be specified")
 	}
@@ -1717,7 +1689,7 @@ func (a *DefaultApiService) GetMetricsByRangeQueryExecute(r ApiGetMetricsByRange
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -1727,15 +1699,15 @@ func (a *DefaultApiService) GetMetricsByRangeQueryExecute(r ApiGetMetricsByRange
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -1746,8 +1718,7 @@ func (a *DefaultApiService) GetMetricsByRangeQueryExecute(r ApiGetMetricsByRange
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -1757,15 +1728,14 @@ func (a *DefaultApiService) GetMetricsByRangeQueryExecute(r ApiGetMetricsByRange
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -1776,49 +1746,52 @@ func (a *DefaultApiService) GetMetricsByRangeQueryExecute(r ApiGetMetricsByRange
 }
 
 type ApiGetVersionMetadataRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 }
 
-func (r ApiGetVersionMetadataRequest) Execute() (*VersionMetadata, *http.Response, error) {
+
+func (r ApiGetVersionMetadataRequest) Execute() (VersionMetadata, *_nethttp.Response, error) {
 	return r.ApiService.GetVersionMetadataExecute(r)
 }
 
 /*
-GetVersionMetadata Method for GetVersionMetadata
-
-Returns the kafka Service Fleet Manager API version metadata
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiGetVersionMetadataRequest
-*/
-func (a *DefaultApiService) GetVersionMetadata(ctx context.Context) ApiGetVersionMetadataRequest {
+ * GetVersionMetadata Method for GetVersionMetadata
+ * Returns the kafka Service Fleet Manager API version metadata
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiGetVersionMetadataRequest
+ */
+func (a *DefaultApiService) GetVersionMetadata(ctx _context.Context) ApiGetVersionMetadataRequest {
 	return ApiGetVersionMetadataRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return VersionMetadata
-func (a *DefaultApiService) GetVersionMetadataExecute(r ApiGetVersionMetadataRequest) (*VersionMetadata, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return VersionMetadata
+ */
+func (a *DefaultApiService) GetVersionMetadataExecute(r ApiGetVersionMetadataRequest) (VersionMetadata, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *VersionMetadata
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  VersionMetadata
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.GetVersionMetadata")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/kafkas_mgmt/v1"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -1837,7 +1810,7 @@ func (a *DefaultApiService) GetVersionMetadataExecute(r ApiGetVersionMetadataReq
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -1847,15 +1820,15 @@ func (a *DefaultApiService) GetVersionMetadataExecute(r ApiGetVersionMetadataReq
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -1864,7 +1837,7 @@ func (a *DefaultApiService) GetVersionMetadataExecute(r ApiGetVersionMetadataReq
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -1875,32 +1848,29 @@ func (a *DefaultApiService) GetVersionMetadataExecute(r ApiGetVersionMetadataReq
 }
 
 type ApiUpdateKafkaByIdRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	id string
 	kafkaUpdateRequest *KafkaUpdateRequest
 }
 
-// Update owner of kafka
 func (r ApiUpdateKafkaByIdRequest) KafkaUpdateRequest(kafkaUpdateRequest KafkaUpdateRequest) ApiUpdateKafkaByIdRequest {
 	r.kafkaUpdateRequest = &kafkaUpdateRequest
 	return r
 }
 
-func (r ApiUpdateKafkaByIdRequest) Execute() (*KafkaRequest, *http.Response, error) {
+func (r ApiUpdateKafkaByIdRequest) Execute() (KafkaRequest, *_nethttp.Response, error) {
 	return r.ApiService.UpdateKafkaByIdExecute(r)
 }
 
 /*
-UpdateKafkaById Method for UpdateKafkaById
-
-Update a Kafka instance by id
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The ID of record
- @return ApiUpdateKafkaByIdRequest
-*/
-func (a *DefaultApiService) UpdateKafkaById(ctx context.Context, id string) ApiUpdateKafkaByIdRequest {
+ * UpdateKafkaById Method for UpdateKafkaById
+ * Update a Kafka instance by id
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The ID of record
+ * @return ApiUpdateKafkaByIdRequest
+ */
+func (a *DefaultApiService) UpdateKafkaById(ctx _context.Context, id string) ApiUpdateKafkaByIdRequest {
 	return ApiUpdateKafkaByIdRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -1908,27 +1878,31 @@ func (a *DefaultApiService) UpdateKafkaById(ctx context.Context, id string) ApiU
 	}
 }
 
-// Execute executes the request
-//  @return KafkaRequest
-func (a *DefaultApiService) UpdateKafkaByIdExecute(r ApiUpdateKafkaByIdRequest) (*KafkaRequest, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return KafkaRequest
+ */
+func (a *DefaultApiService) UpdateKafkaByIdExecute(r ApiUpdateKafkaByIdRequest) (KafkaRequest, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPatch
+		localVarHTTPMethod   = _nethttp.MethodPatch
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *KafkaRequest
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  KafkaRequest
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.UpdateKafkaById")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/kafkas_mgmt/v1/kafkas/{id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.kafkaUpdateRequest == nil {
 		return localVarReturnValue, nil, reportError("kafkaUpdateRequest is required and must be specified")
 	}
@@ -1952,7 +1926,7 @@ func (a *DefaultApiService) UpdateKafkaByIdExecute(r ApiUpdateKafkaByIdRequest)
 	}
 	// body params
 	localVarPostBody = r.kafkaUpdateRequest
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -1962,15 +1936,15 @@ func (a *DefaultApiService) UpdateKafkaByIdExecute(r ApiUpdateKafkaByIdRequest)
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -1981,8 +1955,7 @@ func (a *DefaultApiService) UpdateKafkaByIdExecute(r ApiUpdateKafkaByIdRequest)
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -1992,8 +1965,7 @@ func (a *DefaultApiService) UpdateKafkaByIdExecute(r ApiUpdateKafkaByIdRequest)
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -2003,8 +1975,7 @@ func (a *DefaultApiService) UpdateKafkaByIdExecute(r ApiUpdateKafkaByIdRequest)
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -2014,8 +1985,7 @@ func (a *DefaultApiService) UpdateKafkaByIdExecute(r ApiUpdateKafkaByIdRequest)
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -2025,15 +1995,14 @@ func (a *DefaultApiService) UpdateKafkaByIdExecute(r ApiUpdateKafkaByIdRequest)
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/api_enterprise_dataplane_clusters.go b/app-services-sdk-go/kafkamgmt/apiv1/client/api_enterprise_dataplane_clusters.go
index 269ac1ff..7386fe57 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/api_enterprise_dataplane_clusters.go
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/api_enterprise_dataplane_clusters.go
@@ -1,11 +1,11 @@
 /*
-Kafka Management API
-
-Kafka Management API is a REST API to manage Kafka instances
-
-API version: 1.14.0
-Contact: rhosak-support@redhat.com
-*/
+ * Kafka Management API
+ *
+ * Kafka Management API is a REST API to manage Kafka instances
+ *
+ * API version: 1.14.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -13,28 +13,27 @@ package kafkamgmtclient
 
 import (
 	"bytes"
-	"context"
-	"io/ioutil"
-	"net/http"
-	"net/url"
+	_context "context"
+	_ioutil "io/ioutil"
+	_nethttp "net/http"
+	_neturl "net/url"
 	"strings"
 )
 
+// Linger please
+var (
+	_ _context.Context
+)
 
 type EnterpriseDataplaneClustersApi interface {
 
 	/*
-	DeleteEnterpriseClusterById Method for DeleteEnterpriseClusterById
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id ID of the enterprise data plane cluster
-	@return ApiDeleteEnterpriseClusterByIdRequest
-	*/
-	DeleteEnterpriseClusterById(ctx context.Context, id string) ApiDeleteEnterpriseClusterByIdRequest
-
-	// DeleteEnterpriseClusterByIdExecute executes the request
-	//  @return Error
-	DeleteEnterpriseClusterByIdExecute(r ApiDeleteEnterpriseClusterByIdRequest) (*Error, *http.Response, error)
+	 * DeleteEnterpriseClusterById Method for DeleteEnterpriseClusterById
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id ID of the enterprise data plane cluster
+	 * @return ApiDeleteEnterpriseClusterByIdRequest
+	 */
+	DeleteEnterpriseClusterById(ctx _context.Context, id string) ApiDeleteEnterpriseClusterByIdRequest
 
 	/*
 	GetEnterpriseClusterById Method for GetEnterpriseClusterById
@@ -81,14 +80,28 @@ type EnterpriseDataplaneClustersApi interface {
 	GetEnterpriseOsdClustersExecute(r ApiGetEnterpriseOsdClustersRequest) (*EnterpriseClusterList, *http.Response, error)
 
 	/*
-	RegisterEnterpriseOsdCluster Method for RegisterEnterpriseOsdCluster
+	 * GetEnterpriseClusterById Method for GetEnterpriseClusterById
+	 * Returns enterprise data plane cluster by ID
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id ID of the enterprise data plane cluster
+	 * @return ApiGetEnterpriseClusterByIdRequest
+	 */
+	GetEnterpriseClusterById(ctx _context.Context, id string) ApiGetEnterpriseClusterByIdRequest
 
-	Register enterprise data plane cluster
+	/*
+	 * GetEnterpriseClusterByIdExecute executes the request
+	 * @return EnterpriseCluster
+	 */
+	GetEnterpriseClusterByIdExecute(r ApiGetEnterpriseClusterByIdRequest) (EnterpriseCluster, *_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiRegisterEnterpriseOsdClusterRequest
-	*/
-	RegisterEnterpriseOsdCluster(ctx context.Context) ApiRegisterEnterpriseOsdClusterRequest
+	/*
+	 * GetEnterpriseClusterWithAddonParameters Method for GetEnterpriseClusterWithAddonParameters
+	 * Returns enterprise data plane cluster by ID along with its addon parameters
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id ID of the enterprise data plane cluster
+	 * @return ApiGetEnterpriseClusterWithAddonParametersRequest
+	 */
+	GetEnterpriseClusterWithAddonParameters(ctx _context.Context, id string) ApiGetEnterpriseClusterWithAddonParametersRequest
 
 	// RegisterEnterpriseOsdClusterExecute executes the request
 	//  @return EnterpriseClusterWithAddonParameters
@@ -99,37 +112,33 @@ type EnterpriseDataplaneClustersApi interface {
 type EnterpriseDataplaneClustersApiService service
 
 type ApiDeleteEnterpriseClusterByIdRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService EnterpriseDataplaneClustersApi
 	async *bool
 	id string
 	force *bool
 }
 
-// Perform the action in an asynchronous manner
 func (r ApiDeleteEnterpriseClusterByIdRequest) Async(async bool) ApiDeleteEnterpriseClusterByIdRequest {
 	r.async = &async
 	return r
 }
-
-// When provided with value: true - enterprise cluster will be deleted alongside all kafkas present on the cluster. When skipped and enterprise cluster has any kafkas associated with it, the request will fail.
 func (r ApiDeleteEnterpriseClusterByIdRequest) Force(force bool) ApiDeleteEnterpriseClusterByIdRequest {
 	r.force = &force
 	return r
 }
 
-func (r ApiDeleteEnterpriseClusterByIdRequest) Execute() (*Error, *http.Response, error) {
+func (r ApiDeleteEnterpriseClusterByIdRequest) Execute() (Error, *_nethttp.Response, error) {
 	return r.ApiService.DeleteEnterpriseClusterByIdExecute(r)
 }
 
 /*
-DeleteEnterpriseClusterById Method for DeleteEnterpriseClusterById
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id ID of the enterprise data plane cluster
- @return ApiDeleteEnterpriseClusterByIdRequest
-*/
-func (a *EnterpriseDataplaneClustersApiService) DeleteEnterpriseClusterById(ctx context.Context, id string) ApiDeleteEnterpriseClusterByIdRequest {
+ * DeleteEnterpriseClusterById Method for DeleteEnterpriseClusterById
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id ID of the enterprise data plane cluster
+ * @return ApiDeleteEnterpriseClusterByIdRequest
+ */
+func (a *EnterpriseDataplaneClustersApiService) DeleteEnterpriseClusterById(ctx _context.Context, id string) ApiDeleteEnterpriseClusterByIdRequest {
 	return ApiDeleteEnterpriseClusterByIdRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -137,27 +146,31 @@ func (a *EnterpriseDataplaneClustersApiService) DeleteEnterpriseClusterById(ctx
 	}
 }
 
-// Execute executes the request
-//  @return Error
-func (a *EnterpriseDataplaneClustersApiService) DeleteEnterpriseClusterByIdExecute(r ApiDeleteEnterpriseClusterByIdRequest) (*Error, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return Error
+ */
+func (a *EnterpriseDataplaneClustersApiService) DeleteEnterpriseClusterByIdExecute(r ApiDeleteEnterpriseClusterByIdRequest) (Error, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodDelete
+		localVarHTTPMethod   = _nethttp.MethodDelete
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *Error
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  Error
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "EnterpriseDataplaneClustersApiService.DeleteEnterpriseClusterById")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/kafkas_mgmt/v1/clusters/{id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.async == nil {
 		return localVarReturnValue, nil, reportError("async is required and must be specified")
 	}
@@ -183,7 +196,7 @@ func (a *EnterpriseDataplaneClustersApiService) DeleteEnterpriseClusterByIdExecu
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -193,15 +206,15 @@ func (a *EnterpriseDataplaneClustersApiService) DeleteEnterpriseClusterByIdExecu
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -212,8 +225,7 @@ func (a *EnterpriseDataplaneClustersApiService) DeleteEnterpriseClusterByIdExecu
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -223,8 +235,7 @@ func (a *EnterpriseDataplaneClustersApiService) DeleteEnterpriseClusterByIdExecu
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -234,8 +245,7 @@ func (a *EnterpriseDataplaneClustersApiService) DeleteEnterpriseClusterByIdExecu
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -245,8 +255,7 @@ func (a *EnterpriseDataplaneClustersApiService) DeleteEnterpriseClusterByIdExecu
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -256,15 +265,14 @@ func (a *EnterpriseDataplaneClustersApiService) DeleteEnterpriseClusterByIdExecu
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -569,47 +577,340 @@ func (a *EnterpriseDataplaneClustersApiService) GetEnterpriseClusterWithAddonPar
 type ApiGetEnterpriseOsdClustersRequest struct {
 	ctx context.Context
 	ApiService EnterpriseDataplaneClustersApi
+	id string
 }
 
-func (r ApiGetEnterpriseOsdClustersRequest) Execute() (*EnterpriseClusterList, *http.Response, error) {
-	return r.ApiService.GetEnterpriseOsdClustersExecute(r)
+
+func (r ApiGetEnterpriseClusterByIdRequest) Execute() (EnterpriseCluster, *_nethttp.Response, error) {
+	return r.ApiService.GetEnterpriseClusterByIdExecute(r)
 }
 
 /*
-GetEnterpriseOsdClusters Method for GetEnterpriseOsdClusters
+ * GetEnterpriseClusterById Method for GetEnterpriseClusterById
+ * Returns enterprise data plane cluster by ID
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id ID of the enterprise data plane cluster
+ * @return ApiGetEnterpriseClusterByIdRequest
+ */
+func (a *EnterpriseDataplaneClustersApiService) GetEnterpriseClusterById(ctx _context.Context, id string) ApiGetEnterpriseClusterByIdRequest {
+	return ApiGetEnterpriseClusterByIdRequest{
+		ApiService: a,
+		ctx: ctx,
+		id: id,
+	}
+}
 
-List all Enterprise data plane clusters
+/*
+ * Execute executes the request
+ * @return EnterpriseCluster
+ */
+func (a *EnterpriseDataplaneClustersApiService) GetEnterpriseClusterByIdExecute(r ApiGetEnterpriseClusterByIdRequest) (EnterpriseCluster, *_nethttp.Response, error) {
+	var (
+		localVarHTTPMethod   = _nethttp.MethodGet
+		localVarPostBody     interface{}
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  EnterpriseCluster
+	)
 
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiGetEnterpriseOsdClustersRequest
-*/
-func (a *EnterpriseDataplaneClustersApiService) GetEnterpriseOsdClusters(ctx context.Context) ApiGetEnterpriseOsdClustersRequest {
+	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "EnterpriseDataplaneClustersApiService.GetEnterpriseClusterById")
+	if err != nil {
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
+	}
+
+	localVarPath := localBasePath + "/api/kafkas_mgmt/v1/clusters/{id}"
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
+
+	localVarHeaderParams := make(map[string]string)
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
+
+	// to determine the Content-Type header
+	localVarHTTPContentTypes := []string{}
+
+	// set Content-Type header
+	localVarHTTPContentType := selectHeaderContentType(localVarHTTPContentTypes)
+	if localVarHTTPContentType != "" {
+		localVarHeaderParams["Content-Type"] = localVarHTTPContentType
+	}
+
+	// to determine the Accept header
+	localVarHTTPHeaderAccepts := []string{"application/json"}
+
+	// set Accept header
+	localVarHTTPHeaderAccept := selectHeaderAccept(localVarHTTPHeaderAccepts)
+	if localVarHTTPHeaderAccept != "" {
+		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
+	}
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
+	if err != nil {
+		return localVarReturnValue, nil, err
+	}
+
+	localVarHTTPResponse, err := a.client.callAPI(req)
+	if err != nil || localVarHTTPResponse == nil {
+		return localVarReturnValue, localVarHTTPResponse, err
+	}
+
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarHTTPResponse.Body.Close()
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	if err != nil {
+		return localVarReturnValue, localVarHTTPResponse, err
+	}
+
+	if localVarHTTPResponse.StatusCode >= 300 {
+		newErr := GenericOpenAPIError{
+			body:  localVarBody,
+			error: localVarHTTPResponse.Status,
+		}
+		if localVarHTTPResponse.StatusCode == 401 {
+			var v Error
+			err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
+			if err != nil {
+				newErr.error = err.Error()
+				return localVarReturnValue, localVarHTTPResponse, newErr
+			}
+			newErr.model = v
+			return localVarReturnValue, localVarHTTPResponse, newErr
+		}
+		if localVarHTTPResponse.StatusCode == 403 {
+			var v Error
+			err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
+			if err != nil {
+				newErr.error = err.Error()
+				return localVarReturnValue, localVarHTTPResponse, newErr
+			}
+			newErr.model = v
+			return localVarReturnValue, localVarHTTPResponse, newErr
+		}
+		if localVarHTTPResponse.StatusCode == 404 {
+			var v Error
+			err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
+			if err != nil {
+				newErr.error = err.Error()
+				return localVarReturnValue, localVarHTTPResponse, newErr
+			}
+			newErr.model = v
+			return localVarReturnValue, localVarHTTPResponse, newErr
+		}
+		if localVarHTTPResponse.StatusCode == 500 {
+			var v Error
+			err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
+			if err != nil {
+				newErr.error = err.Error()
+				return localVarReturnValue, localVarHTTPResponse, newErr
+			}
+			newErr.model = v
+		}
+		return localVarReturnValue, localVarHTTPResponse, newErr
+	}
+
+	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
+	if err != nil {
+		newErr := GenericOpenAPIError{
+			body:  localVarBody,
+			error: err.Error(),
+		}
+		return localVarReturnValue, localVarHTTPResponse, newErr
+	}
+
+	return localVarReturnValue, localVarHTTPResponse, nil
+}
+
+type ApiGetEnterpriseClusterWithAddonParametersRequest struct {
+	ctx _context.Context
+	ApiService EnterpriseDataplaneClustersApi
+	id string
+}
+
+
+func (r ApiGetEnterpriseClusterWithAddonParametersRequest) Execute() (EnterpriseClusterWithAddonParameters, *_nethttp.Response, error) {
+	return r.ApiService.GetEnterpriseClusterWithAddonParametersExecute(r)
+}
+
+/*
+ * GetEnterpriseClusterWithAddonParameters Method for GetEnterpriseClusterWithAddonParameters
+ * Returns enterprise data plane cluster by ID along with its addon parameters
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id ID of the enterprise data plane cluster
+ * @return ApiGetEnterpriseClusterWithAddonParametersRequest
+ */
+func (a *EnterpriseDataplaneClustersApiService) GetEnterpriseClusterWithAddonParameters(ctx _context.Context, id string) ApiGetEnterpriseClusterWithAddonParametersRequest {
+	return ApiGetEnterpriseClusterWithAddonParametersRequest{
+		ApiService: a,
+		ctx: ctx,
+		id: id,
+	}
+}
+
+/*
+ * Execute executes the request
+ * @return EnterpriseClusterWithAddonParameters
+ */
+func (a *EnterpriseDataplaneClustersApiService) GetEnterpriseClusterWithAddonParametersExecute(r ApiGetEnterpriseClusterWithAddonParametersRequest) (EnterpriseClusterWithAddonParameters, *_nethttp.Response, error) {
+	var (
+		localVarHTTPMethod   = _nethttp.MethodGet
+		localVarPostBody     interface{}
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  EnterpriseClusterWithAddonParameters
+	)
+
+	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "EnterpriseDataplaneClustersApiService.GetEnterpriseClusterWithAddonParameters")
+	if err != nil {
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
+	}
+
+	localVarPath := localBasePath + "/api/kafkas_mgmt/v1/clusters/{id}/addon_parameters"
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
+
+	localVarHeaderParams := make(map[string]string)
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
+
+	// to determine the Content-Type header
+	localVarHTTPContentTypes := []string{}
+
+	// set Content-Type header
+	localVarHTTPContentType := selectHeaderContentType(localVarHTTPContentTypes)
+	if localVarHTTPContentType != "" {
+		localVarHeaderParams["Content-Type"] = localVarHTTPContentType
+	}
+
+	// to determine the Accept header
+	localVarHTTPHeaderAccepts := []string{"application/json"}
+
+	// set Accept header
+	localVarHTTPHeaderAccept := selectHeaderAccept(localVarHTTPHeaderAccepts)
+	if localVarHTTPHeaderAccept != "" {
+		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
+	}
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
+	if err != nil {
+		return localVarReturnValue, nil, err
+	}
+
+	localVarHTTPResponse, err := a.client.callAPI(req)
+	if err != nil || localVarHTTPResponse == nil {
+		return localVarReturnValue, localVarHTTPResponse, err
+	}
+
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarHTTPResponse.Body.Close()
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	if err != nil {
+		return localVarReturnValue, localVarHTTPResponse, err
+	}
+
+	if localVarHTTPResponse.StatusCode >= 300 {
+		newErr := GenericOpenAPIError{
+			body:  localVarBody,
+			error: localVarHTTPResponse.Status,
+		}
+		if localVarHTTPResponse.StatusCode == 401 {
+			var v Error
+			err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
+			if err != nil {
+				newErr.error = err.Error()
+				return localVarReturnValue, localVarHTTPResponse, newErr
+			}
+			newErr.model = v
+			return localVarReturnValue, localVarHTTPResponse, newErr
+		}
+		if localVarHTTPResponse.StatusCode == 403 {
+			var v Error
+			err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
+			if err != nil {
+				newErr.error = err.Error()
+				return localVarReturnValue, localVarHTTPResponse, newErr
+			}
+			newErr.model = v
+			return localVarReturnValue, localVarHTTPResponse, newErr
+		}
+		if localVarHTTPResponse.StatusCode == 404 {
+			var v Error
+			err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
+			if err != nil {
+				newErr.error = err.Error()
+				return localVarReturnValue, localVarHTTPResponse, newErr
+			}
+			newErr.model = v
+			return localVarReturnValue, localVarHTTPResponse, newErr
+		}
+		if localVarHTTPResponse.StatusCode == 500 {
+			var v Error
+			err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
+			if err != nil {
+				newErr.error = err.Error()
+				return localVarReturnValue, localVarHTTPResponse, newErr
+			}
+			newErr.model = v
+		}
+		return localVarReturnValue, localVarHTTPResponse, newErr
+	}
+
+	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
+	if err != nil {
+		newErr := GenericOpenAPIError{
+			body:  localVarBody,
+			error: err.Error(),
+		}
+		return localVarReturnValue, localVarHTTPResponse, newErr
+	}
+
+	return localVarReturnValue, localVarHTTPResponse, nil
+}
+
+type ApiGetEnterpriseOsdClustersRequest struct {
+	ctx _context.Context
+	ApiService EnterpriseDataplaneClustersApi
+}
+
+
+func (r ApiGetEnterpriseOsdClustersRequest) Execute() (EnterpriseClusterList, *_nethttp.Response, error) {
+	return r.ApiService.GetEnterpriseOsdClustersExecute(r)
+}
+
+/*
+ * GetEnterpriseOsdClusters Method for GetEnterpriseOsdClusters
+ * List all Enterprise data plane clusters
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiGetEnterpriseOsdClustersRequest
+ */
+func (a *EnterpriseDataplaneClustersApiService) GetEnterpriseOsdClusters(ctx _context.Context) ApiGetEnterpriseOsdClustersRequest {
 	return ApiGetEnterpriseOsdClustersRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return EnterpriseClusterList
-func (a *EnterpriseDataplaneClustersApiService) GetEnterpriseOsdClustersExecute(r ApiGetEnterpriseOsdClustersRequest) (*EnterpriseClusterList, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return EnterpriseClusterList
+ */
+func (a *EnterpriseDataplaneClustersApiService) GetEnterpriseOsdClustersExecute(r ApiGetEnterpriseOsdClustersRequest) (EnterpriseClusterList, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *EnterpriseClusterList
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  EnterpriseClusterList
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "EnterpriseDataplaneClustersApiService.GetEnterpriseOsdClusters")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/kafkas_mgmt/v1/clusters"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -628,7 +929,7 @@ func (a *EnterpriseDataplaneClustersApiService) GetEnterpriseOsdClustersExecute(
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -638,15 +939,15 @@ func (a *EnterpriseDataplaneClustersApiService) GetEnterpriseOsdClustersExecute(
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -657,8 +958,7 @@ func (a *EnterpriseDataplaneClustersApiService) GetEnterpriseOsdClustersExecute(
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -668,8 +968,7 @@ func (a *EnterpriseDataplaneClustersApiService) GetEnterpriseOsdClustersExecute(
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -679,8 +978,7 @@ func (a *EnterpriseDataplaneClustersApiService) GetEnterpriseOsdClustersExecute(
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -690,15 +988,14 @@ func (a *EnterpriseDataplaneClustersApiService) GetEnterpriseOsdClustersExecute(
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -709,12 +1006,11 @@ func (a *EnterpriseDataplaneClustersApiService) GetEnterpriseOsdClustersExecute(
 }
 
 type ApiRegisterEnterpriseOsdClusterRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService EnterpriseDataplaneClustersApi
 	enterpriseOsdClusterPayload *EnterpriseOsdClusterPayload
 }
 
-// Enterprise data plane cluster details
 func (r ApiRegisterEnterpriseOsdClusterRequest) EnterpriseOsdClusterPayload(enterpriseOsdClusterPayload EnterpriseOsdClusterPayload) ApiRegisterEnterpriseOsdClusterRequest {
 	r.enterpriseOsdClusterPayload = &enterpriseOsdClusterPayload
 	return r
@@ -725,14 +1021,12 @@ func (r ApiRegisterEnterpriseOsdClusterRequest) Execute() (*EnterpriseClusterWit
 }
 
 /*
-RegisterEnterpriseOsdCluster Method for RegisterEnterpriseOsdCluster
-
-Register enterprise data plane cluster
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiRegisterEnterpriseOsdClusterRequest
-*/
-func (a *EnterpriseDataplaneClustersApiService) RegisterEnterpriseOsdCluster(ctx context.Context) ApiRegisterEnterpriseOsdClusterRequest {
+ * RegisterEnterpriseOsdCluster Method for RegisterEnterpriseOsdCluster
+ * Register enterprise data plane cluster
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiRegisterEnterpriseOsdClusterRequest
+ */
+func (a *EnterpriseDataplaneClustersApiService) RegisterEnterpriseOsdCluster(ctx _context.Context) ApiRegisterEnterpriseOsdClusterRequest {
 	return ApiRegisterEnterpriseOsdClusterRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -743,7 +1037,7 @@ func (a *EnterpriseDataplaneClustersApiService) RegisterEnterpriseOsdCluster(ctx
 //  @return EnterpriseClusterWithAddonParameters
 func (a *EnterpriseDataplaneClustersApiService) RegisterEnterpriseOsdClusterExecute(r ApiRegisterEnterpriseOsdClusterRequest) (*EnterpriseClusterWithAddonParameters, *http.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
 		formFiles            []formFile
 		localVarReturnValue  *EnterpriseClusterWithAddonParameters
@@ -751,14 +1045,14 @@ func (a *EnterpriseDataplaneClustersApiService) RegisterEnterpriseOsdClusterExec
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "EnterpriseDataplaneClustersApiService.RegisterEnterpriseOsdCluster")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/kafkas_mgmt/v1/clusters"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.enterpriseOsdClusterPayload == nil {
 		return localVarReturnValue, nil, reportError("enterpriseOsdClusterPayload is required and must be specified")
 	}
@@ -782,7 +1076,7 @@ func (a *EnterpriseDataplaneClustersApiService) RegisterEnterpriseOsdClusterExec
 	}
 	// body params
 	localVarPostBody = r.enterpriseOsdClusterPayload
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -792,15 +1086,15 @@ func (a *EnterpriseDataplaneClustersApiService) RegisterEnterpriseOsdClusterExec
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -811,8 +1105,7 @@ func (a *EnterpriseDataplaneClustersApiService) RegisterEnterpriseOsdClusterExec
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -822,8 +1115,7 @@ func (a *EnterpriseDataplaneClustersApiService) RegisterEnterpriseOsdClusterExec
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -833,8 +1125,7 @@ func (a *EnterpriseDataplaneClustersApiService) RegisterEnterpriseOsdClusterExec
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 409 {
@@ -844,8 +1135,7 @@ func (a *EnterpriseDataplaneClustersApiService) RegisterEnterpriseOsdClusterExec
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -855,15 +1145,14 @@ func (a *EnterpriseDataplaneClustersApiService) RegisterEnterpriseOsdClusterExec
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/api_errors.go b/app-services-sdk-go/kafkamgmt/apiv1/client/api_errors.go
index e99eabdd..76e1fa01 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/api_errors.go
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/api_errors.go
@@ -1,11 +1,11 @@
 /*
-Kafka Management API
-
-Kafka Management API is a REST API to manage Kafka instances
-
-API version: 1.14.0
-Contact: rhosak-support@redhat.com
-*/
+ * Kafka Management API
+ *
+ * Kafka Management API is a REST API to manage Kafka instances
+ *
+ * API version: 1.14.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -13,69 +13,72 @@ package kafkamgmtclient
 
 import (
 	"bytes"
-	"context"
-	"io/ioutil"
-	"net/http"
-	"net/url"
+	_context "context"
+	_ioutil "io/ioutil"
+	_nethttp "net/http"
+	_neturl "net/url"
 	"strings"
 )
 
+// Linger please
+var (
+	_ _context.Context
+)
 
 type ErrorsApi interface {
 
 	/*
-	GetErrorById Method for GetErrorById
-
-	Returns the error by Id
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The ID of record
-	@return ApiGetErrorByIdRequest
-	*/
-	GetErrorById(ctx context.Context, id string) ApiGetErrorByIdRequest
-
-	// GetErrorByIdExecute executes the request
-	//  @return Error
-	GetErrorByIdExecute(r ApiGetErrorByIdRequest) (*Error, *http.Response, error)
+	 * GetErrorById Method for GetErrorById
+	 * Returns the error by Id
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The ID of record
+	 * @return ApiGetErrorByIdRequest
+	 */
+	GetErrorById(ctx _context.Context, id string) ApiGetErrorByIdRequest
 
 	/*
-	GetErrors Method for GetErrors
-
-	Returns the list of possible API errors
+	 * GetErrorByIdExecute executes the request
+	 * @return Error
+	 */
+	GetErrorByIdExecute(r ApiGetErrorByIdRequest) (Error, *_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiGetErrorsRequest
-	*/
-	GetErrors(ctx context.Context) ApiGetErrorsRequest
+	/*
+	 * GetErrors Method for GetErrors
+	 * Returns the list of possible API errors
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiGetErrorsRequest
+	 */
+	GetErrors(ctx _context.Context) ApiGetErrorsRequest
 
-	// GetErrorsExecute executes the request
-	//  @return ErrorList
-	GetErrorsExecute(r ApiGetErrorsRequest) (*ErrorList, *http.Response, error)
+	/*
+	 * GetErrorsExecute executes the request
+	 * @return ErrorList
+	 */
+	GetErrorsExecute(r ApiGetErrorsRequest) (ErrorList, *_nethttp.Response, error)
 }
 
 // ErrorsApiService ErrorsApi service
 type ErrorsApiService service
 
 type ApiGetErrorByIdRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService ErrorsApi
 	id string
 }
 
-func (r ApiGetErrorByIdRequest) Execute() (*Error, *http.Response, error) {
+
+func (r ApiGetErrorByIdRequest) Execute() (Error, *_nethttp.Response, error) {
 	return r.ApiService.GetErrorByIdExecute(r)
 }
 
 /*
-GetErrorById Method for GetErrorById
-
-Returns the error by Id
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The ID of record
- @return ApiGetErrorByIdRequest
-*/
-func (a *ErrorsApiService) GetErrorById(ctx context.Context, id string) ApiGetErrorByIdRequest {
+ * GetErrorById Method for GetErrorById
+ * Returns the error by Id
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The ID of record
+ * @return ApiGetErrorByIdRequest
+ */
+func (a *ErrorsApiService) GetErrorById(ctx _context.Context, id string) ApiGetErrorByIdRequest {
 	return ApiGetErrorByIdRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -83,27 +86,31 @@ func (a *ErrorsApiService) GetErrorById(ctx context.Context, id string) ApiGetEr
 	}
 }
 
-// Execute executes the request
-//  @return Error
-func (a *ErrorsApiService) GetErrorByIdExecute(r ApiGetErrorByIdRequest) (*Error, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return Error
+ */
+func (a *ErrorsApiService) GetErrorByIdExecute(r ApiGetErrorByIdRequest) (Error, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *Error
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  Error
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "ErrorsApiService.GetErrorById")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/kafkas_mgmt/v1/errors/{id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -122,7 +129,7 @@ func (a *ErrorsApiService) GetErrorByIdExecute(r ApiGetErrorByIdRequest) (*Error
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -132,15 +139,15 @@ func (a *ErrorsApiService) GetErrorByIdExecute(r ApiGetErrorByIdRequest) (*Error
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -149,7 +156,7 @@ func (a *ErrorsApiService) GetErrorByIdExecute(r ApiGetErrorByIdRequest) (*Error
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -160,49 +167,52 @@ func (a *ErrorsApiService) GetErrorByIdExecute(r ApiGetErrorByIdRequest) (*Error
 }
 
 type ApiGetErrorsRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService ErrorsApi
 }
 
-func (r ApiGetErrorsRequest) Execute() (*ErrorList, *http.Response, error) {
+
+func (r ApiGetErrorsRequest) Execute() (ErrorList, *_nethttp.Response, error) {
 	return r.ApiService.GetErrorsExecute(r)
 }
 
 /*
-GetErrors Method for GetErrors
-
-Returns the list of possible API errors
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiGetErrorsRequest
-*/
-func (a *ErrorsApiService) GetErrors(ctx context.Context) ApiGetErrorsRequest {
+ * GetErrors Method for GetErrors
+ * Returns the list of possible API errors
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiGetErrorsRequest
+ */
+func (a *ErrorsApiService) GetErrors(ctx _context.Context) ApiGetErrorsRequest {
 	return ApiGetErrorsRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return ErrorList
-func (a *ErrorsApiService) GetErrorsExecute(r ApiGetErrorsRequest) (*ErrorList, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return ErrorList
+ */
+func (a *ErrorsApiService) GetErrorsExecute(r ApiGetErrorsRequest) (ErrorList, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *ErrorList
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  ErrorList
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "ErrorsApiService.GetErrors")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/kafkas_mgmt/v1/errors"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -221,7 +231,7 @@ func (a *ErrorsApiService) GetErrorsExecute(r ApiGetErrorsRequest) (*ErrorList,
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -231,15 +241,15 @@ func (a *ErrorsApiService) GetErrorsExecute(r ApiGetErrorsRequest) (*ErrorList,
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -248,7 +258,7 @@ func (a *ErrorsApiService) GetErrorsExecute(r ApiGetErrorsRequest) (*ErrorList,
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/api_security.go b/app-services-sdk-go/kafkamgmt/apiv1/client/api_security.go
index 740caf09..2c477f9f 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/api_security.go
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/api_security.go
@@ -1,11 +1,11 @@
 /*
-Kafka Management API
-
-Kafka Management API is a REST API to manage Kafka instances
-
-API version: 1.14.0
-Contact: rhosak-support@redhat.com
-*/
+ * Kafka Management API
+ *
+ * Kafka Management API is a REST API to manage Kafka instances
+ *
+ * API version: 1.14.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -13,158 +13,163 @@ package kafkamgmtclient
 
 import (
 	"bytes"
-	"context"
-	"io/ioutil"
-	"net/http"
-	"net/url"
+	_context "context"
+	_ioutil "io/ioutil"
+	_nethttp "net/http"
+	_neturl "net/url"
 	"strings"
 )
 
+// Linger please
+var (
+	_ _context.Context
+)
 
 type SecurityApi interface {
 
 	/*
-	CreateServiceAccount Method for CreateServiceAccount
-
-	Creates a service account
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiCreateServiceAccountRequest
-	*/
-	CreateServiceAccount(ctx context.Context) ApiCreateServiceAccountRequest
-
-	// CreateServiceAccountExecute executes the request
-	//  @return ServiceAccount
-	CreateServiceAccountExecute(r ApiCreateServiceAccountRequest) (*ServiceAccount, *http.Response, error)
+	 * CreateServiceAccount Method for CreateServiceAccount
+	 * Creates a service account
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiCreateServiceAccountRequest
+	 */
+	CreateServiceAccount(ctx _context.Context) ApiCreateServiceAccountRequest
 
 	/*
-	DeleteServiceAccountById Method for DeleteServiceAccountById
-
-	Deletes a service account by ID
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The ID of record
-	@return ApiDeleteServiceAccountByIdRequest
-	*/
-	DeleteServiceAccountById(ctx context.Context, id string) ApiDeleteServiceAccountByIdRequest
-
-	// DeleteServiceAccountByIdExecute executes the request
-	//  @return Error
-	DeleteServiceAccountByIdExecute(r ApiDeleteServiceAccountByIdRequest) (*Error, *http.Response, error)
+	 * CreateServiceAccountExecute executes the request
+	 * @return ServiceAccount
+	 */
+	CreateServiceAccountExecute(r ApiCreateServiceAccountRequest) (ServiceAccount, *_nethttp.Response, error)
 
 	/*
-	GetServiceAccountById Method for GetServiceAccountById
-
-	Returned service account by ID
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The ID of record
-	@return ApiGetServiceAccountByIdRequest
-	*/
-	GetServiceAccountById(ctx context.Context, id string) ApiGetServiceAccountByIdRequest
-
-	// GetServiceAccountByIdExecute executes the request
-	//  @return ServiceAccount
-	GetServiceAccountByIdExecute(r ApiGetServiceAccountByIdRequest) (*ServiceAccount, *http.Response, error)
+	 * DeleteServiceAccountById Method for DeleteServiceAccountById
+	 * Deletes a service account by ID
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The ID of record
+	 * @return ApiDeleteServiceAccountByIdRequest
+	 */
+	DeleteServiceAccountById(ctx _context.Context, id string) ApiDeleteServiceAccountByIdRequest
 
 	/*
-	GetServiceAccounts Method for GetServiceAccounts
-
-	Returns a list of service accounts
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiGetServiceAccountsRequest
-	*/
-	GetServiceAccounts(ctx context.Context) ApiGetServiceAccountsRequest
-
-	// GetServiceAccountsExecute executes the request
-	//  @return ServiceAccountList
-	GetServiceAccountsExecute(r ApiGetServiceAccountsRequest) (*ServiceAccountList, *http.Response, error)
+	 * DeleteServiceAccountByIdExecute executes the request
+	 * @return Error
+	 */
+	DeleteServiceAccountByIdExecute(r ApiDeleteServiceAccountByIdRequest) (Error, *_nethttp.Response, error)
 
 	/*
-	GetSsoProviders Method for GetSsoProviders
+	 * GetServiceAccountById Method for GetServiceAccountById
+	 * Returned service account by ID
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The ID of record
+	 * @return ApiGetServiceAccountByIdRequest
+	 */
+	GetServiceAccountById(ctx _context.Context, id string) ApiGetServiceAccountByIdRequest
 
-	Return sso provider info
+	/*
+	 * GetServiceAccountByIdExecute executes the request
+	 * @return ServiceAccount
+	 */
+	GetServiceAccountByIdExecute(r ApiGetServiceAccountByIdRequest) (ServiceAccount, *_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiGetSsoProvidersRequest
-	*/
-	GetSsoProviders(ctx context.Context) ApiGetSsoProvidersRequest
+	/*
+	 * GetServiceAccounts Method for GetServiceAccounts
+	 * Returns a list of service accounts
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiGetServiceAccountsRequest
+	 */
+	GetServiceAccounts(ctx _context.Context) ApiGetServiceAccountsRequest
 
-	// GetSsoProvidersExecute executes the request
-	//  @return SsoProvider
-	GetSsoProvidersExecute(r ApiGetSsoProvidersRequest) (*SsoProvider, *http.Response, error)
+	/*
+	 * GetServiceAccountsExecute executes the request
+	 * @return ServiceAccountList
+	 */
+	GetServiceAccountsExecute(r ApiGetServiceAccountsRequest) (ServiceAccountList, *_nethttp.Response, error)
 
 	/*
-	ResetServiceAccountCreds Method for ResetServiceAccountCreds
+	 * GetSsoProviders Method for GetSsoProviders
+	 * Return sso provider info
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiGetSsoProvidersRequest
+	 */
+	GetSsoProviders(ctx _context.Context) ApiGetSsoProvidersRequest
 
-	Resets the credentials for a service account by ID
+	/*
+	 * GetSsoProvidersExecute executes the request
+	 * @return SsoProvider
+	 */
+	GetSsoProvidersExecute(r ApiGetSsoProvidersRequest) (SsoProvider, *_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id The ID of record
-	@return ApiResetServiceAccountCredsRequest
-	*/
-	ResetServiceAccountCreds(ctx context.Context, id string) ApiResetServiceAccountCredsRequest
+	/*
+	 * ResetServiceAccountCreds Method for ResetServiceAccountCreds
+	 * Resets the credentials for a service account by ID
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id The ID of record
+	 * @return ApiResetServiceAccountCredsRequest
+	 */
+	ResetServiceAccountCreds(ctx _context.Context, id string) ApiResetServiceAccountCredsRequest
 
-	// ResetServiceAccountCredsExecute executes the request
-	//  @return ServiceAccount
-	ResetServiceAccountCredsExecute(r ApiResetServiceAccountCredsRequest) (*ServiceAccount, *http.Response, error)
+	/*
+	 * ResetServiceAccountCredsExecute executes the request
+	 * @return ServiceAccount
+	 */
+	ResetServiceAccountCredsExecute(r ApiResetServiceAccountCredsRequest) (ServiceAccount, *_nethttp.Response, error)
 }
 
 // SecurityApiService SecurityApi service
 type SecurityApiService service
 
 type ApiCreateServiceAccountRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService SecurityApi
 	serviceAccountRequest *ServiceAccountRequest
 }
 
-// Service account request
 func (r ApiCreateServiceAccountRequest) ServiceAccountRequest(serviceAccountRequest ServiceAccountRequest) ApiCreateServiceAccountRequest {
 	r.serviceAccountRequest = &serviceAccountRequest
 	return r
 }
 
-func (r ApiCreateServiceAccountRequest) Execute() (*ServiceAccount, *http.Response, error) {
+func (r ApiCreateServiceAccountRequest) Execute() (ServiceAccount, *_nethttp.Response, error) {
 	return r.ApiService.CreateServiceAccountExecute(r)
 }
 
 /*
-CreateServiceAccount Method for CreateServiceAccount
-
-Creates a service account
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiCreateServiceAccountRequest
-*/
-func (a *SecurityApiService) CreateServiceAccount(ctx context.Context) ApiCreateServiceAccountRequest {
+ * CreateServiceAccount Method for CreateServiceAccount
+ * Creates a service account
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiCreateServiceAccountRequest
+ */
+func (a *SecurityApiService) CreateServiceAccount(ctx _context.Context) ApiCreateServiceAccountRequest {
 	return ApiCreateServiceAccountRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return ServiceAccount
-func (a *SecurityApiService) CreateServiceAccountExecute(r ApiCreateServiceAccountRequest) (*ServiceAccount, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return ServiceAccount
+ */
+func (a *SecurityApiService) CreateServiceAccountExecute(r ApiCreateServiceAccountRequest) (ServiceAccount, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *ServiceAccount
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  ServiceAccount
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "SecurityApiService.CreateServiceAccount")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/kafkas_mgmt/v1/service_accounts"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.serviceAccountRequest == nil {
 		return localVarReturnValue, nil, reportError("serviceAccountRequest is required and must be specified")
 	}
@@ -188,7 +193,7 @@ func (a *SecurityApiService) CreateServiceAccountExecute(r ApiCreateServiceAccou
 	}
 	// body params
 	localVarPostBody = r.serviceAccountRequest
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -198,15 +203,15 @@ func (a *SecurityApiService) CreateServiceAccountExecute(r ApiCreateServiceAccou
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -217,8 +222,7 @@ func (a *SecurityApiService) CreateServiceAccountExecute(r ApiCreateServiceAccou
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -228,8 +232,7 @@ func (a *SecurityApiService) CreateServiceAccountExecute(r ApiCreateServiceAccou
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -239,15 +242,14 @@ func (a *SecurityApiService) CreateServiceAccountExecute(r ApiCreateServiceAccou
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -258,25 +260,24 @@ func (a *SecurityApiService) CreateServiceAccountExecute(r ApiCreateServiceAccou
 }
 
 type ApiDeleteServiceAccountByIdRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService SecurityApi
 	id string
 }
 
-func (r ApiDeleteServiceAccountByIdRequest) Execute() (*Error, *http.Response, error) {
+
+func (r ApiDeleteServiceAccountByIdRequest) Execute() (Error, *_nethttp.Response, error) {
 	return r.ApiService.DeleteServiceAccountByIdExecute(r)
 }
 
 /*
-DeleteServiceAccountById Method for DeleteServiceAccountById
-
-Deletes a service account by ID
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The ID of record
- @return ApiDeleteServiceAccountByIdRequest
-*/
-func (a *SecurityApiService) DeleteServiceAccountById(ctx context.Context, id string) ApiDeleteServiceAccountByIdRequest {
+ * DeleteServiceAccountById Method for DeleteServiceAccountById
+ * Deletes a service account by ID
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The ID of record
+ * @return ApiDeleteServiceAccountByIdRequest
+ */
+func (a *SecurityApiService) DeleteServiceAccountById(ctx _context.Context, id string) ApiDeleteServiceAccountByIdRequest {
 	return ApiDeleteServiceAccountByIdRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -284,27 +285,31 @@ func (a *SecurityApiService) DeleteServiceAccountById(ctx context.Context, id st
 	}
 }
 
-// Execute executes the request
-//  @return Error
-func (a *SecurityApiService) DeleteServiceAccountByIdExecute(r ApiDeleteServiceAccountByIdRequest) (*Error, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return Error
+ */
+func (a *SecurityApiService) DeleteServiceAccountByIdExecute(r ApiDeleteServiceAccountByIdRequest) (Error, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodDelete
+		localVarHTTPMethod   = _nethttp.MethodDelete
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *Error
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  Error
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "SecurityApiService.DeleteServiceAccountById")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/kafkas_mgmt/v1/service_accounts/{id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -323,7 +328,7 @@ func (a *SecurityApiService) DeleteServiceAccountByIdExecute(r ApiDeleteServiceA
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -333,15 +338,15 @@ func (a *SecurityApiService) DeleteServiceAccountByIdExecute(r ApiDeleteServiceA
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -352,8 +357,7 @@ func (a *SecurityApiService) DeleteServiceAccountByIdExecute(r ApiDeleteServiceA
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -363,8 +367,7 @@ func (a *SecurityApiService) DeleteServiceAccountByIdExecute(r ApiDeleteServiceA
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -374,15 +377,14 @@ func (a *SecurityApiService) DeleteServiceAccountByIdExecute(r ApiDeleteServiceA
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -393,25 +395,24 @@ func (a *SecurityApiService) DeleteServiceAccountByIdExecute(r ApiDeleteServiceA
 }
 
 type ApiGetServiceAccountByIdRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService SecurityApi
 	id string
 }
 
-func (r ApiGetServiceAccountByIdRequest) Execute() (*ServiceAccount, *http.Response, error) {
+
+func (r ApiGetServiceAccountByIdRequest) Execute() (ServiceAccount, *_nethttp.Response, error) {
 	return r.ApiService.GetServiceAccountByIdExecute(r)
 }
 
 /*
-GetServiceAccountById Method for GetServiceAccountById
-
-Returned service account by ID
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The ID of record
- @return ApiGetServiceAccountByIdRequest
-*/
-func (a *SecurityApiService) GetServiceAccountById(ctx context.Context, id string) ApiGetServiceAccountByIdRequest {
+ * GetServiceAccountById Method for GetServiceAccountById
+ * Returned service account by ID
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The ID of record
+ * @return ApiGetServiceAccountByIdRequest
+ */
+func (a *SecurityApiService) GetServiceAccountById(ctx _context.Context, id string) ApiGetServiceAccountByIdRequest {
 	return ApiGetServiceAccountByIdRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -419,27 +420,31 @@ func (a *SecurityApiService) GetServiceAccountById(ctx context.Context, id strin
 	}
 }
 
-// Execute executes the request
-//  @return ServiceAccount
-func (a *SecurityApiService) GetServiceAccountByIdExecute(r ApiGetServiceAccountByIdRequest) (*ServiceAccount, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return ServiceAccount
+ */
+func (a *SecurityApiService) GetServiceAccountByIdExecute(r ApiGetServiceAccountByIdRequest) (ServiceAccount, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *ServiceAccount
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  ServiceAccount
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "SecurityApiService.GetServiceAccountById")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/kafkas_mgmt/v1/service_accounts/{id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -458,7 +463,7 @@ func (a *SecurityApiService) GetServiceAccountByIdExecute(r ApiGetServiceAccount
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -468,15 +473,15 @@ func (a *SecurityApiService) GetServiceAccountByIdExecute(r ApiGetServiceAccount
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -485,7 +490,7 @@ func (a *SecurityApiService) GetServiceAccountByIdExecute(r ApiGetServiceAccount
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -496,56 +501,57 @@ func (a *SecurityApiService) GetServiceAccountByIdExecute(r ApiGetServiceAccount
 }
 
 type ApiGetServiceAccountsRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService SecurityApi
 	clientId *string
 }
 
-// client_id of the service account to be retrieved
 func (r ApiGetServiceAccountsRequest) ClientId(clientId string) ApiGetServiceAccountsRequest {
 	r.clientId = &clientId
 	return r
 }
 
-func (r ApiGetServiceAccountsRequest) Execute() (*ServiceAccountList, *http.Response, error) {
+func (r ApiGetServiceAccountsRequest) Execute() (ServiceAccountList, *_nethttp.Response, error) {
 	return r.ApiService.GetServiceAccountsExecute(r)
 }
 
 /*
-GetServiceAccounts Method for GetServiceAccounts
-
-Returns a list of service accounts
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiGetServiceAccountsRequest
-*/
-func (a *SecurityApiService) GetServiceAccounts(ctx context.Context) ApiGetServiceAccountsRequest {
+ * GetServiceAccounts Method for GetServiceAccounts
+ * Returns a list of service accounts
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiGetServiceAccountsRequest
+ */
+func (a *SecurityApiService) GetServiceAccounts(ctx _context.Context) ApiGetServiceAccountsRequest {
 	return ApiGetServiceAccountsRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return ServiceAccountList
-func (a *SecurityApiService) GetServiceAccountsExecute(r ApiGetServiceAccountsRequest) (*ServiceAccountList, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return ServiceAccountList
+ */
+func (a *SecurityApiService) GetServiceAccountsExecute(r ApiGetServiceAccountsRequest) (ServiceAccountList, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *ServiceAccountList
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  ServiceAccountList
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "SecurityApiService.GetServiceAccounts")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/kafkas_mgmt/v1/service_accounts"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.clientId != nil {
 		localVarQueryParams.Add("client_id", parameterToString(*r.clientId, ""))
@@ -567,7 +573,7 @@ func (a *SecurityApiService) GetServiceAccountsExecute(r ApiGetServiceAccountsRe
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -577,15 +583,15 @@ func (a *SecurityApiService) GetServiceAccountsExecute(r ApiGetServiceAccountsRe
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -596,8 +602,7 @@ func (a *SecurityApiService) GetServiceAccountsExecute(r ApiGetServiceAccountsRe
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -607,8 +612,7 @@ func (a *SecurityApiService) GetServiceAccountsExecute(r ApiGetServiceAccountsRe
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -618,15 +622,14 @@ func (a *SecurityApiService) GetServiceAccountsExecute(r ApiGetServiceAccountsRe
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -637,49 +640,52 @@ func (a *SecurityApiService) GetServiceAccountsExecute(r ApiGetServiceAccountsRe
 }
 
 type ApiGetSsoProvidersRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService SecurityApi
 }
 
-func (r ApiGetSsoProvidersRequest) Execute() (*SsoProvider, *http.Response, error) {
+
+func (r ApiGetSsoProvidersRequest) Execute() (SsoProvider, *_nethttp.Response, error) {
 	return r.ApiService.GetSsoProvidersExecute(r)
 }
 
 /*
-GetSsoProviders Method for GetSsoProviders
-
-Return sso provider info
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiGetSsoProvidersRequest
-*/
-func (a *SecurityApiService) GetSsoProviders(ctx context.Context) ApiGetSsoProvidersRequest {
+ * GetSsoProviders Method for GetSsoProviders
+ * Return sso provider info
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiGetSsoProvidersRequest
+ */
+func (a *SecurityApiService) GetSsoProviders(ctx _context.Context) ApiGetSsoProvidersRequest {
 	return ApiGetSsoProvidersRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return SsoProvider
-func (a *SecurityApiService) GetSsoProvidersExecute(r ApiGetSsoProvidersRequest) (*SsoProvider, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return SsoProvider
+ */
+func (a *SecurityApiService) GetSsoProvidersExecute(r ApiGetSsoProvidersRequest) (SsoProvider, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *SsoProvider
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  SsoProvider
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "SecurityApiService.GetSsoProviders")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/kafkas_mgmt/v1/sso_providers"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -698,7 +704,7 @@ func (a *SecurityApiService) GetSsoProvidersExecute(r ApiGetSsoProvidersRequest)
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -708,15 +714,15 @@ func (a *SecurityApiService) GetSsoProvidersExecute(r ApiGetSsoProvidersRequest)
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -727,8 +733,7 @@ func (a *SecurityApiService) GetSsoProvidersExecute(r ApiGetSsoProvidersRequest)
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -738,15 +743,14 @@ func (a *SecurityApiService) GetSsoProvidersExecute(r ApiGetSsoProvidersRequest)
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -757,25 +761,24 @@ func (a *SecurityApiService) GetSsoProvidersExecute(r ApiGetSsoProvidersRequest)
 }
 
 type ApiResetServiceAccountCredsRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService SecurityApi
 	id string
 }
 
-func (r ApiResetServiceAccountCredsRequest) Execute() (*ServiceAccount, *http.Response, error) {
+
+func (r ApiResetServiceAccountCredsRequest) Execute() (ServiceAccount, *_nethttp.Response, error) {
 	return r.ApiService.ResetServiceAccountCredsExecute(r)
 }
 
 /*
-ResetServiceAccountCreds Method for ResetServiceAccountCreds
-
-Resets the credentials for a service account by ID
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id The ID of record
- @return ApiResetServiceAccountCredsRequest
-*/
-func (a *SecurityApiService) ResetServiceAccountCreds(ctx context.Context, id string) ApiResetServiceAccountCredsRequest {
+ * ResetServiceAccountCreds Method for ResetServiceAccountCreds
+ * Resets the credentials for a service account by ID
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id The ID of record
+ * @return ApiResetServiceAccountCredsRequest
+ */
+func (a *SecurityApiService) ResetServiceAccountCreds(ctx _context.Context, id string) ApiResetServiceAccountCredsRequest {
 	return ApiResetServiceAccountCredsRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -783,27 +786,31 @@ func (a *SecurityApiService) ResetServiceAccountCreds(ctx context.Context, id st
 	}
 }
 
-// Execute executes the request
-//  @return ServiceAccount
-func (a *SecurityApiService) ResetServiceAccountCredsExecute(r ApiResetServiceAccountCredsRequest) (*ServiceAccount, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return ServiceAccount
+ */
+func (a *SecurityApiService) ResetServiceAccountCredsExecute(r ApiResetServiceAccountCredsRequest) (ServiceAccount, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *ServiceAccount
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  ServiceAccount
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "SecurityApiService.ResetServiceAccountCreds")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/kafkas_mgmt/v1/service_accounts/{id}/reset_credentials"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -822,7 +829,7 @@ func (a *SecurityApiService) ResetServiceAccountCredsExecute(r ApiResetServiceAc
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -832,15 +839,15 @@ func (a *SecurityApiService) ResetServiceAccountCredsExecute(r ApiResetServiceAc
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -851,8 +858,7 @@ func (a *SecurityApiService) ResetServiceAccountCredsExecute(r ApiResetServiceAc
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -862,8 +868,7 @@ func (a *SecurityApiService) ResetServiceAccountCredsExecute(r ApiResetServiceAc
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -873,15 +878,14 @@ func (a *SecurityApiService) ResetServiceAccountCredsExecute(r ApiResetServiceAc
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/client.go b/app-services-sdk-go/kafkamgmt/apiv1/client/client.go
index bae9dc23..a53f4980 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/client.go
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/client.go
@@ -1,11 +1,11 @@
 /*
-Kafka Management API
-
-Kafka Management API is a REST API to manage Kafka instances
-
-API version: 1.14.0
-Contact: rhosak-support@redhat.com
-*/
+ * Kafka Management API
+ *
+ * Kafka Management API is a REST API to manage Kafka instances
+ *
+ * API version: 1.14.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -114,7 +114,7 @@ func selectHeaderAccept(accepts []string) string {
 // contains is a case insensitive match, finding needle in a haystack
 func contains(haystack []string, needle string) bool {
 	for _, a := range haystack {
-		if strings.EqualFold(a, needle) {
+		if strings.ToLower(a) == strings.ToLower(needle) {
 			return true
 		}
 	}
@@ -130,7 +130,7 @@ func typeCheckParameter(obj interface{}, expected string, name string) error {
 
 	// Check the type is as expected.
 	if reflect.TypeOf(obj).String() != expected {
-		return fmt.Errorf("expected %s to be of type %s but received %s", name, expected, reflect.TypeOf(obj).String())
+		return fmt.Errorf("Expected %s to be of type %s but received %s.", name, expected, reflect.TypeOf(obj).String())
 	}
 	return nil
 }
@@ -199,12 +199,6 @@ func (c *APIClient) GetConfig() *Configuration {
 	return c.cfg
 }
 
-type formFile struct {
-		fileBytes []byte
-		fileName string
-		formFileName string
-}
-
 // prepareRequest build the request
 func (c *APIClient) prepareRequest(
 	ctx context.Context,
@@ -213,7 +207,9 @@ func (c *APIClient) prepareRequest(
 	headerParams map[string]string,
 	queryParams url.Values,
 	formParams url.Values,
-	formFiles []formFile) (localVarRequest *http.Request, err error) {
+	formFileName string,
+	fileName string,
+	fileBytes []byte) (localVarRequest *http.Request, err error) {
 
 	var body *bytes.Buffer
 
@@ -232,7 +228,7 @@ func (c *APIClient) prepareRequest(
 	}
 
 	// add form parameters and file if available.
-	if strings.HasPrefix(headerParams["Content-Type"], "multipart/form-data") && len(formParams) > 0 || (len(formFiles) > 0) {
+	if strings.HasPrefix(headerParams["Content-Type"], "multipart/form-data") && len(formParams) > 0 || (len(fileBytes) > 0 && fileName != "") {
 		if body != nil {
 			return nil, errors.New("Cannot specify postBody and multipart form at the same time.")
 		}
@@ -251,17 +247,16 @@ func (c *APIClient) prepareRequest(
 				}
 			}
 		}
-		for _, formFile := range formFiles {
-			if len(formFile.fileBytes) > 0 && formFile.fileName != "" {
-				w.Boundary()
-				part, err := w.CreateFormFile(formFile.formFileName, filepath.Base(formFile.fileName))
-				if err != nil {
-						return nil, err
-				}
-				_, err = part.Write(formFile.fileBytes)
-				if err != nil {
-						return nil, err
-				}
+		if len(fileBytes) > 0 && fileName != "" {
+			w.Boundary()
+			//_, fileNm := filepath.Split(fileName)
+			part, err := w.CreateFormFile(formFileName, filepath.Base(fileName))
+			if err != nil {
+				return nil, err
+			}
+			_, err = part.Write(fileBytes)
+			if err != nil {
+				return nil, err
 			}
 		}
 
@@ -324,7 +319,7 @@ func (c *APIClient) prepareRequest(
 	if len(headerParams) > 0 {
 		headers := http.Header{}
 		for h, v := range headerParams {
-			headers[h] = []string{v}
+			headers.Set(h, v)
 		}
 		localVarRequest.Header = headers
 	}
@@ -381,9 +376,6 @@ func (c *APIClient) decode(v interface{}, b []byte, contentType string) (err err
 			return
 		}
 		_, err = (*f).Write(b)
-		if err != nil {
-			return
-		}
 		_, err = (*f).Seek(0, io.SeekStart)
 		return
 	}
@@ -412,14 +404,11 @@ func (c *APIClient) decode(v interface{}, b []byte, contentType string) (err err
 
 // Add a file to the multipart request
 func addFile(w *multipart.Writer, fieldName, path string) error {
-	file, err := os.Open(filepath.Clean(path))
-	if err != nil {
-		return err
-	}
-	err = file.Close()
+	file, err := os.Open(path)
 	if err != nil {
 		return err
 	}
+	defer file.Close()
 
 	part, err := w.CreateFormFile(fieldName, filepath.Base(path))
 	if err != nil {
@@ -435,13 +424,6 @@ func reportError(format string, a ...interface{}) error {
 	return fmt.Errorf(format, a...)
 }
 
-// A wrapper for strict JSON decoding
-func newStrictDecoder(data []byte) *json.Decoder {
-	dec := json.NewDecoder(bytes.NewBuffer(data))
-	dec.DisallowUnknownFields()
-	return dec
-}
-
 // Set request body from an interface{}
 func setBody(body interface{}, contentType string) (bodyBuf *bytes.Buffer, err error) {
 	if bodyBuf == nil {
@@ -469,7 +451,7 @@ func setBody(body interface{}, contentType string) (bodyBuf *bytes.Buffer, err e
 	}
 
 	if bodyBuf.Len() == 0 {
-		err = fmt.Errorf("invalid body type %s\n", contentType)
+		err = fmt.Errorf("Invalid body type %s\n", contentType)
 		return nil, err
 	}
 	return bodyBuf, nil
@@ -571,23 +553,3 @@ func (e GenericOpenAPIError) Body() []byte {
 func (e GenericOpenAPIError) Model() interface{} {
 	return e.model
 }
-
-// format error message using title and detail when model implements rfc7807
-func formatErrorMessage(status string, v interface{}) string {
-
-    str := ""
-    metaValue := reflect.ValueOf(v).Elem()
-
-    field := metaValue.FieldByName("Title")
-    if field != (reflect.Value{}) {
-        str = fmt.Sprintf("%s", field.Interface())
-    }
-
-    field = metaValue.FieldByName("Detail")
-    if field != (reflect.Value{}) {
-        str = fmt.Sprintf("%s (%s)", str, field.Interface())
-    }
-
-    // status title (detail)
-    return fmt.Sprintf("%s %s", status, str)
-}
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/configuration.go b/app-services-sdk-go/kafkamgmt/apiv1/client/configuration.go
index bf2a4a35..97f52e9b 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/configuration.go
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/configuration.go
@@ -1,11 +1,11 @@
 /*
-Kafka Management API
-
-Kafka Management API is a REST API to manage Kafka instances
-
-API version: 1.14.0
-Contact: rhosak-support@redhat.com
-*/
+ * Kafka Management API
+ *
+ * Kafka Management API is a REST API to manage Kafka instances
+ *
+ * API version: 1.14.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -136,7 +136,7 @@ func (c *Configuration) AddDefaultHeader(key string, value string) {
 // URL formats template on a index using given variables
 func (sc ServerConfigurations) URL(index int, variables map[string]string) (string, error) {
 	if index < 0 || len(sc) <= index {
-		return "", fmt.Errorf("index %v out of range %v", index, len(sc)-1)
+		return "", fmt.Errorf("Index %v out of range %v", index, len(sc)-1)
 	}
 	server := sc[index]
 	url := server.URL
@@ -151,7 +151,7 @@ func (sc ServerConfigurations) URL(index int, variables map[string]string) (stri
 				}
 			}
 			if !found {
-				return "", fmt.Errorf("the variable %s in the server URL has invalid value %v. Must be %v", name, value, variable.EnumValues)
+				return "", fmt.Errorf("The variable %s in the server URL has invalid value %v. Must be %v", name, value, variable.EnumValues)
 			}
 			url = strings.Replace(url, "{"+name+"}", value, -1)
 		} else {
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/docs/DefaultApi.md b/app-services-sdk-go/kafkamgmt/apiv1/client/docs/DefaultApi.md
index 12a8dc6c..67264f32 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/docs/DefaultApi.md
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/docs/DefaultApi.md
@@ -44,8 +44,8 @@ func main() {
     kafkaRequestPayload := *openapiclient.NewKafkaRequestPayload("Name_example") // KafkaRequestPayload | Kafka data
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.CreateKafka(context.Background()).Async(async).KafkaRequestPayload(kafkaRequestPayload).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.CreateKafka(context.Background()).Async(async).KafkaRequestPayload(kafkaRequestPayload).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.CreateKafka``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -112,8 +112,8 @@ func main() {
     async := true // bool | Perform the action in an asynchronous manner
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.DeleteKafkaById(context.Background(), id).Async(async).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.DeleteKafkaById(context.Background(), id).Async(async).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.DeleteKafkaById``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -183,8 +183,8 @@ func main() {
     id := "id_example" // string | The ID of record
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.FederateMetrics(context.Background(), id).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.FederateMetrics(context.Background(), id).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.FederateMetrics``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -255,8 +255,8 @@ func main() {
     size := "100" // string | Number of items in each page (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.GetCloudProviderRegions(context.Background(), id).Page(page).Size(size).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.GetCloudProviderRegions(context.Background(), id).Page(page).Size(size).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.GetCloudProviderRegions``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -328,8 +328,8 @@ func main() {
     size := "100" // string | Number of items in each page (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.GetCloudProviders(context.Background()).Page(page).Size(size).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.GetCloudProviders(context.Background()).Page(page).Size(size).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.GetCloudProviders``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -396,8 +396,8 @@ func main() {
     cloudRegion := "cloudRegion_example" // string | Name of the supported cloud provider region
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.GetInstanceTypesByCloudProviderAndRegion(context.Background(), cloudProvider, cloudRegion).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.GetInstanceTypesByCloudProviderAndRegion(context.Background(), cloudProvider, cloudRegion).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.GetInstanceTypesByCloudProviderAndRegion``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -468,8 +468,8 @@ func main() {
     id := "id_example" // string | The ID of record
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.GetKafkaById(context.Background(), id).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.GetKafkaById(context.Background(), id).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.GetKafkaById``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -541,8 +541,8 @@ func main() {
     search := "name = my-kafka and cloud_provider = aws" // string | Search criteria.  The syntax of this parameter is similar to the syntax of the `where` clause of an SQL statement. Allowed fields in the search are `cloud_provider`, `name`, `owner`, `region`, and `status`. Allowed comparators are `<>`, `=`, `LIKE`, or `ILIKE`. Allowed joins are `AND` and `OR`. However, you can use a maximum of 10 joins in a search query.  Examples:  To return a Kafka instance with the name `my-kafka` and the region `aws`, use the following syntax:  ``` name = my-kafka and cloud_provider = aws ```[p-]  To return a Kafka instance with a name that starts with `my`, use the following syntax:  ``` name like my%25 ```  To return a Kafka instance with a name containing `test` matching any character case combinations, use the following syntax:  ``` name ilike %25test%25 ```  If the parameter isn't provided, or if the value is empty, then all the Kafka instances that the user has permission to see are returned.  Note. If the query is invalid, an error is returned.  (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.GetKafkas(context.Background()).Page(page).Size(size).OrderBy(orderBy).Search(search).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.GetKafkas(context.Background()).Page(page).Size(size).OrderBy(orderBy).Search(search).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.GetKafkas``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -611,8 +611,8 @@ func main() {
     filters := []string{"Inner_example"} // []string | List of metrics to fetch. Fetch all metrics when empty. List entries are Kafka internal metric names. (optional) (default to [])
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.GetMetricsByInstantQuery(context.Background(), id).Filters(filters).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.GetMetricsByInstantQuery(context.Background(), id).Filters(filters).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.GetMetricsByInstantQuery``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -685,8 +685,8 @@ func main() {
     filters := []string{"Inner_example"} // []string | List of metrics to fetch. Fetch all metrics when empty. List entries are Kafka internal metric names. (optional) (default to [])
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.GetMetricsByRangeQuery(context.Background(), id).Duration(duration).Interval(interval).Filters(filters).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.GetMetricsByRangeQuery(context.Background(), id).Duration(duration).Interval(interval).Filters(filters).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.GetMetricsByRangeQuery``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -757,8 +757,8 @@ import (
 func main() {
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.GetVersionMetadata(context.Background()).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.GetVersionMetadata(context.Background()).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.GetVersionMetadata``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -820,8 +820,8 @@ func main() {
     kafkaUpdateRequest := *openapiclient.NewKafkaUpdateRequest() // KafkaUpdateRequest | Update owner of kafka
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.UpdateKafkaById(context.Background(), id).KafkaUpdateRequest(kafkaUpdateRequest).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.UpdateKafkaById(context.Background(), id).KafkaUpdateRequest(kafkaUpdateRequest).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.UpdateKafkaById``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/docs/EnterpriseDataplaneClustersApi.md b/app-services-sdk-go/kafkamgmt/apiv1/client/docs/EnterpriseDataplaneClustersApi.md
index ded34230..f6f8da70 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/docs/EnterpriseDataplaneClustersApi.md
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/docs/EnterpriseDataplaneClustersApi.md
@@ -36,8 +36,8 @@ func main() {
     force := true // bool | When provided with value: true - enterprise cluster will be deleted alongside all kafkas present on the cluster. When skipped and enterprise cluster has any kafkas associated with it, the request will fail. (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.EnterpriseDataplaneClustersApi.DeleteEnterpriseClusterById(context.Background(), id).Async(async).Force(force).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.EnterpriseDataplaneClustersApi.DeleteEnterpriseClusterById(context.Background(), id).Async(async).Force(force).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `EnterpriseDataplaneClustersApi.DeleteEnterpriseClusterById``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -247,8 +247,8 @@ import (
 func main() {
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.EnterpriseDataplaneClustersApi.GetEnterpriseOsdClusters(context.Background()).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.EnterpriseDataplaneClustersApi.GetEnterpriseOsdClusters(context.Background()).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `EnterpriseDataplaneClustersApi.GetEnterpriseOsdClusters``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -309,8 +309,8 @@ func main() {
     enterpriseOsdClusterPayload := *openapiclient.NewEnterpriseOsdClusterPayload(false, "ClusterId_example", "ClusterExternalId_example", "ClusterIngressDnsName_example", int32(123)) // EnterpriseOsdClusterPayload | Enterprise data plane cluster details
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.EnterpriseDataplaneClustersApi.RegisterEnterpriseOsdCluster(context.Background()).EnterpriseOsdClusterPayload(enterpriseOsdClusterPayload).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.EnterpriseDataplaneClustersApi.RegisterEnterpriseOsdCluster(context.Background()).EnterpriseOsdClusterPayload(enterpriseOsdClusterPayload).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `EnterpriseDataplaneClustersApi.RegisterEnterpriseOsdCluster``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/docs/ErrorsApi.md b/app-services-sdk-go/kafkamgmt/apiv1/client/docs/ErrorsApi.md
index 81445cb5..8ce2d28e 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/docs/ErrorsApi.md
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/docs/ErrorsApi.md
@@ -33,8 +33,8 @@ func main() {
     id := "id_example" // string | The ID of record
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.ErrorsApi.GetErrorById(context.Background(), id).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.ErrorsApi.GetErrorById(context.Background(), id).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `ErrorsApi.GetErrorById``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -102,8 +102,8 @@ import (
 func main() {
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.ErrorsApi.GetErrors(context.Background()).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.ErrorsApi.GetErrors(context.Background()).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `ErrorsApi.GetErrors``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/docs/SecurityApi.md b/app-services-sdk-go/kafkamgmt/apiv1/client/docs/SecurityApi.md
index 04713b05..76b38325 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/docs/SecurityApi.md
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/docs/SecurityApi.md
@@ -37,8 +37,8 @@ func main() {
     serviceAccountRequest := *openapiclient.NewServiceAccountRequest("Name_example") // ServiceAccountRequest | Service account request
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.SecurityApi.CreateServiceAccount(context.Background()).ServiceAccountRequest(serviceAccountRequest).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.SecurityApi.CreateServiceAccount(context.Background()).ServiceAccountRequest(serviceAccountRequest).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `SecurityApi.CreateServiceAccount``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -103,8 +103,8 @@ func main() {
     id := "id_example" // string | The ID of record
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.SecurityApi.DeleteServiceAccountById(context.Background(), id).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.SecurityApi.DeleteServiceAccountById(context.Background(), id).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `SecurityApi.DeleteServiceAccountById``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -173,8 +173,8 @@ func main() {
     id := "id_example" // string | The ID of record
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.SecurityApi.GetServiceAccountById(context.Background(), id).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.SecurityApi.GetServiceAccountById(context.Background(), id).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `SecurityApi.GetServiceAccountById``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -243,8 +243,8 @@ func main() {
     clientId := "clientId_example" // string | client_id of the service account to be retrieved (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.SecurityApi.GetServiceAccounts(context.Background()).ClientId(clientId).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.SecurityApi.GetServiceAccounts(context.Background()).ClientId(clientId).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `SecurityApi.GetServiceAccounts``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -308,8 +308,8 @@ import (
 func main() {
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.SecurityApi.GetSsoProviders(context.Background()).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.SecurityApi.GetSsoProviders(context.Background()).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `SecurityApi.GetSsoProviders``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -370,8 +370,8 @@ func main() {
     id := "id_example" // string | The ID of record
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.SecurityApi.ResetServiceAccountCreds(context.Background(), id).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.SecurityApi.ResetServiceAccountCreds(context.Background(), id).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `SecurityApi.ResetServiceAccountCreds``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/docs/SupportedKafkaInstanceType.md b/app-services-sdk-go/kafkamgmt/apiv1/client/docs/SupportedKafkaInstanceType.md
index c65b6cdc..77b939c1 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/docs/SupportedKafkaInstanceType.md
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/docs/SupportedKafkaInstanceType.md
@@ -7,7 +7,7 @@ Name | Type | Description | Notes
 **Id** | Pointer to **string** | Unique identifier of the Kafka instance type. | [optional] 
 **DisplayName** | Pointer to **string** | Human readable name of the supported Kafka instance type | [optional] 
 **SupportedBillingModels** | [**[]SupportedKafkaBillingModel**](SupportedKafkaBillingModel.md) | A list of available kafka billing models for the instance type. Each kafka billing model item has a unique &#39;id&#39; | 
-**Sizes** | Pointer to [**[]SupportedKafkaInstanceTypeSizesInner**](SupportedKafkaInstanceTypeSizesInner.md) | A list of Kafka instance sizes available for this instance type | [optional] 
+**Sizes** | Pointer to [**[]SupportedKafkaSize**](SupportedKafkaSize.md) | A list of Kafka instance sizes available for this instance type | [optional] 
 
 ## Methods
 
@@ -100,20 +100,20 @@ SetSupportedBillingModels sets SupportedBillingModels field to given value.
 
 ### GetSizes
 
-`func (o *SupportedKafkaInstanceType) GetSizes() []SupportedKafkaInstanceTypeSizesInner`
+`func (o *SupportedKafkaInstanceType) GetSizes() []SupportedKafkaSize`
 
 GetSizes returns the Sizes field if non-nil, zero value otherwise.
 
 ### GetSizesOk
 
-`func (o *SupportedKafkaInstanceType) GetSizesOk() (*[]SupportedKafkaInstanceTypeSizesInner, bool)`
+`func (o *SupportedKafkaInstanceType) GetSizesOk() (*[]SupportedKafkaSize, bool)`
 
 GetSizesOk returns a tuple with the Sizes field if it's non-nil, zero value otherwise
 and a boolean to check if the value has been set.
 
 ### SetSizes
 
-`func (o *SupportedKafkaInstanceType) SetSizes(v []SupportedKafkaInstanceTypeSizesInner)`
+`func (o *SupportedKafkaInstanceType) SetSizes(v []SupportedKafkaSize)`
 
 SetSizes sets Sizes field to given value.
 
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/docs/SupportedKafkaInstanceTypeSizesInner.md b/app-services-sdk-go/kafkamgmt/apiv1/client/docs/SupportedKafkaInstanceTypeSizesInner.md
deleted file mode 100644
index 9542f552..00000000
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/docs/SupportedKafkaInstanceTypeSizesInner.md
+++ /dev/null
@@ -1,508 +0,0 @@
-# SupportedKafkaInstanceTypeSizesInner
-
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**Id** | Pointer to **string** | Unique identifier of this Kafka instance size. | [optional] 
-**DisplayName** | Pointer to **string** | Display name of this Kafka instance size. | [optional] 
-**IngressThroughputPerSec** | Pointer to [**SupportedKafkaSizeBytesValueItem**](SupportedKafkaSizeBytesValueItem.md) |  | [optional] 
-**EgressThroughputPerSec** | Pointer to [**SupportedKafkaSizeBytesValueItem**](SupportedKafkaSizeBytesValueItem.md) |  | [optional] 
-**TotalMaxConnections** | Pointer to **int32** | Maximum amount of total connections available to this Kafka instance size. | [optional] 
-**MaxDataRetentionSize** | Pointer to [**SupportedKafkaSizeBytesValueItem**](SupportedKafkaSizeBytesValueItem.md) |  | [optional] 
-**MaxPartitions** | Pointer to **int32** | Maximum amount of total partitions available to this Kafka instance size. | [optional] 
-**MaxDataRetentionPeriod** | Pointer to **string** | Maximum data retention period available to this Kafka instance size. | [optional] 
-**MaxConnectionAttemptsPerSec** | Pointer to **int32** | Maximium connection attempts per second available to this Kafka instance size. | [optional] 
-**MaxMessageSize** | Pointer to [**SupportedKafkaSizeBytesValueItem**](SupportedKafkaSizeBytesValueItem.md) |  | [optional] 
-**MinInSyncReplicas** | Pointer to **int32** | Minimum number of in-sync replicas. | [optional] 
-**ReplicationFactor** | Pointer to **int32** | Replication factor available to this Kafka instance size. | [optional] 
-**SupportedAzModes** | Pointer to **[]string** | List of Availability Zone modes that this Kafka instance size supports. The possible values are \&quot;single\&quot;, \&quot;multi\&quot;. | [optional] 
-**LifespanSeconds** | Pointer to **NullableInt32** | The limit lifespan of the kafka instance in seconds. If not specified then the instance never expires. | [optional] 
-**QuotaConsumed** | Pointer to **int32** | Quota consumed by this Kafka instance size. | [optional] 
-**QuotaType** | Pointer to **string** | Quota type used by this Kafka instance size. This is now deprecated, please refer to supported_billing_models at instance-type level instead. | [optional] 
-**CapacityConsumed** | Pointer to **int32** | Data plane cluster capacity consumed by this Kafka instance size. | [optional] 
-**MaturityStatus** | Pointer to **string** | Maturity level of the size. Can be \&quot;stable\&quot; or \&quot;preview\&quot;. | [optional] 
-
-## Methods
-
-### NewSupportedKafkaInstanceTypeSizesInner
-
-`func NewSupportedKafkaInstanceTypeSizesInner() *SupportedKafkaInstanceTypeSizesInner`
-
-NewSupportedKafkaInstanceTypeSizesInner instantiates a new SupportedKafkaInstanceTypeSizesInner object
-This constructor will assign default values to properties that have it defined,
-and makes sure properties required by API are set, but the set of arguments
-will change when the set of required properties is changed
-
-### NewSupportedKafkaInstanceTypeSizesInnerWithDefaults
-
-`func NewSupportedKafkaInstanceTypeSizesInnerWithDefaults() *SupportedKafkaInstanceTypeSizesInner`
-
-NewSupportedKafkaInstanceTypeSizesInnerWithDefaults instantiates a new SupportedKafkaInstanceTypeSizesInner object
-This constructor will only assign default values to properties that have it defined,
-but it doesn't guarantee that properties required by API are set
-
-### GetId
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) GetId() string`
-
-GetId returns the Id field if non-nil, zero value otherwise.
-
-### GetIdOk
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) GetIdOk() (*string, bool)`
-
-GetIdOk returns a tuple with the Id field if it's non-nil, zero value otherwise
-and a boolean to check if the value has been set.
-
-### SetId
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) SetId(v string)`
-
-SetId sets Id field to given value.
-
-### HasId
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) HasId() bool`
-
-HasId returns a boolean if a field has been set.
-
-### GetDisplayName
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) GetDisplayName() string`
-
-GetDisplayName returns the DisplayName field if non-nil, zero value otherwise.
-
-### GetDisplayNameOk
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) GetDisplayNameOk() (*string, bool)`
-
-GetDisplayNameOk returns a tuple with the DisplayName field if it's non-nil, zero value otherwise
-and a boolean to check if the value has been set.
-
-### SetDisplayName
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) SetDisplayName(v string)`
-
-SetDisplayName sets DisplayName field to given value.
-
-### HasDisplayName
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) HasDisplayName() bool`
-
-HasDisplayName returns a boolean if a field has been set.
-
-### GetIngressThroughputPerSec
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) GetIngressThroughputPerSec() SupportedKafkaSizeBytesValueItem`
-
-GetIngressThroughputPerSec returns the IngressThroughputPerSec field if non-nil, zero value otherwise.
-
-### GetIngressThroughputPerSecOk
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) GetIngressThroughputPerSecOk() (*SupportedKafkaSizeBytesValueItem, bool)`
-
-GetIngressThroughputPerSecOk returns a tuple with the IngressThroughputPerSec field if it's non-nil, zero value otherwise
-and a boolean to check if the value has been set.
-
-### SetIngressThroughputPerSec
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) SetIngressThroughputPerSec(v SupportedKafkaSizeBytesValueItem)`
-
-SetIngressThroughputPerSec sets IngressThroughputPerSec field to given value.
-
-### HasIngressThroughputPerSec
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) HasIngressThroughputPerSec() bool`
-
-HasIngressThroughputPerSec returns a boolean if a field has been set.
-
-### GetEgressThroughputPerSec
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) GetEgressThroughputPerSec() SupportedKafkaSizeBytesValueItem`
-
-GetEgressThroughputPerSec returns the EgressThroughputPerSec field if non-nil, zero value otherwise.
-
-### GetEgressThroughputPerSecOk
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) GetEgressThroughputPerSecOk() (*SupportedKafkaSizeBytesValueItem, bool)`
-
-GetEgressThroughputPerSecOk returns a tuple with the EgressThroughputPerSec field if it's non-nil, zero value otherwise
-and a boolean to check if the value has been set.
-
-### SetEgressThroughputPerSec
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) SetEgressThroughputPerSec(v SupportedKafkaSizeBytesValueItem)`
-
-SetEgressThroughputPerSec sets EgressThroughputPerSec field to given value.
-
-### HasEgressThroughputPerSec
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) HasEgressThroughputPerSec() bool`
-
-HasEgressThroughputPerSec returns a boolean if a field has been set.
-
-### GetTotalMaxConnections
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) GetTotalMaxConnections() int32`
-
-GetTotalMaxConnections returns the TotalMaxConnections field if non-nil, zero value otherwise.
-
-### GetTotalMaxConnectionsOk
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) GetTotalMaxConnectionsOk() (*int32, bool)`
-
-GetTotalMaxConnectionsOk returns a tuple with the TotalMaxConnections field if it's non-nil, zero value otherwise
-and a boolean to check if the value has been set.
-
-### SetTotalMaxConnections
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) SetTotalMaxConnections(v int32)`
-
-SetTotalMaxConnections sets TotalMaxConnections field to given value.
-
-### HasTotalMaxConnections
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) HasTotalMaxConnections() bool`
-
-HasTotalMaxConnections returns a boolean if a field has been set.
-
-### GetMaxDataRetentionSize
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) GetMaxDataRetentionSize() SupportedKafkaSizeBytesValueItem`
-
-GetMaxDataRetentionSize returns the MaxDataRetentionSize field if non-nil, zero value otherwise.
-
-### GetMaxDataRetentionSizeOk
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) GetMaxDataRetentionSizeOk() (*SupportedKafkaSizeBytesValueItem, bool)`
-
-GetMaxDataRetentionSizeOk returns a tuple with the MaxDataRetentionSize field if it's non-nil, zero value otherwise
-and a boolean to check if the value has been set.
-
-### SetMaxDataRetentionSize
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) SetMaxDataRetentionSize(v SupportedKafkaSizeBytesValueItem)`
-
-SetMaxDataRetentionSize sets MaxDataRetentionSize field to given value.
-
-### HasMaxDataRetentionSize
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) HasMaxDataRetentionSize() bool`
-
-HasMaxDataRetentionSize returns a boolean if a field has been set.
-
-### GetMaxPartitions
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) GetMaxPartitions() int32`
-
-GetMaxPartitions returns the MaxPartitions field if non-nil, zero value otherwise.
-
-### GetMaxPartitionsOk
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) GetMaxPartitionsOk() (*int32, bool)`
-
-GetMaxPartitionsOk returns a tuple with the MaxPartitions field if it's non-nil, zero value otherwise
-and a boolean to check if the value has been set.
-
-### SetMaxPartitions
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) SetMaxPartitions(v int32)`
-
-SetMaxPartitions sets MaxPartitions field to given value.
-
-### HasMaxPartitions
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) HasMaxPartitions() bool`
-
-HasMaxPartitions returns a boolean if a field has been set.
-
-### GetMaxDataRetentionPeriod
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) GetMaxDataRetentionPeriod() string`
-
-GetMaxDataRetentionPeriod returns the MaxDataRetentionPeriod field if non-nil, zero value otherwise.
-
-### GetMaxDataRetentionPeriodOk
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) GetMaxDataRetentionPeriodOk() (*string, bool)`
-
-GetMaxDataRetentionPeriodOk returns a tuple with the MaxDataRetentionPeriod field if it's non-nil, zero value otherwise
-and a boolean to check if the value has been set.
-
-### SetMaxDataRetentionPeriod
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) SetMaxDataRetentionPeriod(v string)`
-
-SetMaxDataRetentionPeriod sets MaxDataRetentionPeriod field to given value.
-
-### HasMaxDataRetentionPeriod
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) HasMaxDataRetentionPeriod() bool`
-
-HasMaxDataRetentionPeriod returns a boolean if a field has been set.
-
-### GetMaxConnectionAttemptsPerSec
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) GetMaxConnectionAttemptsPerSec() int32`
-
-GetMaxConnectionAttemptsPerSec returns the MaxConnectionAttemptsPerSec field if non-nil, zero value otherwise.
-
-### GetMaxConnectionAttemptsPerSecOk
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) GetMaxConnectionAttemptsPerSecOk() (*int32, bool)`
-
-GetMaxConnectionAttemptsPerSecOk returns a tuple with the MaxConnectionAttemptsPerSec field if it's non-nil, zero value otherwise
-and a boolean to check if the value has been set.
-
-### SetMaxConnectionAttemptsPerSec
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) SetMaxConnectionAttemptsPerSec(v int32)`
-
-SetMaxConnectionAttemptsPerSec sets MaxConnectionAttemptsPerSec field to given value.
-
-### HasMaxConnectionAttemptsPerSec
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) HasMaxConnectionAttemptsPerSec() bool`
-
-HasMaxConnectionAttemptsPerSec returns a boolean if a field has been set.
-
-### GetMaxMessageSize
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) GetMaxMessageSize() SupportedKafkaSizeBytesValueItem`
-
-GetMaxMessageSize returns the MaxMessageSize field if non-nil, zero value otherwise.
-
-### GetMaxMessageSizeOk
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) GetMaxMessageSizeOk() (*SupportedKafkaSizeBytesValueItem, bool)`
-
-GetMaxMessageSizeOk returns a tuple with the MaxMessageSize field if it's non-nil, zero value otherwise
-and a boolean to check if the value has been set.
-
-### SetMaxMessageSize
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) SetMaxMessageSize(v SupportedKafkaSizeBytesValueItem)`
-
-SetMaxMessageSize sets MaxMessageSize field to given value.
-
-### HasMaxMessageSize
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) HasMaxMessageSize() bool`
-
-HasMaxMessageSize returns a boolean if a field has been set.
-
-### GetMinInSyncReplicas
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) GetMinInSyncReplicas() int32`
-
-GetMinInSyncReplicas returns the MinInSyncReplicas field if non-nil, zero value otherwise.
-
-### GetMinInSyncReplicasOk
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) GetMinInSyncReplicasOk() (*int32, bool)`
-
-GetMinInSyncReplicasOk returns a tuple with the MinInSyncReplicas field if it's non-nil, zero value otherwise
-and a boolean to check if the value has been set.
-
-### SetMinInSyncReplicas
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) SetMinInSyncReplicas(v int32)`
-
-SetMinInSyncReplicas sets MinInSyncReplicas field to given value.
-
-### HasMinInSyncReplicas
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) HasMinInSyncReplicas() bool`
-
-HasMinInSyncReplicas returns a boolean if a field has been set.
-
-### GetReplicationFactor
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) GetReplicationFactor() int32`
-
-GetReplicationFactor returns the ReplicationFactor field if non-nil, zero value otherwise.
-
-### GetReplicationFactorOk
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) GetReplicationFactorOk() (*int32, bool)`
-
-GetReplicationFactorOk returns a tuple with the ReplicationFactor field if it's non-nil, zero value otherwise
-and a boolean to check if the value has been set.
-
-### SetReplicationFactor
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) SetReplicationFactor(v int32)`
-
-SetReplicationFactor sets ReplicationFactor field to given value.
-
-### HasReplicationFactor
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) HasReplicationFactor() bool`
-
-HasReplicationFactor returns a boolean if a field has been set.
-
-### GetSupportedAzModes
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) GetSupportedAzModes() []string`
-
-GetSupportedAzModes returns the SupportedAzModes field if non-nil, zero value otherwise.
-
-### GetSupportedAzModesOk
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) GetSupportedAzModesOk() (*[]string, bool)`
-
-GetSupportedAzModesOk returns a tuple with the SupportedAzModes field if it's non-nil, zero value otherwise
-and a boolean to check if the value has been set.
-
-### SetSupportedAzModes
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) SetSupportedAzModes(v []string)`
-
-SetSupportedAzModes sets SupportedAzModes field to given value.
-
-### HasSupportedAzModes
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) HasSupportedAzModes() bool`
-
-HasSupportedAzModes returns a boolean if a field has been set.
-
-### GetLifespanSeconds
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) GetLifespanSeconds() int32`
-
-GetLifespanSeconds returns the LifespanSeconds field if non-nil, zero value otherwise.
-
-### GetLifespanSecondsOk
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) GetLifespanSecondsOk() (*int32, bool)`
-
-GetLifespanSecondsOk returns a tuple with the LifespanSeconds field if it's non-nil, zero value otherwise
-and a boolean to check if the value has been set.
-
-### SetLifespanSeconds
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) SetLifespanSeconds(v int32)`
-
-SetLifespanSeconds sets LifespanSeconds field to given value.
-
-### HasLifespanSeconds
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) HasLifespanSeconds() bool`
-
-HasLifespanSeconds returns a boolean if a field has been set.
-
-### SetLifespanSecondsNil
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) SetLifespanSecondsNil(b bool)`
-
- SetLifespanSecondsNil sets the value for LifespanSeconds to be an explicit nil
-
-### UnsetLifespanSeconds
-`func (o *SupportedKafkaInstanceTypeSizesInner) UnsetLifespanSeconds()`
-
-UnsetLifespanSeconds ensures that no value is present for LifespanSeconds, not even an explicit nil
-### GetQuotaConsumed
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) GetQuotaConsumed() int32`
-
-GetQuotaConsumed returns the QuotaConsumed field if non-nil, zero value otherwise.
-
-### GetQuotaConsumedOk
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) GetQuotaConsumedOk() (*int32, bool)`
-
-GetQuotaConsumedOk returns a tuple with the QuotaConsumed field if it's non-nil, zero value otherwise
-and a boolean to check if the value has been set.
-
-### SetQuotaConsumed
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) SetQuotaConsumed(v int32)`
-
-SetQuotaConsumed sets QuotaConsumed field to given value.
-
-### HasQuotaConsumed
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) HasQuotaConsumed() bool`
-
-HasQuotaConsumed returns a boolean if a field has been set.
-
-### GetQuotaType
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) GetQuotaType() string`
-
-GetQuotaType returns the QuotaType field if non-nil, zero value otherwise.
-
-### GetQuotaTypeOk
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) GetQuotaTypeOk() (*string, bool)`
-
-GetQuotaTypeOk returns a tuple with the QuotaType field if it's non-nil, zero value otherwise
-and a boolean to check if the value has been set.
-
-### SetQuotaType
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) SetQuotaType(v string)`
-
-SetQuotaType sets QuotaType field to given value.
-
-### HasQuotaType
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) HasQuotaType() bool`
-
-HasQuotaType returns a boolean if a field has been set.
-
-### GetCapacityConsumed
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) GetCapacityConsumed() int32`
-
-GetCapacityConsumed returns the CapacityConsumed field if non-nil, zero value otherwise.
-
-### GetCapacityConsumedOk
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) GetCapacityConsumedOk() (*int32, bool)`
-
-GetCapacityConsumedOk returns a tuple with the CapacityConsumed field if it's non-nil, zero value otherwise
-and a boolean to check if the value has been set.
-
-### SetCapacityConsumed
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) SetCapacityConsumed(v int32)`
-
-SetCapacityConsumed sets CapacityConsumed field to given value.
-
-### HasCapacityConsumed
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) HasCapacityConsumed() bool`
-
-HasCapacityConsumed returns a boolean if a field has been set.
-
-### GetMaturityStatus
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) GetMaturityStatus() string`
-
-GetMaturityStatus returns the MaturityStatus field if non-nil, zero value otherwise.
-
-### GetMaturityStatusOk
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) GetMaturityStatusOk() (*string, bool)`
-
-GetMaturityStatusOk returns a tuple with the MaturityStatus field if it's non-nil, zero value otherwise
-and a boolean to check if the value has been set.
-
-### SetMaturityStatus
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) SetMaturityStatus(v string)`
-
-SetMaturityStatus sets MaturityStatus field to given value.
-
-### HasMaturityStatus
-
-`func (o *SupportedKafkaInstanceTypeSizesInner) HasMaturityStatus() bool`
-
-HasMaturityStatus returns a boolean if a field has been set.
-
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/go.mod b/app-services-sdk-go/kafkamgmt/apiv1/client/go.mod
deleted file mode 100644
index ead32606..00000000
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/go.mod
+++ /dev/null
@@ -1,7 +0,0 @@
-module github.com/GIT_USER_ID/GIT_REPO_ID
-
-go 1.13
-
-require (
-	golang.org/x/oauth2 v0.0.0-20210323180902-22b0adad7558
-)
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/go.sum b/app-services-sdk-go/kafkamgmt/apiv1/client/go.sum
deleted file mode 100644
index 734252e6..00000000
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/go.sum
+++ /dev/null
@@ -1,13 +0,0 @@
-cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
-github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e h1:bRhVy7zSSasaqNksaRZiA5EEI+Ei4I1nO5Jh72wfHlg=
-golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 h1:SVwTIAaPC2U/AvvLNZ2a7OVsmBpC8L5BlwK1whH3hm0=
-golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 h1:YUO/7uOKsKeq9UokNS62b8FYywz3ker1l1vDZRCRefw=
-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508=
-google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/model_cloud_provider.go b/app-services-sdk-go/kafkamgmt/apiv1/client/model_cloud_provider.go
index 822a8e39..bd9f8285 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/model_cloud_provider.go
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/model_cloud_provider.go
@@ -1,11 +1,11 @@
 /*
-Kafka Management API
-
-Kafka Management API is a REST API to manage Kafka instances
-
-API version: 1.14.0
-Contact: rhosak-support@redhat.com
-*/
+ * Kafka Management API
+ *
+ * Kafka Management API is a REST API to manage Kafka instances
+ *
+ * API version: 1.14.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -49,7 +49,7 @@ func NewCloudProviderWithDefaults() *CloudProvider {
 
 // GetKind returns the Kind field value if set, zero value otherwise.
 func (o *CloudProvider) GetKind() string {
-	if o == nil || isNil(o.Kind) {
+	if o == nil || o.Kind == nil {
 		var ret string
 		return ret
 	}
@@ -59,15 +59,15 @@ func (o *CloudProvider) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *CloudProvider) GetKindOk() (*string, bool) {
-	if o == nil || isNil(o.Kind) {
-    return nil, false
+	if o == nil || o.Kind == nil {
+		return nil, false
 	}
 	return o.Kind, true
 }
 
 // HasKind returns a boolean if a field has been set.
 func (o *CloudProvider) HasKind() bool {
-	if o != nil && !isNil(o.Kind) {
+	if o != nil && o.Kind != nil {
 		return true
 	}
 
@@ -81,7 +81,7 @@ func (o *CloudProvider) SetKind(v string) {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *CloudProvider) GetId() string {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret string
 		return ret
 	}
@@ -91,15 +91,15 @@ func (o *CloudProvider) GetId() string {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *CloudProvider) GetIdOk() (*string, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *CloudProvider) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -113,7 +113,7 @@ func (o *CloudProvider) SetId(v string) {
 
 // GetDisplayName returns the DisplayName field value if set, zero value otherwise.
 func (o *CloudProvider) GetDisplayName() string {
-	if o == nil || isNil(o.DisplayName) {
+	if o == nil || o.DisplayName == nil {
 		var ret string
 		return ret
 	}
@@ -123,15 +123,15 @@ func (o *CloudProvider) GetDisplayName() string {
 // GetDisplayNameOk returns a tuple with the DisplayName field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *CloudProvider) GetDisplayNameOk() (*string, bool) {
-	if o == nil || isNil(o.DisplayName) {
-    return nil, false
+	if o == nil || o.DisplayName == nil {
+		return nil, false
 	}
 	return o.DisplayName, true
 }
 
 // HasDisplayName returns a boolean if a field has been set.
 func (o *CloudProvider) HasDisplayName() bool {
-	if o != nil && !isNil(o.DisplayName) {
+	if o != nil && o.DisplayName != nil {
 		return true
 	}
 
@@ -145,7 +145,7 @@ func (o *CloudProvider) SetDisplayName(v string) {
 
 // GetName returns the Name field value if set, zero value otherwise.
 func (o *CloudProvider) GetName() string {
-	if o == nil || isNil(o.Name) {
+	if o == nil || o.Name == nil {
 		var ret string
 		return ret
 	}
@@ -155,15 +155,15 @@ func (o *CloudProvider) GetName() string {
 // GetNameOk returns a tuple with the Name field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *CloudProvider) GetNameOk() (*string, bool) {
-	if o == nil || isNil(o.Name) {
-    return nil, false
+	if o == nil || o.Name == nil {
+		return nil, false
 	}
 	return o.Name, true
 }
 
 // HasName returns a boolean if a field has been set.
 func (o *CloudProvider) HasName() bool {
-	if o != nil && !isNil(o.Name) {
+	if o != nil && o.Name != nil {
 		return true
 	}
 
@@ -188,8 +188,8 @@ func (o *CloudProvider) GetEnabled() bool {
 // GetEnabledOk returns a tuple with the Enabled field value
 // and a boolean to check if the value has been set.
 func (o *CloudProvider) GetEnabledOk() (*bool, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Enabled, true
 }
@@ -201,16 +201,16 @@ func (o *CloudProvider) SetEnabled(v bool) {
 
 func (o CloudProvider) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Kind) {
+	if o.Kind != nil {
 		toSerialize["kind"] = o.Kind
 	}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.DisplayName) {
+	if o.DisplayName != nil {
 		toSerialize["display_name"] = o.DisplayName
 	}
-	if !isNil(o.Name) {
+	if o.Name != nil {
 		toSerialize["name"] = o.Name
 	}
 	if true {
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/model_cloud_provider_list.go b/app-services-sdk-go/kafkamgmt/apiv1/client/model_cloud_provider_list.go
index e7fa8c4f..f798809b 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/model_cloud_provider_list.go
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/model_cloud_provider_list.go
@@ -1,11 +1,11 @@
 /*
-Kafka Management API
-
-Kafka Management API is a REST API to manage Kafka instances
-
-API version: 1.14.0
-Contact: rhosak-support@redhat.com
-*/
+ * Kafka Management API
+ *
+ * Kafka Management API is a REST API to manage Kafka instances
+ *
+ * API version: 1.14.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -59,8 +59,8 @@ func (o *CloudProviderList) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *CloudProviderList) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -83,8 +83,8 @@ func (o *CloudProviderList) GetPage() int32 {
 // GetPageOk returns a tuple with the Page field value
 // and a boolean to check if the value has been set.
 func (o *CloudProviderList) GetPageOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Page, true
 }
@@ -107,8 +107,8 @@ func (o *CloudProviderList) GetSize() int32 {
 // GetSizeOk returns a tuple with the Size field value
 // and a boolean to check if the value has been set.
 func (o *CloudProviderList) GetSizeOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Size, true
 }
@@ -131,8 +131,8 @@ func (o *CloudProviderList) GetTotal() int32 {
 // GetTotalOk returns a tuple with the Total field value
 // and a boolean to check if the value has been set.
 func (o *CloudProviderList) GetTotalOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Total, true
 }
@@ -154,11 +154,11 @@ func (o *CloudProviderList) GetItems() []CloudProvider {
 
 // GetItemsOk returns a tuple with the Items field value
 // and a boolean to check if the value has been set.
-func (o *CloudProviderList) GetItemsOk() ([]CloudProvider, bool) {
-	if o == nil {
-    return nil, false
+func (o *CloudProviderList) GetItemsOk() (*[]CloudProvider, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Items, true
+	return &o.Items, true
 }
 
 // SetItems sets field value
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/model_cloud_provider_list_all_of.go b/app-services-sdk-go/kafkamgmt/apiv1/client/model_cloud_provider_list_all_of.go
index aa36e9d8..6e166645 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/model_cloud_provider_list_all_of.go
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/model_cloud_provider_list_all_of.go
@@ -1,11 +1,11 @@
 /*
-Kafka Management API
-
-Kafka Management API is a REST API to manage Kafka instances
-
-API version: 1.14.0
-Contact: rhosak-support@redhat.com
-*/
+ * Kafka Management API
+ *
+ * Kafka Management API is a REST API to manage Kafka instances
+ *
+ * API version: 1.14.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -17,7 +17,7 @@ import (
 
 // CloudProviderListAllOf struct for CloudProviderListAllOf
 type CloudProviderListAllOf struct {
-	Items []CloudProvider `json:"items,omitempty"`
+	Items *[]CloudProvider `json:"items,omitempty"`
 }
 
 // NewCloudProviderListAllOf instantiates a new CloudProviderListAllOf object
@@ -39,25 +39,25 @@ func NewCloudProviderListAllOfWithDefaults() *CloudProviderListAllOf {
 
 // GetItems returns the Items field value if set, zero value otherwise.
 func (o *CloudProviderListAllOf) GetItems() []CloudProvider {
-	if o == nil || isNil(o.Items) {
+	if o == nil || o.Items == nil {
 		var ret []CloudProvider
 		return ret
 	}
-	return o.Items
+	return *o.Items
 }
 
 // GetItemsOk returns a tuple with the Items field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *CloudProviderListAllOf) GetItemsOk() ([]CloudProvider, bool) {
-	if o == nil || isNil(o.Items) {
-    return nil, false
+func (o *CloudProviderListAllOf) GetItemsOk() (*[]CloudProvider, bool) {
+	if o == nil || o.Items == nil {
+		return nil, false
 	}
 	return o.Items, true
 }
 
 // HasItems returns a boolean if a field has been set.
 func (o *CloudProviderListAllOf) HasItems() bool {
-	if o != nil && !isNil(o.Items) {
+	if o != nil && o.Items != nil {
 		return true
 	}
 
@@ -66,12 +66,12 @@ func (o *CloudProviderListAllOf) HasItems() bool {
 
 // SetItems gets a reference to the given []CloudProvider and assigns it to the Items field.
 func (o *CloudProviderListAllOf) SetItems(v []CloudProvider) {
-	o.Items = v
+	o.Items = &v
 }
 
 func (o CloudProviderListAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Items) {
+	if o.Items != nil {
 		toSerialize["items"] = o.Items
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/model_cloud_region.go b/app-services-sdk-go/kafkamgmt/apiv1/client/model_cloud_region.go
index e7cf5fcc..254d38bb 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/model_cloud_region.go
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/model_cloud_region.go
@@ -1,11 +1,11 @@
 /*
-Kafka Management API
-
-Kafka Management API is a REST API to manage Kafka instances
-
-API version: 1.14.0
-Contact: rhosak-support@redhat.com
-*/
+ * Kafka Management API
+ *
+ * Kafka Management API is a REST API to manage Kafka instances
+ *
+ * API version: 1.14.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -52,7 +52,7 @@ func NewCloudRegionWithDefaults() *CloudRegion {
 
 // GetKind returns the Kind field value if set, zero value otherwise.
 func (o *CloudRegion) GetKind() string {
-	if o == nil || isNil(o.Kind) {
+	if o == nil || o.Kind == nil {
 		var ret string
 		return ret
 	}
@@ -62,15 +62,15 @@ func (o *CloudRegion) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *CloudRegion) GetKindOk() (*string, bool) {
-	if o == nil || isNil(o.Kind) {
-    return nil, false
+	if o == nil || o.Kind == nil {
+		return nil, false
 	}
 	return o.Kind, true
 }
 
 // HasKind returns a boolean if a field has been set.
 func (o *CloudRegion) HasKind() bool {
-	if o != nil && !isNil(o.Kind) {
+	if o != nil && o.Kind != nil {
 		return true
 	}
 
@@ -84,7 +84,7 @@ func (o *CloudRegion) SetKind(v string) {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *CloudRegion) GetId() string {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret string
 		return ret
 	}
@@ -94,15 +94,15 @@ func (o *CloudRegion) GetId() string {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *CloudRegion) GetIdOk() (*string, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *CloudRegion) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -116,7 +116,7 @@ func (o *CloudRegion) SetId(v string) {
 
 // GetDisplayName returns the DisplayName field value if set, zero value otherwise.
 func (o *CloudRegion) GetDisplayName() string {
-	if o == nil || isNil(o.DisplayName) {
+	if o == nil || o.DisplayName == nil {
 		var ret string
 		return ret
 	}
@@ -126,15 +126,15 @@ func (o *CloudRegion) GetDisplayName() string {
 // GetDisplayNameOk returns a tuple with the DisplayName field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *CloudRegion) GetDisplayNameOk() (*string, bool) {
-	if o == nil || isNil(o.DisplayName) {
-    return nil, false
+	if o == nil || o.DisplayName == nil {
+		return nil, false
 	}
 	return o.DisplayName, true
 }
 
 // HasDisplayName returns a boolean if a field has been set.
 func (o *CloudRegion) HasDisplayName() bool {
-	if o != nil && !isNil(o.DisplayName) {
+	if o != nil && o.DisplayName != nil {
 		return true
 	}
 
@@ -159,8 +159,8 @@ func (o *CloudRegion) GetEnabled() bool {
 // GetEnabledOk returns a tuple with the Enabled field value
 // and a boolean to check if the value has been set.
 func (o *CloudRegion) GetEnabledOk() (*bool, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Enabled, true
 }
@@ -182,11 +182,11 @@ func (o *CloudRegion) GetCapacity() []RegionCapacityListItem {
 
 // GetCapacityOk returns a tuple with the Capacity field value
 // and a boolean to check if the value has been set.
-func (o *CloudRegion) GetCapacityOk() ([]RegionCapacityListItem, bool) {
-	if o == nil {
-    return nil, false
+func (o *CloudRegion) GetCapacityOk() (*[]RegionCapacityListItem, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Capacity, true
+	return &o.Capacity, true
 }
 
 // SetCapacity sets field value
@@ -196,13 +196,13 @@ func (o *CloudRegion) SetCapacity(v []RegionCapacityListItem) {
 
 func (o CloudRegion) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Kind) {
+	if o.Kind != nil {
 		toSerialize["kind"] = o.Kind
 	}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.DisplayName) {
+	if o.DisplayName != nil {
 		toSerialize["display_name"] = o.DisplayName
 	}
 	if true {
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/model_cloud_region_list.go b/app-services-sdk-go/kafkamgmt/apiv1/client/model_cloud_region_list.go
index 10839e7f..8092bc1f 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/model_cloud_region_list.go
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/model_cloud_region_list.go
@@ -1,11 +1,11 @@
 /*
-Kafka Management API
-
-Kafka Management API is a REST API to manage Kafka instances
-
-API version: 1.14.0
-Contact: rhosak-support@redhat.com
-*/
+ * Kafka Management API
+ *
+ * Kafka Management API is a REST API to manage Kafka instances
+ *
+ * API version: 1.14.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -59,8 +59,8 @@ func (o *CloudRegionList) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *CloudRegionList) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -83,8 +83,8 @@ func (o *CloudRegionList) GetPage() int32 {
 // GetPageOk returns a tuple with the Page field value
 // and a boolean to check if the value has been set.
 func (o *CloudRegionList) GetPageOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Page, true
 }
@@ -107,8 +107,8 @@ func (o *CloudRegionList) GetSize() int32 {
 // GetSizeOk returns a tuple with the Size field value
 // and a boolean to check if the value has been set.
 func (o *CloudRegionList) GetSizeOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Size, true
 }
@@ -131,8 +131,8 @@ func (o *CloudRegionList) GetTotal() int32 {
 // GetTotalOk returns a tuple with the Total field value
 // and a boolean to check if the value has been set.
 func (o *CloudRegionList) GetTotalOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Total, true
 }
@@ -154,11 +154,11 @@ func (o *CloudRegionList) GetItems() []CloudRegion {
 
 // GetItemsOk returns a tuple with the Items field value
 // and a boolean to check if the value has been set.
-func (o *CloudRegionList) GetItemsOk() ([]CloudRegion, bool) {
-	if o == nil {
-    return nil, false
+func (o *CloudRegionList) GetItemsOk() (*[]CloudRegion, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Items, true
+	return &o.Items, true
 }
 
 // SetItems sets field value
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/model_cloud_region_list_all_of.go b/app-services-sdk-go/kafkamgmt/apiv1/client/model_cloud_region_list_all_of.go
index f6ee5480..b99cc0c5 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/model_cloud_region_list_all_of.go
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/model_cloud_region_list_all_of.go
@@ -1,11 +1,11 @@
 /*
-Kafka Management API
-
-Kafka Management API is a REST API to manage Kafka instances
-
-API version: 1.14.0
-Contact: rhosak-support@redhat.com
-*/
+ * Kafka Management API
+ *
+ * Kafka Management API is a REST API to manage Kafka instances
+ *
+ * API version: 1.14.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -17,7 +17,7 @@ import (
 
 // CloudRegionListAllOf struct for CloudRegionListAllOf
 type CloudRegionListAllOf struct {
-	Items []CloudRegion `json:"items,omitempty"`
+	Items *[]CloudRegion `json:"items,omitempty"`
 }
 
 // NewCloudRegionListAllOf instantiates a new CloudRegionListAllOf object
@@ -39,25 +39,25 @@ func NewCloudRegionListAllOfWithDefaults() *CloudRegionListAllOf {
 
 // GetItems returns the Items field value if set, zero value otherwise.
 func (o *CloudRegionListAllOf) GetItems() []CloudRegion {
-	if o == nil || isNil(o.Items) {
+	if o == nil || o.Items == nil {
 		var ret []CloudRegion
 		return ret
 	}
-	return o.Items
+	return *o.Items
 }
 
 // GetItemsOk returns a tuple with the Items field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *CloudRegionListAllOf) GetItemsOk() ([]CloudRegion, bool) {
-	if o == nil || isNil(o.Items) {
-    return nil, false
+func (o *CloudRegionListAllOf) GetItemsOk() (*[]CloudRegion, bool) {
+	if o == nil || o.Items == nil {
+		return nil, false
 	}
 	return o.Items, true
 }
 
 // HasItems returns a boolean if a field has been set.
 func (o *CloudRegionListAllOf) HasItems() bool {
-	if o != nil && !isNil(o.Items) {
+	if o != nil && o.Items != nil {
 		return true
 	}
 
@@ -66,12 +66,12 @@ func (o *CloudRegionListAllOf) HasItems() bool {
 
 // SetItems gets a reference to the given []CloudRegion and assigns it to the Items field.
 func (o *CloudRegionListAllOf) SetItems(v []CloudRegion) {
-	o.Items = v
+	o.Items = &v
 }
 
 func (o CloudRegionListAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Items) {
+	if o.Items != nil {
 		toSerialize["items"] = o.Items
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/model_enterprise_cluster.go b/app-services-sdk-go/kafkamgmt/apiv1/client/model_enterprise_cluster.go
index 03c6f260..2774b41e 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/model_enterprise_cluster.go
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/model_enterprise_cluster.go
@@ -1,11 +1,11 @@
 /*
-Kafka Management API
-
-Kafka Management API is a REST API to manage Kafka instances
-
-API version: 1.14.0
-Contact: rhosak-support@redhat.com
-*/
+ * Kafka Management API
+ *
+ * Kafka Management API is a REST API to manage Kafka instances
+ *
+ * API version: 1.14.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -62,8 +62,8 @@ func (o *EnterpriseCluster) GetId() string {
 // GetIdOk returns a tuple with the Id field value
 // and a boolean to check if the value has been set.
 func (o *EnterpriseCluster) GetIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Id, true
 }
@@ -86,8 +86,8 @@ func (o *EnterpriseCluster) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *EnterpriseCluster) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -110,8 +110,8 @@ func (o *EnterpriseCluster) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value
 // and a boolean to check if the value has been set.
 func (o *EnterpriseCluster) GetHrefOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Href, true
 }
@@ -134,8 +134,8 @@ func (o *EnterpriseCluster) GetAccessKafkasViaPrivateNetwork() bool {
 // GetAccessKafkasViaPrivateNetworkOk returns a tuple with the AccessKafkasViaPrivateNetwork field value
 // and a boolean to check if the value has been set.
 func (o *EnterpriseCluster) GetAccessKafkasViaPrivateNetworkOk() (*bool, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.AccessKafkasViaPrivateNetwork, true
 }
@@ -147,7 +147,7 @@ func (o *EnterpriseCluster) SetAccessKafkasViaPrivateNetwork(v bool) {
 
 // GetClusterId returns the ClusterId field value if set, zero value otherwise.
 func (o *EnterpriseCluster) GetClusterId() string {
-	if o == nil || isNil(o.ClusterId) {
+	if o == nil || o.ClusterId == nil {
 		var ret string
 		return ret
 	}
@@ -157,15 +157,15 @@ func (o *EnterpriseCluster) GetClusterId() string {
 // GetClusterIdOk returns a tuple with the ClusterId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *EnterpriseCluster) GetClusterIdOk() (*string, bool) {
-	if o == nil || isNil(o.ClusterId) {
-    return nil, false
+	if o == nil || o.ClusterId == nil {
+		return nil, false
 	}
 	return o.ClusterId, true
 }
 
 // HasClusterId returns a boolean if a field has been set.
 func (o *EnterpriseCluster) HasClusterId() bool {
-	if o != nil && !isNil(o.ClusterId) {
+	if o != nil && o.ClusterId != nil {
 		return true
 	}
 
@@ -179,7 +179,7 @@ func (o *EnterpriseCluster) SetClusterId(v string) {
 
 // GetStatus returns the Status field value if set, zero value otherwise.
 func (o *EnterpriseCluster) GetStatus() string {
-	if o == nil || isNil(o.Status) {
+	if o == nil || o.Status == nil {
 		var ret string
 		return ret
 	}
@@ -189,15 +189,15 @@ func (o *EnterpriseCluster) GetStatus() string {
 // GetStatusOk returns a tuple with the Status field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *EnterpriseCluster) GetStatusOk() (*string, bool) {
-	if o == nil || isNil(o.Status) {
-    return nil, false
+	if o == nil || o.Status == nil {
+		return nil, false
 	}
 	return o.Status, true
 }
 
 // HasStatus returns a boolean if a field has been set.
 func (o *EnterpriseCluster) HasStatus() bool {
-	if o != nil && !isNil(o.Status) {
+	if o != nil && o.Status != nil {
 		return true
 	}
 
@@ -223,10 +223,10 @@ func (o EnterpriseCluster) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["access_kafkas_via_private_network"] = o.AccessKafkasViaPrivateNetwork
 	}
-	if !isNil(o.ClusterId) {
+	if o.ClusterId != nil {
 		toSerialize["cluster_id"] = o.ClusterId
 	}
-	if !isNil(o.Status) {
+	if o.Status != nil {
 		toSerialize["status"] = o.Status
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/model_enterprise_cluster_all_of.go b/app-services-sdk-go/kafkamgmt/apiv1/client/model_enterprise_cluster_all_of.go
index 4b212f4f..503ac7dd 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/model_enterprise_cluster_all_of.go
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/model_enterprise_cluster_all_of.go
@@ -1,11 +1,11 @@
 /*
-Kafka Management API
-
-Kafka Management API is a REST API to manage Kafka instances
-
-API version: 1.14.0
-Contact: rhosak-support@redhat.com
-*/
+ * Kafka Management API
+ *
+ * Kafka Management API is a REST API to manage Kafka instances
+ *
+ * API version: 1.14.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -56,8 +56,8 @@ func (o *EnterpriseClusterAllOf) GetAccessKafkasViaPrivateNetwork() bool {
 // GetAccessKafkasViaPrivateNetworkOk returns a tuple with the AccessKafkasViaPrivateNetwork field value
 // and a boolean to check if the value has been set.
 func (o *EnterpriseClusterAllOf) GetAccessKafkasViaPrivateNetworkOk() (*bool, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.AccessKafkasViaPrivateNetwork, true
 }
@@ -69,7 +69,7 @@ func (o *EnterpriseClusterAllOf) SetAccessKafkasViaPrivateNetwork(v bool) {
 
 // GetClusterId returns the ClusterId field value if set, zero value otherwise.
 func (o *EnterpriseClusterAllOf) GetClusterId() string {
-	if o == nil || isNil(o.ClusterId) {
+	if o == nil || o.ClusterId == nil {
 		var ret string
 		return ret
 	}
@@ -79,15 +79,15 @@ func (o *EnterpriseClusterAllOf) GetClusterId() string {
 // GetClusterIdOk returns a tuple with the ClusterId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *EnterpriseClusterAllOf) GetClusterIdOk() (*string, bool) {
-	if o == nil || isNil(o.ClusterId) {
-    return nil, false
+	if o == nil || o.ClusterId == nil {
+		return nil, false
 	}
 	return o.ClusterId, true
 }
 
 // HasClusterId returns a boolean if a field has been set.
 func (o *EnterpriseClusterAllOf) HasClusterId() bool {
-	if o != nil && !isNil(o.ClusterId) {
+	if o != nil && o.ClusterId != nil {
 		return true
 	}
 
@@ -101,7 +101,7 @@ func (o *EnterpriseClusterAllOf) SetClusterId(v string) {
 
 // GetStatus returns the Status field value if set, zero value otherwise.
 func (o *EnterpriseClusterAllOf) GetStatus() string {
-	if o == nil || isNil(o.Status) {
+	if o == nil || o.Status == nil {
 		var ret string
 		return ret
 	}
@@ -111,15 +111,15 @@ func (o *EnterpriseClusterAllOf) GetStatus() string {
 // GetStatusOk returns a tuple with the Status field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *EnterpriseClusterAllOf) GetStatusOk() (*string, bool) {
-	if o == nil || isNil(o.Status) {
-    return nil, false
+	if o == nil || o.Status == nil {
+		return nil, false
 	}
 	return o.Status, true
 }
 
 // HasStatus returns a boolean if a field has been set.
 func (o *EnterpriseClusterAllOf) HasStatus() bool {
-	if o != nil && !isNil(o.Status) {
+	if o != nil && o.Status != nil {
 		return true
 	}
 
@@ -136,10 +136,10 @@ func (o EnterpriseClusterAllOf) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["access_kafkas_via_private_network"] = o.AccessKafkasViaPrivateNetwork
 	}
-	if !isNil(o.ClusterId) {
+	if o.ClusterId != nil {
 		toSerialize["cluster_id"] = o.ClusterId
 	}
-	if !isNil(o.Status) {
+	if o.Status != nil {
 		toSerialize["status"] = o.Status
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/model_enterprise_cluster_list.go b/app-services-sdk-go/kafkamgmt/apiv1/client/model_enterprise_cluster_list.go
index f4eb8791..80b23a88 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/model_enterprise_cluster_list.go
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/model_enterprise_cluster_list.go
@@ -1,11 +1,11 @@
 /*
-Kafka Management API
-
-Kafka Management API is a REST API to manage Kafka instances
-
-API version: 1.14.0
-Contact: rhosak-support@redhat.com
-*/
+ * Kafka Management API
+ *
+ * Kafka Management API is a REST API to manage Kafka instances
+ *
+ * API version: 1.14.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -59,8 +59,8 @@ func (o *EnterpriseClusterList) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *EnterpriseClusterList) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -83,8 +83,8 @@ func (o *EnterpriseClusterList) GetPage() int32 {
 // GetPageOk returns a tuple with the Page field value
 // and a boolean to check if the value has been set.
 func (o *EnterpriseClusterList) GetPageOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Page, true
 }
@@ -107,8 +107,8 @@ func (o *EnterpriseClusterList) GetSize() int32 {
 // GetSizeOk returns a tuple with the Size field value
 // and a boolean to check if the value has been set.
 func (o *EnterpriseClusterList) GetSizeOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Size, true
 }
@@ -131,8 +131,8 @@ func (o *EnterpriseClusterList) GetTotal() int32 {
 // GetTotalOk returns a tuple with the Total field value
 // and a boolean to check if the value has been set.
 func (o *EnterpriseClusterList) GetTotalOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Total, true
 }
@@ -154,11 +154,11 @@ func (o *EnterpriseClusterList) GetItems() []EnterpriseCluster {
 
 // GetItemsOk returns a tuple with the Items field value
 // and a boolean to check if the value has been set.
-func (o *EnterpriseClusterList) GetItemsOk() ([]EnterpriseCluster, bool) {
-	if o == nil {
-    return nil, false
+func (o *EnterpriseClusterList) GetItemsOk() (*[]EnterpriseCluster, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Items, true
+	return &o.Items, true
 }
 
 // SetItems sets field value
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/model_enterprise_cluster_list_all_of.go b/app-services-sdk-go/kafkamgmt/apiv1/client/model_enterprise_cluster_list_all_of.go
index 114b74df..e5507f58 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/model_enterprise_cluster_list_all_of.go
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/model_enterprise_cluster_list_all_of.go
@@ -1,11 +1,11 @@
 /*
-Kafka Management API
-
-Kafka Management API is a REST API to manage Kafka instances
-
-API version: 1.14.0
-Contact: rhosak-support@redhat.com
-*/
+ * Kafka Management API
+ *
+ * Kafka Management API is a REST API to manage Kafka instances
+ *
+ * API version: 1.14.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -17,7 +17,7 @@ import (
 
 // EnterpriseClusterListAllOf struct for EnterpriseClusterListAllOf
 type EnterpriseClusterListAllOf struct {
-	Items []EnterpriseCluster `json:"items,omitempty"`
+	Items *[]EnterpriseCluster `json:"items,omitempty"`
 }
 
 // NewEnterpriseClusterListAllOf instantiates a new EnterpriseClusterListAllOf object
@@ -39,25 +39,25 @@ func NewEnterpriseClusterListAllOfWithDefaults() *EnterpriseClusterListAllOf {
 
 // GetItems returns the Items field value if set, zero value otherwise.
 func (o *EnterpriseClusterListAllOf) GetItems() []EnterpriseCluster {
-	if o == nil || isNil(o.Items) {
+	if o == nil || o.Items == nil {
 		var ret []EnterpriseCluster
 		return ret
 	}
-	return o.Items
+	return *o.Items
 }
 
 // GetItemsOk returns a tuple with the Items field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *EnterpriseClusterListAllOf) GetItemsOk() ([]EnterpriseCluster, bool) {
-	if o == nil || isNil(o.Items) {
-    return nil, false
+func (o *EnterpriseClusterListAllOf) GetItemsOk() (*[]EnterpriseCluster, bool) {
+	if o == nil || o.Items == nil {
+		return nil, false
 	}
 	return o.Items, true
 }
 
 // HasItems returns a boolean if a field has been set.
 func (o *EnterpriseClusterListAllOf) HasItems() bool {
-	if o != nil && !isNil(o.Items) {
+	if o != nil && o.Items != nil {
 		return true
 	}
 
@@ -66,12 +66,12 @@ func (o *EnterpriseClusterListAllOf) HasItems() bool {
 
 // SetItems gets a reference to the given []EnterpriseCluster and assigns it to the Items field.
 func (o *EnterpriseClusterListAllOf) SetItems(v []EnterpriseCluster) {
-	o.Items = v
+	o.Items = &v
 }
 
 func (o EnterpriseClusterListAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Items) {
+	if o.Items != nil {
 		toSerialize["items"] = o.Items
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/model_enterprise_cluster_with_addon_parameters.go b/app-services-sdk-go/kafkamgmt/apiv1/client/model_enterprise_cluster_with_addon_parameters.go
index ff7203a4..89e5c3c3 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/model_enterprise_cluster_with_addon_parameters.go
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/model_enterprise_cluster_with_addon_parameters.go
@@ -1,11 +1,11 @@
 /*
-Kafka Management API
-
-Kafka Management API is a REST API to manage Kafka instances
-
-API version: 1.14.0
-Contact: rhosak-support@redhat.com
-*/
+ * Kafka Management API
+ *
+ * Kafka Management API is a REST API to manage Kafka instances
+ *
+ * API version: 1.14.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -26,7 +26,7 @@ type EnterpriseClusterWithAddonParameters struct {
 	ClusterId *string `json:"cluster_id,omitempty"`
 	// status of registered Enterprise cluster
 	Status *string `json:"status,omitempty"`
-	FleetshardParameters []FleetshardParameter `json:"fleetshard_parameters,omitempty"`
+	FleetshardParameters *[]FleetshardParameter `json:"fleetshard_parameters,omitempty"`
 }
 
 // NewEnterpriseClusterWithAddonParameters instantiates a new EnterpriseClusterWithAddonParameters object
@@ -216,7 +216,7 @@ func (o *EnterpriseClusterWithAddonParameters) GetFleetshardParameters() []Fleet
 		var ret []FleetshardParameter
 		return ret
 	}
-	return o.FleetshardParameters
+	return *o.FleetshardParameters
 }
 
 // GetFleetshardParametersOk returns a tuple with the FleetshardParameters field value if set, nil otherwise
@@ -256,13 +256,13 @@ func (o EnterpriseClusterWithAddonParameters) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["access_kafkas_via_private_network"] = o.AccessKafkasViaPrivateNetwork
 	}
-	if !isNil(o.ClusterId) {
+	if o.ClusterId != nil {
 		toSerialize["cluster_id"] = o.ClusterId
 	}
-	if !isNil(o.Status) {
+	if o.Status != nil {
 		toSerialize["status"] = o.Status
 	}
-	if !isNil(o.FleetshardParameters) {
+	if o.FleetshardParameters != nil {
 		toSerialize["fleetshard_parameters"] = o.FleetshardParameters
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/model_enterprise_osd_cluster_payload.go b/app-services-sdk-go/kafkamgmt/apiv1/client/model_enterprise_osd_cluster_payload.go
index 4538a251..b14469af 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/model_enterprise_osd_cluster_payload.go
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/model_enterprise_osd_cluster_payload.go
@@ -1,11 +1,11 @@
 /*
-Kafka Management API
-
-Kafka Management API is a REST API to manage Kafka instances
-
-API version: 1.14.0
-Contact: rhosak-support@redhat.com
-*/
+ * Kafka Management API
+ *
+ * Kafka Management API is a REST API to manage Kafka instances
+ *
+ * API version: 1.14.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -64,8 +64,8 @@ func (o *EnterpriseOsdClusterPayload) GetAccessKafkasViaPrivateNetwork() bool {
 // GetAccessKafkasViaPrivateNetworkOk returns a tuple with the AccessKafkasViaPrivateNetwork field value
 // and a boolean to check if the value has been set.
 func (o *EnterpriseOsdClusterPayload) GetAccessKafkasViaPrivateNetworkOk() (*bool, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.AccessKafkasViaPrivateNetwork, true
 }
@@ -88,8 +88,8 @@ func (o *EnterpriseOsdClusterPayload) GetClusterId() string {
 // GetClusterIdOk returns a tuple with the ClusterId field value
 // and a boolean to check if the value has been set.
 func (o *EnterpriseOsdClusterPayload) GetClusterIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.ClusterId, true
 }
@@ -112,8 +112,8 @@ func (o *EnterpriseOsdClusterPayload) GetClusterExternalId() string {
 // GetClusterExternalIdOk returns a tuple with the ClusterExternalId field value
 // and a boolean to check if the value has been set.
 func (o *EnterpriseOsdClusterPayload) GetClusterExternalIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.ClusterExternalId, true
 }
@@ -136,8 +136,8 @@ func (o *EnterpriseOsdClusterPayload) GetClusterIngressDnsName() string {
 // GetClusterIngressDnsNameOk returns a tuple with the ClusterIngressDnsName field value
 // and a boolean to check if the value has been set.
 func (o *EnterpriseOsdClusterPayload) GetClusterIngressDnsNameOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.ClusterIngressDnsName, true
 }
@@ -160,8 +160,8 @@ func (o *EnterpriseOsdClusterPayload) GetKafkaMachinePoolNodeCount() int32 {
 // GetKafkaMachinePoolNodeCountOk returns a tuple with the KafkaMachinePoolNodeCount field value
 // and a boolean to check if the value has been set.
 func (o *EnterpriseOsdClusterPayload) GetKafkaMachinePoolNodeCountOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.KafkaMachinePoolNodeCount, true
 }
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/model_error.go b/app-services-sdk-go/kafkamgmt/apiv1/client/model_error.go
index ed9b9173..3158f5ee 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/model_error.go
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/model_error.go
@@ -1,11 +1,11 @@
 /*
-Kafka Management API
-
-Kafka Management API is a REST API to manage Kafka instances
-
-API version: 1.14.0
-Contact: rhosak-support@redhat.com
-*/
+ * Kafka Management API
+ *
+ * Kafka Management API is a REST API to manage Kafka instances
+ *
+ * API version: 1.14.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -66,8 +66,8 @@ func (o *Error) GetReason() string {
 // GetReasonOk returns a tuple with the Reason field value
 // and a boolean to check if the value has been set.
 func (o *Error) GetReasonOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Reason, true
 }
@@ -79,7 +79,7 @@ func (o *Error) SetReason(v string) {
 
 // GetOperationId returns the OperationId field value if set, zero value otherwise.
 func (o *Error) GetOperationId() string {
-	if o == nil || isNil(o.OperationId) {
+	if o == nil || o.OperationId == nil {
 		var ret string
 		return ret
 	}
@@ -89,15 +89,15 @@ func (o *Error) GetOperationId() string {
 // GetOperationIdOk returns a tuple with the OperationId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Error) GetOperationIdOk() (*string, bool) {
-	if o == nil || isNil(o.OperationId) {
-    return nil, false
+	if o == nil || o.OperationId == nil {
+		return nil, false
 	}
 	return o.OperationId, true
 }
 
 // HasOperationId returns a boolean if a field has been set.
 func (o *Error) HasOperationId() bool {
-	if o != nil && !isNil(o.OperationId) {
+	if o != nil && o.OperationId != nil {
 		return true
 	}
 
@@ -122,8 +122,8 @@ func (o *Error) GetId() string {
 // GetIdOk returns a tuple with the Id field value
 // and a boolean to check if the value has been set.
 func (o *Error) GetIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Id, true
 }
@@ -146,8 +146,8 @@ func (o *Error) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *Error) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -170,8 +170,8 @@ func (o *Error) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value
 // and a boolean to check if the value has been set.
 func (o *Error) GetHrefOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Href, true
 }
@@ -194,8 +194,8 @@ func (o *Error) GetCode() string {
 // GetCodeOk returns a tuple with the Code field value
 // and a boolean to check if the value has been set.
 func (o *Error) GetCodeOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Code, true
 }
@@ -210,7 +210,7 @@ func (o Error) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["reason"] = o.Reason
 	}
-	if !isNil(o.OperationId) {
+	if o.OperationId != nil {
 		toSerialize["operation_id"] = o.OperationId
 	}
 	if true {
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/model_error_list.go b/app-services-sdk-go/kafkamgmt/apiv1/client/model_error_list.go
index 3ae2895c..954888dd 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/model_error_list.go
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/model_error_list.go
@@ -1,11 +1,11 @@
 /*
-Kafka Management API
-
-Kafka Management API is a REST API to manage Kafka instances
-
-API version: 1.14.0
-Contact: rhosak-support@redhat.com
-*/
+ * Kafka Management API
+ *
+ * Kafka Management API is a REST API to manage Kafka instances
+ *
+ * API version: 1.14.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -59,8 +59,8 @@ func (o *ErrorList) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *ErrorList) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -83,8 +83,8 @@ func (o *ErrorList) GetPage() int32 {
 // GetPageOk returns a tuple with the Page field value
 // and a boolean to check if the value has been set.
 func (o *ErrorList) GetPageOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Page, true
 }
@@ -107,8 +107,8 @@ func (o *ErrorList) GetSize() int32 {
 // GetSizeOk returns a tuple with the Size field value
 // and a boolean to check if the value has been set.
 func (o *ErrorList) GetSizeOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Size, true
 }
@@ -131,8 +131,8 @@ func (o *ErrorList) GetTotal() int32 {
 // GetTotalOk returns a tuple with the Total field value
 // and a boolean to check if the value has been set.
 func (o *ErrorList) GetTotalOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Total, true
 }
@@ -154,11 +154,11 @@ func (o *ErrorList) GetItems() []Error {
 
 // GetItemsOk returns a tuple with the Items field value
 // and a boolean to check if the value has been set.
-func (o *ErrorList) GetItemsOk() ([]Error, bool) {
-	if o == nil {
-    return nil, false
+func (o *ErrorList) GetItemsOk() (*[]Error, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Items, true
+	return &o.Items, true
 }
 
 // SetItems sets field value
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/model_error_list_all_of.go b/app-services-sdk-go/kafkamgmt/apiv1/client/model_error_list_all_of.go
index ef180106..2fd81a08 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/model_error_list_all_of.go
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/model_error_list_all_of.go
@@ -1,11 +1,11 @@
 /*
-Kafka Management API
-
-Kafka Management API is a REST API to manage Kafka instances
-
-API version: 1.14.0
-Contact: rhosak-support@redhat.com
-*/
+ * Kafka Management API
+ *
+ * Kafka Management API is a REST API to manage Kafka instances
+ *
+ * API version: 1.14.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -17,7 +17,7 @@ import (
 
 // ErrorListAllOf struct for ErrorListAllOf
 type ErrorListAllOf struct {
-	Items []Error `json:"items,omitempty"`
+	Items *[]Error `json:"items,omitempty"`
 }
 
 // NewErrorListAllOf instantiates a new ErrorListAllOf object
@@ -39,25 +39,25 @@ func NewErrorListAllOfWithDefaults() *ErrorListAllOf {
 
 // GetItems returns the Items field value if set, zero value otherwise.
 func (o *ErrorListAllOf) GetItems() []Error {
-	if o == nil || isNil(o.Items) {
+	if o == nil || o.Items == nil {
 		var ret []Error
 		return ret
 	}
-	return o.Items
+	return *o.Items
 }
 
 // GetItemsOk returns a tuple with the Items field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *ErrorListAllOf) GetItemsOk() ([]Error, bool) {
-	if o == nil || isNil(o.Items) {
-    return nil, false
+func (o *ErrorListAllOf) GetItemsOk() (*[]Error, bool) {
+	if o == nil || o.Items == nil {
+		return nil, false
 	}
 	return o.Items, true
 }
 
 // HasItems returns a boolean if a field has been set.
 func (o *ErrorListAllOf) HasItems() bool {
-	if o != nil && !isNil(o.Items) {
+	if o != nil && o.Items != nil {
 		return true
 	}
 
@@ -66,12 +66,12 @@ func (o *ErrorListAllOf) HasItems() bool {
 
 // SetItems gets a reference to the given []Error and assigns it to the Items field.
 func (o *ErrorListAllOf) SetItems(v []Error) {
-	o.Items = v
+	o.Items = &v
 }
 
 func (o ErrorListAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Items) {
+	if o.Items != nil {
 		toSerialize["items"] = o.Items
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/model_fleetshard_parameter.go b/app-services-sdk-go/kafkamgmt/apiv1/client/model_fleetshard_parameter.go
index fe86d31b..197199de 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/model_fleetshard_parameter.go
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/model_fleetshard_parameter.go
@@ -1,11 +1,11 @@
 /*
-Kafka Management API
-
-Kafka Management API is a REST API to manage Kafka instances
-
-API version: 1.14.0
-Contact: rhosak-support@redhat.com
-*/
+ * Kafka Management API
+ *
+ * Kafka Management API is a REST API to manage Kafka instances
+ *
+ * API version: 1.14.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -40,7 +40,7 @@ func NewFleetshardParameterWithDefaults() *FleetshardParameter {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *FleetshardParameter) GetId() string {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret string
 		return ret
 	}
@@ -50,15 +50,15 @@ func (o *FleetshardParameter) GetId() string {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *FleetshardParameter) GetIdOk() (*string, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *FleetshardParameter) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -72,7 +72,7 @@ func (o *FleetshardParameter) SetId(v string) {
 
 // GetValue returns the Value field value if set, zero value otherwise.
 func (o *FleetshardParameter) GetValue() string {
-	if o == nil || isNil(o.Value) {
+	if o == nil || o.Value == nil {
 		var ret string
 		return ret
 	}
@@ -82,15 +82,15 @@ func (o *FleetshardParameter) GetValue() string {
 // GetValueOk returns a tuple with the Value field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *FleetshardParameter) GetValueOk() (*string, bool) {
-	if o == nil || isNil(o.Value) {
-    return nil, false
+	if o == nil || o.Value == nil {
+		return nil, false
 	}
 	return o.Value, true
 }
 
 // HasValue returns a boolean if a field has been set.
 func (o *FleetshardParameter) HasValue() bool {
-	if o != nil && !isNil(o.Value) {
+	if o != nil && o.Value != nil {
 		return true
 	}
 
@@ -104,10 +104,10 @@ func (o *FleetshardParameter) SetValue(v string) {
 
 func (o FleetshardParameter) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.Value) {
+	if o.Value != nil {
 		toSerialize["value"] = o.Value
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/model_instant_query.go b/app-services-sdk-go/kafkamgmt/apiv1/client/model_instant_query.go
index 8e159cee..7f5ba5c2 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/model_instant_query.go
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/model_instant_query.go
@@ -1,11 +1,11 @@
 /*
-Kafka Management API
-
-Kafka Management API is a REST API to manage Kafka instances
-
-API version: 1.14.0
-Contact: rhosak-support@redhat.com
-*/
+ * Kafka Management API
+ *
+ * Kafka Management API is a REST API to manage Kafka instances
+ *
+ * API version: 1.14.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -42,7 +42,7 @@ func NewInstantQueryWithDefaults() *InstantQuery {
 
 // GetMetric returns the Metric field value if set, zero value otherwise.
 func (o *InstantQuery) GetMetric() map[string]string {
-	if o == nil || isNil(o.Metric) {
+	if o == nil || o.Metric == nil {
 		var ret map[string]string
 		return ret
 	}
@@ -52,15 +52,15 @@ func (o *InstantQuery) GetMetric() map[string]string {
 // GetMetricOk returns a tuple with the Metric field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *InstantQuery) GetMetricOk() (*map[string]string, bool) {
-	if o == nil || isNil(o.Metric) {
-    return nil, false
+	if o == nil || o.Metric == nil {
+		return nil, false
 	}
 	return o.Metric, true
 }
 
 // HasMetric returns a boolean if a field has been set.
 func (o *InstantQuery) HasMetric() bool {
-	if o != nil && !isNil(o.Metric) {
+	if o != nil && o.Metric != nil {
 		return true
 	}
 
@@ -74,7 +74,7 @@ func (o *InstantQuery) SetMetric(v map[string]string) {
 
 // GetTimestamp returns the Timestamp field value if set, zero value otherwise.
 func (o *InstantQuery) GetTimestamp() int64 {
-	if o == nil || isNil(o.Timestamp) {
+	if o == nil || o.Timestamp == nil {
 		var ret int64
 		return ret
 	}
@@ -84,15 +84,15 @@ func (o *InstantQuery) GetTimestamp() int64 {
 // GetTimestampOk returns a tuple with the Timestamp field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *InstantQuery) GetTimestampOk() (*int64, bool) {
-	if o == nil || isNil(o.Timestamp) {
-    return nil, false
+	if o == nil || o.Timestamp == nil {
+		return nil, false
 	}
 	return o.Timestamp, true
 }
 
 // HasTimestamp returns a boolean if a field has been set.
 func (o *InstantQuery) HasTimestamp() bool {
-	if o != nil && !isNil(o.Timestamp) {
+	if o != nil && o.Timestamp != nil {
 		return true
 	}
 
@@ -117,8 +117,8 @@ func (o *InstantQuery) GetValue() float64 {
 // GetValueOk returns a tuple with the Value field value
 // and a boolean to check if the value has been set.
 func (o *InstantQuery) GetValueOk() (*float64, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Value, true
 }
@@ -130,10 +130,10 @@ func (o *InstantQuery) SetValue(v float64) {
 
 func (o InstantQuery) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Metric) {
+	if o.Metric != nil {
 		toSerialize["metric"] = o.Metric
 	}
-	if !isNil(o.Timestamp) {
+	if o.Timestamp != nil {
 		toSerialize["timestamp"] = o.Timestamp
 	}
 	if true {
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/model_kafka_request.go b/app-services-sdk-go/kafkamgmt/apiv1/client/model_kafka_request.go
index 1921fd01..733da909 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/model_kafka_request.go
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/model_kafka_request.go
@@ -1,11 +1,11 @@
 /*
-Kafka Management API
-
-Kafka Management API is a REST API to manage Kafka instances
-
-API version: 1.14.0
-Contact: rhosak-support@redhat.com
-*/
+ * Kafka Management API
+ *
+ * Kafka Management API is a REST API to manage Kafka instances
+ *
+ * API version: 1.14.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -13,6 +13,7 @@ package kafkamgmtclient
 
 import (
 	"encoding/json"
+	"time"
 )
 
 // KafkaRequest struct for KafkaRequest
@@ -39,32 +40,24 @@ type KafkaRequest struct {
 	Version *string `json:"version,omitempty"`
 	InstanceType *string `json:"instance_type,omitempty"`
 	// This field is now deprecated, please use the /api/kafkas_mgmt/v1/instance_types/{cloud_provider}/{cloud_region} endpoint to retrieve the field instead.
-	// Deprecated
 	InstanceTypeName *string `json:"instance_type_name,omitempty"`
 	ReauthenticationEnabled bool `json:"reauthentication_enabled"`
 	// Maximum data storage available to this Kafka. This is now deprecated, please use max_data_retention_size instead.
-	// Deprecated
 	KafkaStorageSize *string `json:"kafka_storage_size,omitempty"`
 	MaxDataRetentionSize *SupportedKafkaSizeBytesValueItem `json:"max_data_retention_size,omitempty"`
 	BrowserUrl *string `json:"browser_url,omitempty"`
 	SizeId *string `json:"size_id,omitempty"`
 	// This field is now deprecated, please use the /api/kafkas_mgmt/v1/instance_types/{cloud_provider}/{cloud_region} endpoint to retrieve the field instead.
-	// Deprecated
 	IngressThroughputPerSec *string `json:"ingress_throughput_per_sec,omitempty"`
 	// This field is now deprecated, please use the /api/kafkas_mgmt/v1/instance_types/{cloud_provider}/{cloud_region} endpoint to retrieve the field instead.
-	// Deprecated
 	EgressThroughputPerSec *string `json:"egress_throughput_per_sec,omitempty"`
 	// This field is now deprecated, please use the /api/kafkas_mgmt/v1/instance_types/{cloud_provider}/{cloud_region} endpoint to retrieve the field instead.
-	// Deprecated
 	TotalMaxConnections *int32 `json:"total_max_connections,omitempty"`
 	// This field is now deprecated, please use the /api/kafkas_mgmt/v1/instance_types/{cloud_provider}/{cloud_region} endpoint to retrieve the field instead.
-	// Deprecated
 	MaxPartitions *int32 `json:"max_partitions,omitempty"`
 	// This field is now deprecated, please use the /api/kafkas_mgmt/v1/instance_types/{cloud_provider}/{cloud_region} endpoint to retrieve the field instead.
-	// Deprecated
 	MaxDataRetentionPeriod *string `json:"max_data_retention_period,omitempty"`
 	// This field is now deprecated, please use the /api/kafkas_mgmt/v1/instance_types/{cloud_provider}/{cloud_region} endpoint to retrieve the field instead.
-	// Deprecated
 	MaxConnectionAttemptsPerSec *int32 `json:"max_connection_attempts_per_sec,omitempty"`
 	BillingCloudAccountId *string `json:"billing_cloud_account_id,omitempty"`
 	Marketplace *string `json:"marketplace,omitempty"`
@@ -106,8 +99,8 @@ func (o *KafkaRequest) GetId() string {
 // GetIdOk returns a tuple with the Id field value
 // and a boolean to check if the value has been set.
 func (o *KafkaRequest) GetIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Id, true
 }
@@ -130,8 +123,8 @@ func (o *KafkaRequest) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *KafkaRequest) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -154,8 +147,8 @@ func (o *KafkaRequest) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value
 // and a boolean to check if the value has been set.
 func (o *KafkaRequest) GetHrefOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Href, true
 }
@@ -167,7 +160,7 @@ func (o *KafkaRequest) SetHref(v string) {
 
 // GetStatus returns the Status field value if set, zero value otherwise.
 func (o *KafkaRequest) GetStatus() string {
-	if o == nil || isNil(o.Status) {
+	if o == nil || o.Status == nil {
 		var ret string
 		return ret
 	}
@@ -177,15 +170,15 @@ func (o *KafkaRequest) GetStatus() string {
 // GetStatusOk returns a tuple with the Status field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *KafkaRequest) GetStatusOk() (*string, bool) {
-	if o == nil || isNil(o.Status) {
-    return nil, false
+	if o == nil || o.Status == nil {
+		return nil, false
 	}
 	return o.Status, true
 }
 
 // HasStatus returns a boolean if a field has been set.
 func (o *KafkaRequest) HasStatus() bool {
-	if o != nil && !isNil(o.Status) {
+	if o != nil && o.Status != nil {
 		return true
 	}
 
@@ -199,7 +192,7 @@ func (o *KafkaRequest) SetStatus(v string) {
 
 // GetCloudProvider returns the CloudProvider field value if set, zero value otherwise.
 func (o *KafkaRequest) GetCloudProvider() string {
-	if o == nil || isNil(o.CloudProvider) {
+	if o == nil || o.CloudProvider == nil {
 		var ret string
 		return ret
 	}
@@ -209,15 +202,15 @@ func (o *KafkaRequest) GetCloudProvider() string {
 // GetCloudProviderOk returns a tuple with the CloudProvider field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *KafkaRequest) GetCloudProviderOk() (*string, bool) {
-	if o == nil || isNil(o.CloudProvider) {
-    return nil, false
+	if o == nil || o.CloudProvider == nil {
+		return nil, false
 	}
 	return o.CloudProvider, true
 }
 
 // HasCloudProvider returns a boolean if a field has been set.
 func (o *KafkaRequest) HasCloudProvider() bool {
-	if o != nil && !isNil(o.CloudProvider) {
+	if o != nil && o.CloudProvider != nil {
 		return true
 	}
 
@@ -242,8 +235,8 @@ func (o *KafkaRequest) GetMultiAz() bool {
 // GetMultiAzOk returns a tuple with the MultiAz field value
 // and a boolean to check if the value has been set.
 func (o *KafkaRequest) GetMultiAzOk() (*bool, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.MultiAz, true
 }
@@ -255,7 +248,7 @@ func (o *KafkaRequest) SetMultiAz(v bool) {
 
 // GetRegion returns the Region field value if set, zero value otherwise.
 func (o *KafkaRequest) GetRegion() string {
-	if o == nil || isNil(o.Region) {
+	if o == nil || o.Region == nil {
 		var ret string
 		return ret
 	}
@@ -265,15 +258,15 @@ func (o *KafkaRequest) GetRegion() string {
 // GetRegionOk returns a tuple with the Region field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *KafkaRequest) GetRegionOk() (*string, bool) {
-	if o == nil || isNil(o.Region) {
-    return nil, false
+	if o == nil || o.Region == nil {
+		return nil, false
 	}
 	return o.Region, true
 }
 
 // HasRegion returns a boolean if a field has been set.
 func (o *KafkaRequest) HasRegion() bool {
-	if o != nil && !isNil(o.Region) {
+	if o != nil && o.Region != nil {
 		return true
 	}
 
@@ -287,7 +280,7 @@ func (o *KafkaRequest) SetRegion(v string) {
 
 // GetOwner returns the Owner field value if set, zero value otherwise.
 func (o *KafkaRequest) GetOwner() string {
-	if o == nil || isNil(o.Owner) {
+	if o == nil || o.Owner == nil {
 		var ret string
 		return ret
 	}
@@ -297,15 +290,15 @@ func (o *KafkaRequest) GetOwner() string {
 // GetOwnerOk returns a tuple with the Owner field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *KafkaRequest) GetOwnerOk() (*string, bool) {
-	if o == nil || isNil(o.Owner) {
-    return nil, false
+	if o == nil || o.Owner == nil {
+		return nil, false
 	}
 	return o.Owner, true
 }
 
 // HasOwner returns a boolean if a field has been set.
 func (o *KafkaRequest) HasOwner() bool {
-	if o != nil && !isNil(o.Owner) {
+	if o != nil && o.Owner != nil {
 		return true
 	}
 
@@ -319,7 +312,7 @@ func (o *KafkaRequest) SetOwner(v string) {
 
 // GetName returns the Name field value if set, zero value otherwise.
 func (o *KafkaRequest) GetName() string {
-	if o == nil || isNil(o.Name) {
+	if o == nil || o.Name == nil {
 		var ret string
 		return ret
 	}
@@ -329,15 +322,15 @@ func (o *KafkaRequest) GetName() string {
 // GetNameOk returns a tuple with the Name field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *KafkaRequest) GetNameOk() (*string, bool) {
-	if o == nil || isNil(o.Name) {
-    return nil, false
+	if o == nil || o.Name == nil {
+		return nil, false
 	}
 	return o.Name, true
 }
 
 // HasName returns a boolean if a field has been set.
 func (o *KafkaRequest) HasName() bool {
-	if o != nil && !isNil(o.Name) {
+	if o != nil && o.Name != nil {
 		return true
 	}
 
@@ -351,7 +344,7 @@ func (o *KafkaRequest) SetName(v string) {
 
 // GetBootstrapServerHost returns the BootstrapServerHost field value if set, zero value otherwise.
 func (o *KafkaRequest) GetBootstrapServerHost() string {
-	if o == nil || isNil(o.BootstrapServerHost) {
+	if o == nil || o.BootstrapServerHost == nil {
 		var ret string
 		return ret
 	}
@@ -361,15 +354,15 @@ func (o *KafkaRequest) GetBootstrapServerHost() string {
 // GetBootstrapServerHostOk returns a tuple with the BootstrapServerHost field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *KafkaRequest) GetBootstrapServerHostOk() (*string, bool) {
-	if o == nil || isNil(o.BootstrapServerHost) {
-    return nil, false
+	if o == nil || o.BootstrapServerHost == nil {
+		return nil, false
 	}
 	return o.BootstrapServerHost, true
 }
 
 // HasBootstrapServerHost returns a boolean if a field has been set.
 func (o *KafkaRequest) HasBootstrapServerHost() bool {
-	if o != nil && !isNil(o.BootstrapServerHost) {
+	if o != nil && o.BootstrapServerHost != nil {
 		return true
 	}
 
@@ -383,7 +376,7 @@ func (o *KafkaRequest) SetBootstrapServerHost(v string) {
 
 // GetAdminApiServerUrl returns the AdminApiServerUrl field value if set, zero value otherwise.
 func (o *KafkaRequest) GetAdminApiServerUrl() string {
-	if o == nil || isNil(o.AdminApiServerUrl) {
+	if o == nil || o.AdminApiServerUrl == nil {
 		var ret string
 		return ret
 	}
@@ -393,15 +386,15 @@ func (o *KafkaRequest) GetAdminApiServerUrl() string {
 // GetAdminApiServerUrlOk returns a tuple with the AdminApiServerUrl field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *KafkaRequest) GetAdminApiServerUrlOk() (*string, bool) {
-	if o == nil || isNil(o.AdminApiServerUrl) {
-    return nil, false
+	if o == nil || o.AdminApiServerUrl == nil {
+		return nil, false
 	}
 	return o.AdminApiServerUrl, true
 }
 
 // HasAdminApiServerUrl returns a boolean if a field has been set.
 func (o *KafkaRequest) HasAdminApiServerUrl() bool {
-	if o != nil && !isNil(o.AdminApiServerUrl) {
+	if o != nil && o.AdminApiServerUrl != nil {
 		return true
 	}
 
@@ -415,7 +408,7 @@ func (o *KafkaRequest) SetAdminApiServerUrl(v string) {
 
 // GetCreatedAt returns the CreatedAt field value if set, zero value otherwise.
 func (o *KafkaRequest) GetCreatedAt() time.Time {
-	if o == nil || isNil(o.CreatedAt) {
+	if o == nil || o.CreatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -425,15 +418,15 @@ func (o *KafkaRequest) GetCreatedAt() time.Time {
 // GetCreatedAtOk returns a tuple with the CreatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *KafkaRequest) GetCreatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.CreatedAt) {
-    return nil, false
+	if o == nil || o.CreatedAt == nil {
+		return nil, false
 	}
 	return o.CreatedAt, true
 }
 
 // HasCreatedAt returns a boolean if a field has been set.
 func (o *KafkaRequest) HasCreatedAt() bool {
-	if o != nil && !isNil(o.CreatedAt) {
+	if o != nil && o.CreatedAt != nil {
 		return true
 	}
 
@@ -447,7 +440,7 @@ func (o *KafkaRequest) SetCreatedAt(v time.Time) {
 
 // GetExpiresAt returns the ExpiresAt field value if set, zero value otherwise (both if not set or set to explicit null).
 func (o *KafkaRequest) GetExpiresAt() time.Time {
-	if o == nil || isNil(o.ExpiresAt.Get()) {
+	if o == nil || o.ExpiresAt.Get() == nil {
 		var ret time.Time
 		return ret
 	}
@@ -458,8 +451,8 @@ func (o *KafkaRequest) GetExpiresAt() time.Time {
 // and a boolean to check if the value has been set.
 // NOTE: If the value is an explicit nil, `nil, true` will be returned
 func (o *KafkaRequest) GetExpiresAtOk() (*time.Time, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return o.ExpiresAt.Get(), o.ExpiresAt.IsSet()
 }
@@ -489,7 +482,7 @@ func (o *KafkaRequest) UnsetExpiresAt() {
 
 // GetUpdatedAt returns the UpdatedAt field value if set, zero value otherwise.
 func (o *KafkaRequest) GetUpdatedAt() time.Time {
-	if o == nil || isNil(o.UpdatedAt) {
+	if o == nil || o.UpdatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -499,15 +492,15 @@ func (o *KafkaRequest) GetUpdatedAt() time.Time {
 // GetUpdatedAtOk returns a tuple with the UpdatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *KafkaRequest) GetUpdatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.UpdatedAt) {
-    return nil, false
+	if o == nil || o.UpdatedAt == nil {
+		return nil, false
 	}
 	return o.UpdatedAt, true
 }
 
 // HasUpdatedAt returns a boolean if a field has been set.
 func (o *KafkaRequest) HasUpdatedAt() bool {
-	if o != nil && !isNil(o.UpdatedAt) {
+	if o != nil && o.UpdatedAt != nil {
 		return true
 	}
 
@@ -521,7 +514,7 @@ func (o *KafkaRequest) SetUpdatedAt(v time.Time) {
 
 // GetFailedReason returns the FailedReason field value if set, zero value otherwise.
 func (o *KafkaRequest) GetFailedReason() string {
-	if o == nil || isNil(o.FailedReason) {
+	if o == nil || o.FailedReason == nil {
 		var ret string
 		return ret
 	}
@@ -531,15 +524,15 @@ func (o *KafkaRequest) GetFailedReason() string {
 // GetFailedReasonOk returns a tuple with the FailedReason field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *KafkaRequest) GetFailedReasonOk() (*string, bool) {
-	if o == nil || isNil(o.FailedReason) {
-    return nil, false
+	if o == nil || o.FailedReason == nil {
+		return nil, false
 	}
 	return o.FailedReason, true
 }
 
 // HasFailedReason returns a boolean if a field has been set.
 func (o *KafkaRequest) HasFailedReason() bool {
-	if o != nil && !isNil(o.FailedReason) {
+	if o != nil && o.FailedReason != nil {
 		return true
 	}
 
@@ -553,7 +546,7 @@ func (o *KafkaRequest) SetFailedReason(v string) {
 
 // GetVersion returns the Version field value if set, zero value otherwise.
 func (o *KafkaRequest) GetVersion() string {
-	if o == nil || isNil(o.Version) {
+	if o == nil || o.Version == nil {
 		var ret string
 		return ret
 	}
@@ -563,15 +556,15 @@ func (o *KafkaRequest) GetVersion() string {
 // GetVersionOk returns a tuple with the Version field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *KafkaRequest) GetVersionOk() (*string, bool) {
-	if o == nil || isNil(o.Version) {
-    return nil, false
+	if o == nil || o.Version == nil {
+		return nil, false
 	}
 	return o.Version, true
 }
 
 // HasVersion returns a boolean if a field has been set.
 func (o *KafkaRequest) HasVersion() bool {
-	if o != nil && !isNil(o.Version) {
+	if o != nil && o.Version != nil {
 		return true
 	}
 
@@ -585,7 +578,7 @@ func (o *KafkaRequest) SetVersion(v string) {
 
 // GetInstanceType returns the InstanceType field value if set, zero value otherwise.
 func (o *KafkaRequest) GetInstanceType() string {
-	if o == nil || isNil(o.InstanceType) {
+	if o == nil || o.InstanceType == nil {
 		var ret string
 		return ret
 	}
@@ -595,15 +588,15 @@ func (o *KafkaRequest) GetInstanceType() string {
 // GetInstanceTypeOk returns a tuple with the InstanceType field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *KafkaRequest) GetInstanceTypeOk() (*string, bool) {
-	if o == nil || isNil(o.InstanceType) {
-    return nil, false
+	if o == nil || o.InstanceType == nil {
+		return nil, false
 	}
 	return o.InstanceType, true
 }
 
 // HasInstanceType returns a boolean if a field has been set.
 func (o *KafkaRequest) HasInstanceType() bool {
-	if o != nil && !isNil(o.InstanceType) {
+	if o != nil && o.InstanceType != nil {
 		return true
 	}
 
@@ -616,9 +609,8 @@ func (o *KafkaRequest) SetInstanceType(v string) {
 }
 
 // GetInstanceTypeName returns the InstanceTypeName field value if set, zero value otherwise.
-// Deprecated
 func (o *KafkaRequest) GetInstanceTypeName() string {
-	if o == nil || isNil(o.InstanceTypeName) {
+	if o == nil || o.InstanceTypeName == nil {
 		var ret string
 		return ret
 	}
@@ -627,17 +619,16 @@ func (o *KafkaRequest) GetInstanceTypeName() string {
 
 // GetInstanceTypeNameOk returns a tuple with the InstanceTypeName field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-// Deprecated
 func (o *KafkaRequest) GetInstanceTypeNameOk() (*string, bool) {
-	if o == nil || isNil(o.InstanceTypeName) {
-    return nil, false
+	if o == nil || o.InstanceTypeName == nil {
+		return nil, false
 	}
 	return o.InstanceTypeName, true
 }
 
 // HasInstanceTypeName returns a boolean if a field has been set.
 func (o *KafkaRequest) HasInstanceTypeName() bool {
-	if o != nil && !isNil(o.InstanceTypeName) {
+	if o != nil && o.InstanceTypeName != nil {
 		return true
 	}
 
@@ -645,7 +636,6 @@ func (o *KafkaRequest) HasInstanceTypeName() bool {
 }
 
 // SetInstanceTypeName gets a reference to the given string and assigns it to the InstanceTypeName field.
-// Deprecated
 func (o *KafkaRequest) SetInstanceTypeName(v string) {
 	o.InstanceTypeName = &v
 }
@@ -663,8 +653,8 @@ func (o *KafkaRequest) GetReauthenticationEnabled() bool {
 // GetReauthenticationEnabledOk returns a tuple with the ReauthenticationEnabled field value
 // and a boolean to check if the value has been set.
 func (o *KafkaRequest) GetReauthenticationEnabledOk() (*bool, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.ReauthenticationEnabled, true
 }
@@ -675,9 +665,8 @@ func (o *KafkaRequest) SetReauthenticationEnabled(v bool) {
 }
 
 // GetKafkaStorageSize returns the KafkaStorageSize field value if set, zero value otherwise.
-// Deprecated
 func (o *KafkaRequest) GetKafkaStorageSize() string {
-	if o == nil || isNil(o.KafkaStorageSize) {
+	if o == nil || o.KafkaStorageSize == nil {
 		var ret string
 		return ret
 	}
@@ -686,17 +675,16 @@ func (o *KafkaRequest) GetKafkaStorageSize() string {
 
 // GetKafkaStorageSizeOk returns a tuple with the KafkaStorageSize field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-// Deprecated
 func (o *KafkaRequest) GetKafkaStorageSizeOk() (*string, bool) {
-	if o == nil || isNil(o.KafkaStorageSize) {
-    return nil, false
+	if o == nil || o.KafkaStorageSize == nil {
+		return nil, false
 	}
 	return o.KafkaStorageSize, true
 }
 
 // HasKafkaStorageSize returns a boolean if a field has been set.
 func (o *KafkaRequest) HasKafkaStorageSize() bool {
-	if o != nil && !isNil(o.KafkaStorageSize) {
+	if o != nil && o.KafkaStorageSize != nil {
 		return true
 	}
 
@@ -704,14 +692,13 @@ func (o *KafkaRequest) HasKafkaStorageSize() bool {
 }
 
 // SetKafkaStorageSize gets a reference to the given string and assigns it to the KafkaStorageSize field.
-// Deprecated
 func (o *KafkaRequest) SetKafkaStorageSize(v string) {
 	o.KafkaStorageSize = &v
 }
 
 // GetMaxDataRetentionSize returns the MaxDataRetentionSize field value if set, zero value otherwise.
 func (o *KafkaRequest) GetMaxDataRetentionSize() SupportedKafkaSizeBytesValueItem {
-	if o == nil || isNil(o.MaxDataRetentionSize) {
+	if o == nil || o.MaxDataRetentionSize == nil {
 		var ret SupportedKafkaSizeBytesValueItem
 		return ret
 	}
@@ -721,15 +708,15 @@ func (o *KafkaRequest) GetMaxDataRetentionSize() SupportedKafkaSizeBytesValueIte
 // GetMaxDataRetentionSizeOk returns a tuple with the MaxDataRetentionSize field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *KafkaRequest) GetMaxDataRetentionSizeOk() (*SupportedKafkaSizeBytesValueItem, bool) {
-	if o == nil || isNil(o.MaxDataRetentionSize) {
-    return nil, false
+	if o == nil || o.MaxDataRetentionSize == nil {
+		return nil, false
 	}
 	return o.MaxDataRetentionSize, true
 }
 
 // HasMaxDataRetentionSize returns a boolean if a field has been set.
 func (o *KafkaRequest) HasMaxDataRetentionSize() bool {
-	if o != nil && !isNil(o.MaxDataRetentionSize) {
+	if o != nil && o.MaxDataRetentionSize != nil {
 		return true
 	}
 
@@ -743,7 +730,7 @@ func (o *KafkaRequest) SetMaxDataRetentionSize(v SupportedKafkaSizeBytesValueIte
 
 // GetBrowserUrl returns the BrowserUrl field value if set, zero value otherwise.
 func (o *KafkaRequest) GetBrowserUrl() string {
-	if o == nil || isNil(o.BrowserUrl) {
+	if o == nil || o.BrowserUrl == nil {
 		var ret string
 		return ret
 	}
@@ -753,15 +740,15 @@ func (o *KafkaRequest) GetBrowserUrl() string {
 // GetBrowserUrlOk returns a tuple with the BrowserUrl field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *KafkaRequest) GetBrowserUrlOk() (*string, bool) {
-	if o == nil || isNil(o.BrowserUrl) {
-    return nil, false
+	if o == nil || o.BrowserUrl == nil {
+		return nil, false
 	}
 	return o.BrowserUrl, true
 }
 
 // HasBrowserUrl returns a boolean if a field has been set.
 func (o *KafkaRequest) HasBrowserUrl() bool {
-	if o != nil && !isNil(o.BrowserUrl) {
+	if o != nil && o.BrowserUrl != nil {
 		return true
 	}
 
@@ -775,7 +762,7 @@ func (o *KafkaRequest) SetBrowserUrl(v string) {
 
 // GetSizeId returns the SizeId field value if set, zero value otherwise.
 func (o *KafkaRequest) GetSizeId() string {
-	if o == nil || isNil(o.SizeId) {
+	if o == nil || o.SizeId == nil {
 		var ret string
 		return ret
 	}
@@ -785,15 +772,15 @@ func (o *KafkaRequest) GetSizeId() string {
 // GetSizeIdOk returns a tuple with the SizeId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *KafkaRequest) GetSizeIdOk() (*string, bool) {
-	if o == nil || isNil(o.SizeId) {
-    return nil, false
+	if o == nil || o.SizeId == nil {
+		return nil, false
 	}
 	return o.SizeId, true
 }
 
 // HasSizeId returns a boolean if a field has been set.
 func (o *KafkaRequest) HasSizeId() bool {
-	if o != nil && !isNil(o.SizeId) {
+	if o != nil && o.SizeId != nil {
 		return true
 	}
 
@@ -806,9 +793,8 @@ func (o *KafkaRequest) SetSizeId(v string) {
 }
 
 // GetIngressThroughputPerSec returns the IngressThroughputPerSec field value if set, zero value otherwise.
-// Deprecated
 func (o *KafkaRequest) GetIngressThroughputPerSec() string {
-	if o == nil || isNil(o.IngressThroughputPerSec) {
+	if o == nil || o.IngressThroughputPerSec == nil {
 		var ret string
 		return ret
 	}
@@ -817,17 +803,16 @@ func (o *KafkaRequest) GetIngressThroughputPerSec() string {
 
 // GetIngressThroughputPerSecOk returns a tuple with the IngressThroughputPerSec field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-// Deprecated
 func (o *KafkaRequest) GetIngressThroughputPerSecOk() (*string, bool) {
-	if o == nil || isNil(o.IngressThroughputPerSec) {
-    return nil, false
+	if o == nil || o.IngressThroughputPerSec == nil {
+		return nil, false
 	}
 	return o.IngressThroughputPerSec, true
 }
 
 // HasIngressThroughputPerSec returns a boolean if a field has been set.
 func (o *KafkaRequest) HasIngressThroughputPerSec() bool {
-	if o != nil && !isNil(o.IngressThroughputPerSec) {
+	if o != nil && o.IngressThroughputPerSec != nil {
 		return true
 	}
 
@@ -835,15 +820,13 @@ func (o *KafkaRequest) HasIngressThroughputPerSec() bool {
 }
 
 // SetIngressThroughputPerSec gets a reference to the given string and assigns it to the IngressThroughputPerSec field.
-// Deprecated
 func (o *KafkaRequest) SetIngressThroughputPerSec(v string) {
 	o.IngressThroughputPerSec = &v
 }
 
 // GetEgressThroughputPerSec returns the EgressThroughputPerSec field value if set, zero value otherwise.
-// Deprecated
 func (o *KafkaRequest) GetEgressThroughputPerSec() string {
-	if o == nil || isNil(o.EgressThroughputPerSec) {
+	if o == nil || o.EgressThroughputPerSec == nil {
 		var ret string
 		return ret
 	}
@@ -852,17 +835,16 @@ func (o *KafkaRequest) GetEgressThroughputPerSec() string {
 
 // GetEgressThroughputPerSecOk returns a tuple with the EgressThroughputPerSec field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-// Deprecated
 func (o *KafkaRequest) GetEgressThroughputPerSecOk() (*string, bool) {
-	if o == nil || isNil(o.EgressThroughputPerSec) {
-    return nil, false
+	if o == nil || o.EgressThroughputPerSec == nil {
+		return nil, false
 	}
 	return o.EgressThroughputPerSec, true
 }
 
 // HasEgressThroughputPerSec returns a boolean if a field has been set.
 func (o *KafkaRequest) HasEgressThroughputPerSec() bool {
-	if o != nil && !isNil(o.EgressThroughputPerSec) {
+	if o != nil && o.EgressThroughputPerSec != nil {
 		return true
 	}
 
@@ -870,15 +852,13 @@ func (o *KafkaRequest) HasEgressThroughputPerSec() bool {
 }
 
 // SetEgressThroughputPerSec gets a reference to the given string and assigns it to the EgressThroughputPerSec field.
-// Deprecated
 func (o *KafkaRequest) SetEgressThroughputPerSec(v string) {
 	o.EgressThroughputPerSec = &v
 }
 
 // GetTotalMaxConnections returns the TotalMaxConnections field value if set, zero value otherwise.
-// Deprecated
 func (o *KafkaRequest) GetTotalMaxConnections() int32 {
-	if o == nil || isNil(o.TotalMaxConnections) {
+	if o == nil || o.TotalMaxConnections == nil {
 		var ret int32
 		return ret
 	}
@@ -887,17 +867,16 @@ func (o *KafkaRequest) GetTotalMaxConnections() int32 {
 
 // GetTotalMaxConnectionsOk returns a tuple with the TotalMaxConnections field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-// Deprecated
 func (o *KafkaRequest) GetTotalMaxConnectionsOk() (*int32, bool) {
-	if o == nil || isNil(o.TotalMaxConnections) {
-    return nil, false
+	if o == nil || o.TotalMaxConnections == nil {
+		return nil, false
 	}
 	return o.TotalMaxConnections, true
 }
 
 // HasTotalMaxConnections returns a boolean if a field has been set.
 func (o *KafkaRequest) HasTotalMaxConnections() bool {
-	if o != nil && !isNil(o.TotalMaxConnections) {
+	if o != nil && o.TotalMaxConnections != nil {
 		return true
 	}
 
@@ -905,15 +884,13 @@ func (o *KafkaRequest) HasTotalMaxConnections() bool {
 }
 
 // SetTotalMaxConnections gets a reference to the given int32 and assigns it to the TotalMaxConnections field.
-// Deprecated
 func (o *KafkaRequest) SetTotalMaxConnections(v int32) {
 	o.TotalMaxConnections = &v
 }
 
 // GetMaxPartitions returns the MaxPartitions field value if set, zero value otherwise.
-// Deprecated
 func (o *KafkaRequest) GetMaxPartitions() int32 {
-	if o == nil || isNil(o.MaxPartitions) {
+	if o == nil || o.MaxPartitions == nil {
 		var ret int32
 		return ret
 	}
@@ -922,17 +899,16 @@ func (o *KafkaRequest) GetMaxPartitions() int32 {
 
 // GetMaxPartitionsOk returns a tuple with the MaxPartitions field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-// Deprecated
 func (o *KafkaRequest) GetMaxPartitionsOk() (*int32, bool) {
-	if o == nil || isNil(o.MaxPartitions) {
-    return nil, false
+	if o == nil || o.MaxPartitions == nil {
+		return nil, false
 	}
 	return o.MaxPartitions, true
 }
 
 // HasMaxPartitions returns a boolean if a field has been set.
 func (o *KafkaRequest) HasMaxPartitions() bool {
-	if o != nil && !isNil(o.MaxPartitions) {
+	if o != nil && o.MaxPartitions != nil {
 		return true
 	}
 
@@ -940,15 +916,13 @@ func (o *KafkaRequest) HasMaxPartitions() bool {
 }
 
 // SetMaxPartitions gets a reference to the given int32 and assigns it to the MaxPartitions field.
-// Deprecated
 func (o *KafkaRequest) SetMaxPartitions(v int32) {
 	o.MaxPartitions = &v
 }
 
 // GetMaxDataRetentionPeriod returns the MaxDataRetentionPeriod field value if set, zero value otherwise.
-// Deprecated
 func (o *KafkaRequest) GetMaxDataRetentionPeriod() string {
-	if o == nil || isNil(o.MaxDataRetentionPeriod) {
+	if o == nil || o.MaxDataRetentionPeriod == nil {
 		var ret string
 		return ret
 	}
@@ -957,17 +931,16 @@ func (o *KafkaRequest) GetMaxDataRetentionPeriod() string {
 
 // GetMaxDataRetentionPeriodOk returns a tuple with the MaxDataRetentionPeriod field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-// Deprecated
 func (o *KafkaRequest) GetMaxDataRetentionPeriodOk() (*string, bool) {
-	if o == nil || isNil(o.MaxDataRetentionPeriod) {
-    return nil, false
+	if o == nil || o.MaxDataRetentionPeriod == nil {
+		return nil, false
 	}
 	return o.MaxDataRetentionPeriod, true
 }
 
 // HasMaxDataRetentionPeriod returns a boolean if a field has been set.
 func (o *KafkaRequest) HasMaxDataRetentionPeriod() bool {
-	if o != nil && !isNil(o.MaxDataRetentionPeriod) {
+	if o != nil && o.MaxDataRetentionPeriod != nil {
 		return true
 	}
 
@@ -975,15 +948,13 @@ func (o *KafkaRequest) HasMaxDataRetentionPeriod() bool {
 }
 
 // SetMaxDataRetentionPeriod gets a reference to the given string and assigns it to the MaxDataRetentionPeriod field.
-// Deprecated
 func (o *KafkaRequest) SetMaxDataRetentionPeriod(v string) {
 	o.MaxDataRetentionPeriod = &v
 }
 
 // GetMaxConnectionAttemptsPerSec returns the MaxConnectionAttemptsPerSec field value if set, zero value otherwise.
-// Deprecated
 func (o *KafkaRequest) GetMaxConnectionAttemptsPerSec() int32 {
-	if o == nil || isNil(o.MaxConnectionAttemptsPerSec) {
+	if o == nil || o.MaxConnectionAttemptsPerSec == nil {
 		var ret int32
 		return ret
 	}
@@ -992,17 +963,16 @@ func (o *KafkaRequest) GetMaxConnectionAttemptsPerSec() int32 {
 
 // GetMaxConnectionAttemptsPerSecOk returns a tuple with the MaxConnectionAttemptsPerSec field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-// Deprecated
 func (o *KafkaRequest) GetMaxConnectionAttemptsPerSecOk() (*int32, bool) {
-	if o == nil || isNil(o.MaxConnectionAttemptsPerSec) {
-    return nil, false
+	if o == nil || o.MaxConnectionAttemptsPerSec == nil {
+		return nil, false
 	}
 	return o.MaxConnectionAttemptsPerSec, true
 }
 
 // HasMaxConnectionAttemptsPerSec returns a boolean if a field has been set.
 func (o *KafkaRequest) HasMaxConnectionAttemptsPerSec() bool {
-	if o != nil && !isNil(o.MaxConnectionAttemptsPerSec) {
+	if o != nil && o.MaxConnectionAttemptsPerSec != nil {
 		return true
 	}
 
@@ -1010,14 +980,13 @@ func (o *KafkaRequest) HasMaxConnectionAttemptsPerSec() bool {
 }
 
 // SetMaxConnectionAttemptsPerSec gets a reference to the given int32 and assigns it to the MaxConnectionAttemptsPerSec field.
-// Deprecated
 func (o *KafkaRequest) SetMaxConnectionAttemptsPerSec(v int32) {
 	o.MaxConnectionAttemptsPerSec = &v
 }
 
 // GetBillingCloudAccountId returns the BillingCloudAccountId field value if set, zero value otherwise.
 func (o *KafkaRequest) GetBillingCloudAccountId() string {
-	if o == nil || isNil(o.BillingCloudAccountId) {
+	if o == nil || o.BillingCloudAccountId == nil {
 		var ret string
 		return ret
 	}
@@ -1027,15 +996,15 @@ func (o *KafkaRequest) GetBillingCloudAccountId() string {
 // GetBillingCloudAccountIdOk returns a tuple with the BillingCloudAccountId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *KafkaRequest) GetBillingCloudAccountIdOk() (*string, bool) {
-	if o == nil || isNil(o.BillingCloudAccountId) {
-    return nil, false
+	if o == nil || o.BillingCloudAccountId == nil {
+		return nil, false
 	}
 	return o.BillingCloudAccountId, true
 }
 
 // HasBillingCloudAccountId returns a boolean if a field has been set.
 func (o *KafkaRequest) HasBillingCloudAccountId() bool {
-	if o != nil && !isNil(o.BillingCloudAccountId) {
+	if o != nil && o.BillingCloudAccountId != nil {
 		return true
 	}
 
@@ -1049,7 +1018,7 @@ func (o *KafkaRequest) SetBillingCloudAccountId(v string) {
 
 // GetMarketplace returns the Marketplace field value if set, zero value otherwise.
 func (o *KafkaRequest) GetMarketplace() string {
-	if o == nil || isNil(o.Marketplace) {
+	if o == nil || o.Marketplace == nil {
 		var ret string
 		return ret
 	}
@@ -1059,15 +1028,15 @@ func (o *KafkaRequest) GetMarketplace() string {
 // GetMarketplaceOk returns a tuple with the Marketplace field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *KafkaRequest) GetMarketplaceOk() (*string, bool) {
-	if o == nil || isNil(o.Marketplace) {
-    return nil, false
+	if o == nil || o.Marketplace == nil {
+		return nil, false
 	}
 	return o.Marketplace, true
 }
 
 // HasMarketplace returns a boolean if a field has been set.
 func (o *KafkaRequest) HasMarketplace() bool {
-	if o != nil && !isNil(o.Marketplace) {
+	if o != nil && o.Marketplace != nil {
 		return true
 	}
 
@@ -1081,7 +1050,7 @@ func (o *KafkaRequest) SetMarketplace(v string) {
 
 // GetBillingModel returns the BillingModel field value if set, zero value otherwise.
 func (o *KafkaRequest) GetBillingModel() string {
-	if o == nil || isNil(o.BillingModel) {
+	if o == nil || o.BillingModel == nil {
 		var ret string
 		return ret
 	}
@@ -1091,15 +1060,15 @@ func (o *KafkaRequest) GetBillingModel() string {
 // GetBillingModelOk returns a tuple with the BillingModel field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *KafkaRequest) GetBillingModelOk() (*string, bool) {
-	if o == nil || isNil(o.BillingModel) {
-    return nil, false
+	if o == nil || o.BillingModel == nil {
+		return nil, false
 	}
 	return o.BillingModel, true
 }
 
 // HasBillingModel returns a boolean if a field has been set.
 func (o *KafkaRequest) HasBillingModel() bool {
-	if o != nil && !isNil(o.BillingModel) {
+	if o != nil && o.BillingModel != nil {
 		return true
 	}
 
@@ -1122,91 +1091,91 @@ func (o KafkaRequest) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["href"] = o.Href
 	}
-	if !isNil(o.Status) {
+	if o.Status != nil {
 		toSerialize["status"] = o.Status
 	}
-	if !isNil(o.CloudProvider) {
+	if o.CloudProvider != nil {
 		toSerialize["cloud_provider"] = o.CloudProvider
 	}
 	if true {
 		toSerialize["multi_az"] = o.MultiAz
 	}
-	if !isNil(o.Region) {
+	if o.Region != nil {
 		toSerialize["region"] = o.Region
 	}
-	if !isNil(o.Owner) {
+	if o.Owner != nil {
 		toSerialize["owner"] = o.Owner
 	}
-	if !isNil(o.Name) {
+	if o.Name != nil {
 		toSerialize["name"] = o.Name
 	}
-	if !isNil(o.BootstrapServerHost) {
+	if o.BootstrapServerHost != nil {
 		toSerialize["bootstrap_server_host"] = o.BootstrapServerHost
 	}
-	if !isNil(o.AdminApiServerUrl) {
+	if o.AdminApiServerUrl != nil {
 		toSerialize["admin_api_server_url"] = o.AdminApiServerUrl
 	}
-	if !isNil(o.CreatedAt) {
+	if o.CreatedAt != nil {
 		toSerialize["created_at"] = o.CreatedAt
 	}
 	if o.ExpiresAt.IsSet() {
 		toSerialize["expires_at"] = o.ExpiresAt.Get()
 	}
-	if !isNil(o.UpdatedAt) {
+	if o.UpdatedAt != nil {
 		toSerialize["updated_at"] = o.UpdatedAt
 	}
-	if !isNil(o.FailedReason) {
+	if o.FailedReason != nil {
 		toSerialize["failed_reason"] = o.FailedReason
 	}
-	if !isNil(o.Version) {
+	if o.Version != nil {
 		toSerialize["version"] = o.Version
 	}
-	if !isNil(o.InstanceType) {
+	if o.InstanceType != nil {
 		toSerialize["instance_type"] = o.InstanceType
 	}
-	if !isNil(o.InstanceTypeName) {
+	if o.InstanceTypeName != nil {
 		toSerialize["instance_type_name"] = o.InstanceTypeName
 	}
 	if true {
 		toSerialize["reauthentication_enabled"] = o.ReauthenticationEnabled
 	}
-	if !isNil(o.KafkaStorageSize) {
+	if o.KafkaStorageSize != nil {
 		toSerialize["kafka_storage_size"] = o.KafkaStorageSize
 	}
-	if !isNil(o.MaxDataRetentionSize) {
+	if o.MaxDataRetentionSize != nil {
 		toSerialize["max_data_retention_size"] = o.MaxDataRetentionSize
 	}
-	if !isNil(o.BrowserUrl) {
+	if o.BrowserUrl != nil {
 		toSerialize["browser_url"] = o.BrowserUrl
 	}
-	if !isNil(o.SizeId) {
+	if o.SizeId != nil {
 		toSerialize["size_id"] = o.SizeId
 	}
-	if !isNil(o.IngressThroughputPerSec) {
+	if o.IngressThroughputPerSec != nil {
 		toSerialize["ingress_throughput_per_sec"] = o.IngressThroughputPerSec
 	}
-	if !isNil(o.EgressThroughputPerSec) {
+	if o.EgressThroughputPerSec != nil {
 		toSerialize["egress_throughput_per_sec"] = o.EgressThroughputPerSec
 	}
-	if !isNil(o.TotalMaxConnections) {
+	if o.TotalMaxConnections != nil {
 		toSerialize["total_max_connections"] = o.TotalMaxConnections
 	}
-	if !isNil(o.MaxPartitions) {
+	if o.MaxPartitions != nil {
 		toSerialize["max_partitions"] = o.MaxPartitions
 	}
-	if !isNil(o.MaxDataRetentionPeriod) {
+	if o.MaxDataRetentionPeriod != nil {
 		toSerialize["max_data_retention_period"] = o.MaxDataRetentionPeriod
 	}
-	if !isNil(o.MaxConnectionAttemptsPerSec) {
+	if o.MaxConnectionAttemptsPerSec != nil {
 		toSerialize["max_connection_attempts_per_sec"] = o.MaxConnectionAttemptsPerSec
 	}
-	if !isNil(o.BillingCloudAccountId) {
+	if o.BillingCloudAccountId != nil {
 		toSerialize["billing_cloud_account_id"] = o.BillingCloudAccountId
 	}
-	if !isNil(o.Marketplace) {
+	if o.Marketplace != nil {
 		toSerialize["marketplace"] = o.Marketplace
 	}
-	if !isNil(o.BillingModel) {
+	if o.BillingModel != nil {
 		toSerialize["billing_model"] = o.BillingModel
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/model_kafka_request_all_of.go b/app-services-sdk-go/kafkamgmt/apiv1/client/model_kafka_request_all_of.go
index 3bec4685..f31aced4 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/model_kafka_request_all_of.go
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/model_kafka_request_all_of.go
@@ -1,11 +1,11 @@
 /*
-Kafka Management API
-
-Kafka Management API is a REST API to manage Kafka instances
-
-API version: 1.14.0
-Contact: rhosak-support@redhat.com
-*/
+ * Kafka Management API
+ *
+ * Kafka Management API is a REST API to manage Kafka instances
+ *
+ * API version: 1.14.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -37,32 +37,24 @@ type KafkaRequestAllOf struct {
 	Version *string `json:"version,omitempty"`
 	InstanceType *string `json:"instance_type,omitempty"`
 	// This field is now deprecated, please use the /api/kafkas_mgmt/v1/instance_types/{cloud_provider}/{cloud_region} endpoint to retrieve the field instead.
-	// Deprecated
 	InstanceTypeName *string `json:"instance_type_name,omitempty"`
 	ReauthenticationEnabled bool `json:"reauthentication_enabled"`
 	// Maximum data storage available to this Kafka. This is now deprecated, please use max_data_retention_size instead.
-	// Deprecated
 	KafkaStorageSize *string `json:"kafka_storage_size,omitempty"`
 	MaxDataRetentionSize *SupportedKafkaSizeBytesValueItem `json:"max_data_retention_size,omitempty"`
 	BrowserUrl *string `json:"browser_url,omitempty"`
 	SizeId *string `json:"size_id,omitempty"`
 	// This field is now deprecated, please use the /api/kafkas_mgmt/v1/instance_types/{cloud_provider}/{cloud_region} endpoint to retrieve the field instead.
-	// Deprecated
 	IngressThroughputPerSec *string `json:"ingress_throughput_per_sec,omitempty"`
 	// This field is now deprecated, please use the /api/kafkas_mgmt/v1/instance_types/{cloud_provider}/{cloud_region} endpoint to retrieve the field instead.
-	// Deprecated
 	EgressThroughputPerSec *string `json:"egress_throughput_per_sec,omitempty"`
 	// This field is now deprecated, please use the /api/kafkas_mgmt/v1/instance_types/{cloud_provider}/{cloud_region} endpoint to retrieve the field instead.
-	// Deprecated
 	TotalMaxConnections *int32 `json:"total_max_connections,omitempty"`
 	// This field is now deprecated, please use the /api/kafkas_mgmt/v1/instance_types/{cloud_provider}/{cloud_region} endpoint to retrieve the field instead.
-	// Deprecated
 	MaxPartitions *int32 `json:"max_partitions,omitempty"`
 	// This field is now deprecated, please use the /api/kafkas_mgmt/v1/instance_types/{cloud_provider}/{cloud_region} endpoint to retrieve the field instead.
-	// Deprecated
 	MaxDataRetentionPeriod *string `json:"max_data_retention_period,omitempty"`
 	// This field is now deprecated, please use the /api/kafkas_mgmt/v1/instance_types/{cloud_provider}/{cloud_region} endpoint to retrieve the field instead.
-	// Deprecated
 	MaxConnectionAttemptsPerSec *int32 `json:"max_connection_attempts_per_sec,omitempty"`
 	BillingCloudAccountId *string `json:"billing_cloud_account_id,omitempty"`
 	Marketplace *string `json:"marketplace,omitempty"`
@@ -90,7 +82,7 @@ func NewKafkaRequestAllOfWithDefaults() *KafkaRequestAllOf {
 
 // GetStatus returns the Status field value if set, zero value otherwise.
 func (o *KafkaRequestAllOf) GetStatus() string {
-	if o == nil || isNil(o.Status) {
+	if o == nil || o.Status == nil {
 		var ret string
 		return ret
 	}
@@ -100,15 +92,15 @@ func (o *KafkaRequestAllOf) GetStatus() string {
 // GetStatusOk returns a tuple with the Status field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *KafkaRequestAllOf) GetStatusOk() (*string, bool) {
-	if o == nil || isNil(o.Status) {
-    return nil, false
+	if o == nil || o.Status == nil {
+		return nil, false
 	}
 	return o.Status, true
 }
 
 // HasStatus returns a boolean if a field has been set.
 func (o *KafkaRequestAllOf) HasStatus() bool {
-	if o != nil && !isNil(o.Status) {
+	if o != nil && o.Status != nil {
 		return true
 	}
 
@@ -122,7 +114,7 @@ func (o *KafkaRequestAllOf) SetStatus(v string) {
 
 // GetCloudProvider returns the CloudProvider field value if set, zero value otherwise.
 func (o *KafkaRequestAllOf) GetCloudProvider() string {
-	if o == nil || isNil(o.CloudProvider) {
+	if o == nil || o.CloudProvider == nil {
 		var ret string
 		return ret
 	}
@@ -132,15 +124,15 @@ func (o *KafkaRequestAllOf) GetCloudProvider() string {
 // GetCloudProviderOk returns a tuple with the CloudProvider field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *KafkaRequestAllOf) GetCloudProviderOk() (*string, bool) {
-	if o == nil || isNil(o.CloudProvider) {
-    return nil, false
+	if o == nil || o.CloudProvider == nil {
+		return nil, false
 	}
 	return o.CloudProvider, true
 }
 
 // HasCloudProvider returns a boolean if a field has been set.
 func (o *KafkaRequestAllOf) HasCloudProvider() bool {
-	if o != nil && !isNil(o.CloudProvider) {
+	if o != nil && o.CloudProvider != nil {
 		return true
 	}
 
@@ -165,8 +157,8 @@ func (o *KafkaRequestAllOf) GetMultiAz() bool {
 // GetMultiAzOk returns a tuple with the MultiAz field value
 // and a boolean to check if the value has been set.
 func (o *KafkaRequestAllOf) GetMultiAzOk() (*bool, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.MultiAz, true
 }
@@ -178,7 +170,7 @@ func (o *KafkaRequestAllOf) SetMultiAz(v bool) {
 
 // GetRegion returns the Region field value if set, zero value otherwise.
 func (o *KafkaRequestAllOf) GetRegion() string {
-	if o == nil || isNil(o.Region) {
+	if o == nil || o.Region == nil {
 		var ret string
 		return ret
 	}
@@ -188,15 +180,15 @@ func (o *KafkaRequestAllOf) GetRegion() string {
 // GetRegionOk returns a tuple with the Region field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *KafkaRequestAllOf) GetRegionOk() (*string, bool) {
-	if o == nil || isNil(o.Region) {
-    return nil, false
+	if o == nil || o.Region == nil {
+		return nil, false
 	}
 	return o.Region, true
 }
 
 // HasRegion returns a boolean if a field has been set.
 func (o *KafkaRequestAllOf) HasRegion() bool {
-	if o != nil && !isNil(o.Region) {
+	if o != nil && o.Region != nil {
 		return true
 	}
 
@@ -210,7 +202,7 @@ func (o *KafkaRequestAllOf) SetRegion(v string) {
 
 // GetOwner returns the Owner field value if set, zero value otherwise.
 func (o *KafkaRequestAllOf) GetOwner() string {
-	if o == nil || isNil(o.Owner) {
+	if o == nil || o.Owner == nil {
 		var ret string
 		return ret
 	}
@@ -220,15 +212,15 @@ func (o *KafkaRequestAllOf) GetOwner() string {
 // GetOwnerOk returns a tuple with the Owner field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *KafkaRequestAllOf) GetOwnerOk() (*string, bool) {
-	if o == nil || isNil(o.Owner) {
-    return nil, false
+	if o == nil || o.Owner == nil {
+		return nil, false
 	}
 	return o.Owner, true
 }
 
 // HasOwner returns a boolean if a field has been set.
 func (o *KafkaRequestAllOf) HasOwner() bool {
-	if o != nil && !isNil(o.Owner) {
+	if o != nil && o.Owner != nil {
 		return true
 	}
 
@@ -242,7 +234,7 @@ func (o *KafkaRequestAllOf) SetOwner(v string) {
 
 // GetName returns the Name field value if set, zero value otherwise.
 func (o *KafkaRequestAllOf) GetName() string {
-	if o == nil || isNil(o.Name) {
+	if o == nil || o.Name == nil {
 		var ret string
 		return ret
 	}
@@ -252,15 +244,15 @@ func (o *KafkaRequestAllOf) GetName() string {
 // GetNameOk returns a tuple with the Name field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *KafkaRequestAllOf) GetNameOk() (*string, bool) {
-	if o == nil || isNil(o.Name) {
-    return nil, false
+	if o == nil || o.Name == nil {
+		return nil, false
 	}
 	return o.Name, true
 }
 
 // HasName returns a boolean if a field has been set.
 func (o *KafkaRequestAllOf) HasName() bool {
-	if o != nil && !isNil(o.Name) {
+	if o != nil && o.Name != nil {
 		return true
 	}
 
@@ -274,7 +266,7 @@ func (o *KafkaRequestAllOf) SetName(v string) {
 
 // GetBootstrapServerHost returns the BootstrapServerHost field value if set, zero value otherwise.
 func (o *KafkaRequestAllOf) GetBootstrapServerHost() string {
-	if o == nil || isNil(o.BootstrapServerHost) {
+	if o == nil || o.BootstrapServerHost == nil {
 		var ret string
 		return ret
 	}
@@ -284,15 +276,15 @@ func (o *KafkaRequestAllOf) GetBootstrapServerHost() string {
 // GetBootstrapServerHostOk returns a tuple with the BootstrapServerHost field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *KafkaRequestAllOf) GetBootstrapServerHostOk() (*string, bool) {
-	if o == nil || isNil(o.BootstrapServerHost) {
-    return nil, false
+	if o == nil || o.BootstrapServerHost == nil {
+		return nil, false
 	}
 	return o.BootstrapServerHost, true
 }
 
 // HasBootstrapServerHost returns a boolean if a field has been set.
 func (o *KafkaRequestAllOf) HasBootstrapServerHost() bool {
-	if o != nil && !isNil(o.BootstrapServerHost) {
+	if o != nil && o.BootstrapServerHost != nil {
 		return true
 	}
 
@@ -306,7 +298,7 @@ func (o *KafkaRequestAllOf) SetBootstrapServerHost(v string) {
 
 // GetAdminApiServerUrl returns the AdminApiServerUrl field value if set, zero value otherwise.
 func (o *KafkaRequestAllOf) GetAdminApiServerUrl() string {
-	if o == nil || isNil(o.AdminApiServerUrl) {
+	if o == nil || o.AdminApiServerUrl == nil {
 		var ret string
 		return ret
 	}
@@ -316,15 +308,15 @@ func (o *KafkaRequestAllOf) GetAdminApiServerUrl() string {
 // GetAdminApiServerUrlOk returns a tuple with the AdminApiServerUrl field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *KafkaRequestAllOf) GetAdminApiServerUrlOk() (*string, bool) {
-	if o == nil || isNil(o.AdminApiServerUrl) {
-    return nil, false
+	if o == nil || o.AdminApiServerUrl == nil {
+		return nil, false
 	}
 	return o.AdminApiServerUrl, true
 }
 
 // HasAdminApiServerUrl returns a boolean if a field has been set.
 func (o *KafkaRequestAllOf) HasAdminApiServerUrl() bool {
-	if o != nil && !isNil(o.AdminApiServerUrl) {
+	if o != nil && o.AdminApiServerUrl != nil {
 		return true
 	}
 
@@ -338,7 +330,7 @@ func (o *KafkaRequestAllOf) SetAdminApiServerUrl(v string) {
 
 // GetCreatedAt returns the CreatedAt field value if set, zero value otherwise.
 func (o *KafkaRequestAllOf) GetCreatedAt() time.Time {
-	if o == nil || isNil(o.CreatedAt) {
+	if o == nil || o.CreatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -348,15 +340,15 @@ func (o *KafkaRequestAllOf) GetCreatedAt() time.Time {
 // GetCreatedAtOk returns a tuple with the CreatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *KafkaRequestAllOf) GetCreatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.CreatedAt) {
-    return nil, false
+	if o == nil || o.CreatedAt == nil {
+		return nil, false
 	}
 	return o.CreatedAt, true
 }
 
 // HasCreatedAt returns a boolean if a field has been set.
 func (o *KafkaRequestAllOf) HasCreatedAt() bool {
-	if o != nil && !isNil(o.CreatedAt) {
+	if o != nil && o.CreatedAt != nil {
 		return true
 	}
 
@@ -370,7 +362,7 @@ func (o *KafkaRequestAllOf) SetCreatedAt(v time.Time) {
 
 // GetExpiresAt returns the ExpiresAt field value if set, zero value otherwise (both if not set or set to explicit null).
 func (o *KafkaRequestAllOf) GetExpiresAt() time.Time {
-	if o == nil || isNil(o.ExpiresAt.Get()) {
+	if o == nil || o.ExpiresAt.Get() == nil {
 		var ret time.Time
 		return ret
 	}
@@ -381,8 +373,8 @@ func (o *KafkaRequestAllOf) GetExpiresAt() time.Time {
 // and a boolean to check if the value has been set.
 // NOTE: If the value is an explicit nil, `nil, true` will be returned
 func (o *KafkaRequestAllOf) GetExpiresAtOk() (*time.Time, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return o.ExpiresAt.Get(), o.ExpiresAt.IsSet()
 }
@@ -412,7 +404,7 @@ func (o *KafkaRequestAllOf) UnsetExpiresAt() {
 
 // GetUpdatedAt returns the UpdatedAt field value if set, zero value otherwise.
 func (o *KafkaRequestAllOf) GetUpdatedAt() time.Time {
-	if o == nil || isNil(o.UpdatedAt) {
+	if o == nil || o.UpdatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -422,15 +414,15 @@ func (o *KafkaRequestAllOf) GetUpdatedAt() time.Time {
 // GetUpdatedAtOk returns a tuple with the UpdatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *KafkaRequestAllOf) GetUpdatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.UpdatedAt) {
-    return nil, false
+	if o == nil || o.UpdatedAt == nil {
+		return nil, false
 	}
 	return o.UpdatedAt, true
 }
 
 // HasUpdatedAt returns a boolean if a field has been set.
 func (o *KafkaRequestAllOf) HasUpdatedAt() bool {
-	if o != nil && !isNil(o.UpdatedAt) {
+	if o != nil && o.UpdatedAt != nil {
 		return true
 	}
 
@@ -444,7 +436,7 @@ func (o *KafkaRequestAllOf) SetUpdatedAt(v time.Time) {
 
 // GetFailedReason returns the FailedReason field value if set, zero value otherwise.
 func (o *KafkaRequestAllOf) GetFailedReason() string {
-	if o == nil || isNil(o.FailedReason) {
+	if o == nil || o.FailedReason == nil {
 		var ret string
 		return ret
 	}
@@ -454,15 +446,15 @@ func (o *KafkaRequestAllOf) GetFailedReason() string {
 // GetFailedReasonOk returns a tuple with the FailedReason field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *KafkaRequestAllOf) GetFailedReasonOk() (*string, bool) {
-	if o == nil || isNil(o.FailedReason) {
-    return nil, false
+	if o == nil || o.FailedReason == nil {
+		return nil, false
 	}
 	return o.FailedReason, true
 }
 
 // HasFailedReason returns a boolean if a field has been set.
 func (o *KafkaRequestAllOf) HasFailedReason() bool {
-	if o != nil && !isNil(o.FailedReason) {
+	if o != nil && o.FailedReason != nil {
 		return true
 	}
 
@@ -476,7 +468,7 @@ func (o *KafkaRequestAllOf) SetFailedReason(v string) {
 
 // GetVersion returns the Version field value if set, zero value otherwise.
 func (o *KafkaRequestAllOf) GetVersion() string {
-	if o == nil || isNil(o.Version) {
+	if o == nil || o.Version == nil {
 		var ret string
 		return ret
 	}
@@ -486,15 +478,15 @@ func (o *KafkaRequestAllOf) GetVersion() string {
 // GetVersionOk returns a tuple with the Version field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *KafkaRequestAllOf) GetVersionOk() (*string, bool) {
-	if o == nil || isNil(o.Version) {
-    return nil, false
+	if o == nil || o.Version == nil {
+		return nil, false
 	}
 	return o.Version, true
 }
 
 // HasVersion returns a boolean if a field has been set.
 func (o *KafkaRequestAllOf) HasVersion() bool {
-	if o != nil && !isNil(o.Version) {
+	if o != nil && o.Version != nil {
 		return true
 	}
 
@@ -508,7 +500,7 @@ func (o *KafkaRequestAllOf) SetVersion(v string) {
 
 // GetInstanceType returns the InstanceType field value if set, zero value otherwise.
 func (o *KafkaRequestAllOf) GetInstanceType() string {
-	if o == nil || isNil(o.InstanceType) {
+	if o == nil || o.InstanceType == nil {
 		var ret string
 		return ret
 	}
@@ -518,15 +510,15 @@ func (o *KafkaRequestAllOf) GetInstanceType() string {
 // GetInstanceTypeOk returns a tuple with the InstanceType field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *KafkaRequestAllOf) GetInstanceTypeOk() (*string, bool) {
-	if o == nil || isNil(o.InstanceType) {
-    return nil, false
+	if o == nil || o.InstanceType == nil {
+		return nil, false
 	}
 	return o.InstanceType, true
 }
 
 // HasInstanceType returns a boolean if a field has been set.
 func (o *KafkaRequestAllOf) HasInstanceType() bool {
-	if o != nil && !isNil(o.InstanceType) {
+	if o != nil && o.InstanceType != nil {
 		return true
 	}
 
@@ -539,9 +531,8 @@ func (o *KafkaRequestAllOf) SetInstanceType(v string) {
 }
 
 // GetInstanceTypeName returns the InstanceTypeName field value if set, zero value otherwise.
-// Deprecated
 func (o *KafkaRequestAllOf) GetInstanceTypeName() string {
-	if o == nil || isNil(o.InstanceTypeName) {
+	if o == nil || o.InstanceTypeName == nil {
 		var ret string
 		return ret
 	}
@@ -550,17 +541,16 @@ func (o *KafkaRequestAllOf) GetInstanceTypeName() string {
 
 // GetInstanceTypeNameOk returns a tuple with the InstanceTypeName field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-// Deprecated
 func (o *KafkaRequestAllOf) GetInstanceTypeNameOk() (*string, bool) {
-	if o == nil || isNil(o.InstanceTypeName) {
-    return nil, false
+	if o == nil || o.InstanceTypeName == nil {
+		return nil, false
 	}
 	return o.InstanceTypeName, true
 }
 
 // HasInstanceTypeName returns a boolean if a field has been set.
 func (o *KafkaRequestAllOf) HasInstanceTypeName() bool {
-	if o != nil && !isNil(o.InstanceTypeName) {
+	if o != nil && o.InstanceTypeName != nil {
 		return true
 	}
 
@@ -568,7 +558,6 @@ func (o *KafkaRequestAllOf) HasInstanceTypeName() bool {
 }
 
 // SetInstanceTypeName gets a reference to the given string and assigns it to the InstanceTypeName field.
-// Deprecated
 func (o *KafkaRequestAllOf) SetInstanceTypeName(v string) {
 	o.InstanceTypeName = &v
 }
@@ -586,8 +575,8 @@ func (o *KafkaRequestAllOf) GetReauthenticationEnabled() bool {
 // GetReauthenticationEnabledOk returns a tuple with the ReauthenticationEnabled field value
 // and a boolean to check if the value has been set.
 func (o *KafkaRequestAllOf) GetReauthenticationEnabledOk() (*bool, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.ReauthenticationEnabled, true
 }
@@ -598,9 +587,8 @@ func (o *KafkaRequestAllOf) SetReauthenticationEnabled(v bool) {
 }
 
 // GetKafkaStorageSize returns the KafkaStorageSize field value if set, zero value otherwise.
-// Deprecated
 func (o *KafkaRequestAllOf) GetKafkaStorageSize() string {
-	if o == nil || isNil(o.KafkaStorageSize) {
+	if o == nil || o.KafkaStorageSize == nil {
 		var ret string
 		return ret
 	}
@@ -609,17 +597,16 @@ func (o *KafkaRequestAllOf) GetKafkaStorageSize() string {
 
 // GetKafkaStorageSizeOk returns a tuple with the KafkaStorageSize field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-// Deprecated
 func (o *KafkaRequestAllOf) GetKafkaStorageSizeOk() (*string, bool) {
-	if o == nil || isNil(o.KafkaStorageSize) {
-    return nil, false
+	if o == nil || o.KafkaStorageSize == nil {
+		return nil, false
 	}
 	return o.KafkaStorageSize, true
 }
 
 // HasKafkaStorageSize returns a boolean if a field has been set.
 func (o *KafkaRequestAllOf) HasKafkaStorageSize() bool {
-	if o != nil && !isNil(o.KafkaStorageSize) {
+	if o != nil && o.KafkaStorageSize != nil {
 		return true
 	}
 
@@ -627,14 +614,13 @@ func (o *KafkaRequestAllOf) HasKafkaStorageSize() bool {
 }
 
 // SetKafkaStorageSize gets a reference to the given string and assigns it to the KafkaStorageSize field.
-// Deprecated
 func (o *KafkaRequestAllOf) SetKafkaStorageSize(v string) {
 	o.KafkaStorageSize = &v
 }
 
 // GetMaxDataRetentionSize returns the MaxDataRetentionSize field value if set, zero value otherwise.
 func (o *KafkaRequestAllOf) GetMaxDataRetentionSize() SupportedKafkaSizeBytesValueItem {
-	if o == nil || isNil(o.MaxDataRetentionSize) {
+	if o == nil || o.MaxDataRetentionSize == nil {
 		var ret SupportedKafkaSizeBytesValueItem
 		return ret
 	}
@@ -644,15 +630,15 @@ func (o *KafkaRequestAllOf) GetMaxDataRetentionSize() SupportedKafkaSizeBytesVal
 // GetMaxDataRetentionSizeOk returns a tuple with the MaxDataRetentionSize field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *KafkaRequestAllOf) GetMaxDataRetentionSizeOk() (*SupportedKafkaSizeBytesValueItem, bool) {
-	if o == nil || isNil(o.MaxDataRetentionSize) {
-    return nil, false
+	if o == nil || o.MaxDataRetentionSize == nil {
+		return nil, false
 	}
 	return o.MaxDataRetentionSize, true
 }
 
 // HasMaxDataRetentionSize returns a boolean if a field has been set.
 func (o *KafkaRequestAllOf) HasMaxDataRetentionSize() bool {
-	if o != nil && !isNil(o.MaxDataRetentionSize) {
+	if o != nil && o.MaxDataRetentionSize != nil {
 		return true
 	}
 
@@ -666,7 +652,7 @@ func (o *KafkaRequestAllOf) SetMaxDataRetentionSize(v SupportedKafkaSizeBytesVal
 
 // GetBrowserUrl returns the BrowserUrl field value if set, zero value otherwise.
 func (o *KafkaRequestAllOf) GetBrowserUrl() string {
-	if o == nil || isNil(o.BrowserUrl) {
+	if o == nil || o.BrowserUrl == nil {
 		var ret string
 		return ret
 	}
@@ -676,15 +662,15 @@ func (o *KafkaRequestAllOf) GetBrowserUrl() string {
 // GetBrowserUrlOk returns a tuple with the BrowserUrl field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *KafkaRequestAllOf) GetBrowserUrlOk() (*string, bool) {
-	if o == nil || isNil(o.BrowserUrl) {
-    return nil, false
+	if o == nil || o.BrowserUrl == nil {
+		return nil, false
 	}
 	return o.BrowserUrl, true
 }
 
 // HasBrowserUrl returns a boolean if a field has been set.
 func (o *KafkaRequestAllOf) HasBrowserUrl() bool {
-	if o != nil && !isNil(o.BrowserUrl) {
+	if o != nil && o.BrowserUrl != nil {
 		return true
 	}
 
@@ -698,7 +684,7 @@ func (o *KafkaRequestAllOf) SetBrowserUrl(v string) {
 
 // GetSizeId returns the SizeId field value if set, zero value otherwise.
 func (o *KafkaRequestAllOf) GetSizeId() string {
-	if o == nil || isNil(o.SizeId) {
+	if o == nil || o.SizeId == nil {
 		var ret string
 		return ret
 	}
@@ -708,15 +694,15 @@ func (o *KafkaRequestAllOf) GetSizeId() string {
 // GetSizeIdOk returns a tuple with the SizeId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *KafkaRequestAllOf) GetSizeIdOk() (*string, bool) {
-	if o == nil || isNil(o.SizeId) {
-    return nil, false
+	if o == nil || o.SizeId == nil {
+		return nil, false
 	}
 	return o.SizeId, true
 }
 
 // HasSizeId returns a boolean if a field has been set.
 func (o *KafkaRequestAllOf) HasSizeId() bool {
-	if o != nil && !isNil(o.SizeId) {
+	if o != nil && o.SizeId != nil {
 		return true
 	}
 
@@ -729,9 +715,8 @@ func (o *KafkaRequestAllOf) SetSizeId(v string) {
 }
 
 // GetIngressThroughputPerSec returns the IngressThroughputPerSec field value if set, zero value otherwise.
-// Deprecated
 func (o *KafkaRequestAllOf) GetIngressThroughputPerSec() string {
-	if o == nil || isNil(o.IngressThroughputPerSec) {
+	if o == nil || o.IngressThroughputPerSec == nil {
 		var ret string
 		return ret
 	}
@@ -740,17 +725,16 @@ func (o *KafkaRequestAllOf) GetIngressThroughputPerSec() string {
 
 // GetIngressThroughputPerSecOk returns a tuple with the IngressThroughputPerSec field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-// Deprecated
 func (o *KafkaRequestAllOf) GetIngressThroughputPerSecOk() (*string, bool) {
-	if o == nil || isNil(o.IngressThroughputPerSec) {
-    return nil, false
+	if o == nil || o.IngressThroughputPerSec == nil {
+		return nil, false
 	}
 	return o.IngressThroughputPerSec, true
 }
 
 // HasIngressThroughputPerSec returns a boolean if a field has been set.
 func (o *KafkaRequestAllOf) HasIngressThroughputPerSec() bool {
-	if o != nil && !isNil(o.IngressThroughputPerSec) {
+	if o != nil && o.IngressThroughputPerSec != nil {
 		return true
 	}
 
@@ -758,15 +742,13 @@ func (o *KafkaRequestAllOf) HasIngressThroughputPerSec() bool {
 }
 
 // SetIngressThroughputPerSec gets a reference to the given string and assigns it to the IngressThroughputPerSec field.
-// Deprecated
 func (o *KafkaRequestAllOf) SetIngressThroughputPerSec(v string) {
 	o.IngressThroughputPerSec = &v
 }
 
 // GetEgressThroughputPerSec returns the EgressThroughputPerSec field value if set, zero value otherwise.
-// Deprecated
 func (o *KafkaRequestAllOf) GetEgressThroughputPerSec() string {
-	if o == nil || isNil(o.EgressThroughputPerSec) {
+	if o == nil || o.EgressThroughputPerSec == nil {
 		var ret string
 		return ret
 	}
@@ -775,17 +757,16 @@ func (o *KafkaRequestAllOf) GetEgressThroughputPerSec() string {
 
 // GetEgressThroughputPerSecOk returns a tuple with the EgressThroughputPerSec field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-// Deprecated
 func (o *KafkaRequestAllOf) GetEgressThroughputPerSecOk() (*string, bool) {
-	if o == nil || isNil(o.EgressThroughputPerSec) {
-    return nil, false
+	if o == nil || o.EgressThroughputPerSec == nil {
+		return nil, false
 	}
 	return o.EgressThroughputPerSec, true
 }
 
 // HasEgressThroughputPerSec returns a boolean if a field has been set.
 func (o *KafkaRequestAllOf) HasEgressThroughputPerSec() bool {
-	if o != nil && !isNil(o.EgressThroughputPerSec) {
+	if o != nil && o.EgressThroughputPerSec != nil {
 		return true
 	}
 
@@ -793,15 +774,13 @@ func (o *KafkaRequestAllOf) HasEgressThroughputPerSec() bool {
 }
 
 // SetEgressThroughputPerSec gets a reference to the given string and assigns it to the EgressThroughputPerSec field.
-// Deprecated
 func (o *KafkaRequestAllOf) SetEgressThroughputPerSec(v string) {
 	o.EgressThroughputPerSec = &v
 }
 
 // GetTotalMaxConnections returns the TotalMaxConnections field value if set, zero value otherwise.
-// Deprecated
 func (o *KafkaRequestAllOf) GetTotalMaxConnections() int32 {
-	if o == nil || isNil(o.TotalMaxConnections) {
+	if o == nil || o.TotalMaxConnections == nil {
 		var ret int32
 		return ret
 	}
@@ -810,17 +789,16 @@ func (o *KafkaRequestAllOf) GetTotalMaxConnections() int32 {
 
 // GetTotalMaxConnectionsOk returns a tuple with the TotalMaxConnections field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-// Deprecated
 func (o *KafkaRequestAllOf) GetTotalMaxConnectionsOk() (*int32, bool) {
-	if o == nil || isNil(o.TotalMaxConnections) {
-    return nil, false
+	if o == nil || o.TotalMaxConnections == nil {
+		return nil, false
 	}
 	return o.TotalMaxConnections, true
 }
 
 // HasTotalMaxConnections returns a boolean if a field has been set.
 func (o *KafkaRequestAllOf) HasTotalMaxConnections() bool {
-	if o != nil && !isNil(o.TotalMaxConnections) {
+	if o != nil && o.TotalMaxConnections != nil {
 		return true
 	}
 
@@ -828,15 +806,13 @@ func (o *KafkaRequestAllOf) HasTotalMaxConnections() bool {
 }
 
 // SetTotalMaxConnections gets a reference to the given int32 and assigns it to the TotalMaxConnections field.
-// Deprecated
 func (o *KafkaRequestAllOf) SetTotalMaxConnections(v int32) {
 	o.TotalMaxConnections = &v
 }
 
 // GetMaxPartitions returns the MaxPartitions field value if set, zero value otherwise.
-// Deprecated
 func (o *KafkaRequestAllOf) GetMaxPartitions() int32 {
-	if o == nil || isNil(o.MaxPartitions) {
+	if o == nil || o.MaxPartitions == nil {
 		var ret int32
 		return ret
 	}
@@ -845,17 +821,16 @@ func (o *KafkaRequestAllOf) GetMaxPartitions() int32 {
 
 // GetMaxPartitionsOk returns a tuple with the MaxPartitions field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-// Deprecated
 func (o *KafkaRequestAllOf) GetMaxPartitionsOk() (*int32, bool) {
-	if o == nil || isNil(o.MaxPartitions) {
-    return nil, false
+	if o == nil || o.MaxPartitions == nil {
+		return nil, false
 	}
 	return o.MaxPartitions, true
 }
 
 // HasMaxPartitions returns a boolean if a field has been set.
 func (o *KafkaRequestAllOf) HasMaxPartitions() bool {
-	if o != nil && !isNil(o.MaxPartitions) {
+	if o != nil && o.MaxPartitions != nil {
 		return true
 	}
 
@@ -863,15 +838,13 @@ func (o *KafkaRequestAllOf) HasMaxPartitions() bool {
 }
 
 // SetMaxPartitions gets a reference to the given int32 and assigns it to the MaxPartitions field.
-// Deprecated
 func (o *KafkaRequestAllOf) SetMaxPartitions(v int32) {
 	o.MaxPartitions = &v
 }
 
 // GetMaxDataRetentionPeriod returns the MaxDataRetentionPeriod field value if set, zero value otherwise.
-// Deprecated
 func (o *KafkaRequestAllOf) GetMaxDataRetentionPeriod() string {
-	if o == nil || isNil(o.MaxDataRetentionPeriod) {
+	if o == nil || o.MaxDataRetentionPeriod == nil {
 		var ret string
 		return ret
 	}
@@ -880,17 +853,16 @@ func (o *KafkaRequestAllOf) GetMaxDataRetentionPeriod() string {
 
 // GetMaxDataRetentionPeriodOk returns a tuple with the MaxDataRetentionPeriod field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-// Deprecated
 func (o *KafkaRequestAllOf) GetMaxDataRetentionPeriodOk() (*string, bool) {
-	if o == nil || isNil(o.MaxDataRetentionPeriod) {
-    return nil, false
+	if o == nil || o.MaxDataRetentionPeriod == nil {
+		return nil, false
 	}
 	return o.MaxDataRetentionPeriod, true
 }
 
 // HasMaxDataRetentionPeriod returns a boolean if a field has been set.
 func (o *KafkaRequestAllOf) HasMaxDataRetentionPeriod() bool {
-	if o != nil && !isNil(o.MaxDataRetentionPeriod) {
+	if o != nil && o.MaxDataRetentionPeriod != nil {
 		return true
 	}
 
@@ -898,15 +870,13 @@ func (o *KafkaRequestAllOf) HasMaxDataRetentionPeriod() bool {
 }
 
 // SetMaxDataRetentionPeriod gets a reference to the given string and assigns it to the MaxDataRetentionPeriod field.
-// Deprecated
 func (o *KafkaRequestAllOf) SetMaxDataRetentionPeriod(v string) {
 	o.MaxDataRetentionPeriod = &v
 }
 
 // GetMaxConnectionAttemptsPerSec returns the MaxConnectionAttemptsPerSec field value if set, zero value otherwise.
-// Deprecated
 func (o *KafkaRequestAllOf) GetMaxConnectionAttemptsPerSec() int32 {
-	if o == nil || isNil(o.MaxConnectionAttemptsPerSec) {
+	if o == nil || o.MaxConnectionAttemptsPerSec == nil {
 		var ret int32
 		return ret
 	}
@@ -915,17 +885,16 @@ func (o *KafkaRequestAllOf) GetMaxConnectionAttemptsPerSec() int32 {
 
 // GetMaxConnectionAttemptsPerSecOk returns a tuple with the MaxConnectionAttemptsPerSec field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-// Deprecated
 func (o *KafkaRequestAllOf) GetMaxConnectionAttemptsPerSecOk() (*int32, bool) {
-	if o == nil || isNil(o.MaxConnectionAttemptsPerSec) {
-    return nil, false
+	if o == nil || o.MaxConnectionAttemptsPerSec == nil {
+		return nil, false
 	}
 	return o.MaxConnectionAttemptsPerSec, true
 }
 
 // HasMaxConnectionAttemptsPerSec returns a boolean if a field has been set.
 func (o *KafkaRequestAllOf) HasMaxConnectionAttemptsPerSec() bool {
-	if o != nil && !isNil(o.MaxConnectionAttemptsPerSec) {
+	if o != nil && o.MaxConnectionAttemptsPerSec != nil {
 		return true
 	}
 
@@ -933,14 +902,13 @@ func (o *KafkaRequestAllOf) HasMaxConnectionAttemptsPerSec() bool {
 }
 
 // SetMaxConnectionAttemptsPerSec gets a reference to the given int32 and assigns it to the MaxConnectionAttemptsPerSec field.
-// Deprecated
 func (o *KafkaRequestAllOf) SetMaxConnectionAttemptsPerSec(v int32) {
 	o.MaxConnectionAttemptsPerSec = &v
 }
 
 // GetBillingCloudAccountId returns the BillingCloudAccountId field value if set, zero value otherwise.
 func (o *KafkaRequestAllOf) GetBillingCloudAccountId() string {
-	if o == nil || isNil(o.BillingCloudAccountId) {
+	if o == nil || o.BillingCloudAccountId == nil {
 		var ret string
 		return ret
 	}
@@ -950,15 +918,15 @@ func (o *KafkaRequestAllOf) GetBillingCloudAccountId() string {
 // GetBillingCloudAccountIdOk returns a tuple with the BillingCloudAccountId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *KafkaRequestAllOf) GetBillingCloudAccountIdOk() (*string, bool) {
-	if o == nil || isNil(o.BillingCloudAccountId) {
-    return nil, false
+	if o == nil || o.BillingCloudAccountId == nil {
+		return nil, false
 	}
 	return o.BillingCloudAccountId, true
 }
 
 // HasBillingCloudAccountId returns a boolean if a field has been set.
 func (o *KafkaRequestAllOf) HasBillingCloudAccountId() bool {
-	if o != nil && !isNil(o.BillingCloudAccountId) {
+	if o != nil && o.BillingCloudAccountId != nil {
 		return true
 	}
 
@@ -972,7 +940,7 @@ func (o *KafkaRequestAllOf) SetBillingCloudAccountId(v string) {
 
 // GetMarketplace returns the Marketplace field value if set, zero value otherwise.
 func (o *KafkaRequestAllOf) GetMarketplace() string {
-	if o == nil || isNil(o.Marketplace) {
+	if o == nil || o.Marketplace == nil {
 		var ret string
 		return ret
 	}
@@ -982,15 +950,15 @@ func (o *KafkaRequestAllOf) GetMarketplace() string {
 // GetMarketplaceOk returns a tuple with the Marketplace field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *KafkaRequestAllOf) GetMarketplaceOk() (*string, bool) {
-	if o == nil || isNil(o.Marketplace) {
-    return nil, false
+	if o == nil || o.Marketplace == nil {
+		return nil, false
 	}
 	return o.Marketplace, true
 }
 
 // HasMarketplace returns a boolean if a field has been set.
 func (o *KafkaRequestAllOf) HasMarketplace() bool {
-	if o != nil && !isNil(o.Marketplace) {
+	if o != nil && o.Marketplace != nil {
 		return true
 	}
 
@@ -1004,7 +972,7 @@ func (o *KafkaRequestAllOf) SetMarketplace(v string) {
 
 // GetBillingModel returns the BillingModel field value if set, zero value otherwise.
 func (o *KafkaRequestAllOf) GetBillingModel() string {
-	if o == nil || isNil(o.BillingModel) {
+	if o == nil || o.BillingModel == nil {
 		var ret string
 		return ret
 	}
@@ -1014,15 +982,15 @@ func (o *KafkaRequestAllOf) GetBillingModel() string {
 // GetBillingModelOk returns a tuple with the BillingModel field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *KafkaRequestAllOf) GetBillingModelOk() (*string, bool) {
-	if o == nil || isNil(o.BillingModel) {
-    return nil, false
+	if o == nil || o.BillingModel == nil {
+		return nil, false
 	}
 	return o.BillingModel, true
 }
 
 // HasBillingModel returns a boolean if a field has been set.
 func (o *KafkaRequestAllOf) HasBillingModel() bool {
-	if o != nil && !isNil(o.BillingModel) {
+	if o != nil && o.BillingModel != nil {
 		return true
 	}
 
@@ -1036,91 +1004,91 @@ func (o *KafkaRequestAllOf) SetBillingModel(v string) {
 
 func (o KafkaRequestAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Status) {
+	if o.Status != nil {
 		toSerialize["status"] = o.Status
 	}
-	if !isNil(o.CloudProvider) {
+	if o.CloudProvider != nil {
 		toSerialize["cloud_provider"] = o.CloudProvider
 	}
 	if true {
 		toSerialize["multi_az"] = o.MultiAz
 	}
-	if !isNil(o.Region) {
+	if o.Region != nil {
 		toSerialize["region"] = o.Region
 	}
-	if !isNil(o.Owner) {
+	if o.Owner != nil {
 		toSerialize["owner"] = o.Owner
 	}
-	if !isNil(o.Name) {
+	if o.Name != nil {
 		toSerialize["name"] = o.Name
 	}
-	if !isNil(o.BootstrapServerHost) {
+	if o.BootstrapServerHost != nil {
 		toSerialize["bootstrap_server_host"] = o.BootstrapServerHost
 	}
-	if !isNil(o.AdminApiServerUrl) {
+	if o.AdminApiServerUrl != nil {
 		toSerialize["admin_api_server_url"] = o.AdminApiServerUrl
 	}
-	if !isNil(o.CreatedAt) {
+	if o.CreatedAt != nil {
 		toSerialize["created_at"] = o.CreatedAt
 	}
 	if o.ExpiresAt.IsSet() {
 		toSerialize["expires_at"] = o.ExpiresAt.Get()
 	}
-	if !isNil(o.UpdatedAt) {
+	if o.UpdatedAt != nil {
 		toSerialize["updated_at"] = o.UpdatedAt
 	}
-	if !isNil(o.FailedReason) {
+	if o.FailedReason != nil {
 		toSerialize["failed_reason"] = o.FailedReason
 	}
-	if !isNil(o.Version) {
+	if o.Version != nil {
 		toSerialize["version"] = o.Version
 	}
-	if !isNil(o.InstanceType) {
+	if o.InstanceType != nil {
 		toSerialize["instance_type"] = o.InstanceType
 	}
-	if !isNil(o.InstanceTypeName) {
+	if o.InstanceTypeName != nil {
 		toSerialize["instance_type_name"] = o.InstanceTypeName
 	}
 	if true {
 		toSerialize["reauthentication_enabled"] = o.ReauthenticationEnabled
 	}
-	if !isNil(o.KafkaStorageSize) {
+	if o.KafkaStorageSize != nil {
 		toSerialize["kafka_storage_size"] = o.KafkaStorageSize
 	}
-	if !isNil(o.MaxDataRetentionSize) {
+	if o.MaxDataRetentionSize != nil {
 		toSerialize["max_data_retention_size"] = o.MaxDataRetentionSize
 	}
-	if !isNil(o.BrowserUrl) {
+	if o.BrowserUrl != nil {
 		toSerialize["browser_url"] = o.BrowserUrl
 	}
-	if !isNil(o.SizeId) {
+	if o.SizeId != nil {
 		toSerialize["size_id"] = o.SizeId
 	}
-	if !isNil(o.IngressThroughputPerSec) {
+	if o.IngressThroughputPerSec != nil {
 		toSerialize["ingress_throughput_per_sec"] = o.IngressThroughputPerSec
 	}
-	if !isNil(o.EgressThroughputPerSec) {
+	if o.EgressThroughputPerSec != nil {
 		toSerialize["egress_throughput_per_sec"] = o.EgressThroughputPerSec
 	}
-	if !isNil(o.TotalMaxConnections) {
+	if o.TotalMaxConnections != nil {
 		toSerialize["total_max_connections"] = o.TotalMaxConnections
 	}
-	if !isNil(o.MaxPartitions) {
+	if o.MaxPartitions != nil {
 		toSerialize["max_partitions"] = o.MaxPartitions
 	}
-	if !isNil(o.MaxDataRetentionPeriod) {
+	if o.MaxDataRetentionPeriod != nil {
 		toSerialize["max_data_retention_period"] = o.MaxDataRetentionPeriod
 	}
-	if !isNil(o.MaxConnectionAttemptsPerSec) {
+	if o.MaxConnectionAttemptsPerSec != nil {
 		toSerialize["max_connection_attempts_per_sec"] = o.MaxConnectionAttemptsPerSec
 	}
-	if !isNil(o.BillingCloudAccountId) {
+	if o.BillingCloudAccountId != nil {
 		toSerialize["billing_cloud_account_id"] = o.BillingCloudAccountId
 	}
-	if !isNil(o.Marketplace) {
+	if o.Marketplace != nil {
 		toSerialize["marketplace"] = o.Marketplace
 	}
-	if !isNil(o.BillingModel) {
+	if o.BillingModel != nil {
 		toSerialize["billing_model"] = o.BillingModel
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/model_kafka_request_list.go b/app-services-sdk-go/kafkamgmt/apiv1/client/model_kafka_request_list.go
index 6a40306f..7b911149 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/model_kafka_request_list.go
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/model_kafka_request_list.go
@@ -1,11 +1,11 @@
 /*
-Kafka Management API
-
-Kafka Management API is a REST API to manage Kafka instances
-
-API version: 1.14.0
-Contact: rhosak-support@redhat.com
-*/
+ * Kafka Management API
+ *
+ * Kafka Management API is a REST API to manage Kafka instances
+ *
+ * API version: 1.14.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -59,8 +59,8 @@ func (o *KafkaRequestList) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *KafkaRequestList) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -83,8 +83,8 @@ func (o *KafkaRequestList) GetPage() int32 {
 // GetPageOk returns a tuple with the Page field value
 // and a boolean to check if the value has been set.
 func (o *KafkaRequestList) GetPageOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Page, true
 }
@@ -107,8 +107,8 @@ func (o *KafkaRequestList) GetSize() int32 {
 // GetSizeOk returns a tuple with the Size field value
 // and a boolean to check if the value has been set.
 func (o *KafkaRequestList) GetSizeOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Size, true
 }
@@ -131,8 +131,8 @@ func (o *KafkaRequestList) GetTotal() int32 {
 // GetTotalOk returns a tuple with the Total field value
 // and a boolean to check if the value has been set.
 func (o *KafkaRequestList) GetTotalOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Total, true
 }
@@ -154,11 +154,11 @@ func (o *KafkaRequestList) GetItems() []KafkaRequest {
 
 // GetItemsOk returns a tuple with the Items field value
 // and a boolean to check if the value has been set.
-func (o *KafkaRequestList) GetItemsOk() ([]KafkaRequest, bool) {
-	if o == nil {
-    return nil, false
+func (o *KafkaRequestList) GetItemsOk() (*[]KafkaRequest, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Items, true
+	return &o.Items, true
 }
 
 // SetItems sets field value
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/model_kafka_request_list_all_of.go b/app-services-sdk-go/kafkamgmt/apiv1/client/model_kafka_request_list_all_of.go
index aa83ee2b..d713a354 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/model_kafka_request_list_all_of.go
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/model_kafka_request_list_all_of.go
@@ -1,11 +1,11 @@
 /*
-Kafka Management API
-
-Kafka Management API is a REST API to manage Kafka instances
-
-API version: 1.14.0
-Contact: rhosak-support@redhat.com
-*/
+ * Kafka Management API
+ *
+ * Kafka Management API is a REST API to manage Kafka instances
+ *
+ * API version: 1.14.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -17,7 +17,7 @@ import (
 
 // KafkaRequestListAllOf struct for KafkaRequestListAllOf
 type KafkaRequestListAllOf struct {
-	Items []KafkaRequest `json:"items,omitempty"`
+	Items *[]KafkaRequest `json:"items,omitempty"`
 }
 
 // NewKafkaRequestListAllOf instantiates a new KafkaRequestListAllOf object
@@ -39,25 +39,25 @@ func NewKafkaRequestListAllOfWithDefaults() *KafkaRequestListAllOf {
 
 // GetItems returns the Items field value if set, zero value otherwise.
 func (o *KafkaRequestListAllOf) GetItems() []KafkaRequest {
-	if o == nil || isNil(o.Items) {
+	if o == nil || o.Items == nil {
 		var ret []KafkaRequest
 		return ret
 	}
-	return o.Items
+	return *o.Items
 }
 
 // GetItemsOk returns a tuple with the Items field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *KafkaRequestListAllOf) GetItemsOk() ([]KafkaRequest, bool) {
-	if o == nil || isNil(o.Items) {
-    return nil, false
+func (o *KafkaRequestListAllOf) GetItemsOk() (*[]KafkaRequest, bool) {
+	if o == nil || o.Items == nil {
+		return nil, false
 	}
 	return o.Items, true
 }
 
 // HasItems returns a boolean if a field has been set.
 func (o *KafkaRequestListAllOf) HasItems() bool {
-	if o != nil && !isNil(o.Items) {
+	if o != nil && o.Items != nil {
 		return true
 	}
 
@@ -66,12 +66,12 @@ func (o *KafkaRequestListAllOf) HasItems() bool {
 
 // SetItems gets a reference to the given []KafkaRequest and assigns it to the Items field.
 func (o *KafkaRequestListAllOf) SetItems(v []KafkaRequest) {
-	o.Items = v
+	o.Items = &v
 }
 
 func (o KafkaRequestListAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Items) {
+	if o.Items != nil {
 		toSerialize["items"] = o.Items
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/model_kafka_request_payload.go b/app-services-sdk-go/kafkamgmt/apiv1/client/model_kafka_request_payload.go
index 37215e91..63140d5e 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/model_kafka_request_payload.go
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/model_kafka_request_payload.go
@@ -1,11 +1,11 @@
 /*
-Kafka Management API
-
-Kafka Management API is a REST API to manage Kafka instances
-
-API version: 1.14.0
-Contact: rhosak-support@redhat.com
-*/
+ * Kafka Management API
+ *
+ * Kafka Management API is a REST API to manage Kafka instances
+ *
+ * API version: 1.14.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -55,7 +55,7 @@ func NewKafkaRequestPayloadWithDefaults() *KafkaRequestPayload {
 
 // GetCloudProvider returns the CloudProvider field value if set, zero value otherwise.
 func (o *KafkaRequestPayload) GetCloudProvider() string {
-	if o == nil || isNil(o.CloudProvider) {
+	if o == nil || o.CloudProvider == nil {
 		var ret string
 		return ret
 	}
@@ -65,15 +65,15 @@ func (o *KafkaRequestPayload) GetCloudProvider() string {
 // GetCloudProviderOk returns a tuple with the CloudProvider field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *KafkaRequestPayload) GetCloudProviderOk() (*string, bool) {
-	if o == nil || isNil(o.CloudProvider) {
-    return nil, false
+	if o == nil || o.CloudProvider == nil {
+		return nil, false
 	}
 	return o.CloudProvider, true
 }
 
 // HasCloudProvider returns a boolean if a field has been set.
 func (o *KafkaRequestPayload) HasCloudProvider() bool {
-	if o != nil && !isNil(o.CloudProvider) {
+	if o != nil && o.CloudProvider != nil {
 		return true
 	}
 
@@ -98,8 +98,8 @@ func (o *KafkaRequestPayload) GetName() string {
 // GetNameOk returns a tuple with the Name field value
 // and a boolean to check if the value has been set.
 func (o *KafkaRequestPayload) GetNameOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Name, true
 }
@@ -111,7 +111,7 @@ func (o *KafkaRequestPayload) SetName(v string) {
 
 // GetRegion returns the Region field value if set, zero value otherwise.
 func (o *KafkaRequestPayload) GetRegion() string {
-	if o == nil || isNil(o.Region) {
+	if o == nil || o.Region == nil {
 		var ret string
 		return ret
 	}
@@ -121,15 +121,15 @@ func (o *KafkaRequestPayload) GetRegion() string {
 // GetRegionOk returns a tuple with the Region field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *KafkaRequestPayload) GetRegionOk() (*string, bool) {
-	if o == nil || isNil(o.Region) {
-    return nil, false
+	if o == nil || o.Region == nil {
+		return nil, false
 	}
 	return o.Region, true
 }
 
 // HasRegion returns a boolean if a field has been set.
 func (o *KafkaRequestPayload) HasRegion() bool {
-	if o != nil && !isNil(o.Region) {
+	if o != nil && o.Region != nil {
 		return true
 	}
 
@@ -143,7 +143,7 @@ func (o *KafkaRequestPayload) SetRegion(v string) {
 
 // GetReauthenticationEnabled returns the ReauthenticationEnabled field value if set, zero value otherwise (both if not set or set to explicit null).
 func (o *KafkaRequestPayload) GetReauthenticationEnabled() bool {
-	if o == nil || isNil(o.ReauthenticationEnabled.Get()) {
+	if o == nil || o.ReauthenticationEnabled.Get() == nil {
 		var ret bool
 		return ret
 	}
@@ -154,8 +154,8 @@ func (o *KafkaRequestPayload) GetReauthenticationEnabled() bool {
 // and a boolean to check if the value has been set.
 // NOTE: If the value is an explicit nil, `nil, true` will be returned
 func (o *KafkaRequestPayload) GetReauthenticationEnabledOk() (*bool, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return o.ReauthenticationEnabled.Get(), o.ReauthenticationEnabled.IsSet()
 }
@@ -185,7 +185,7 @@ func (o *KafkaRequestPayload) UnsetReauthenticationEnabled() {
 
 // GetPlan returns the Plan field value if set, zero value otherwise.
 func (o *KafkaRequestPayload) GetPlan() string {
-	if o == nil || isNil(o.Plan) {
+	if o == nil || o.Plan == nil {
 		var ret string
 		return ret
 	}
@@ -195,15 +195,15 @@ func (o *KafkaRequestPayload) GetPlan() string {
 // GetPlanOk returns a tuple with the Plan field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *KafkaRequestPayload) GetPlanOk() (*string, bool) {
-	if o == nil || isNil(o.Plan) {
-    return nil, false
+	if o == nil || o.Plan == nil {
+		return nil, false
 	}
 	return o.Plan, true
 }
 
 // HasPlan returns a boolean if a field has been set.
 func (o *KafkaRequestPayload) HasPlan() bool {
-	if o != nil && !isNil(o.Plan) {
+	if o != nil && o.Plan != nil {
 		return true
 	}
 
@@ -217,7 +217,7 @@ func (o *KafkaRequestPayload) SetPlan(v string) {
 
 // GetBillingCloudAccountId returns the BillingCloudAccountId field value if set, zero value otherwise (both if not set or set to explicit null).
 func (o *KafkaRequestPayload) GetBillingCloudAccountId() string {
-	if o == nil || isNil(o.BillingCloudAccountId.Get()) {
+	if o == nil || o.BillingCloudAccountId.Get() == nil {
 		var ret string
 		return ret
 	}
@@ -228,8 +228,8 @@ func (o *KafkaRequestPayload) GetBillingCloudAccountId() string {
 // and a boolean to check if the value has been set.
 // NOTE: If the value is an explicit nil, `nil, true` will be returned
 func (o *KafkaRequestPayload) GetBillingCloudAccountIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return o.BillingCloudAccountId.Get(), o.BillingCloudAccountId.IsSet()
 }
@@ -259,7 +259,7 @@ func (o *KafkaRequestPayload) UnsetBillingCloudAccountId() {
 
 // GetMarketplace returns the Marketplace field value if set, zero value otherwise (both if not set or set to explicit null).
 func (o *KafkaRequestPayload) GetMarketplace() string {
-	if o == nil || isNil(o.Marketplace.Get()) {
+	if o == nil || o.Marketplace.Get() == nil {
 		var ret string
 		return ret
 	}
@@ -270,8 +270,8 @@ func (o *KafkaRequestPayload) GetMarketplace() string {
 // and a boolean to check if the value has been set.
 // NOTE: If the value is an explicit nil, `nil, true` will be returned
 func (o *KafkaRequestPayload) GetMarketplaceOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return o.Marketplace.Get(), o.Marketplace.IsSet()
 }
@@ -301,7 +301,7 @@ func (o *KafkaRequestPayload) UnsetMarketplace() {
 
 // GetBillingModel returns the BillingModel field value if set, zero value otherwise (both if not set or set to explicit null).
 func (o *KafkaRequestPayload) GetBillingModel() string {
-	if o == nil || isNil(o.BillingModel.Get()) {
+	if o == nil || o.BillingModel.Get() == nil {
 		var ret string
 		return ret
 	}
@@ -312,8 +312,8 @@ func (o *KafkaRequestPayload) GetBillingModel() string {
 // and a boolean to check if the value has been set.
 // NOTE: If the value is an explicit nil, `nil, true` will be returned
 func (o *KafkaRequestPayload) GetBillingModelOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return o.BillingModel.Get(), o.BillingModel.IsSet()
 }
@@ -343,19 +343,19 @@ func (o *KafkaRequestPayload) UnsetBillingModel() {
 
 func (o KafkaRequestPayload) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.CloudProvider) {
+	if o.CloudProvider != nil {
 		toSerialize["cloud_provider"] = o.CloudProvider
 	}
 	if true {
 		toSerialize["name"] = o.Name
 	}
-	if !isNil(o.Region) {
+	if o.Region != nil {
 		toSerialize["region"] = o.Region
 	}
 	if o.ReauthenticationEnabled.IsSet() {
 		toSerialize["reauthentication_enabled"] = o.ReauthenticationEnabled.Get()
 	}
-	if !isNil(o.Plan) {
+	if o.Plan != nil {
 		toSerialize["plan"] = o.Plan
 	}
 	if o.BillingCloudAccountId.IsSet() {
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/model_kafka_update_request.go b/app-services-sdk-go/kafkamgmt/apiv1/client/model_kafka_update_request.go
index fe3a8b61..547b1763 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/model_kafka_update_request.go
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/model_kafka_update_request.go
@@ -1,11 +1,11 @@
 /*
-Kafka Management API
-
-Kafka Management API is a REST API to manage Kafka instances
-
-API version: 1.14.0
-Contact: rhosak-support@redhat.com
-*/
+ * Kafka Management API
+ *
+ * Kafka Management API is a REST API to manage Kafka instances
+ *
+ * API version: 1.14.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -41,7 +41,7 @@ func NewKafkaUpdateRequestWithDefaults() *KafkaUpdateRequest {
 
 // GetOwner returns the Owner field value if set, zero value otherwise (both if not set or set to explicit null).
 func (o *KafkaUpdateRequest) GetOwner() string {
-	if o == nil || isNil(o.Owner.Get()) {
+	if o == nil || o.Owner.Get() == nil {
 		var ret string
 		return ret
 	}
@@ -52,8 +52,8 @@ func (o *KafkaUpdateRequest) GetOwner() string {
 // and a boolean to check if the value has been set.
 // NOTE: If the value is an explicit nil, `nil, true` will be returned
 func (o *KafkaUpdateRequest) GetOwnerOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return o.Owner.Get(), o.Owner.IsSet()
 }
@@ -83,7 +83,7 @@ func (o *KafkaUpdateRequest) UnsetOwner() {
 
 // GetReauthenticationEnabled returns the ReauthenticationEnabled field value if set, zero value otherwise (both if not set or set to explicit null).
 func (o *KafkaUpdateRequest) GetReauthenticationEnabled() bool {
-	if o == nil || isNil(o.ReauthenticationEnabled.Get()) {
+	if o == nil || o.ReauthenticationEnabled.Get() == nil {
 		var ret bool
 		return ret
 	}
@@ -94,8 +94,8 @@ func (o *KafkaUpdateRequest) GetReauthenticationEnabled() bool {
 // and a boolean to check if the value has been set.
 // NOTE: If the value is an explicit nil, `nil, true` will be returned
 func (o *KafkaUpdateRequest) GetReauthenticationEnabledOk() (*bool, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return o.ReauthenticationEnabled.Get(), o.ReauthenticationEnabled.IsSet()
 }
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/model_list.go b/app-services-sdk-go/kafkamgmt/apiv1/client/model_list.go
index 9434792b..0980b278 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/model_list.go
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/model_list.go
@@ -1,11 +1,11 @@
 /*
-Kafka Management API
-
-Kafka Management API is a REST API to manage Kafka instances
-
-API version: 1.14.0
-Contact: rhosak-support@redhat.com
-*/
+ * Kafka Management API
+ *
+ * Kafka Management API is a REST API to manage Kafka instances
+ *
+ * API version: 1.14.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -59,8 +59,8 @@ func (o *List) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *List) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -83,8 +83,8 @@ func (o *List) GetPage() int32 {
 // GetPageOk returns a tuple with the Page field value
 // and a boolean to check if the value has been set.
 func (o *List) GetPageOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Page, true
 }
@@ -107,8 +107,8 @@ func (o *List) GetSize() int32 {
 // GetSizeOk returns a tuple with the Size field value
 // and a boolean to check if the value has been set.
 func (o *List) GetSizeOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Size, true
 }
@@ -131,8 +131,8 @@ func (o *List) GetTotal() int32 {
 // GetTotalOk returns a tuple with the Total field value
 // and a boolean to check if the value has been set.
 func (o *List) GetTotalOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Total, true
 }
@@ -154,11 +154,11 @@ func (o *List) GetItems() []ObjectReference {
 
 // GetItemsOk returns a tuple with the Items field value
 // and a boolean to check if the value has been set.
-func (o *List) GetItemsOk() ([]ObjectReference, bool) {
-	if o == nil {
-    return nil, false
+func (o *List) GetItemsOk() (*[]ObjectReference, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Items, true
+	return &o.Items, true
 }
 
 // SetItems sets field value
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/model_metrics_instant_query_list.go b/app-services-sdk-go/kafkamgmt/apiv1/client/model_metrics_instant_query_list.go
index 6ed4c9c5..5a080c2b 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/model_metrics_instant_query_list.go
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/model_metrics_instant_query_list.go
@@ -1,11 +1,11 @@
 /*
-Kafka Management API
-
-Kafka Management API is a REST API to manage Kafka instances
-
-API version: 1.14.0
-Contact: rhosak-support@redhat.com
-*/
+ * Kafka Management API
+ *
+ * Kafka Management API is a REST API to manage Kafka instances
+ *
+ * API version: 1.14.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -19,7 +19,7 @@ import (
 type MetricsInstantQueryList struct {
 	Kind *string `json:"kind,omitempty"`
 	Id *string `json:"id,omitempty"`
-	Items []InstantQuery `json:"items,omitempty"`
+	Items *[]InstantQuery `json:"items,omitempty"`
 }
 
 // NewMetricsInstantQueryList instantiates a new MetricsInstantQueryList object
@@ -41,7 +41,7 @@ func NewMetricsInstantQueryListWithDefaults() *MetricsInstantQueryList {
 
 // GetKind returns the Kind field value if set, zero value otherwise.
 func (o *MetricsInstantQueryList) GetKind() string {
-	if o == nil || isNil(o.Kind) {
+	if o == nil || o.Kind == nil {
 		var ret string
 		return ret
 	}
@@ -51,15 +51,15 @@ func (o *MetricsInstantQueryList) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *MetricsInstantQueryList) GetKindOk() (*string, bool) {
-	if o == nil || isNil(o.Kind) {
-    return nil, false
+	if o == nil || o.Kind == nil {
+		return nil, false
 	}
 	return o.Kind, true
 }
 
 // HasKind returns a boolean if a field has been set.
 func (o *MetricsInstantQueryList) HasKind() bool {
-	if o != nil && !isNil(o.Kind) {
+	if o != nil && o.Kind != nil {
 		return true
 	}
 
@@ -73,7 +73,7 @@ func (o *MetricsInstantQueryList) SetKind(v string) {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *MetricsInstantQueryList) GetId() string {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret string
 		return ret
 	}
@@ -83,15 +83,15 @@ func (o *MetricsInstantQueryList) GetId() string {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *MetricsInstantQueryList) GetIdOk() (*string, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *MetricsInstantQueryList) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -105,25 +105,25 @@ func (o *MetricsInstantQueryList) SetId(v string) {
 
 // GetItems returns the Items field value if set, zero value otherwise.
 func (o *MetricsInstantQueryList) GetItems() []InstantQuery {
-	if o == nil || isNil(o.Items) {
+	if o == nil || o.Items == nil {
 		var ret []InstantQuery
 		return ret
 	}
-	return o.Items
+	return *o.Items
 }
 
 // GetItemsOk returns a tuple with the Items field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *MetricsInstantQueryList) GetItemsOk() ([]InstantQuery, bool) {
-	if o == nil || isNil(o.Items) {
-    return nil, false
+func (o *MetricsInstantQueryList) GetItemsOk() (*[]InstantQuery, bool) {
+	if o == nil || o.Items == nil {
+		return nil, false
 	}
 	return o.Items, true
 }
 
 // HasItems returns a boolean if a field has been set.
 func (o *MetricsInstantQueryList) HasItems() bool {
-	if o != nil && !isNil(o.Items) {
+	if o != nil && o.Items != nil {
 		return true
 	}
 
@@ -132,18 +132,18 @@ func (o *MetricsInstantQueryList) HasItems() bool {
 
 // SetItems gets a reference to the given []InstantQuery and assigns it to the Items field.
 func (o *MetricsInstantQueryList) SetItems(v []InstantQuery) {
-	o.Items = v
+	o.Items = &v
 }
 
 func (o MetricsInstantQueryList) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Kind) {
+	if o.Kind != nil {
 		toSerialize["kind"] = o.Kind
 	}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.Items) {
+	if o.Items != nil {
 		toSerialize["items"] = o.Items
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/model_metrics_instant_query_list_all_of.go b/app-services-sdk-go/kafkamgmt/apiv1/client/model_metrics_instant_query_list_all_of.go
index e74ecf70..06976d80 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/model_metrics_instant_query_list_all_of.go
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/model_metrics_instant_query_list_all_of.go
@@ -1,11 +1,11 @@
 /*
-Kafka Management API
-
-Kafka Management API is a REST API to manage Kafka instances
-
-API version: 1.14.0
-Contact: rhosak-support@redhat.com
-*/
+ * Kafka Management API
+ *
+ * Kafka Management API is a REST API to manage Kafka instances
+ *
+ * API version: 1.14.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -19,7 +19,7 @@ import (
 type MetricsInstantQueryListAllOf struct {
 	Kind *string `json:"kind,omitempty"`
 	Id *string `json:"id,omitempty"`
-	Items []InstantQuery `json:"items,omitempty"`
+	Items *[]InstantQuery `json:"items,omitempty"`
 }
 
 // NewMetricsInstantQueryListAllOf instantiates a new MetricsInstantQueryListAllOf object
@@ -41,7 +41,7 @@ func NewMetricsInstantQueryListAllOfWithDefaults() *MetricsInstantQueryListAllOf
 
 // GetKind returns the Kind field value if set, zero value otherwise.
 func (o *MetricsInstantQueryListAllOf) GetKind() string {
-	if o == nil || isNil(o.Kind) {
+	if o == nil || o.Kind == nil {
 		var ret string
 		return ret
 	}
@@ -51,15 +51,15 @@ func (o *MetricsInstantQueryListAllOf) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *MetricsInstantQueryListAllOf) GetKindOk() (*string, bool) {
-	if o == nil || isNil(o.Kind) {
-    return nil, false
+	if o == nil || o.Kind == nil {
+		return nil, false
 	}
 	return o.Kind, true
 }
 
 // HasKind returns a boolean if a field has been set.
 func (o *MetricsInstantQueryListAllOf) HasKind() bool {
-	if o != nil && !isNil(o.Kind) {
+	if o != nil && o.Kind != nil {
 		return true
 	}
 
@@ -73,7 +73,7 @@ func (o *MetricsInstantQueryListAllOf) SetKind(v string) {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *MetricsInstantQueryListAllOf) GetId() string {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret string
 		return ret
 	}
@@ -83,15 +83,15 @@ func (o *MetricsInstantQueryListAllOf) GetId() string {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *MetricsInstantQueryListAllOf) GetIdOk() (*string, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *MetricsInstantQueryListAllOf) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -105,25 +105,25 @@ func (o *MetricsInstantQueryListAllOf) SetId(v string) {
 
 // GetItems returns the Items field value if set, zero value otherwise.
 func (o *MetricsInstantQueryListAllOf) GetItems() []InstantQuery {
-	if o == nil || isNil(o.Items) {
+	if o == nil || o.Items == nil {
 		var ret []InstantQuery
 		return ret
 	}
-	return o.Items
+	return *o.Items
 }
 
 // GetItemsOk returns a tuple with the Items field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *MetricsInstantQueryListAllOf) GetItemsOk() ([]InstantQuery, bool) {
-	if o == nil || isNil(o.Items) {
-    return nil, false
+func (o *MetricsInstantQueryListAllOf) GetItemsOk() (*[]InstantQuery, bool) {
+	if o == nil || o.Items == nil {
+		return nil, false
 	}
 	return o.Items, true
 }
 
 // HasItems returns a boolean if a field has been set.
 func (o *MetricsInstantQueryListAllOf) HasItems() bool {
-	if o != nil && !isNil(o.Items) {
+	if o != nil && o.Items != nil {
 		return true
 	}
 
@@ -132,18 +132,18 @@ func (o *MetricsInstantQueryListAllOf) HasItems() bool {
 
 // SetItems gets a reference to the given []InstantQuery and assigns it to the Items field.
 func (o *MetricsInstantQueryListAllOf) SetItems(v []InstantQuery) {
-	o.Items = v
+	o.Items = &v
 }
 
 func (o MetricsInstantQueryListAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Kind) {
+	if o.Kind != nil {
 		toSerialize["kind"] = o.Kind
 	}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.Items) {
+	if o.Items != nil {
 		toSerialize["items"] = o.Items
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/model_metrics_range_query_list.go b/app-services-sdk-go/kafkamgmt/apiv1/client/model_metrics_range_query_list.go
index 5549ca44..9175ed7e 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/model_metrics_range_query_list.go
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/model_metrics_range_query_list.go
@@ -1,11 +1,11 @@
 /*
-Kafka Management API
-
-Kafka Management API is a REST API to manage Kafka instances
-
-API version: 1.14.0
-Contact: rhosak-support@redhat.com
-*/
+ * Kafka Management API
+ *
+ * Kafka Management API is a REST API to manage Kafka instances
+ *
+ * API version: 1.14.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -19,7 +19,7 @@ import (
 type MetricsRangeQueryList struct {
 	Kind *string `json:"kind,omitempty"`
 	Id *string `json:"id,omitempty"`
-	Items []RangeQuery `json:"items,omitempty"`
+	Items *[]RangeQuery `json:"items,omitempty"`
 }
 
 // NewMetricsRangeQueryList instantiates a new MetricsRangeQueryList object
@@ -41,7 +41,7 @@ func NewMetricsRangeQueryListWithDefaults() *MetricsRangeQueryList {
 
 // GetKind returns the Kind field value if set, zero value otherwise.
 func (o *MetricsRangeQueryList) GetKind() string {
-	if o == nil || isNil(o.Kind) {
+	if o == nil || o.Kind == nil {
 		var ret string
 		return ret
 	}
@@ -51,15 +51,15 @@ func (o *MetricsRangeQueryList) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *MetricsRangeQueryList) GetKindOk() (*string, bool) {
-	if o == nil || isNil(o.Kind) {
-    return nil, false
+	if o == nil || o.Kind == nil {
+		return nil, false
 	}
 	return o.Kind, true
 }
 
 // HasKind returns a boolean if a field has been set.
 func (o *MetricsRangeQueryList) HasKind() bool {
-	if o != nil && !isNil(o.Kind) {
+	if o != nil && o.Kind != nil {
 		return true
 	}
 
@@ -73,7 +73,7 @@ func (o *MetricsRangeQueryList) SetKind(v string) {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *MetricsRangeQueryList) GetId() string {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret string
 		return ret
 	}
@@ -83,15 +83,15 @@ func (o *MetricsRangeQueryList) GetId() string {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *MetricsRangeQueryList) GetIdOk() (*string, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *MetricsRangeQueryList) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -105,25 +105,25 @@ func (o *MetricsRangeQueryList) SetId(v string) {
 
 // GetItems returns the Items field value if set, zero value otherwise.
 func (o *MetricsRangeQueryList) GetItems() []RangeQuery {
-	if o == nil || isNil(o.Items) {
+	if o == nil || o.Items == nil {
 		var ret []RangeQuery
 		return ret
 	}
-	return o.Items
+	return *o.Items
 }
 
 // GetItemsOk returns a tuple with the Items field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *MetricsRangeQueryList) GetItemsOk() ([]RangeQuery, bool) {
-	if o == nil || isNil(o.Items) {
-    return nil, false
+func (o *MetricsRangeQueryList) GetItemsOk() (*[]RangeQuery, bool) {
+	if o == nil || o.Items == nil {
+		return nil, false
 	}
 	return o.Items, true
 }
 
 // HasItems returns a boolean if a field has been set.
 func (o *MetricsRangeQueryList) HasItems() bool {
-	if o != nil && !isNil(o.Items) {
+	if o != nil && o.Items != nil {
 		return true
 	}
 
@@ -132,18 +132,18 @@ func (o *MetricsRangeQueryList) HasItems() bool {
 
 // SetItems gets a reference to the given []RangeQuery and assigns it to the Items field.
 func (o *MetricsRangeQueryList) SetItems(v []RangeQuery) {
-	o.Items = v
+	o.Items = &v
 }
 
 func (o MetricsRangeQueryList) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Kind) {
+	if o.Kind != nil {
 		toSerialize["kind"] = o.Kind
 	}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.Items) {
+	if o.Items != nil {
 		toSerialize["items"] = o.Items
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/model_metrics_range_query_list_all_of.go b/app-services-sdk-go/kafkamgmt/apiv1/client/model_metrics_range_query_list_all_of.go
index ff2877cd..c90ae08d 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/model_metrics_range_query_list_all_of.go
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/model_metrics_range_query_list_all_of.go
@@ -1,11 +1,11 @@
 /*
-Kafka Management API
-
-Kafka Management API is a REST API to manage Kafka instances
-
-API version: 1.14.0
-Contact: rhosak-support@redhat.com
-*/
+ * Kafka Management API
+ *
+ * Kafka Management API is a REST API to manage Kafka instances
+ *
+ * API version: 1.14.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -19,7 +19,7 @@ import (
 type MetricsRangeQueryListAllOf struct {
 	Kind *string `json:"kind,omitempty"`
 	Id *string `json:"id,omitempty"`
-	Items []RangeQuery `json:"items,omitempty"`
+	Items *[]RangeQuery `json:"items,omitempty"`
 }
 
 // NewMetricsRangeQueryListAllOf instantiates a new MetricsRangeQueryListAllOf object
@@ -41,7 +41,7 @@ func NewMetricsRangeQueryListAllOfWithDefaults() *MetricsRangeQueryListAllOf {
 
 // GetKind returns the Kind field value if set, zero value otherwise.
 func (o *MetricsRangeQueryListAllOf) GetKind() string {
-	if o == nil || isNil(o.Kind) {
+	if o == nil || o.Kind == nil {
 		var ret string
 		return ret
 	}
@@ -51,15 +51,15 @@ func (o *MetricsRangeQueryListAllOf) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *MetricsRangeQueryListAllOf) GetKindOk() (*string, bool) {
-	if o == nil || isNil(o.Kind) {
-    return nil, false
+	if o == nil || o.Kind == nil {
+		return nil, false
 	}
 	return o.Kind, true
 }
 
 // HasKind returns a boolean if a field has been set.
 func (o *MetricsRangeQueryListAllOf) HasKind() bool {
-	if o != nil && !isNil(o.Kind) {
+	if o != nil && o.Kind != nil {
 		return true
 	}
 
@@ -73,7 +73,7 @@ func (o *MetricsRangeQueryListAllOf) SetKind(v string) {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *MetricsRangeQueryListAllOf) GetId() string {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret string
 		return ret
 	}
@@ -83,15 +83,15 @@ func (o *MetricsRangeQueryListAllOf) GetId() string {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *MetricsRangeQueryListAllOf) GetIdOk() (*string, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *MetricsRangeQueryListAllOf) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -105,25 +105,25 @@ func (o *MetricsRangeQueryListAllOf) SetId(v string) {
 
 // GetItems returns the Items field value if set, zero value otherwise.
 func (o *MetricsRangeQueryListAllOf) GetItems() []RangeQuery {
-	if o == nil || isNil(o.Items) {
+	if o == nil || o.Items == nil {
 		var ret []RangeQuery
 		return ret
 	}
-	return o.Items
+	return *o.Items
 }
 
 // GetItemsOk returns a tuple with the Items field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *MetricsRangeQueryListAllOf) GetItemsOk() ([]RangeQuery, bool) {
-	if o == nil || isNil(o.Items) {
-    return nil, false
+func (o *MetricsRangeQueryListAllOf) GetItemsOk() (*[]RangeQuery, bool) {
+	if o == nil || o.Items == nil {
+		return nil, false
 	}
 	return o.Items, true
 }
 
 // HasItems returns a boolean if a field has been set.
 func (o *MetricsRangeQueryListAllOf) HasItems() bool {
-	if o != nil && !isNil(o.Items) {
+	if o != nil && o.Items != nil {
 		return true
 	}
 
@@ -132,18 +132,18 @@ func (o *MetricsRangeQueryListAllOf) HasItems() bool {
 
 // SetItems gets a reference to the given []RangeQuery and assigns it to the Items field.
 func (o *MetricsRangeQueryListAllOf) SetItems(v []RangeQuery) {
-	o.Items = v
+	o.Items = &v
 }
 
 func (o MetricsRangeQueryListAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Kind) {
+	if o.Kind != nil {
 		toSerialize["kind"] = o.Kind
 	}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.Items) {
+	if o.Items != nil {
 		toSerialize["items"] = o.Items
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/model_object_reference.go b/app-services-sdk-go/kafkamgmt/apiv1/client/model_object_reference.go
index 2aa3c16c..d96e9350 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/model_object_reference.go
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/model_object_reference.go
@@ -1,11 +1,11 @@
 /*
-Kafka Management API
-
-Kafka Management API is a REST API to manage Kafka instances
-
-API version: 1.14.0
-Contact: rhosak-support@redhat.com
-*/
+ * Kafka Management API
+ *
+ * Kafka Management API is a REST API to manage Kafka instances
+ *
+ * API version: 1.14.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -55,8 +55,8 @@ func (o *ObjectReference) GetId() string {
 // GetIdOk returns a tuple with the Id field value
 // and a boolean to check if the value has been set.
 func (o *ObjectReference) GetIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Id, true
 }
@@ -79,8 +79,8 @@ func (o *ObjectReference) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *ObjectReference) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -103,8 +103,8 @@ func (o *ObjectReference) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value
 // and a boolean to check if the value has been set.
 func (o *ObjectReference) GetHrefOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Href, true
 }
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/model_range_query.go b/app-services-sdk-go/kafkamgmt/apiv1/client/model_range_query.go
index c058e409..431551c9 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/model_range_query.go
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/model_range_query.go
@@ -1,11 +1,11 @@
 /*
-Kafka Management API
-
-Kafka Management API is a REST API to manage Kafka instances
-
-API version: 1.14.0
-Contact: rhosak-support@redhat.com
-*/
+ * Kafka Management API
+ *
+ * Kafka Management API is a REST API to manage Kafka instances
+ *
+ * API version: 1.14.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -18,7 +18,7 @@ import (
 // RangeQuery struct for RangeQuery
 type RangeQuery struct {
 	Metric *map[string]string `json:"metric,omitempty"`
-	Values []Values `json:"values,omitempty"`
+	Values *[]Values `json:"values,omitempty"`
 }
 
 // NewRangeQuery instantiates a new RangeQuery object
@@ -40,7 +40,7 @@ func NewRangeQueryWithDefaults() *RangeQuery {
 
 // GetMetric returns the Metric field value if set, zero value otherwise.
 func (o *RangeQuery) GetMetric() map[string]string {
-	if o == nil || isNil(o.Metric) {
+	if o == nil || o.Metric == nil {
 		var ret map[string]string
 		return ret
 	}
@@ -50,15 +50,15 @@ func (o *RangeQuery) GetMetric() map[string]string {
 // GetMetricOk returns a tuple with the Metric field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RangeQuery) GetMetricOk() (*map[string]string, bool) {
-	if o == nil || isNil(o.Metric) {
-    return nil, false
+	if o == nil || o.Metric == nil {
+		return nil, false
 	}
 	return o.Metric, true
 }
 
 // HasMetric returns a boolean if a field has been set.
 func (o *RangeQuery) HasMetric() bool {
-	if o != nil && !isNil(o.Metric) {
+	if o != nil && o.Metric != nil {
 		return true
 	}
 
@@ -72,25 +72,25 @@ func (o *RangeQuery) SetMetric(v map[string]string) {
 
 // GetValues returns the Values field value if set, zero value otherwise.
 func (o *RangeQuery) GetValues() []Values {
-	if o == nil || isNil(o.Values) {
+	if o == nil || o.Values == nil {
 		var ret []Values
 		return ret
 	}
-	return o.Values
+	return *o.Values
 }
 
 // GetValuesOk returns a tuple with the Values field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *RangeQuery) GetValuesOk() ([]Values, bool) {
-	if o == nil || isNil(o.Values) {
-    return nil, false
+func (o *RangeQuery) GetValuesOk() (*[]Values, bool) {
+	if o == nil || o.Values == nil {
+		return nil, false
 	}
 	return o.Values, true
 }
 
 // HasValues returns a boolean if a field has been set.
 func (o *RangeQuery) HasValues() bool {
-	if o != nil && !isNil(o.Values) {
+	if o != nil && o.Values != nil {
 		return true
 	}
 
@@ -99,15 +99,15 @@ func (o *RangeQuery) HasValues() bool {
 
 // SetValues gets a reference to the given []Values and assigns it to the Values field.
 func (o *RangeQuery) SetValues(v []Values) {
-	o.Values = v
+	o.Values = &v
 }
 
 func (o RangeQuery) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Metric) {
+	if o.Metric != nil {
 		toSerialize["metric"] = o.Metric
 	}
-	if !isNil(o.Values) {
+	if o.Values != nil {
 		toSerialize["values"] = o.Values
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/model_region_capacity_list_item.go b/app-services-sdk-go/kafkamgmt/apiv1/client/model_region_capacity_list_item.go
index 81e9acbf..05645b0f 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/model_region_capacity_list_item.go
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/model_region_capacity_list_item.go
@@ -1,11 +1,11 @@
 /*
-Kafka Management API
-
-Kafka Management API is a REST API to manage Kafka instances
-
-API version: 1.14.0
-Contact: rhosak-support@redhat.com
-*/
+ * Kafka Management API
+ *
+ * Kafka Management API is a REST API to manage Kafka instances
+ *
+ * API version: 1.14.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -55,8 +55,8 @@ func (o *RegionCapacityListItem) GetInstanceType() string {
 // GetInstanceTypeOk returns a tuple with the InstanceType field value
 // and a boolean to check if the value has been set.
 func (o *RegionCapacityListItem) GetInstanceTypeOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.InstanceType, true
 }
@@ -78,11 +78,11 @@ func (o *RegionCapacityListItem) GetAvailableSizes() []string {
 
 // GetAvailableSizesOk returns a tuple with the AvailableSizes field value
 // and a boolean to check if the value has been set.
-func (o *RegionCapacityListItem) GetAvailableSizesOk() ([]string, bool) {
-	if o == nil {
-    return nil, false
+func (o *RegionCapacityListItem) GetAvailableSizesOk() (*[]string, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.AvailableSizes, true
+	return &o.AvailableSizes, true
 }
 
 // SetAvailableSizes sets field value
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/model_service_account.go b/app-services-sdk-go/kafkamgmt/apiv1/client/model_service_account.go
index e2167e09..ce3a4b42 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/model_service_account.go
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/model_service_account.go
@@ -1,11 +1,11 @@
 /*
-Kafka Management API
-
-Kafka Management API is a REST API to manage Kafka instances
-
-API version: 1.14.0
-Contact: rhosak-support@redhat.com
-*/
+ * Kafka Management API
+ *
+ * Kafka Management API is a REST API to manage Kafka instances
+ *
+ * API version: 1.14.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -13,6 +13,7 @@ package kafkamgmtclient
 
 import (
 	"encoding/json"
+	"time"
 )
 
 // ServiceAccount Service Account created in MAS-SSO for the Kafka Cluster for authentication
@@ -21,13 +22,10 @@ type ServiceAccount struct {
 	Id string `json:"id"`
 	Kind string `json:"kind"`
 	Href string `json:"href"`
-	// 
 	Name *string `json:"name,omitempty"`
-	// 
 	Description *string `json:"description,omitempty"`
 	ClientId *string `json:"client_id,omitempty"`
 	ClientSecret *string `json:"client_secret,omitempty"`
-	// Deprecated
 	Owner *string `json:"owner,omitempty"`
 	CreatedBy *string `json:"created_by,omitempty"`
 	CreatedAt *time.Time `json:"created_at,omitempty"`
@@ -66,8 +64,8 @@ func (o *ServiceAccount) GetId() string {
 // GetIdOk returns a tuple with the Id field value
 // and a boolean to check if the value has been set.
 func (o *ServiceAccount) GetIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Id, true
 }
@@ -90,8 +88,8 @@ func (o *ServiceAccount) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *ServiceAccount) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -114,8 +112,8 @@ func (o *ServiceAccount) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value
 // and a boolean to check if the value has been set.
 func (o *ServiceAccount) GetHrefOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Href, true
 }
@@ -127,7 +125,7 @@ func (o *ServiceAccount) SetHref(v string) {
 
 // GetName returns the Name field value if set, zero value otherwise.
 func (o *ServiceAccount) GetName() string {
-	if o == nil || isNil(o.Name) {
+	if o == nil || o.Name == nil {
 		var ret string
 		return ret
 	}
@@ -137,15 +135,15 @@ func (o *ServiceAccount) GetName() string {
 // GetNameOk returns a tuple with the Name field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ServiceAccount) GetNameOk() (*string, bool) {
-	if o == nil || isNil(o.Name) {
-    return nil, false
+	if o == nil || o.Name == nil {
+		return nil, false
 	}
 	return o.Name, true
 }
 
 // HasName returns a boolean if a field has been set.
 func (o *ServiceAccount) HasName() bool {
-	if o != nil && !isNil(o.Name) {
+	if o != nil && o.Name != nil {
 		return true
 	}
 
@@ -159,7 +157,7 @@ func (o *ServiceAccount) SetName(v string) {
 
 // GetDescription returns the Description field value if set, zero value otherwise.
 func (o *ServiceAccount) GetDescription() string {
-	if o == nil || isNil(o.Description) {
+	if o == nil || o.Description == nil {
 		var ret string
 		return ret
 	}
@@ -169,15 +167,15 @@ func (o *ServiceAccount) GetDescription() string {
 // GetDescriptionOk returns a tuple with the Description field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ServiceAccount) GetDescriptionOk() (*string, bool) {
-	if o == nil || isNil(o.Description) {
-    return nil, false
+	if o == nil || o.Description == nil {
+		return nil, false
 	}
 	return o.Description, true
 }
 
 // HasDescription returns a boolean if a field has been set.
 func (o *ServiceAccount) HasDescription() bool {
-	if o != nil && !isNil(o.Description) {
+	if o != nil && o.Description != nil {
 		return true
 	}
 
@@ -191,7 +189,7 @@ func (o *ServiceAccount) SetDescription(v string) {
 
 // GetClientId returns the ClientId field value if set, zero value otherwise.
 func (o *ServiceAccount) GetClientId() string {
-	if o == nil || isNil(o.ClientId) {
+	if o == nil || o.ClientId == nil {
 		var ret string
 		return ret
 	}
@@ -201,15 +199,15 @@ func (o *ServiceAccount) GetClientId() string {
 // GetClientIdOk returns a tuple with the ClientId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ServiceAccount) GetClientIdOk() (*string, bool) {
-	if o == nil || isNil(o.ClientId) {
-    return nil, false
+	if o == nil || o.ClientId == nil {
+		return nil, false
 	}
 	return o.ClientId, true
 }
 
 // HasClientId returns a boolean if a field has been set.
 func (o *ServiceAccount) HasClientId() bool {
-	if o != nil && !isNil(o.ClientId) {
+	if o != nil && o.ClientId != nil {
 		return true
 	}
 
@@ -223,7 +221,7 @@ func (o *ServiceAccount) SetClientId(v string) {
 
 // GetClientSecret returns the ClientSecret field value if set, zero value otherwise.
 func (o *ServiceAccount) GetClientSecret() string {
-	if o == nil || isNil(o.ClientSecret) {
+	if o == nil || o.ClientSecret == nil {
 		var ret string
 		return ret
 	}
@@ -233,15 +231,15 @@ func (o *ServiceAccount) GetClientSecret() string {
 // GetClientSecretOk returns a tuple with the ClientSecret field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ServiceAccount) GetClientSecretOk() (*string, bool) {
-	if o == nil || isNil(o.ClientSecret) {
-    return nil, false
+	if o == nil || o.ClientSecret == nil {
+		return nil, false
 	}
 	return o.ClientSecret, true
 }
 
 // HasClientSecret returns a boolean if a field has been set.
 func (o *ServiceAccount) HasClientSecret() bool {
-	if o != nil && !isNil(o.ClientSecret) {
+	if o != nil && o.ClientSecret != nil {
 		return true
 	}
 
@@ -254,9 +252,8 @@ func (o *ServiceAccount) SetClientSecret(v string) {
 }
 
 // GetOwner returns the Owner field value if set, zero value otherwise.
-// Deprecated
 func (o *ServiceAccount) GetOwner() string {
-	if o == nil || isNil(o.Owner) {
+	if o == nil || o.Owner == nil {
 		var ret string
 		return ret
 	}
@@ -265,17 +262,16 @@ func (o *ServiceAccount) GetOwner() string {
 
 // GetOwnerOk returns a tuple with the Owner field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-// Deprecated
 func (o *ServiceAccount) GetOwnerOk() (*string, bool) {
-	if o == nil || isNil(o.Owner) {
-    return nil, false
+	if o == nil || o.Owner == nil {
+		return nil, false
 	}
 	return o.Owner, true
 }
 
 // HasOwner returns a boolean if a field has been set.
 func (o *ServiceAccount) HasOwner() bool {
-	if o != nil && !isNil(o.Owner) {
+	if o != nil && o.Owner != nil {
 		return true
 	}
 
@@ -283,14 +279,13 @@ func (o *ServiceAccount) HasOwner() bool {
 }
 
 // SetOwner gets a reference to the given string and assigns it to the Owner field.
-// Deprecated
 func (o *ServiceAccount) SetOwner(v string) {
 	o.Owner = &v
 }
 
 // GetCreatedBy returns the CreatedBy field value if set, zero value otherwise.
 func (o *ServiceAccount) GetCreatedBy() string {
-	if o == nil || isNil(o.CreatedBy) {
+	if o == nil || o.CreatedBy == nil {
 		var ret string
 		return ret
 	}
@@ -300,15 +295,15 @@ func (o *ServiceAccount) GetCreatedBy() string {
 // GetCreatedByOk returns a tuple with the CreatedBy field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ServiceAccount) GetCreatedByOk() (*string, bool) {
-	if o == nil || isNil(o.CreatedBy) {
-    return nil, false
+	if o == nil || o.CreatedBy == nil {
+		return nil, false
 	}
 	return o.CreatedBy, true
 }
 
 // HasCreatedBy returns a boolean if a field has been set.
 func (o *ServiceAccount) HasCreatedBy() bool {
-	if o != nil && !isNil(o.CreatedBy) {
+	if o != nil && o.CreatedBy != nil {
 		return true
 	}
 
@@ -322,7 +317,7 @@ func (o *ServiceAccount) SetCreatedBy(v string) {
 
 // GetCreatedAt returns the CreatedAt field value if set, zero value otherwise.
 func (o *ServiceAccount) GetCreatedAt() time.Time {
-	if o == nil || isNil(o.CreatedAt) {
+	if o == nil || o.CreatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -332,15 +327,15 @@ func (o *ServiceAccount) GetCreatedAt() time.Time {
 // GetCreatedAtOk returns a tuple with the CreatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ServiceAccount) GetCreatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.CreatedAt) {
-    return nil, false
+	if o == nil || o.CreatedAt == nil {
+		return nil, false
 	}
 	return o.CreatedAt, true
 }
 
 // HasCreatedAt returns a boolean if a field has been set.
 func (o *ServiceAccount) HasCreatedAt() bool {
-	if o != nil && !isNil(o.CreatedAt) {
+	if o != nil && o.CreatedAt != nil {
 		return true
 	}
 
@@ -363,25 +358,25 @@ func (o ServiceAccount) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["href"] = o.Href
 	}
-	if !isNil(o.Name) {
+	if o.Name != nil {
 		toSerialize["name"] = o.Name
 	}
-	if !isNil(o.Description) {
+	if o.Description != nil {
 		toSerialize["description"] = o.Description
 	}
-	if !isNil(o.ClientId) {
+	if o.ClientId != nil {
 		toSerialize["client_id"] = o.ClientId
 	}
-	if !isNil(o.ClientSecret) {
+	if o.ClientSecret != nil {
 		toSerialize["client_secret"] = o.ClientSecret
 	}
-	if !isNil(o.Owner) {
+	if o.Owner != nil {
 		toSerialize["owner"] = o.Owner
 	}
-	if !isNil(o.CreatedBy) {
+	if o.CreatedBy != nil {
 		toSerialize["created_by"] = o.CreatedBy
 	}
-	if !isNil(o.CreatedAt) {
+	if o.CreatedAt != nil {
 		toSerialize["created_at"] = o.CreatedAt
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/model_service_account_all_of.go b/app-services-sdk-go/kafkamgmt/apiv1/client/model_service_account_all_of.go
index 8c74dfec..402577dc 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/model_service_account_all_of.go
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/model_service_account_all_of.go
@@ -1,11 +1,11 @@
 /*
-Kafka Management API
-
-Kafka Management API is a REST API to manage Kafka instances
-
-API version: 1.14.0
-Contact: rhosak-support@redhat.com
-*/
+ * Kafka Management API
+ *
+ * Kafka Management API is a REST API to manage Kafka instances
+ *
+ * API version: 1.14.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -20,13 +20,10 @@ import (
 type ServiceAccountAllOf struct {
 	// server generated unique id of the service account
 	Id *string `json:"id,omitempty"`
-	// 
 	Name *string `json:"name,omitempty"`
-	// 
 	Description *string `json:"description,omitempty"`
 	ClientId *string `json:"client_id,omitempty"`
 	ClientSecret *string `json:"client_secret,omitempty"`
-	// Deprecated
 	Owner *string `json:"owner,omitempty"`
 	CreatedBy *string `json:"created_by,omitempty"`
 	CreatedAt *time.Time `json:"created_at,omitempty"`
@@ -51,7 +48,7 @@ func NewServiceAccountAllOfWithDefaults() *ServiceAccountAllOf {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *ServiceAccountAllOf) GetId() string {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret string
 		return ret
 	}
@@ -61,15 +58,15 @@ func (o *ServiceAccountAllOf) GetId() string {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ServiceAccountAllOf) GetIdOk() (*string, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *ServiceAccountAllOf) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -83,7 +80,7 @@ func (o *ServiceAccountAllOf) SetId(v string) {
 
 // GetName returns the Name field value if set, zero value otherwise.
 func (o *ServiceAccountAllOf) GetName() string {
-	if o == nil || isNil(o.Name) {
+	if o == nil || o.Name == nil {
 		var ret string
 		return ret
 	}
@@ -93,15 +90,15 @@ func (o *ServiceAccountAllOf) GetName() string {
 // GetNameOk returns a tuple with the Name field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ServiceAccountAllOf) GetNameOk() (*string, bool) {
-	if o == nil || isNil(o.Name) {
-    return nil, false
+	if o == nil || o.Name == nil {
+		return nil, false
 	}
 	return o.Name, true
 }
 
 // HasName returns a boolean if a field has been set.
 func (o *ServiceAccountAllOf) HasName() bool {
-	if o != nil && !isNil(o.Name) {
+	if o != nil && o.Name != nil {
 		return true
 	}
 
@@ -115,7 +112,7 @@ func (o *ServiceAccountAllOf) SetName(v string) {
 
 // GetDescription returns the Description field value if set, zero value otherwise.
 func (o *ServiceAccountAllOf) GetDescription() string {
-	if o == nil || isNil(o.Description) {
+	if o == nil || o.Description == nil {
 		var ret string
 		return ret
 	}
@@ -125,15 +122,15 @@ func (o *ServiceAccountAllOf) GetDescription() string {
 // GetDescriptionOk returns a tuple with the Description field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ServiceAccountAllOf) GetDescriptionOk() (*string, bool) {
-	if o == nil || isNil(o.Description) {
-    return nil, false
+	if o == nil || o.Description == nil {
+		return nil, false
 	}
 	return o.Description, true
 }
 
 // HasDescription returns a boolean if a field has been set.
 func (o *ServiceAccountAllOf) HasDescription() bool {
-	if o != nil && !isNil(o.Description) {
+	if o != nil && o.Description != nil {
 		return true
 	}
 
@@ -147,7 +144,7 @@ func (o *ServiceAccountAllOf) SetDescription(v string) {
 
 // GetClientId returns the ClientId field value if set, zero value otherwise.
 func (o *ServiceAccountAllOf) GetClientId() string {
-	if o == nil || isNil(o.ClientId) {
+	if o == nil || o.ClientId == nil {
 		var ret string
 		return ret
 	}
@@ -157,15 +154,15 @@ func (o *ServiceAccountAllOf) GetClientId() string {
 // GetClientIdOk returns a tuple with the ClientId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ServiceAccountAllOf) GetClientIdOk() (*string, bool) {
-	if o == nil || isNil(o.ClientId) {
-    return nil, false
+	if o == nil || o.ClientId == nil {
+		return nil, false
 	}
 	return o.ClientId, true
 }
 
 // HasClientId returns a boolean if a field has been set.
 func (o *ServiceAccountAllOf) HasClientId() bool {
-	if o != nil && !isNil(o.ClientId) {
+	if o != nil && o.ClientId != nil {
 		return true
 	}
 
@@ -179,7 +176,7 @@ func (o *ServiceAccountAllOf) SetClientId(v string) {
 
 // GetClientSecret returns the ClientSecret field value if set, zero value otherwise.
 func (o *ServiceAccountAllOf) GetClientSecret() string {
-	if o == nil || isNil(o.ClientSecret) {
+	if o == nil || o.ClientSecret == nil {
 		var ret string
 		return ret
 	}
@@ -189,15 +186,15 @@ func (o *ServiceAccountAllOf) GetClientSecret() string {
 // GetClientSecretOk returns a tuple with the ClientSecret field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ServiceAccountAllOf) GetClientSecretOk() (*string, bool) {
-	if o == nil || isNil(o.ClientSecret) {
-    return nil, false
+	if o == nil || o.ClientSecret == nil {
+		return nil, false
 	}
 	return o.ClientSecret, true
 }
 
 // HasClientSecret returns a boolean if a field has been set.
 func (o *ServiceAccountAllOf) HasClientSecret() bool {
-	if o != nil && !isNil(o.ClientSecret) {
+	if o != nil && o.ClientSecret != nil {
 		return true
 	}
 
@@ -210,9 +207,8 @@ func (o *ServiceAccountAllOf) SetClientSecret(v string) {
 }
 
 // GetOwner returns the Owner field value if set, zero value otherwise.
-// Deprecated
 func (o *ServiceAccountAllOf) GetOwner() string {
-	if o == nil || isNil(o.Owner) {
+	if o == nil || o.Owner == nil {
 		var ret string
 		return ret
 	}
@@ -221,17 +217,16 @@ func (o *ServiceAccountAllOf) GetOwner() string {
 
 // GetOwnerOk returns a tuple with the Owner field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-// Deprecated
 func (o *ServiceAccountAllOf) GetOwnerOk() (*string, bool) {
-	if o == nil || isNil(o.Owner) {
-    return nil, false
+	if o == nil || o.Owner == nil {
+		return nil, false
 	}
 	return o.Owner, true
 }
 
 // HasOwner returns a boolean if a field has been set.
 func (o *ServiceAccountAllOf) HasOwner() bool {
-	if o != nil && !isNil(o.Owner) {
+	if o != nil && o.Owner != nil {
 		return true
 	}
 
@@ -239,14 +234,13 @@ func (o *ServiceAccountAllOf) HasOwner() bool {
 }
 
 // SetOwner gets a reference to the given string and assigns it to the Owner field.
-// Deprecated
 func (o *ServiceAccountAllOf) SetOwner(v string) {
 	o.Owner = &v
 }
 
 // GetCreatedBy returns the CreatedBy field value if set, zero value otherwise.
 func (o *ServiceAccountAllOf) GetCreatedBy() string {
-	if o == nil || isNil(o.CreatedBy) {
+	if o == nil || o.CreatedBy == nil {
 		var ret string
 		return ret
 	}
@@ -256,15 +250,15 @@ func (o *ServiceAccountAllOf) GetCreatedBy() string {
 // GetCreatedByOk returns a tuple with the CreatedBy field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ServiceAccountAllOf) GetCreatedByOk() (*string, bool) {
-	if o == nil || isNil(o.CreatedBy) {
-    return nil, false
+	if o == nil || o.CreatedBy == nil {
+		return nil, false
 	}
 	return o.CreatedBy, true
 }
 
 // HasCreatedBy returns a boolean if a field has been set.
 func (o *ServiceAccountAllOf) HasCreatedBy() bool {
-	if o != nil && !isNil(o.CreatedBy) {
+	if o != nil && o.CreatedBy != nil {
 		return true
 	}
 
@@ -278,7 +272,7 @@ func (o *ServiceAccountAllOf) SetCreatedBy(v string) {
 
 // GetCreatedAt returns the CreatedAt field value if set, zero value otherwise.
 func (o *ServiceAccountAllOf) GetCreatedAt() time.Time {
-	if o == nil || isNil(o.CreatedAt) {
+	if o == nil || o.CreatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -288,15 +282,15 @@ func (o *ServiceAccountAllOf) GetCreatedAt() time.Time {
 // GetCreatedAtOk returns a tuple with the CreatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ServiceAccountAllOf) GetCreatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.CreatedAt) {
-    return nil, false
+	if o == nil || o.CreatedAt == nil {
+		return nil, false
 	}
 	return o.CreatedAt, true
 }
 
 // HasCreatedAt returns a boolean if a field has been set.
 func (o *ServiceAccountAllOf) HasCreatedAt() bool {
-	if o != nil && !isNil(o.CreatedAt) {
+	if o != nil && o.CreatedAt != nil {
 		return true
 	}
 
@@ -310,28 +304,28 @@ func (o *ServiceAccountAllOf) SetCreatedAt(v time.Time) {
 
 func (o ServiceAccountAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.Name) {
+	if o.Name != nil {
 		toSerialize["name"] = o.Name
 	}
-	if !isNil(o.Description) {
+	if o.Description != nil {
 		toSerialize["description"] = o.Description
 	}
-	if !isNil(o.ClientId) {
+	if o.ClientId != nil {
 		toSerialize["client_id"] = o.ClientId
 	}
-	if !isNil(o.ClientSecret) {
+	if o.ClientSecret != nil {
 		toSerialize["client_secret"] = o.ClientSecret
 	}
-	if !isNil(o.Owner) {
+	if o.Owner != nil {
 		toSerialize["owner"] = o.Owner
 	}
-	if !isNil(o.CreatedBy) {
+	if o.CreatedBy != nil {
 		toSerialize["created_by"] = o.CreatedBy
 	}
-	if !isNil(o.CreatedAt) {
+	if o.CreatedAt != nil {
 		toSerialize["created_at"] = o.CreatedAt
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/model_service_account_list.go b/app-services-sdk-go/kafkamgmt/apiv1/client/model_service_account_list.go
index 551a580e..13bfb114 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/model_service_account_list.go
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/model_service_account_list.go
@@ -1,11 +1,11 @@
 /*
-Kafka Management API
-
-Kafka Management API is a REST API to manage Kafka instances
-
-API version: 1.14.0
-Contact: rhosak-support@redhat.com
-*/
+ * Kafka Management API
+ *
+ * Kafka Management API is a REST API to manage Kafka instances
+ *
+ * API version: 1.14.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -53,8 +53,8 @@ func (o *ServiceAccountList) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *ServiceAccountList) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -76,11 +76,11 @@ func (o *ServiceAccountList) GetItems() []ServiceAccountListItem {
 
 // GetItemsOk returns a tuple with the Items field value
 // and a boolean to check if the value has been set.
-func (o *ServiceAccountList) GetItemsOk() ([]ServiceAccountListItem, bool) {
-	if o == nil {
-    return nil, false
+func (o *ServiceAccountList) GetItemsOk() (*[]ServiceAccountListItem, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Items, true
+	return &o.Items, true
 }
 
 // SetItems sets field value
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/model_service_account_list_all_of.go b/app-services-sdk-go/kafkamgmt/apiv1/client/model_service_account_list_all_of.go
index 68650c10..0a70f21c 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/model_service_account_list_all_of.go
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/model_service_account_list_all_of.go
@@ -1,11 +1,11 @@
 /*
-Kafka Management API
-
-Kafka Management API is a REST API to manage Kafka instances
-
-API version: 1.14.0
-Contact: rhosak-support@redhat.com
-*/
+ * Kafka Management API
+ *
+ * Kafka Management API is a REST API to manage Kafka instances
+ *
+ * API version: 1.14.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -53,8 +53,8 @@ func (o *ServiceAccountListAllOf) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *ServiceAccountListAllOf) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -76,11 +76,11 @@ func (o *ServiceAccountListAllOf) GetItems() []ServiceAccountListItem {
 
 // GetItemsOk returns a tuple with the Items field value
 // and a boolean to check if the value has been set.
-func (o *ServiceAccountListAllOf) GetItemsOk() ([]ServiceAccountListItem, bool) {
-	if o == nil {
-    return nil, false
+func (o *ServiceAccountListAllOf) GetItemsOk() (*[]ServiceAccountListItem, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Items, true
+	return &o.Items, true
 }
 
 // SetItems sets field value
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/model_service_account_list_item.go b/app-services-sdk-go/kafkamgmt/apiv1/client/model_service_account_list_item.go
index 2cc5f87a..b0105b1d 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/model_service_account_list_item.go
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/model_service_account_list_item.go
@@ -1,11 +1,11 @@
 /*
-Kafka Management API
-
-Kafka Management API is a REST API to manage Kafka instances
-
-API version: 1.14.0
-Contact: rhosak-support@redhat.com
-*/
+ * Kafka Management API
+ *
+ * Kafka Management API is a REST API to manage Kafka instances
+ *
+ * API version: 1.14.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -13,9 +13,10 @@ package kafkamgmtclient
 
 import (
 	"encoding/json"
+	"time"
 )
 
-// ServiceAccountListItem 
+// ServiceAccountListItem struct for ServiceAccountListItem
 type ServiceAccountListItem struct {
 	// server generated unique id of the service account
 	Id string `json:"id"`
@@ -26,7 +27,6 @@ type ServiceAccountListItem struct {
 	// name of the service account
 	Name *string `json:"name,omitempty"`
 	// owner of the service account
-	// Deprecated
 	Owner *string `json:"owner,omitempty"`
 	// service account created by the user
 	CreatedBy *string `json:"created_by,omitempty"`
@@ -69,8 +69,8 @@ func (o *ServiceAccountListItem) GetId() string {
 // GetIdOk returns a tuple with the Id field value
 // and a boolean to check if the value has been set.
 func (o *ServiceAccountListItem) GetIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Id, true
 }
@@ -93,8 +93,8 @@ func (o *ServiceAccountListItem) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *ServiceAccountListItem) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -117,8 +117,8 @@ func (o *ServiceAccountListItem) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value
 // and a boolean to check if the value has been set.
 func (o *ServiceAccountListItem) GetHrefOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Href, true
 }
@@ -130,7 +130,7 @@ func (o *ServiceAccountListItem) SetHref(v string) {
 
 // GetClientId returns the ClientId field value if set, zero value otherwise.
 func (o *ServiceAccountListItem) GetClientId() string {
-	if o == nil || isNil(o.ClientId) {
+	if o == nil || o.ClientId == nil {
 		var ret string
 		return ret
 	}
@@ -140,15 +140,15 @@ func (o *ServiceAccountListItem) GetClientId() string {
 // GetClientIdOk returns a tuple with the ClientId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ServiceAccountListItem) GetClientIdOk() (*string, bool) {
-	if o == nil || isNil(o.ClientId) {
-    return nil, false
+	if o == nil || o.ClientId == nil {
+		return nil, false
 	}
 	return o.ClientId, true
 }
 
 // HasClientId returns a boolean if a field has been set.
 func (o *ServiceAccountListItem) HasClientId() bool {
-	if o != nil && !isNil(o.ClientId) {
+	if o != nil && o.ClientId != nil {
 		return true
 	}
 
@@ -162,7 +162,7 @@ func (o *ServiceAccountListItem) SetClientId(v string) {
 
 // GetName returns the Name field value if set, zero value otherwise.
 func (o *ServiceAccountListItem) GetName() string {
-	if o == nil || isNil(o.Name) {
+	if o == nil || o.Name == nil {
 		var ret string
 		return ret
 	}
@@ -172,15 +172,15 @@ func (o *ServiceAccountListItem) GetName() string {
 // GetNameOk returns a tuple with the Name field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ServiceAccountListItem) GetNameOk() (*string, bool) {
-	if o == nil || isNil(o.Name) {
-    return nil, false
+	if o == nil || o.Name == nil {
+		return nil, false
 	}
 	return o.Name, true
 }
 
 // HasName returns a boolean if a field has been set.
 func (o *ServiceAccountListItem) HasName() bool {
-	if o != nil && !isNil(o.Name) {
+	if o != nil && o.Name != nil {
 		return true
 	}
 
@@ -193,9 +193,8 @@ func (o *ServiceAccountListItem) SetName(v string) {
 }
 
 // GetOwner returns the Owner field value if set, zero value otherwise.
-// Deprecated
 func (o *ServiceAccountListItem) GetOwner() string {
-	if o == nil || isNil(o.Owner) {
+	if o == nil || o.Owner == nil {
 		var ret string
 		return ret
 	}
@@ -204,17 +203,16 @@ func (o *ServiceAccountListItem) GetOwner() string {
 
 // GetOwnerOk returns a tuple with the Owner field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-// Deprecated
 func (o *ServiceAccountListItem) GetOwnerOk() (*string, bool) {
-	if o == nil || isNil(o.Owner) {
-    return nil, false
+	if o == nil || o.Owner == nil {
+		return nil, false
 	}
 	return o.Owner, true
 }
 
 // HasOwner returns a boolean if a field has been set.
 func (o *ServiceAccountListItem) HasOwner() bool {
-	if o != nil && !isNil(o.Owner) {
+	if o != nil && o.Owner != nil {
 		return true
 	}
 
@@ -222,14 +220,13 @@ func (o *ServiceAccountListItem) HasOwner() bool {
 }
 
 // SetOwner gets a reference to the given string and assigns it to the Owner field.
-// Deprecated
 func (o *ServiceAccountListItem) SetOwner(v string) {
 	o.Owner = &v
 }
 
 // GetCreatedBy returns the CreatedBy field value if set, zero value otherwise.
 func (o *ServiceAccountListItem) GetCreatedBy() string {
-	if o == nil || isNil(o.CreatedBy) {
+	if o == nil || o.CreatedBy == nil {
 		var ret string
 		return ret
 	}
@@ -239,15 +236,15 @@ func (o *ServiceAccountListItem) GetCreatedBy() string {
 // GetCreatedByOk returns a tuple with the CreatedBy field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ServiceAccountListItem) GetCreatedByOk() (*string, bool) {
-	if o == nil || isNil(o.CreatedBy) {
-    return nil, false
+	if o == nil || o.CreatedBy == nil {
+		return nil, false
 	}
 	return o.CreatedBy, true
 }
 
 // HasCreatedBy returns a boolean if a field has been set.
 func (o *ServiceAccountListItem) HasCreatedBy() bool {
-	if o != nil && !isNil(o.CreatedBy) {
+	if o != nil && o.CreatedBy != nil {
 		return true
 	}
 
@@ -261,7 +258,7 @@ func (o *ServiceAccountListItem) SetCreatedBy(v string) {
 
 // GetCreatedAt returns the CreatedAt field value if set, zero value otherwise.
 func (o *ServiceAccountListItem) GetCreatedAt() time.Time {
-	if o == nil || isNil(o.CreatedAt) {
+	if o == nil || o.CreatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -271,15 +268,15 @@ func (o *ServiceAccountListItem) GetCreatedAt() time.Time {
 // GetCreatedAtOk returns a tuple with the CreatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ServiceAccountListItem) GetCreatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.CreatedAt) {
-    return nil, false
+	if o == nil || o.CreatedAt == nil {
+		return nil, false
 	}
 	return o.CreatedAt, true
 }
 
 // HasCreatedAt returns a boolean if a field has been set.
 func (o *ServiceAccountListItem) HasCreatedAt() bool {
-	if o != nil && !isNil(o.CreatedAt) {
+	if o != nil && o.CreatedAt != nil {
 		return true
 	}
 
@@ -293,7 +290,7 @@ func (o *ServiceAccountListItem) SetCreatedAt(v time.Time) {
 
 // GetDescription returns the Description field value if set, zero value otherwise.
 func (o *ServiceAccountListItem) GetDescription() string {
-	if o == nil || isNil(o.Description) {
+	if o == nil || o.Description == nil {
 		var ret string
 		return ret
 	}
@@ -303,15 +300,15 @@ func (o *ServiceAccountListItem) GetDescription() string {
 // GetDescriptionOk returns a tuple with the Description field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ServiceAccountListItem) GetDescriptionOk() (*string, bool) {
-	if o == nil || isNil(o.Description) {
-    return nil, false
+	if o == nil || o.Description == nil {
+		return nil, false
 	}
 	return o.Description, true
 }
 
 // HasDescription returns a boolean if a field has been set.
 func (o *ServiceAccountListItem) HasDescription() bool {
-	if o != nil && !isNil(o.Description) {
+	if o != nil && o.Description != nil {
 		return true
 	}
 
@@ -334,22 +331,22 @@ func (o ServiceAccountListItem) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["href"] = o.Href
 	}
-	if !isNil(o.ClientId) {
+	if o.ClientId != nil {
 		toSerialize["client_id"] = o.ClientId
 	}
-	if !isNil(o.Name) {
+	if o.Name != nil {
 		toSerialize["name"] = o.Name
 	}
-	if !isNil(o.Owner) {
+	if o.Owner != nil {
 		toSerialize["owner"] = o.Owner
 	}
-	if !isNil(o.CreatedBy) {
+	if o.CreatedBy != nil {
 		toSerialize["created_by"] = o.CreatedBy
 	}
-	if !isNil(o.CreatedAt) {
+	if o.CreatedAt != nil {
 		toSerialize["created_at"] = o.CreatedAt
 	}
-	if !isNil(o.Description) {
+	if o.Description != nil {
 		toSerialize["description"] = o.Description
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/model_service_account_list_item_all_of.go b/app-services-sdk-go/kafkamgmt/apiv1/client/model_service_account_list_item_all_of.go
index 95e92ec8..c05fbe52 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/model_service_account_list_item_all_of.go
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/model_service_account_list_item_all_of.go
@@ -1,11 +1,11 @@
 /*
-Kafka Management API
-
-Kafka Management API is a REST API to manage Kafka instances
-
-API version: 1.14.0
-Contact: rhosak-support@redhat.com
-*/
+ * Kafka Management API
+ *
+ * Kafka Management API is a REST API to manage Kafka instances
+ *
+ * API version: 1.14.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -25,7 +25,6 @@ type ServiceAccountListItemAllOf struct {
 	// name of the service account
 	Name *string `json:"name,omitempty"`
 	// owner of the service account
-	// Deprecated
 	Owner *string `json:"owner,omitempty"`
 	// service account created by the user
 	CreatedBy *string `json:"created_by,omitempty"`
@@ -54,7 +53,7 @@ func NewServiceAccountListItemAllOfWithDefaults() *ServiceAccountListItemAllOf {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *ServiceAccountListItemAllOf) GetId() string {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret string
 		return ret
 	}
@@ -64,15 +63,15 @@ func (o *ServiceAccountListItemAllOf) GetId() string {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ServiceAccountListItemAllOf) GetIdOk() (*string, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *ServiceAccountListItemAllOf) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -86,7 +85,7 @@ func (o *ServiceAccountListItemAllOf) SetId(v string) {
 
 // GetClientId returns the ClientId field value if set, zero value otherwise.
 func (o *ServiceAccountListItemAllOf) GetClientId() string {
-	if o == nil || isNil(o.ClientId) {
+	if o == nil || o.ClientId == nil {
 		var ret string
 		return ret
 	}
@@ -96,15 +95,15 @@ func (o *ServiceAccountListItemAllOf) GetClientId() string {
 // GetClientIdOk returns a tuple with the ClientId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ServiceAccountListItemAllOf) GetClientIdOk() (*string, bool) {
-	if o == nil || isNil(o.ClientId) {
-    return nil, false
+	if o == nil || o.ClientId == nil {
+		return nil, false
 	}
 	return o.ClientId, true
 }
 
 // HasClientId returns a boolean if a field has been set.
 func (o *ServiceAccountListItemAllOf) HasClientId() bool {
-	if o != nil && !isNil(o.ClientId) {
+	if o != nil && o.ClientId != nil {
 		return true
 	}
 
@@ -118,7 +117,7 @@ func (o *ServiceAccountListItemAllOf) SetClientId(v string) {
 
 // GetName returns the Name field value if set, zero value otherwise.
 func (o *ServiceAccountListItemAllOf) GetName() string {
-	if o == nil || isNil(o.Name) {
+	if o == nil || o.Name == nil {
 		var ret string
 		return ret
 	}
@@ -128,15 +127,15 @@ func (o *ServiceAccountListItemAllOf) GetName() string {
 // GetNameOk returns a tuple with the Name field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ServiceAccountListItemAllOf) GetNameOk() (*string, bool) {
-	if o == nil || isNil(o.Name) {
-    return nil, false
+	if o == nil || o.Name == nil {
+		return nil, false
 	}
 	return o.Name, true
 }
 
 // HasName returns a boolean if a field has been set.
 func (o *ServiceAccountListItemAllOf) HasName() bool {
-	if o != nil && !isNil(o.Name) {
+	if o != nil && o.Name != nil {
 		return true
 	}
 
@@ -149,9 +148,8 @@ func (o *ServiceAccountListItemAllOf) SetName(v string) {
 }
 
 // GetOwner returns the Owner field value if set, zero value otherwise.
-// Deprecated
 func (o *ServiceAccountListItemAllOf) GetOwner() string {
-	if o == nil || isNil(o.Owner) {
+	if o == nil || o.Owner == nil {
 		var ret string
 		return ret
 	}
@@ -160,17 +158,16 @@ func (o *ServiceAccountListItemAllOf) GetOwner() string {
 
 // GetOwnerOk returns a tuple with the Owner field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-// Deprecated
 func (o *ServiceAccountListItemAllOf) GetOwnerOk() (*string, bool) {
-	if o == nil || isNil(o.Owner) {
-    return nil, false
+	if o == nil || o.Owner == nil {
+		return nil, false
 	}
 	return o.Owner, true
 }
 
 // HasOwner returns a boolean if a field has been set.
 func (o *ServiceAccountListItemAllOf) HasOwner() bool {
-	if o != nil && !isNil(o.Owner) {
+	if o != nil && o.Owner != nil {
 		return true
 	}
 
@@ -178,14 +175,13 @@ func (o *ServiceAccountListItemAllOf) HasOwner() bool {
 }
 
 // SetOwner gets a reference to the given string and assigns it to the Owner field.
-// Deprecated
 func (o *ServiceAccountListItemAllOf) SetOwner(v string) {
 	o.Owner = &v
 }
 
 // GetCreatedBy returns the CreatedBy field value if set, zero value otherwise.
 func (o *ServiceAccountListItemAllOf) GetCreatedBy() string {
-	if o == nil || isNil(o.CreatedBy) {
+	if o == nil || o.CreatedBy == nil {
 		var ret string
 		return ret
 	}
@@ -195,15 +191,15 @@ func (o *ServiceAccountListItemAllOf) GetCreatedBy() string {
 // GetCreatedByOk returns a tuple with the CreatedBy field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ServiceAccountListItemAllOf) GetCreatedByOk() (*string, bool) {
-	if o == nil || isNil(o.CreatedBy) {
-    return nil, false
+	if o == nil || o.CreatedBy == nil {
+		return nil, false
 	}
 	return o.CreatedBy, true
 }
 
 // HasCreatedBy returns a boolean if a field has been set.
 func (o *ServiceAccountListItemAllOf) HasCreatedBy() bool {
-	if o != nil && !isNil(o.CreatedBy) {
+	if o != nil && o.CreatedBy != nil {
 		return true
 	}
 
@@ -217,7 +213,7 @@ func (o *ServiceAccountListItemAllOf) SetCreatedBy(v string) {
 
 // GetCreatedAt returns the CreatedAt field value if set, zero value otherwise.
 func (o *ServiceAccountListItemAllOf) GetCreatedAt() time.Time {
-	if o == nil || isNil(o.CreatedAt) {
+	if o == nil || o.CreatedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -227,15 +223,15 @@ func (o *ServiceAccountListItemAllOf) GetCreatedAt() time.Time {
 // GetCreatedAtOk returns a tuple with the CreatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ServiceAccountListItemAllOf) GetCreatedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.CreatedAt) {
-    return nil, false
+	if o == nil || o.CreatedAt == nil {
+		return nil, false
 	}
 	return o.CreatedAt, true
 }
 
 // HasCreatedAt returns a boolean if a field has been set.
 func (o *ServiceAccountListItemAllOf) HasCreatedAt() bool {
-	if o != nil && !isNil(o.CreatedAt) {
+	if o != nil && o.CreatedAt != nil {
 		return true
 	}
 
@@ -249,7 +245,7 @@ func (o *ServiceAccountListItemAllOf) SetCreatedAt(v time.Time) {
 
 // GetDescription returns the Description field value if set, zero value otherwise.
 func (o *ServiceAccountListItemAllOf) GetDescription() string {
-	if o == nil || isNil(o.Description) {
+	if o == nil || o.Description == nil {
 		var ret string
 		return ret
 	}
@@ -259,15 +255,15 @@ func (o *ServiceAccountListItemAllOf) GetDescription() string {
 // GetDescriptionOk returns a tuple with the Description field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ServiceAccountListItemAllOf) GetDescriptionOk() (*string, bool) {
-	if o == nil || isNil(o.Description) {
-    return nil, false
+	if o == nil || o.Description == nil {
+		return nil, false
 	}
 	return o.Description, true
 }
 
 // HasDescription returns a boolean if a field has been set.
 func (o *ServiceAccountListItemAllOf) HasDescription() bool {
-	if o != nil && !isNil(o.Description) {
+	if o != nil && o.Description != nil {
 		return true
 	}
 
@@ -281,25 +277,25 @@ func (o *ServiceAccountListItemAllOf) SetDescription(v string) {
 
 func (o ServiceAccountListItemAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.ClientId) {
+	if o.ClientId != nil {
 		toSerialize["client_id"] = o.ClientId
 	}
-	if !isNil(o.Name) {
+	if o.Name != nil {
 		toSerialize["name"] = o.Name
 	}
-	if !isNil(o.Owner) {
+	if o.Owner != nil {
 		toSerialize["owner"] = o.Owner
 	}
-	if !isNil(o.CreatedBy) {
+	if o.CreatedBy != nil {
 		toSerialize["created_by"] = o.CreatedBy
 	}
-	if !isNil(o.CreatedAt) {
+	if o.CreatedAt != nil {
 		toSerialize["created_at"] = o.CreatedAt
 	}
-	if !isNil(o.Description) {
+	if o.Description != nil {
 		toSerialize["description"] = o.Description
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/model_service_account_request.go b/app-services-sdk-go/kafkamgmt/apiv1/client/model_service_account_request.go
index 20f6f1cf..4abef1bb 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/model_service_account_request.go
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/model_service_account_request.go
@@ -1,11 +1,11 @@
 /*
-Kafka Management API
-
-Kafka Management API is a REST API to manage Kafka instances
-
-API version: 1.14.0
-Contact: rhosak-support@redhat.com
-*/
+ * Kafka Management API
+ *
+ * Kafka Management API is a REST API to manage Kafka instances
+ *
+ * API version: 1.14.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -54,8 +54,8 @@ func (o *ServiceAccountRequest) GetName() string {
 // GetNameOk returns a tuple with the Name field value
 // and a boolean to check if the value has been set.
 func (o *ServiceAccountRequest) GetNameOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Name, true
 }
@@ -67,7 +67,7 @@ func (o *ServiceAccountRequest) SetName(v string) {
 
 // GetDescription returns the Description field value if set, zero value otherwise.
 func (o *ServiceAccountRequest) GetDescription() string {
-	if o == nil || isNil(o.Description) {
+	if o == nil || o.Description == nil {
 		var ret string
 		return ret
 	}
@@ -77,15 +77,15 @@ func (o *ServiceAccountRequest) GetDescription() string {
 // GetDescriptionOk returns a tuple with the Description field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ServiceAccountRequest) GetDescriptionOk() (*string, bool) {
-	if o == nil || isNil(o.Description) {
-    return nil, false
+	if o == nil || o.Description == nil {
+		return nil, false
 	}
 	return o.Description, true
 }
 
 // HasDescription returns a boolean if a field has been set.
 func (o *ServiceAccountRequest) HasDescription() bool {
-	if o != nil && !isNil(o.Description) {
+	if o != nil && o.Description != nil {
 		return true
 	}
 
@@ -102,7 +102,7 @@ func (o ServiceAccountRequest) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["name"] = o.Name
 	}
-	if !isNil(o.Description) {
+	if o.Description != nil {
 		toSerialize["description"] = o.Description
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/model_sso_provider.go b/app-services-sdk-go/kafkamgmt/apiv1/client/model_sso_provider.go
index f00867aa..5046e917 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/model_sso_provider.go
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/model_sso_provider.go
@@ -1,11 +1,11 @@
 /*
-Kafka Management API
-
-Kafka Management API is a REST API to manage Kafka instances
-
-API version: 1.14.0
-Contact: rhosak-support@redhat.com
-*/
+ * Kafka Management API
+ *
+ * Kafka Management API is a REST API to manage Kafka instances
+ *
+ * API version: 1.14.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -62,8 +62,8 @@ func (o *SsoProvider) GetId() string {
 // GetIdOk returns a tuple with the Id field value
 // and a boolean to check if the value has been set.
 func (o *SsoProvider) GetIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Id, true
 }
@@ -86,8 +86,8 @@ func (o *SsoProvider) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *SsoProvider) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -110,8 +110,8 @@ func (o *SsoProvider) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value
 // and a boolean to check if the value has been set.
 func (o *SsoProvider) GetHrefOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Href, true
 }
@@ -123,7 +123,7 @@ func (o *SsoProvider) SetHref(v string) {
 
 // GetName returns the Name field value if set, zero value otherwise.
 func (o *SsoProvider) GetName() string {
-	if o == nil || isNil(o.Name) {
+	if o == nil || o.Name == nil {
 		var ret string
 		return ret
 	}
@@ -133,15 +133,15 @@ func (o *SsoProvider) GetName() string {
 // GetNameOk returns a tuple with the Name field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SsoProvider) GetNameOk() (*string, bool) {
-	if o == nil || isNil(o.Name) {
-    return nil, false
+	if o == nil || o.Name == nil {
+		return nil, false
 	}
 	return o.Name, true
 }
 
 // HasName returns a boolean if a field has been set.
 func (o *SsoProvider) HasName() bool {
-	if o != nil && !isNil(o.Name) {
+	if o != nil && o.Name != nil {
 		return true
 	}
 
@@ -155,7 +155,7 @@ func (o *SsoProvider) SetName(v string) {
 
 // GetBaseUrl returns the BaseUrl field value if set, zero value otherwise.
 func (o *SsoProvider) GetBaseUrl() string {
-	if o == nil || isNil(o.BaseUrl) {
+	if o == nil || o.BaseUrl == nil {
 		var ret string
 		return ret
 	}
@@ -165,15 +165,15 @@ func (o *SsoProvider) GetBaseUrl() string {
 // GetBaseUrlOk returns a tuple with the BaseUrl field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SsoProvider) GetBaseUrlOk() (*string, bool) {
-	if o == nil || isNil(o.BaseUrl) {
-    return nil, false
+	if o == nil || o.BaseUrl == nil {
+		return nil, false
 	}
 	return o.BaseUrl, true
 }
 
 // HasBaseUrl returns a boolean if a field has been set.
 func (o *SsoProvider) HasBaseUrl() bool {
-	if o != nil && !isNil(o.BaseUrl) {
+	if o != nil && o.BaseUrl != nil {
 		return true
 	}
 
@@ -187,7 +187,7 @@ func (o *SsoProvider) SetBaseUrl(v string) {
 
 // GetTokenUrl returns the TokenUrl field value if set, zero value otherwise.
 func (o *SsoProvider) GetTokenUrl() string {
-	if o == nil || isNil(o.TokenUrl) {
+	if o == nil || o.TokenUrl == nil {
 		var ret string
 		return ret
 	}
@@ -197,15 +197,15 @@ func (o *SsoProvider) GetTokenUrl() string {
 // GetTokenUrlOk returns a tuple with the TokenUrl field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SsoProvider) GetTokenUrlOk() (*string, bool) {
-	if o == nil || isNil(o.TokenUrl) {
-    return nil, false
+	if o == nil || o.TokenUrl == nil {
+		return nil, false
 	}
 	return o.TokenUrl, true
 }
 
 // HasTokenUrl returns a boolean if a field has been set.
 func (o *SsoProvider) HasTokenUrl() bool {
-	if o != nil && !isNil(o.TokenUrl) {
+	if o != nil && o.TokenUrl != nil {
 		return true
 	}
 
@@ -219,7 +219,7 @@ func (o *SsoProvider) SetTokenUrl(v string) {
 
 // GetJwks returns the Jwks field value if set, zero value otherwise.
 func (o *SsoProvider) GetJwks() string {
-	if o == nil || isNil(o.Jwks) {
+	if o == nil || o.Jwks == nil {
 		var ret string
 		return ret
 	}
@@ -229,15 +229,15 @@ func (o *SsoProvider) GetJwks() string {
 // GetJwksOk returns a tuple with the Jwks field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SsoProvider) GetJwksOk() (*string, bool) {
-	if o == nil || isNil(o.Jwks) {
-    return nil, false
+	if o == nil || o.Jwks == nil {
+		return nil, false
 	}
 	return o.Jwks, true
 }
 
 // HasJwks returns a boolean if a field has been set.
 func (o *SsoProvider) HasJwks() bool {
-	if o != nil && !isNil(o.Jwks) {
+	if o != nil && o.Jwks != nil {
 		return true
 	}
 
@@ -251,7 +251,7 @@ func (o *SsoProvider) SetJwks(v string) {
 
 // GetValidIssuer returns the ValidIssuer field value if set, zero value otherwise.
 func (o *SsoProvider) GetValidIssuer() string {
-	if o == nil || isNil(o.ValidIssuer) {
+	if o == nil || o.ValidIssuer == nil {
 		var ret string
 		return ret
 	}
@@ -261,15 +261,15 @@ func (o *SsoProvider) GetValidIssuer() string {
 // GetValidIssuerOk returns a tuple with the ValidIssuer field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SsoProvider) GetValidIssuerOk() (*string, bool) {
-	if o == nil || isNil(o.ValidIssuer) {
-    return nil, false
+	if o == nil || o.ValidIssuer == nil {
+		return nil, false
 	}
 	return o.ValidIssuer, true
 }
 
 // HasValidIssuer returns a boolean if a field has been set.
 func (o *SsoProvider) HasValidIssuer() bool {
-	if o != nil && !isNil(o.ValidIssuer) {
+	if o != nil && o.ValidIssuer != nil {
 		return true
 	}
 
@@ -292,19 +292,19 @@ func (o SsoProvider) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["href"] = o.Href
 	}
-	if !isNil(o.Name) {
+	if o.Name != nil {
 		toSerialize["name"] = o.Name
 	}
-	if !isNil(o.BaseUrl) {
+	if o.BaseUrl != nil {
 		toSerialize["base_url"] = o.BaseUrl
 	}
-	if !isNil(o.TokenUrl) {
+	if o.TokenUrl != nil {
 		toSerialize["token_url"] = o.TokenUrl
 	}
-	if !isNil(o.Jwks) {
+	if o.Jwks != nil {
 		toSerialize["jwks"] = o.Jwks
 	}
-	if !isNil(o.ValidIssuer) {
+	if o.ValidIssuer != nil {
 		toSerialize["valid_issuer"] = o.ValidIssuer
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/model_sso_provider_all_of.go b/app-services-sdk-go/kafkamgmt/apiv1/client/model_sso_provider_all_of.go
index df7d1817..9a6d727d 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/model_sso_provider_all_of.go
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/model_sso_provider_all_of.go
@@ -1,11 +1,11 @@
 /*
-Kafka Management API
-
-Kafka Management API is a REST API to manage Kafka instances
-
-API version: 1.14.0
-Contact: rhosak-support@redhat.com
-*/
+ * Kafka Management API
+ *
+ * Kafka Management API is a REST API to manage Kafka instances
+ *
+ * API version: 1.14.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -45,7 +45,7 @@ func NewSsoProviderAllOfWithDefaults() *SsoProviderAllOf {
 
 // GetName returns the Name field value if set, zero value otherwise.
 func (o *SsoProviderAllOf) GetName() string {
-	if o == nil || isNil(o.Name) {
+	if o == nil || o.Name == nil {
 		var ret string
 		return ret
 	}
@@ -55,15 +55,15 @@ func (o *SsoProviderAllOf) GetName() string {
 // GetNameOk returns a tuple with the Name field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SsoProviderAllOf) GetNameOk() (*string, bool) {
-	if o == nil || isNil(o.Name) {
-    return nil, false
+	if o == nil || o.Name == nil {
+		return nil, false
 	}
 	return o.Name, true
 }
 
 // HasName returns a boolean if a field has been set.
 func (o *SsoProviderAllOf) HasName() bool {
-	if o != nil && !isNil(o.Name) {
+	if o != nil && o.Name != nil {
 		return true
 	}
 
@@ -77,7 +77,7 @@ func (o *SsoProviderAllOf) SetName(v string) {
 
 // GetBaseUrl returns the BaseUrl field value if set, zero value otherwise.
 func (o *SsoProviderAllOf) GetBaseUrl() string {
-	if o == nil || isNil(o.BaseUrl) {
+	if o == nil || o.BaseUrl == nil {
 		var ret string
 		return ret
 	}
@@ -87,15 +87,15 @@ func (o *SsoProviderAllOf) GetBaseUrl() string {
 // GetBaseUrlOk returns a tuple with the BaseUrl field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SsoProviderAllOf) GetBaseUrlOk() (*string, bool) {
-	if o == nil || isNil(o.BaseUrl) {
-    return nil, false
+	if o == nil || o.BaseUrl == nil {
+		return nil, false
 	}
 	return o.BaseUrl, true
 }
 
 // HasBaseUrl returns a boolean if a field has been set.
 func (o *SsoProviderAllOf) HasBaseUrl() bool {
-	if o != nil && !isNil(o.BaseUrl) {
+	if o != nil && o.BaseUrl != nil {
 		return true
 	}
 
@@ -109,7 +109,7 @@ func (o *SsoProviderAllOf) SetBaseUrl(v string) {
 
 // GetTokenUrl returns the TokenUrl field value if set, zero value otherwise.
 func (o *SsoProviderAllOf) GetTokenUrl() string {
-	if o == nil || isNil(o.TokenUrl) {
+	if o == nil || o.TokenUrl == nil {
 		var ret string
 		return ret
 	}
@@ -119,15 +119,15 @@ func (o *SsoProviderAllOf) GetTokenUrl() string {
 // GetTokenUrlOk returns a tuple with the TokenUrl field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SsoProviderAllOf) GetTokenUrlOk() (*string, bool) {
-	if o == nil || isNil(o.TokenUrl) {
-    return nil, false
+	if o == nil || o.TokenUrl == nil {
+		return nil, false
 	}
 	return o.TokenUrl, true
 }
 
 // HasTokenUrl returns a boolean if a field has been set.
 func (o *SsoProviderAllOf) HasTokenUrl() bool {
-	if o != nil && !isNil(o.TokenUrl) {
+	if o != nil && o.TokenUrl != nil {
 		return true
 	}
 
@@ -141,7 +141,7 @@ func (o *SsoProviderAllOf) SetTokenUrl(v string) {
 
 // GetJwks returns the Jwks field value if set, zero value otherwise.
 func (o *SsoProviderAllOf) GetJwks() string {
-	if o == nil || isNil(o.Jwks) {
+	if o == nil || o.Jwks == nil {
 		var ret string
 		return ret
 	}
@@ -151,15 +151,15 @@ func (o *SsoProviderAllOf) GetJwks() string {
 // GetJwksOk returns a tuple with the Jwks field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SsoProviderAllOf) GetJwksOk() (*string, bool) {
-	if o == nil || isNil(o.Jwks) {
-    return nil, false
+	if o == nil || o.Jwks == nil {
+		return nil, false
 	}
 	return o.Jwks, true
 }
 
 // HasJwks returns a boolean if a field has been set.
 func (o *SsoProviderAllOf) HasJwks() bool {
-	if o != nil && !isNil(o.Jwks) {
+	if o != nil && o.Jwks != nil {
 		return true
 	}
 
@@ -173,7 +173,7 @@ func (o *SsoProviderAllOf) SetJwks(v string) {
 
 // GetValidIssuer returns the ValidIssuer field value if set, zero value otherwise.
 func (o *SsoProviderAllOf) GetValidIssuer() string {
-	if o == nil || isNil(o.ValidIssuer) {
+	if o == nil || o.ValidIssuer == nil {
 		var ret string
 		return ret
 	}
@@ -183,15 +183,15 @@ func (o *SsoProviderAllOf) GetValidIssuer() string {
 // GetValidIssuerOk returns a tuple with the ValidIssuer field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SsoProviderAllOf) GetValidIssuerOk() (*string, bool) {
-	if o == nil || isNil(o.ValidIssuer) {
-    return nil, false
+	if o == nil || o.ValidIssuer == nil {
+		return nil, false
 	}
 	return o.ValidIssuer, true
 }
 
 // HasValidIssuer returns a boolean if a field has been set.
 func (o *SsoProviderAllOf) HasValidIssuer() bool {
-	if o != nil && !isNil(o.ValidIssuer) {
+	if o != nil && o.ValidIssuer != nil {
 		return true
 	}
 
@@ -205,19 +205,19 @@ func (o *SsoProviderAllOf) SetValidIssuer(v string) {
 
 func (o SsoProviderAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Name) {
+	if o.Name != nil {
 		toSerialize["name"] = o.Name
 	}
-	if !isNil(o.BaseUrl) {
+	if o.BaseUrl != nil {
 		toSerialize["base_url"] = o.BaseUrl
 	}
-	if !isNil(o.TokenUrl) {
+	if o.TokenUrl != nil {
 		toSerialize["token_url"] = o.TokenUrl
 	}
-	if !isNil(o.Jwks) {
+	if o.Jwks != nil {
 		toSerialize["jwks"] = o.Jwks
 	}
-	if !isNil(o.ValidIssuer) {
+	if o.ValidIssuer != nil {
 		toSerialize["valid_issuer"] = o.ValidIssuer
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/model_supported_kafka_billing_model.go b/app-services-sdk-go/kafkamgmt/apiv1/client/model_supported_kafka_billing_model.go
index 53856882..e449a611 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/model_supported_kafka_billing_model.go
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/model_supported_kafka_billing_model.go
@@ -1,11 +1,11 @@
 /*
-Kafka Management API
-
-Kafka Management API is a REST API to manage Kafka instances
-
-API version: 1.14.0
-Contact: rhosak-support@redhat.com
-*/
+ * Kafka Management API
+ *
+ * Kafka Management API is a REST API to manage Kafka instances
+ *
+ * API version: 1.14.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -61,8 +61,8 @@ func (o *SupportedKafkaBillingModel) GetId() string {
 // GetIdOk returns a tuple with the Id field value
 // and a boolean to check if the value has been set.
 func (o *SupportedKafkaBillingModel) GetIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Id, true
 }
@@ -85,8 +85,8 @@ func (o *SupportedKafkaBillingModel) GetAmsResource() string {
 // GetAmsResourceOk returns a tuple with the AmsResource field value
 // and a boolean to check if the value has been set.
 func (o *SupportedKafkaBillingModel) GetAmsResourceOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.AmsResource, true
 }
@@ -109,8 +109,8 @@ func (o *SupportedKafkaBillingModel) GetAmsProduct() string {
 // GetAmsProductOk returns a tuple with the AmsProduct field value
 // and a boolean to check if the value has been set.
 func (o *SupportedKafkaBillingModel) GetAmsProductOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.AmsProduct, true
 }
@@ -132,11 +132,11 @@ func (o *SupportedKafkaBillingModel) GetAmsBillingModels() []string {
 
 // GetAmsBillingModelsOk returns a tuple with the AmsBillingModels field value
 // and a boolean to check if the value has been set.
-func (o *SupportedKafkaBillingModel) GetAmsBillingModelsOk() ([]string, bool) {
-	if o == nil {
-    return nil, false
+func (o *SupportedKafkaBillingModel) GetAmsBillingModelsOk() (*[]string, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.AmsBillingModels, true
+	return &o.AmsBillingModels, true
 }
 
 // SetAmsBillingModels sets field value
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/model_supported_kafka_instance_type.go b/app-services-sdk-go/kafkamgmt/apiv1/client/model_supported_kafka_instance_type.go
index 4381b28f..e48aa387 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/model_supported_kafka_instance_type.go
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/model_supported_kafka_instance_type.go
@@ -1,11 +1,11 @@
 /*
-Kafka Management API
-
-Kafka Management API is a REST API to manage Kafka instances
-
-API version: 1.14.0
-Contact: rhosak-support@redhat.com
-*/
+ * Kafka Management API
+ *
+ * Kafka Management API is a REST API to manage Kafka instances
+ *
+ * API version: 1.14.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -24,7 +24,7 @@ type SupportedKafkaInstanceType struct {
 	// A list of available kafka billing models for the instance type. Each kafka billing model item has a unique 'id'
 	SupportedBillingModels []SupportedKafkaBillingModel `json:"supported_billing_models"`
 	// A list of Kafka instance sizes available for this instance type
-	Sizes []SupportedKafkaInstanceTypeSizesInner `json:"sizes,omitempty"`
+	Sizes *[]SupportedKafkaSize `json:"sizes,omitempty"`
 }
 
 // NewSupportedKafkaInstanceType instantiates a new SupportedKafkaInstanceType object
@@ -47,7 +47,7 @@ func NewSupportedKafkaInstanceTypeWithDefaults() *SupportedKafkaInstanceType {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *SupportedKafkaInstanceType) GetId() string {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret string
 		return ret
 	}
@@ -57,15 +57,15 @@ func (o *SupportedKafkaInstanceType) GetId() string {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SupportedKafkaInstanceType) GetIdOk() (*string, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *SupportedKafkaInstanceType) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -79,7 +79,7 @@ func (o *SupportedKafkaInstanceType) SetId(v string) {
 
 // GetDisplayName returns the DisplayName field value if set, zero value otherwise.
 func (o *SupportedKafkaInstanceType) GetDisplayName() string {
-	if o == nil || isNil(o.DisplayName) {
+	if o == nil || o.DisplayName == nil {
 		var ret string
 		return ret
 	}
@@ -89,15 +89,15 @@ func (o *SupportedKafkaInstanceType) GetDisplayName() string {
 // GetDisplayNameOk returns a tuple with the DisplayName field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SupportedKafkaInstanceType) GetDisplayNameOk() (*string, bool) {
-	if o == nil || isNil(o.DisplayName) {
-    return nil, false
+	if o == nil || o.DisplayName == nil {
+		return nil, false
 	}
 	return o.DisplayName, true
 }
 
 // HasDisplayName returns a boolean if a field has been set.
 func (o *SupportedKafkaInstanceType) HasDisplayName() bool {
-	if o != nil && !isNil(o.DisplayName) {
+	if o != nil && o.DisplayName != nil {
 		return true
 	}
 
@@ -121,11 +121,11 @@ func (o *SupportedKafkaInstanceType) GetSupportedBillingModels() []SupportedKafk
 
 // GetSupportedBillingModelsOk returns a tuple with the SupportedBillingModels field value
 // and a boolean to check if the value has been set.
-func (o *SupportedKafkaInstanceType) GetSupportedBillingModelsOk() ([]SupportedKafkaBillingModel, bool) {
-	if o == nil {
-    return nil, false
+func (o *SupportedKafkaInstanceType) GetSupportedBillingModelsOk() (*[]SupportedKafkaBillingModel, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.SupportedBillingModels, true
+	return &o.SupportedBillingModels, true
 }
 
 // SetSupportedBillingModels sets field value
@@ -134,49 +134,49 @@ func (o *SupportedKafkaInstanceType) SetSupportedBillingModels(v []SupportedKafk
 }
 
 // GetSizes returns the Sizes field value if set, zero value otherwise.
-func (o *SupportedKafkaInstanceType) GetSizes() []SupportedKafkaInstanceTypeSizesInner {
-	if o == nil || isNil(o.Sizes) {
-		var ret []SupportedKafkaInstanceTypeSizesInner
+func (o *SupportedKafkaInstanceType) GetSizes() []SupportedKafkaSize {
+	if o == nil || o.Sizes == nil {
+		var ret []SupportedKafkaSize
 		return ret
 	}
-	return o.Sizes
+	return *o.Sizes
 }
 
 // GetSizesOk returns a tuple with the Sizes field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *SupportedKafkaInstanceType) GetSizesOk() ([]SupportedKafkaInstanceTypeSizesInner, bool) {
-	if o == nil || isNil(o.Sizes) {
-    return nil, false
+func (o *SupportedKafkaInstanceType) GetSizesOk() (*[]SupportedKafkaSize, bool) {
+	if o == nil || o.Sizes == nil {
+		return nil, false
 	}
 	return o.Sizes, true
 }
 
 // HasSizes returns a boolean if a field has been set.
 func (o *SupportedKafkaInstanceType) HasSizes() bool {
-	if o != nil && !isNil(o.Sizes) {
+	if o != nil && o.Sizes != nil {
 		return true
 	}
 
 	return false
 }
 
-// SetSizes gets a reference to the given []SupportedKafkaInstanceTypeSizesInner and assigns it to the Sizes field.
-func (o *SupportedKafkaInstanceType) SetSizes(v []SupportedKafkaInstanceTypeSizesInner) {
-	o.Sizes = v
+// SetSizes gets a reference to the given []SupportedKafkaSize and assigns it to the Sizes field.
+func (o *SupportedKafkaInstanceType) SetSizes(v []SupportedKafkaSize) {
+	o.Sizes = &v
 }
 
 func (o SupportedKafkaInstanceType) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.DisplayName) {
+	if o.DisplayName != nil {
 		toSerialize["display_name"] = o.DisplayName
 	}
 	if true {
 		toSerialize["supported_billing_models"] = o.SupportedBillingModels
 	}
-	if !isNil(o.Sizes) {
+	if o.Sizes != nil {
 		toSerialize["sizes"] = o.Sizes
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/model_supported_kafka_instance_type_sizes_inner.go b/app-services-sdk-go/kafkamgmt/apiv1/client/model_supported_kafka_instance_type_sizes_inner.go
deleted file mode 100644
index 992ec03d..00000000
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/model_supported_kafka_instance_type_sizes_inner.go
+++ /dev/null
@@ -1,756 +0,0 @@
-/*
-Kafka Management API
-
-Kafka Management API is a REST API to manage Kafka instances
-
-API version: 1.14.0
-Contact: rhosak-support@redhat.com
-*/
-
-// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
-
-package kafkamgmtclient
-
-import (
-	"encoding/json"
-)
-
-// SupportedKafkaInstanceTypeSizesInner struct for SupportedKafkaInstanceTypeSizesInner
-type SupportedKafkaInstanceTypeSizesInner struct {
-	// Unique identifier of this Kafka instance size.
-	Id *string `json:"id,omitempty"`
-	// Display name of this Kafka instance size.
-	DisplayName *string `json:"display_name,omitempty"`
-	IngressThroughputPerSec SupportedKafkaSizeBytesValueItem `json:"ingress_throughput_per_sec,omitempty"`
-	EgressThroughputPerSec SupportedKafkaSizeBytesValueItem `json:"egress_throughput_per_sec,omitempty"`
-	// Maximum amount of total connections available to this Kafka instance size.
-	TotalMaxConnections *int32 `json:"total_max_connections,omitempty"`
-	MaxDataRetentionSize SupportedKafkaSizeBytesValueItem `json:"max_data_retention_size,omitempty"`
-	// Maximum amount of total partitions available to this Kafka instance size.
-	MaxPartitions *int32 `json:"max_partitions,omitempty"`
-	// Maximum data retention period available to this Kafka instance size.
-	MaxDataRetentionPeriod *string `json:"max_data_retention_period,omitempty"`
-	// Maximium connection attempts per second available to this Kafka instance size.
-	MaxConnectionAttemptsPerSec *int32 `json:"max_connection_attempts_per_sec,omitempty"`
-	MaxMessageSize SupportedKafkaSizeBytesValueItem `json:"max_message_size,omitempty"`
-	// Minimum number of in-sync replicas.
-	MinInSyncReplicas *int32 `json:"min_in_sync_replicas,omitempty"`
-	// Replication factor available to this Kafka instance size.
-	ReplicationFactor *int32 `json:"replication_factor,omitempty"`
-	// List of Availability Zone modes that this Kafka instance size supports. The possible values are \"single\", \"multi\".
-	SupportedAzModes []string `json:"supported_az_modes,omitempty"`
-	// The limit lifespan of the kafka instance in seconds. If not specified then the instance never expires.
-	LifespanSeconds NullableInt32 `json:"lifespan_seconds,omitempty"`
-	// Quota consumed by this Kafka instance size.
-	QuotaConsumed *int32 `json:"quota_consumed,omitempty"`
-	// Quota type used by this Kafka instance size. This is now deprecated, please refer to supported_billing_models at instance-type level instead.
-	// Deprecated
-	QuotaType *string `json:"quota_type,omitempty"`
-	// Data plane cluster capacity consumed by this Kafka instance size.
-	CapacityConsumed *int32 `json:"capacity_consumed,omitempty"`
-	// Maturity level of the size. Can be \"stable\" or \"preview\".
-	MaturityStatus *string `json:"maturity_status,omitempty"`
-}
-
-// NewSupportedKafkaInstanceTypeSizesInner instantiates a new SupportedKafkaInstanceTypeSizesInner object
-// This constructor will assign default values to properties that have it defined,
-// and makes sure properties required by API are set, but the set of arguments
-// will change when the set of required properties is changed
-func NewSupportedKafkaInstanceTypeSizesInner() *SupportedKafkaInstanceTypeSizesInner {
-	this := SupportedKafkaInstanceTypeSizesInner{}
-	return &this
-}
-
-// NewSupportedKafkaInstanceTypeSizesInnerWithDefaults instantiates a new SupportedKafkaInstanceTypeSizesInner object
-// This constructor will only assign default values to properties that have it defined,
-// but it doesn't guarantee that properties required by API are set
-func NewSupportedKafkaInstanceTypeSizesInnerWithDefaults() *SupportedKafkaInstanceTypeSizesInner {
-	this := SupportedKafkaInstanceTypeSizesInner{}
-	return &this
-}
-
-// GetId returns the Id field value if set, zero value otherwise.
-func (o *SupportedKafkaInstanceTypeSizesInner) GetId() string {
-	if o == nil || isNil(o.Id) {
-		var ret string
-		return ret
-	}
-	return *o.Id
-}
-
-// GetIdOk returns a tuple with the Id field value if set, nil otherwise
-// and a boolean to check if the value has been set.
-func (o *SupportedKafkaInstanceTypeSizesInner) GetIdOk() (*string, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
-	}
-	return o.Id, true
-}
-
-// HasId returns a boolean if a field has been set.
-func (o *SupportedKafkaInstanceTypeSizesInner) HasId() bool {
-	if o != nil && !isNil(o.Id) {
-		return true
-	}
-
-	return false
-}
-
-// SetId gets a reference to the given string and assigns it to the Id field.
-func (o *SupportedKafkaInstanceTypeSizesInner) SetId(v string) {
-	o.Id = &v
-}
-
-// GetDisplayName returns the DisplayName field value if set, zero value otherwise.
-func (o *SupportedKafkaInstanceTypeSizesInner) GetDisplayName() string {
-	if o == nil || isNil(o.DisplayName) {
-		var ret string
-		return ret
-	}
-	return *o.DisplayName
-}
-
-// GetDisplayNameOk returns a tuple with the DisplayName field value if set, nil otherwise
-// and a boolean to check if the value has been set.
-func (o *SupportedKafkaInstanceTypeSizesInner) GetDisplayNameOk() (*string, bool) {
-	if o == nil || isNil(o.DisplayName) {
-    return nil, false
-	}
-	return o.DisplayName, true
-}
-
-// HasDisplayName returns a boolean if a field has been set.
-func (o *SupportedKafkaInstanceTypeSizesInner) HasDisplayName() bool {
-	if o != nil && !isNil(o.DisplayName) {
-		return true
-	}
-
-	return false
-}
-
-// SetDisplayName gets a reference to the given string and assigns it to the DisplayName field.
-func (o *SupportedKafkaInstanceTypeSizesInner) SetDisplayName(v string) {
-	o.DisplayName = &v
-}
-
-// GetIngressThroughputPerSec returns the IngressThroughputPerSec field value if set, zero value otherwise.
-func (o *SupportedKafkaInstanceTypeSizesInner) GetIngressThroughputPerSec() SupportedKafkaSizeBytesValueItem {
-	if o == nil || isNil(o.IngressThroughputPerSec) {
-		var ret SupportedKafkaSizeBytesValueItem
-		return ret
-	}
-	return o.IngressThroughputPerSec
-}
-
-// GetIngressThroughputPerSecOk returns a tuple with the IngressThroughputPerSec field value if set, nil otherwise
-// and a boolean to check if the value has been set.
-func (o *SupportedKafkaInstanceTypeSizesInner) GetIngressThroughputPerSecOk() (SupportedKafkaSizeBytesValueItem, bool) {
-	if o == nil || isNil(o.IngressThroughputPerSec) {
-    return SupportedKafkaSizeBytesValueItem{}, false
-	}
-	return o.IngressThroughputPerSec, true
-}
-
-// HasIngressThroughputPerSec returns a boolean if a field has been set.
-func (o *SupportedKafkaInstanceTypeSizesInner) HasIngressThroughputPerSec() bool {
-	if o != nil && !isNil(o.IngressThroughputPerSec) {
-		return true
-	}
-
-	return false
-}
-
-// SetIngressThroughputPerSec gets a reference to the given SupportedKafkaSizeBytesValueItem and assigns it to the IngressThroughputPerSec field.
-func (o *SupportedKafkaInstanceTypeSizesInner) SetIngressThroughputPerSec(v SupportedKafkaSizeBytesValueItem) {
-	o.IngressThroughputPerSec = v
-}
-
-// GetEgressThroughputPerSec returns the EgressThroughputPerSec field value if set, zero value otherwise.
-func (o *SupportedKafkaInstanceTypeSizesInner) GetEgressThroughputPerSec() SupportedKafkaSizeBytesValueItem {
-	if o == nil || isNil(o.EgressThroughputPerSec) {
-		var ret SupportedKafkaSizeBytesValueItem
-		return ret
-	}
-	return o.EgressThroughputPerSec
-}
-
-// GetEgressThroughputPerSecOk returns a tuple with the EgressThroughputPerSec field value if set, nil otherwise
-// and a boolean to check if the value has been set.
-func (o *SupportedKafkaInstanceTypeSizesInner) GetEgressThroughputPerSecOk() (SupportedKafkaSizeBytesValueItem, bool) {
-	if o == nil || isNil(o.EgressThroughputPerSec) {
-    return SupportedKafkaSizeBytesValueItem{}, false
-	}
-	return o.EgressThroughputPerSec, true
-}
-
-// HasEgressThroughputPerSec returns a boolean if a field has been set.
-func (o *SupportedKafkaInstanceTypeSizesInner) HasEgressThroughputPerSec() bool {
-	if o != nil && !isNil(o.EgressThroughputPerSec) {
-		return true
-	}
-
-	return false
-}
-
-// SetEgressThroughputPerSec gets a reference to the given SupportedKafkaSizeBytesValueItem and assigns it to the EgressThroughputPerSec field.
-func (o *SupportedKafkaInstanceTypeSizesInner) SetEgressThroughputPerSec(v SupportedKafkaSizeBytesValueItem) {
-	o.EgressThroughputPerSec = v
-}
-
-// GetTotalMaxConnections returns the TotalMaxConnections field value if set, zero value otherwise.
-func (o *SupportedKafkaInstanceTypeSizesInner) GetTotalMaxConnections() int32 {
-	if o == nil || isNil(o.TotalMaxConnections) {
-		var ret int32
-		return ret
-	}
-	return *o.TotalMaxConnections
-}
-
-// GetTotalMaxConnectionsOk returns a tuple with the TotalMaxConnections field value if set, nil otherwise
-// and a boolean to check if the value has been set.
-func (o *SupportedKafkaInstanceTypeSizesInner) GetTotalMaxConnectionsOk() (*int32, bool) {
-	if o == nil || isNil(o.TotalMaxConnections) {
-    return nil, false
-	}
-	return o.TotalMaxConnections, true
-}
-
-// HasTotalMaxConnections returns a boolean if a field has been set.
-func (o *SupportedKafkaInstanceTypeSizesInner) HasTotalMaxConnections() bool {
-	if o != nil && !isNil(o.TotalMaxConnections) {
-		return true
-	}
-
-	return false
-}
-
-// SetTotalMaxConnections gets a reference to the given int32 and assigns it to the TotalMaxConnections field.
-func (o *SupportedKafkaInstanceTypeSizesInner) SetTotalMaxConnections(v int32) {
-	o.TotalMaxConnections = &v
-}
-
-// GetMaxDataRetentionSize returns the MaxDataRetentionSize field value if set, zero value otherwise.
-func (o *SupportedKafkaInstanceTypeSizesInner) GetMaxDataRetentionSize() SupportedKafkaSizeBytesValueItem {
-	if o == nil || isNil(o.MaxDataRetentionSize) {
-		var ret SupportedKafkaSizeBytesValueItem
-		return ret
-	}
-	return o.MaxDataRetentionSize
-}
-
-// GetMaxDataRetentionSizeOk returns a tuple with the MaxDataRetentionSize field value if set, nil otherwise
-// and a boolean to check if the value has been set.
-func (o *SupportedKafkaInstanceTypeSizesInner) GetMaxDataRetentionSizeOk() (SupportedKafkaSizeBytesValueItem, bool) {
-	if o == nil || isNil(o.MaxDataRetentionSize) {
-    return SupportedKafkaSizeBytesValueItem{}, false
-	}
-	return o.MaxDataRetentionSize, true
-}
-
-// HasMaxDataRetentionSize returns a boolean if a field has been set.
-func (o *SupportedKafkaInstanceTypeSizesInner) HasMaxDataRetentionSize() bool {
-	if o != nil && !isNil(o.MaxDataRetentionSize) {
-		return true
-	}
-
-	return false
-}
-
-// SetMaxDataRetentionSize gets a reference to the given SupportedKafkaSizeBytesValueItem and assigns it to the MaxDataRetentionSize field.
-func (o *SupportedKafkaInstanceTypeSizesInner) SetMaxDataRetentionSize(v SupportedKafkaSizeBytesValueItem) {
-	o.MaxDataRetentionSize = v
-}
-
-// GetMaxPartitions returns the MaxPartitions field value if set, zero value otherwise.
-func (o *SupportedKafkaInstanceTypeSizesInner) GetMaxPartitions() int32 {
-	if o == nil || isNil(o.MaxPartitions) {
-		var ret int32
-		return ret
-	}
-	return *o.MaxPartitions
-}
-
-// GetMaxPartitionsOk returns a tuple with the MaxPartitions field value if set, nil otherwise
-// and a boolean to check if the value has been set.
-func (o *SupportedKafkaInstanceTypeSizesInner) GetMaxPartitionsOk() (*int32, bool) {
-	if o == nil || isNil(o.MaxPartitions) {
-    return nil, false
-	}
-	return o.MaxPartitions, true
-}
-
-// HasMaxPartitions returns a boolean if a field has been set.
-func (o *SupportedKafkaInstanceTypeSizesInner) HasMaxPartitions() bool {
-	if o != nil && !isNil(o.MaxPartitions) {
-		return true
-	}
-
-	return false
-}
-
-// SetMaxPartitions gets a reference to the given int32 and assigns it to the MaxPartitions field.
-func (o *SupportedKafkaInstanceTypeSizesInner) SetMaxPartitions(v int32) {
-	o.MaxPartitions = &v
-}
-
-// GetMaxDataRetentionPeriod returns the MaxDataRetentionPeriod field value if set, zero value otherwise.
-func (o *SupportedKafkaInstanceTypeSizesInner) GetMaxDataRetentionPeriod() string {
-	if o == nil || isNil(o.MaxDataRetentionPeriod) {
-		var ret string
-		return ret
-	}
-	return *o.MaxDataRetentionPeriod
-}
-
-// GetMaxDataRetentionPeriodOk returns a tuple with the MaxDataRetentionPeriod field value if set, nil otherwise
-// and a boolean to check if the value has been set.
-func (o *SupportedKafkaInstanceTypeSizesInner) GetMaxDataRetentionPeriodOk() (*string, bool) {
-	if o == nil || isNil(o.MaxDataRetentionPeriod) {
-    return nil, false
-	}
-	return o.MaxDataRetentionPeriod, true
-}
-
-// HasMaxDataRetentionPeriod returns a boolean if a field has been set.
-func (o *SupportedKafkaInstanceTypeSizesInner) HasMaxDataRetentionPeriod() bool {
-	if o != nil && !isNil(o.MaxDataRetentionPeriod) {
-		return true
-	}
-
-	return false
-}
-
-// SetMaxDataRetentionPeriod gets a reference to the given string and assigns it to the MaxDataRetentionPeriod field.
-func (o *SupportedKafkaInstanceTypeSizesInner) SetMaxDataRetentionPeriod(v string) {
-	o.MaxDataRetentionPeriod = &v
-}
-
-// GetMaxConnectionAttemptsPerSec returns the MaxConnectionAttemptsPerSec field value if set, zero value otherwise.
-func (o *SupportedKafkaInstanceTypeSizesInner) GetMaxConnectionAttemptsPerSec() int32 {
-	if o == nil || isNil(o.MaxConnectionAttemptsPerSec) {
-		var ret int32
-		return ret
-	}
-	return *o.MaxConnectionAttemptsPerSec
-}
-
-// GetMaxConnectionAttemptsPerSecOk returns a tuple with the MaxConnectionAttemptsPerSec field value if set, nil otherwise
-// and a boolean to check if the value has been set.
-func (o *SupportedKafkaInstanceTypeSizesInner) GetMaxConnectionAttemptsPerSecOk() (*int32, bool) {
-	if o == nil || isNil(o.MaxConnectionAttemptsPerSec) {
-    return nil, false
-	}
-	return o.MaxConnectionAttemptsPerSec, true
-}
-
-// HasMaxConnectionAttemptsPerSec returns a boolean if a field has been set.
-func (o *SupportedKafkaInstanceTypeSizesInner) HasMaxConnectionAttemptsPerSec() bool {
-	if o != nil && !isNil(o.MaxConnectionAttemptsPerSec) {
-		return true
-	}
-
-	return false
-}
-
-// SetMaxConnectionAttemptsPerSec gets a reference to the given int32 and assigns it to the MaxConnectionAttemptsPerSec field.
-func (o *SupportedKafkaInstanceTypeSizesInner) SetMaxConnectionAttemptsPerSec(v int32) {
-	o.MaxConnectionAttemptsPerSec = &v
-}
-
-// GetMaxMessageSize returns the MaxMessageSize field value if set, zero value otherwise.
-func (o *SupportedKafkaInstanceTypeSizesInner) GetMaxMessageSize() SupportedKafkaSizeBytesValueItem {
-	if o == nil || isNil(o.MaxMessageSize) {
-		var ret SupportedKafkaSizeBytesValueItem
-		return ret
-	}
-	return o.MaxMessageSize
-}
-
-// GetMaxMessageSizeOk returns a tuple with the MaxMessageSize field value if set, nil otherwise
-// and a boolean to check if the value has been set.
-func (o *SupportedKafkaInstanceTypeSizesInner) GetMaxMessageSizeOk() (SupportedKafkaSizeBytesValueItem, bool) {
-	if o == nil || isNil(o.MaxMessageSize) {
-    return SupportedKafkaSizeBytesValueItem{}, false
-	}
-	return o.MaxMessageSize, true
-}
-
-// HasMaxMessageSize returns a boolean if a field has been set.
-func (o *SupportedKafkaInstanceTypeSizesInner) HasMaxMessageSize() bool {
-	if o != nil && !isNil(o.MaxMessageSize) {
-		return true
-	}
-
-	return false
-}
-
-// SetMaxMessageSize gets a reference to the given SupportedKafkaSizeBytesValueItem and assigns it to the MaxMessageSize field.
-func (o *SupportedKafkaInstanceTypeSizesInner) SetMaxMessageSize(v SupportedKafkaSizeBytesValueItem) {
-	o.MaxMessageSize = v
-}
-
-// GetMinInSyncReplicas returns the MinInSyncReplicas field value if set, zero value otherwise.
-func (o *SupportedKafkaInstanceTypeSizesInner) GetMinInSyncReplicas() int32 {
-	if o == nil || isNil(o.MinInSyncReplicas) {
-		var ret int32
-		return ret
-	}
-	return *o.MinInSyncReplicas
-}
-
-// GetMinInSyncReplicasOk returns a tuple with the MinInSyncReplicas field value if set, nil otherwise
-// and a boolean to check if the value has been set.
-func (o *SupportedKafkaInstanceTypeSizesInner) GetMinInSyncReplicasOk() (*int32, bool) {
-	if o == nil || isNil(o.MinInSyncReplicas) {
-    return nil, false
-	}
-	return o.MinInSyncReplicas, true
-}
-
-// HasMinInSyncReplicas returns a boolean if a field has been set.
-func (o *SupportedKafkaInstanceTypeSizesInner) HasMinInSyncReplicas() bool {
-	if o != nil && !isNil(o.MinInSyncReplicas) {
-		return true
-	}
-
-	return false
-}
-
-// SetMinInSyncReplicas gets a reference to the given int32 and assigns it to the MinInSyncReplicas field.
-func (o *SupportedKafkaInstanceTypeSizesInner) SetMinInSyncReplicas(v int32) {
-	o.MinInSyncReplicas = &v
-}
-
-// GetReplicationFactor returns the ReplicationFactor field value if set, zero value otherwise.
-func (o *SupportedKafkaInstanceTypeSizesInner) GetReplicationFactor() int32 {
-	if o == nil || isNil(o.ReplicationFactor) {
-		var ret int32
-		return ret
-	}
-	return *o.ReplicationFactor
-}
-
-// GetReplicationFactorOk returns a tuple with the ReplicationFactor field value if set, nil otherwise
-// and a boolean to check if the value has been set.
-func (o *SupportedKafkaInstanceTypeSizesInner) GetReplicationFactorOk() (*int32, bool) {
-	if o == nil || isNil(o.ReplicationFactor) {
-    return nil, false
-	}
-	return o.ReplicationFactor, true
-}
-
-// HasReplicationFactor returns a boolean if a field has been set.
-func (o *SupportedKafkaInstanceTypeSizesInner) HasReplicationFactor() bool {
-	if o != nil && !isNil(o.ReplicationFactor) {
-		return true
-	}
-
-	return false
-}
-
-// SetReplicationFactor gets a reference to the given int32 and assigns it to the ReplicationFactor field.
-func (o *SupportedKafkaInstanceTypeSizesInner) SetReplicationFactor(v int32) {
-	o.ReplicationFactor = &v
-}
-
-// GetSupportedAzModes returns the SupportedAzModes field value if set, zero value otherwise.
-func (o *SupportedKafkaInstanceTypeSizesInner) GetSupportedAzModes() []string {
-	if o == nil || isNil(o.SupportedAzModes) {
-		var ret []string
-		return ret
-	}
-	return o.SupportedAzModes
-}
-
-// GetSupportedAzModesOk returns a tuple with the SupportedAzModes field value if set, nil otherwise
-// and a boolean to check if the value has been set.
-func (o *SupportedKafkaInstanceTypeSizesInner) GetSupportedAzModesOk() ([]string, bool) {
-	if o == nil || isNil(o.SupportedAzModes) {
-    return nil, false
-	}
-	return o.SupportedAzModes, true
-}
-
-// HasSupportedAzModes returns a boolean if a field has been set.
-func (o *SupportedKafkaInstanceTypeSizesInner) HasSupportedAzModes() bool {
-	if o != nil && !isNil(o.SupportedAzModes) {
-		return true
-	}
-
-	return false
-}
-
-// SetSupportedAzModes gets a reference to the given []string and assigns it to the SupportedAzModes field.
-func (o *SupportedKafkaInstanceTypeSizesInner) SetSupportedAzModes(v []string) {
-	o.SupportedAzModes = v
-}
-
-// GetLifespanSeconds returns the LifespanSeconds field value if set, zero value otherwise (both if not set or set to explicit null).
-func (o *SupportedKafkaInstanceTypeSizesInner) GetLifespanSeconds() int32 {
-	if o == nil || isNil(o.LifespanSeconds.Get()) {
-		var ret int32
-		return ret
-	}
-	return *o.LifespanSeconds.Get()
-}
-
-// GetLifespanSecondsOk returns a tuple with the LifespanSeconds field value if set, nil otherwise
-// and a boolean to check if the value has been set.
-// NOTE: If the value is an explicit nil, `nil, true` will be returned
-func (o *SupportedKafkaInstanceTypeSizesInner) GetLifespanSecondsOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
-	}
-	return o.LifespanSeconds.Get(), o.LifespanSeconds.IsSet()
-}
-
-// HasLifespanSeconds returns a boolean if a field has been set.
-func (o *SupportedKafkaInstanceTypeSizesInner) HasLifespanSeconds() bool {
-	if o != nil && o.LifespanSeconds.IsSet() {
-		return true
-	}
-
-	return false
-}
-
-// SetLifespanSeconds gets a reference to the given NullableInt32 and assigns it to the LifespanSeconds field.
-func (o *SupportedKafkaInstanceTypeSizesInner) SetLifespanSeconds(v int32) {
-	o.LifespanSeconds.Set(&v)
-}
-// SetLifespanSecondsNil sets the value for LifespanSeconds to be an explicit nil
-func (o *SupportedKafkaInstanceTypeSizesInner) SetLifespanSecondsNil() {
-	o.LifespanSeconds.Set(nil)
-}
-
-// UnsetLifespanSeconds ensures that no value is present for LifespanSeconds, not even an explicit nil
-func (o *SupportedKafkaInstanceTypeSizesInner) UnsetLifespanSeconds() {
-	o.LifespanSeconds.Unset()
-}
-
-// GetQuotaConsumed returns the QuotaConsumed field value if set, zero value otherwise.
-func (o *SupportedKafkaInstanceTypeSizesInner) GetQuotaConsumed() int32 {
-	if o == nil || isNil(o.QuotaConsumed) {
-		var ret int32
-		return ret
-	}
-	return *o.QuotaConsumed
-}
-
-// GetQuotaConsumedOk returns a tuple with the QuotaConsumed field value if set, nil otherwise
-// and a boolean to check if the value has been set.
-func (o *SupportedKafkaInstanceTypeSizesInner) GetQuotaConsumedOk() (*int32, bool) {
-	if o == nil || isNil(o.QuotaConsumed) {
-    return nil, false
-	}
-	return o.QuotaConsumed, true
-}
-
-// HasQuotaConsumed returns a boolean if a field has been set.
-func (o *SupportedKafkaInstanceTypeSizesInner) HasQuotaConsumed() bool {
-	if o != nil && !isNil(o.QuotaConsumed) {
-		return true
-	}
-
-	return false
-}
-
-// SetQuotaConsumed gets a reference to the given int32 and assigns it to the QuotaConsumed field.
-func (o *SupportedKafkaInstanceTypeSizesInner) SetQuotaConsumed(v int32) {
-	o.QuotaConsumed = &v
-}
-
-// GetQuotaType returns the QuotaType field value if set, zero value otherwise.
-// Deprecated
-func (o *SupportedKafkaInstanceTypeSizesInner) GetQuotaType() string {
-	if o == nil || isNil(o.QuotaType) {
-		var ret string
-		return ret
-	}
-	return *o.QuotaType
-}
-
-// GetQuotaTypeOk returns a tuple with the QuotaType field value if set, nil otherwise
-// and a boolean to check if the value has been set.
-// Deprecated
-func (o *SupportedKafkaInstanceTypeSizesInner) GetQuotaTypeOk() (*string, bool) {
-	if o == nil || isNil(o.QuotaType) {
-    return nil, false
-	}
-	return o.QuotaType, true
-}
-
-// HasQuotaType returns a boolean if a field has been set.
-func (o *SupportedKafkaInstanceTypeSizesInner) HasQuotaType() bool {
-	if o != nil && !isNil(o.QuotaType) {
-		return true
-	}
-
-	return false
-}
-
-// SetQuotaType gets a reference to the given string and assigns it to the QuotaType field.
-// Deprecated
-func (o *SupportedKafkaInstanceTypeSizesInner) SetQuotaType(v string) {
-	o.QuotaType = &v
-}
-
-// GetCapacityConsumed returns the CapacityConsumed field value if set, zero value otherwise.
-func (o *SupportedKafkaInstanceTypeSizesInner) GetCapacityConsumed() int32 {
-	if o == nil || isNil(o.CapacityConsumed) {
-		var ret int32
-		return ret
-	}
-	return *o.CapacityConsumed
-}
-
-// GetCapacityConsumedOk returns a tuple with the CapacityConsumed field value if set, nil otherwise
-// and a boolean to check if the value has been set.
-func (o *SupportedKafkaInstanceTypeSizesInner) GetCapacityConsumedOk() (*int32, bool) {
-	if o == nil || isNil(o.CapacityConsumed) {
-    return nil, false
-	}
-	return o.CapacityConsumed, true
-}
-
-// HasCapacityConsumed returns a boolean if a field has been set.
-func (o *SupportedKafkaInstanceTypeSizesInner) HasCapacityConsumed() bool {
-	if o != nil && !isNil(o.CapacityConsumed) {
-		return true
-	}
-
-	return false
-}
-
-// SetCapacityConsumed gets a reference to the given int32 and assigns it to the CapacityConsumed field.
-func (o *SupportedKafkaInstanceTypeSizesInner) SetCapacityConsumed(v int32) {
-	o.CapacityConsumed = &v
-}
-
-// GetMaturityStatus returns the MaturityStatus field value if set, zero value otherwise.
-func (o *SupportedKafkaInstanceTypeSizesInner) GetMaturityStatus() string {
-	if o == nil || isNil(o.MaturityStatus) {
-		var ret string
-		return ret
-	}
-	return *o.MaturityStatus
-}
-
-// GetMaturityStatusOk returns a tuple with the MaturityStatus field value if set, nil otherwise
-// and a boolean to check if the value has been set.
-func (o *SupportedKafkaInstanceTypeSizesInner) GetMaturityStatusOk() (*string, bool) {
-	if o == nil || isNil(o.MaturityStatus) {
-    return nil, false
-	}
-	return o.MaturityStatus, true
-}
-
-// HasMaturityStatus returns a boolean if a field has been set.
-func (o *SupportedKafkaInstanceTypeSizesInner) HasMaturityStatus() bool {
-	if o != nil && !isNil(o.MaturityStatus) {
-		return true
-	}
-
-	return false
-}
-
-// SetMaturityStatus gets a reference to the given string and assigns it to the MaturityStatus field.
-func (o *SupportedKafkaInstanceTypeSizesInner) SetMaturityStatus(v string) {
-	o.MaturityStatus = &v
-}
-
-func (o SupportedKafkaInstanceTypeSizesInner) MarshalJSON() ([]byte, error) {
-	toSerialize := map[string]interface{}{}
-	if !isNil(o.Id) {
-		toSerialize["id"] = o.Id
-	}
-	if !isNil(o.DisplayName) {
-		toSerialize["display_name"] = o.DisplayName
-	}
-	if !isNil(o.IngressThroughputPerSec) {
-		toSerialize["ingress_throughput_per_sec"] = o.IngressThroughputPerSec
-	}
-	if !isNil(o.EgressThroughputPerSec) {
-		toSerialize["egress_throughput_per_sec"] = o.EgressThroughputPerSec
-	}
-	if !isNil(o.TotalMaxConnections) {
-		toSerialize["total_max_connections"] = o.TotalMaxConnections
-	}
-	if !isNil(o.MaxDataRetentionSize) {
-		toSerialize["max_data_retention_size"] = o.MaxDataRetentionSize
-	}
-	if !isNil(o.MaxPartitions) {
-		toSerialize["max_partitions"] = o.MaxPartitions
-	}
-	if !isNil(o.MaxDataRetentionPeriod) {
-		toSerialize["max_data_retention_period"] = o.MaxDataRetentionPeriod
-	}
-	if !isNil(o.MaxConnectionAttemptsPerSec) {
-		toSerialize["max_connection_attempts_per_sec"] = o.MaxConnectionAttemptsPerSec
-	}
-	if !isNil(o.MaxMessageSize) {
-		toSerialize["max_message_size"] = o.MaxMessageSize
-	}
-	if !isNil(o.MinInSyncReplicas) {
-		toSerialize["min_in_sync_replicas"] = o.MinInSyncReplicas
-	}
-	if !isNil(o.ReplicationFactor) {
-		toSerialize["replication_factor"] = o.ReplicationFactor
-	}
-	if !isNil(o.SupportedAzModes) {
-		toSerialize["supported_az_modes"] = o.SupportedAzModes
-	}
-	if o.LifespanSeconds.IsSet() {
-		toSerialize["lifespan_seconds"] = o.LifespanSeconds.Get()
-	}
-	if !isNil(o.QuotaConsumed) {
-		toSerialize["quota_consumed"] = o.QuotaConsumed
-	}
-	if !isNil(o.QuotaType) {
-		toSerialize["quota_type"] = o.QuotaType
-	}
-	if !isNil(o.CapacityConsumed) {
-		toSerialize["capacity_consumed"] = o.CapacityConsumed
-	}
-	if !isNil(o.MaturityStatus) {
-		toSerialize["maturity_status"] = o.MaturityStatus
-	}
-	return json.Marshal(toSerialize)
-}
-
-type NullableSupportedKafkaInstanceTypeSizesInner struct {
-	value *SupportedKafkaInstanceTypeSizesInner
-	isSet bool
-}
-
-func (v NullableSupportedKafkaInstanceTypeSizesInner) Get() *SupportedKafkaInstanceTypeSizesInner {
-	return v.value
-}
-
-func (v *NullableSupportedKafkaInstanceTypeSizesInner) Set(val *SupportedKafkaInstanceTypeSizesInner) {
-	v.value = val
-	v.isSet = true
-}
-
-func (v NullableSupportedKafkaInstanceTypeSizesInner) IsSet() bool {
-	return v.isSet
-}
-
-func (v *NullableSupportedKafkaInstanceTypeSizesInner) Unset() {
-	v.value = nil
-	v.isSet = false
-}
-
-func NewNullableSupportedKafkaInstanceTypeSizesInner(val *SupportedKafkaInstanceTypeSizesInner) *NullableSupportedKafkaInstanceTypeSizesInner {
-	return &NullableSupportedKafkaInstanceTypeSizesInner{value: val, isSet: true}
-}
-
-func (v NullableSupportedKafkaInstanceTypeSizesInner) MarshalJSON() ([]byte, error) {
-	return json.Marshal(v.value)
-}
-
-func (v *NullableSupportedKafkaInstanceTypeSizesInner) UnmarshalJSON(src []byte) error {
-	v.isSet = true
-	return json.Unmarshal(src, &v.value)
-}
-
-
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/model_supported_kafka_instance_types_list.go b/app-services-sdk-go/kafkamgmt/apiv1/client/model_supported_kafka_instance_types_list.go
index bdde3871..f766a924 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/model_supported_kafka_instance_types_list.go
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/model_supported_kafka_instance_types_list.go
@@ -1,11 +1,11 @@
 /*
-Kafka Management API
-
-Kafka Management API is a REST API to manage Kafka instances
-
-API version: 1.14.0
-Contact: rhosak-support@redhat.com
-*/
+ * Kafka Management API
+ *
+ * Kafka Management API is a REST API to manage Kafka instances
+ *
+ * API version: 1.14.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -17,7 +17,7 @@ import (
 
 // SupportedKafkaInstanceTypesList struct for SupportedKafkaInstanceTypesList
 type SupportedKafkaInstanceTypesList struct {
-	InstanceTypes []SupportedKafkaInstanceType `json:"instance_types,omitempty"`
+	InstanceTypes *[]SupportedKafkaInstanceType `json:"instance_types,omitempty"`
 }
 
 // NewSupportedKafkaInstanceTypesList instantiates a new SupportedKafkaInstanceTypesList object
@@ -39,25 +39,25 @@ func NewSupportedKafkaInstanceTypesListWithDefaults() *SupportedKafkaInstanceTyp
 
 // GetInstanceTypes returns the InstanceTypes field value if set, zero value otherwise.
 func (o *SupportedKafkaInstanceTypesList) GetInstanceTypes() []SupportedKafkaInstanceType {
-	if o == nil || isNil(o.InstanceTypes) {
+	if o == nil || o.InstanceTypes == nil {
 		var ret []SupportedKafkaInstanceType
 		return ret
 	}
-	return o.InstanceTypes
+	return *o.InstanceTypes
 }
 
 // GetInstanceTypesOk returns a tuple with the InstanceTypes field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *SupportedKafkaInstanceTypesList) GetInstanceTypesOk() ([]SupportedKafkaInstanceType, bool) {
-	if o == nil || isNil(o.InstanceTypes) {
-    return nil, false
+func (o *SupportedKafkaInstanceTypesList) GetInstanceTypesOk() (*[]SupportedKafkaInstanceType, bool) {
+	if o == nil || o.InstanceTypes == nil {
+		return nil, false
 	}
 	return o.InstanceTypes, true
 }
 
 // HasInstanceTypes returns a boolean if a field has been set.
 func (o *SupportedKafkaInstanceTypesList) HasInstanceTypes() bool {
-	if o != nil && !isNil(o.InstanceTypes) {
+	if o != nil && o.InstanceTypes != nil {
 		return true
 	}
 
@@ -66,12 +66,12 @@ func (o *SupportedKafkaInstanceTypesList) HasInstanceTypes() bool {
 
 // SetInstanceTypes gets a reference to the given []SupportedKafkaInstanceType and assigns it to the InstanceTypes field.
 func (o *SupportedKafkaInstanceTypesList) SetInstanceTypes(v []SupportedKafkaInstanceType) {
-	o.InstanceTypes = v
+	o.InstanceTypes = &v
 }
 
 func (o SupportedKafkaInstanceTypesList) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.InstanceTypes) {
+	if o.InstanceTypes != nil {
 		toSerialize["instance_types"] = o.InstanceTypes
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/model_supported_kafka_instance_types_list_all_of.go b/app-services-sdk-go/kafkamgmt/apiv1/client/model_supported_kafka_instance_types_list_all_of.go
index 20875337..201899b8 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/model_supported_kafka_instance_types_list_all_of.go
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/model_supported_kafka_instance_types_list_all_of.go
@@ -1,11 +1,11 @@
 /*
-Kafka Management API
-
-Kafka Management API is a REST API to manage Kafka instances
-
-API version: 1.14.0
-Contact: rhosak-support@redhat.com
-*/
+ * Kafka Management API
+ *
+ * Kafka Management API is a REST API to manage Kafka instances
+ *
+ * API version: 1.14.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -17,7 +17,7 @@ import (
 
 // SupportedKafkaInstanceTypesListAllOf struct for SupportedKafkaInstanceTypesListAllOf
 type SupportedKafkaInstanceTypesListAllOf struct {
-	InstanceTypes []SupportedKafkaInstanceType `json:"instance_types,omitempty"`
+	InstanceTypes *[]SupportedKafkaInstanceType `json:"instance_types,omitempty"`
 }
 
 // NewSupportedKafkaInstanceTypesListAllOf instantiates a new SupportedKafkaInstanceTypesListAllOf object
@@ -39,25 +39,25 @@ func NewSupportedKafkaInstanceTypesListAllOfWithDefaults() *SupportedKafkaInstan
 
 // GetInstanceTypes returns the InstanceTypes field value if set, zero value otherwise.
 func (o *SupportedKafkaInstanceTypesListAllOf) GetInstanceTypes() []SupportedKafkaInstanceType {
-	if o == nil || isNil(o.InstanceTypes) {
+	if o == nil || o.InstanceTypes == nil {
 		var ret []SupportedKafkaInstanceType
 		return ret
 	}
-	return o.InstanceTypes
+	return *o.InstanceTypes
 }
 
 // GetInstanceTypesOk returns a tuple with the InstanceTypes field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *SupportedKafkaInstanceTypesListAllOf) GetInstanceTypesOk() ([]SupportedKafkaInstanceType, bool) {
-	if o == nil || isNil(o.InstanceTypes) {
-    return nil, false
+func (o *SupportedKafkaInstanceTypesListAllOf) GetInstanceTypesOk() (*[]SupportedKafkaInstanceType, bool) {
+	if o == nil || o.InstanceTypes == nil {
+		return nil, false
 	}
 	return o.InstanceTypes, true
 }
 
 // HasInstanceTypes returns a boolean if a field has been set.
 func (o *SupportedKafkaInstanceTypesListAllOf) HasInstanceTypes() bool {
-	if o != nil && !isNil(o.InstanceTypes) {
+	if o != nil && o.InstanceTypes != nil {
 		return true
 	}
 
@@ -66,12 +66,12 @@ func (o *SupportedKafkaInstanceTypesListAllOf) HasInstanceTypes() bool {
 
 // SetInstanceTypes gets a reference to the given []SupportedKafkaInstanceType and assigns it to the InstanceTypes field.
 func (o *SupportedKafkaInstanceTypesListAllOf) SetInstanceTypes(v []SupportedKafkaInstanceType) {
-	o.InstanceTypes = v
+	o.InstanceTypes = &v
 }
 
 func (o SupportedKafkaInstanceTypesListAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.InstanceTypes) {
+	if o.InstanceTypes != nil {
 		toSerialize["instance_types"] = o.InstanceTypes
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/model_supported_kafka_size.go b/app-services-sdk-go/kafkamgmt/apiv1/client/model_supported_kafka_size.go
index 2b4f6673..fed11370 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/model_supported_kafka_size.go
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/model_supported_kafka_size.go
@@ -1,11 +1,11 @@
 /*
-Kafka Management API
-
-Kafka Management API is a REST API to manage Kafka instances
-
-API version: 1.14.0
-Contact: rhosak-support@redhat.com
-*/
+ * Kafka Management API
+ *
+ * Kafka Management API is a REST API to manage Kafka instances
+ *
+ * API version: 1.14.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -21,30 +21,29 @@ type SupportedKafkaSize struct {
 	Id *string `json:"id,omitempty"`
 	// Display name of this Kafka instance size.
 	DisplayName *string `json:"display_name,omitempty"`
-	IngressThroughputPerSec SupportedKafkaSizeBytesValueItem `json:"ingress_throughput_per_sec,omitempty"`
-	EgressThroughputPerSec SupportedKafkaSizeBytesValueItem `json:"egress_throughput_per_sec,omitempty"`
+	IngressThroughputPerSec *SupportedKafkaSizeBytesValueItem `json:"ingress_throughput_per_sec,omitempty"`
+	EgressThroughputPerSec *SupportedKafkaSizeBytesValueItem `json:"egress_throughput_per_sec,omitempty"`
 	// Maximum amount of total connections available to this Kafka instance size.
 	TotalMaxConnections *int32 `json:"total_max_connections,omitempty"`
-	MaxDataRetentionSize SupportedKafkaSizeBytesValueItem `json:"max_data_retention_size,omitempty"`
+	MaxDataRetentionSize *SupportedKafkaSizeBytesValueItem `json:"max_data_retention_size,omitempty"`
 	// Maximum amount of total partitions available to this Kafka instance size.
 	MaxPartitions *int32 `json:"max_partitions,omitempty"`
 	// Maximum data retention period available to this Kafka instance size.
 	MaxDataRetentionPeriod *string `json:"max_data_retention_period,omitempty"`
 	// Maximium connection attempts per second available to this Kafka instance size.
 	MaxConnectionAttemptsPerSec *int32 `json:"max_connection_attempts_per_sec,omitempty"`
-	MaxMessageSize SupportedKafkaSizeBytesValueItem `json:"max_message_size,omitempty"`
+	MaxMessageSize *SupportedKafkaSizeBytesValueItem `json:"max_message_size,omitempty"`
 	// Minimum number of in-sync replicas.
 	MinInSyncReplicas *int32 `json:"min_in_sync_replicas,omitempty"`
 	// Replication factor available to this Kafka instance size.
 	ReplicationFactor *int32 `json:"replication_factor,omitempty"`
 	// List of Availability Zone modes that this Kafka instance size supports. The possible values are \"single\", \"multi\".
-	SupportedAzModes []string `json:"supported_az_modes,omitempty"`
+	SupportedAzModes *[]string `json:"supported_az_modes,omitempty"`
 	// The limit lifespan of the kafka instance in seconds. If not specified then the instance never expires.
 	LifespanSeconds NullableInt32 `json:"lifespan_seconds,omitempty"`
 	// Quota consumed by this Kafka instance size.
 	QuotaConsumed *int32 `json:"quota_consumed,omitempty"`
 	// Quota type used by this Kafka instance size. This is now deprecated, please refer to supported_billing_models at instance-type level instead.
-	// Deprecated
 	QuotaType *string `json:"quota_type,omitempty"`
 	// Data plane cluster capacity consumed by this Kafka instance size.
 	CapacityConsumed *int32 `json:"capacity_consumed,omitempty"`
@@ -71,7 +70,7 @@ func NewSupportedKafkaSizeWithDefaults() *SupportedKafkaSize {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *SupportedKafkaSize) GetId() string {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret string
 		return ret
 	}
@@ -81,15 +80,15 @@ func (o *SupportedKafkaSize) GetId() string {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SupportedKafkaSize) GetIdOk() (*string, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *SupportedKafkaSize) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -103,7 +102,7 @@ func (o *SupportedKafkaSize) SetId(v string) {
 
 // GetDisplayName returns the DisplayName field value if set, zero value otherwise.
 func (o *SupportedKafkaSize) GetDisplayName() string {
-	if o == nil || isNil(o.DisplayName) {
+	if o == nil || o.DisplayName == nil {
 		var ret string
 		return ret
 	}
@@ -113,15 +112,15 @@ func (o *SupportedKafkaSize) GetDisplayName() string {
 // GetDisplayNameOk returns a tuple with the DisplayName field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SupportedKafkaSize) GetDisplayNameOk() (*string, bool) {
-	if o == nil || isNil(o.DisplayName) {
-    return nil, false
+	if o == nil || o.DisplayName == nil {
+		return nil, false
 	}
 	return o.DisplayName, true
 }
 
 // HasDisplayName returns a boolean if a field has been set.
 func (o *SupportedKafkaSize) HasDisplayName() bool {
-	if o != nil && !isNil(o.DisplayName) {
+	if o != nil && o.DisplayName != nil {
 		return true
 	}
 
@@ -135,25 +134,25 @@ func (o *SupportedKafkaSize) SetDisplayName(v string) {
 
 // GetIngressThroughputPerSec returns the IngressThroughputPerSec field value if set, zero value otherwise.
 func (o *SupportedKafkaSize) GetIngressThroughputPerSec() SupportedKafkaSizeBytesValueItem {
-	if o == nil || isNil(o.IngressThroughputPerSec) {
+	if o == nil || o.IngressThroughputPerSec == nil {
 		var ret SupportedKafkaSizeBytesValueItem
 		return ret
 	}
-	return o.IngressThroughputPerSec
+	return *o.IngressThroughputPerSec
 }
 
 // GetIngressThroughputPerSecOk returns a tuple with the IngressThroughputPerSec field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *SupportedKafkaSize) GetIngressThroughputPerSecOk() (SupportedKafkaSizeBytesValueItem, bool) {
-	if o == nil || isNil(o.IngressThroughputPerSec) {
-    return SupportedKafkaSizeBytesValueItem{}, false
+func (o *SupportedKafkaSize) GetIngressThroughputPerSecOk() (*SupportedKafkaSizeBytesValueItem, bool) {
+	if o == nil || o.IngressThroughputPerSec == nil {
+		return nil, false
 	}
 	return o.IngressThroughputPerSec, true
 }
 
 // HasIngressThroughputPerSec returns a boolean if a field has been set.
 func (o *SupportedKafkaSize) HasIngressThroughputPerSec() bool {
-	if o != nil && !isNil(o.IngressThroughputPerSec) {
+	if o != nil && o.IngressThroughputPerSec != nil {
 		return true
 	}
 
@@ -162,30 +161,30 @@ func (o *SupportedKafkaSize) HasIngressThroughputPerSec() bool {
 
 // SetIngressThroughputPerSec gets a reference to the given SupportedKafkaSizeBytesValueItem and assigns it to the IngressThroughputPerSec field.
 func (o *SupportedKafkaSize) SetIngressThroughputPerSec(v SupportedKafkaSizeBytesValueItem) {
-	o.IngressThroughputPerSec = v
+	o.IngressThroughputPerSec = &v
 }
 
 // GetEgressThroughputPerSec returns the EgressThroughputPerSec field value if set, zero value otherwise.
 func (o *SupportedKafkaSize) GetEgressThroughputPerSec() SupportedKafkaSizeBytesValueItem {
-	if o == nil || isNil(o.EgressThroughputPerSec) {
+	if o == nil || o.EgressThroughputPerSec == nil {
 		var ret SupportedKafkaSizeBytesValueItem
 		return ret
 	}
-	return o.EgressThroughputPerSec
+	return *o.EgressThroughputPerSec
 }
 
 // GetEgressThroughputPerSecOk returns a tuple with the EgressThroughputPerSec field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *SupportedKafkaSize) GetEgressThroughputPerSecOk() (SupportedKafkaSizeBytesValueItem, bool) {
-	if o == nil || isNil(o.EgressThroughputPerSec) {
-    return SupportedKafkaSizeBytesValueItem{}, false
+func (o *SupportedKafkaSize) GetEgressThroughputPerSecOk() (*SupportedKafkaSizeBytesValueItem, bool) {
+	if o == nil || o.EgressThroughputPerSec == nil {
+		return nil, false
 	}
 	return o.EgressThroughputPerSec, true
 }
 
 // HasEgressThroughputPerSec returns a boolean if a field has been set.
 func (o *SupportedKafkaSize) HasEgressThroughputPerSec() bool {
-	if o != nil && !isNil(o.EgressThroughputPerSec) {
+	if o != nil && o.EgressThroughputPerSec != nil {
 		return true
 	}
 
@@ -194,12 +193,12 @@ func (o *SupportedKafkaSize) HasEgressThroughputPerSec() bool {
 
 // SetEgressThroughputPerSec gets a reference to the given SupportedKafkaSizeBytesValueItem and assigns it to the EgressThroughputPerSec field.
 func (o *SupportedKafkaSize) SetEgressThroughputPerSec(v SupportedKafkaSizeBytesValueItem) {
-	o.EgressThroughputPerSec = v
+	o.EgressThroughputPerSec = &v
 }
 
 // GetTotalMaxConnections returns the TotalMaxConnections field value if set, zero value otherwise.
 func (o *SupportedKafkaSize) GetTotalMaxConnections() int32 {
-	if o == nil || isNil(o.TotalMaxConnections) {
+	if o == nil || o.TotalMaxConnections == nil {
 		var ret int32
 		return ret
 	}
@@ -209,15 +208,15 @@ func (o *SupportedKafkaSize) GetTotalMaxConnections() int32 {
 // GetTotalMaxConnectionsOk returns a tuple with the TotalMaxConnections field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SupportedKafkaSize) GetTotalMaxConnectionsOk() (*int32, bool) {
-	if o == nil || isNil(o.TotalMaxConnections) {
-    return nil, false
+	if o == nil || o.TotalMaxConnections == nil {
+		return nil, false
 	}
 	return o.TotalMaxConnections, true
 }
 
 // HasTotalMaxConnections returns a boolean if a field has been set.
 func (o *SupportedKafkaSize) HasTotalMaxConnections() bool {
-	if o != nil && !isNil(o.TotalMaxConnections) {
+	if o != nil && o.TotalMaxConnections != nil {
 		return true
 	}
 
@@ -231,25 +230,25 @@ func (o *SupportedKafkaSize) SetTotalMaxConnections(v int32) {
 
 // GetMaxDataRetentionSize returns the MaxDataRetentionSize field value if set, zero value otherwise.
 func (o *SupportedKafkaSize) GetMaxDataRetentionSize() SupportedKafkaSizeBytesValueItem {
-	if o == nil || isNil(o.MaxDataRetentionSize) {
+	if o == nil || o.MaxDataRetentionSize == nil {
 		var ret SupportedKafkaSizeBytesValueItem
 		return ret
 	}
-	return o.MaxDataRetentionSize
+	return *o.MaxDataRetentionSize
 }
 
 // GetMaxDataRetentionSizeOk returns a tuple with the MaxDataRetentionSize field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *SupportedKafkaSize) GetMaxDataRetentionSizeOk() (SupportedKafkaSizeBytesValueItem, bool) {
-	if o == nil || isNil(o.MaxDataRetentionSize) {
-    return SupportedKafkaSizeBytesValueItem{}, false
+func (o *SupportedKafkaSize) GetMaxDataRetentionSizeOk() (*SupportedKafkaSizeBytesValueItem, bool) {
+	if o == nil || o.MaxDataRetentionSize == nil {
+		return nil, false
 	}
 	return o.MaxDataRetentionSize, true
 }
 
 // HasMaxDataRetentionSize returns a boolean if a field has been set.
 func (o *SupportedKafkaSize) HasMaxDataRetentionSize() bool {
-	if o != nil && !isNil(o.MaxDataRetentionSize) {
+	if o != nil && o.MaxDataRetentionSize != nil {
 		return true
 	}
 
@@ -258,12 +257,12 @@ func (o *SupportedKafkaSize) HasMaxDataRetentionSize() bool {
 
 // SetMaxDataRetentionSize gets a reference to the given SupportedKafkaSizeBytesValueItem and assigns it to the MaxDataRetentionSize field.
 func (o *SupportedKafkaSize) SetMaxDataRetentionSize(v SupportedKafkaSizeBytesValueItem) {
-	o.MaxDataRetentionSize = v
+	o.MaxDataRetentionSize = &v
 }
 
 // GetMaxPartitions returns the MaxPartitions field value if set, zero value otherwise.
 func (o *SupportedKafkaSize) GetMaxPartitions() int32 {
-	if o == nil || isNil(o.MaxPartitions) {
+	if o == nil || o.MaxPartitions == nil {
 		var ret int32
 		return ret
 	}
@@ -273,15 +272,15 @@ func (o *SupportedKafkaSize) GetMaxPartitions() int32 {
 // GetMaxPartitionsOk returns a tuple with the MaxPartitions field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SupportedKafkaSize) GetMaxPartitionsOk() (*int32, bool) {
-	if o == nil || isNil(o.MaxPartitions) {
-    return nil, false
+	if o == nil || o.MaxPartitions == nil {
+		return nil, false
 	}
 	return o.MaxPartitions, true
 }
 
 // HasMaxPartitions returns a boolean if a field has been set.
 func (o *SupportedKafkaSize) HasMaxPartitions() bool {
-	if o != nil && !isNil(o.MaxPartitions) {
+	if o != nil && o.MaxPartitions != nil {
 		return true
 	}
 
@@ -295,7 +294,7 @@ func (o *SupportedKafkaSize) SetMaxPartitions(v int32) {
 
 // GetMaxDataRetentionPeriod returns the MaxDataRetentionPeriod field value if set, zero value otherwise.
 func (o *SupportedKafkaSize) GetMaxDataRetentionPeriod() string {
-	if o == nil || isNil(o.MaxDataRetentionPeriod) {
+	if o == nil || o.MaxDataRetentionPeriod == nil {
 		var ret string
 		return ret
 	}
@@ -305,15 +304,15 @@ func (o *SupportedKafkaSize) GetMaxDataRetentionPeriod() string {
 // GetMaxDataRetentionPeriodOk returns a tuple with the MaxDataRetentionPeriod field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SupportedKafkaSize) GetMaxDataRetentionPeriodOk() (*string, bool) {
-	if o == nil || isNil(o.MaxDataRetentionPeriod) {
-    return nil, false
+	if o == nil || o.MaxDataRetentionPeriod == nil {
+		return nil, false
 	}
 	return o.MaxDataRetentionPeriod, true
 }
 
 // HasMaxDataRetentionPeriod returns a boolean if a field has been set.
 func (o *SupportedKafkaSize) HasMaxDataRetentionPeriod() bool {
-	if o != nil && !isNil(o.MaxDataRetentionPeriod) {
+	if o != nil && o.MaxDataRetentionPeriod != nil {
 		return true
 	}
 
@@ -327,7 +326,7 @@ func (o *SupportedKafkaSize) SetMaxDataRetentionPeriod(v string) {
 
 // GetMaxConnectionAttemptsPerSec returns the MaxConnectionAttemptsPerSec field value if set, zero value otherwise.
 func (o *SupportedKafkaSize) GetMaxConnectionAttemptsPerSec() int32 {
-	if o == nil || isNil(o.MaxConnectionAttemptsPerSec) {
+	if o == nil || o.MaxConnectionAttemptsPerSec == nil {
 		var ret int32
 		return ret
 	}
@@ -337,15 +336,15 @@ func (o *SupportedKafkaSize) GetMaxConnectionAttemptsPerSec() int32 {
 // GetMaxConnectionAttemptsPerSecOk returns a tuple with the MaxConnectionAttemptsPerSec field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SupportedKafkaSize) GetMaxConnectionAttemptsPerSecOk() (*int32, bool) {
-	if o == nil || isNil(o.MaxConnectionAttemptsPerSec) {
-    return nil, false
+	if o == nil || o.MaxConnectionAttemptsPerSec == nil {
+		return nil, false
 	}
 	return o.MaxConnectionAttemptsPerSec, true
 }
 
 // HasMaxConnectionAttemptsPerSec returns a boolean if a field has been set.
 func (o *SupportedKafkaSize) HasMaxConnectionAttemptsPerSec() bool {
-	if o != nil && !isNil(o.MaxConnectionAttemptsPerSec) {
+	if o != nil && o.MaxConnectionAttemptsPerSec != nil {
 		return true
 	}
 
@@ -359,25 +358,25 @@ func (o *SupportedKafkaSize) SetMaxConnectionAttemptsPerSec(v int32) {
 
 // GetMaxMessageSize returns the MaxMessageSize field value if set, zero value otherwise.
 func (o *SupportedKafkaSize) GetMaxMessageSize() SupportedKafkaSizeBytesValueItem {
-	if o == nil || isNil(o.MaxMessageSize) {
+	if o == nil || o.MaxMessageSize == nil {
 		var ret SupportedKafkaSizeBytesValueItem
 		return ret
 	}
-	return o.MaxMessageSize
+	return *o.MaxMessageSize
 }
 
 // GetMaxMessageSizeOk returns a tuple with the MaxMessageSize field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *SupportedKafkaSize) GetMaxMessageSizeOk() (SupportedKafkaSizeBytesValueItem, bool) {
-	if o == nil || isNil(o.MaxMessageSize) {
-    return SupportedKafkaSizeBytesValueItem{}, false
+func (o *SupportedKafkaSize) GetMaxMessageSizeOk() (*SupportedKafkaSizeBytesValueItem, bool) {
+	if o == nil || o.MaxMessageSize == nil {
+		return nil, false
 	}
 	return o.MaxMessageSize, true
 }
 
 // HasMaxMessageSize returns a boolean if a field has been set.
 func (o *SupportedKafkaSize) HasMaxMessageSize() bool {
-	if o != nil && !isNil(o.MaxMessageSize) {
+	if o != nil && o.MaxMessageSize != nil {
 		return true
 	}
 
@@ -386,12 +385,12 @@ func (o *SupportedKafkaSize) HasMaxMessageSize() bool {
 
 // SetMaxMessageSize gets a reference to the given SupportedKafkaSizeBytesValueItem and assigns it to the MaxMessageSize field.
 func (o *SupportedKafkaSize) SetMaxMessageSize(v SupportedKafkaSizeBytesValueItem) {
-	o.MaxMessageSize = v
+	o.MaxMessageSize = &v
 }
 
 // GetMinInSyncReplicas returns the MinInSyncReplicas field value if set, zero value otherwise.
 func (o *SupportedKafkaSize) GetMinInSyncReplicas() int32 {
-	if o == nil || isNil(o.MinInSyncReplicas) {
+	if o == nil || o.MinInSyncReplicas == nil {
 		var ret int32
 		return ret
 	}
@@ -401,15 +400,15 @@ func (o *SupportedKafkaSize) GetMinInSyncReplicas() int32 {
 // GetMinInSyncReplicasOk returns a tuple with the MinInSyncReplicas field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SupportedKafkaSize) GetMinInSyncReplicasOk() (*int32, bool) {
-	if o == nil || isNil(o.MinInSyncReplicas) {
-    return nil, false
+	if o == nil || o.MinInSyncReplicas == nil {
+		return nil, false
 	}
 	return o.MinInSyncReplicas, true
 }
 
 // HasMinInSyncReplicas returns a boolean if a field has been set.
 func (o *SupportedKafkaSize) HasMinInSyncReplicas() bool {
-	if o != nil && !isNil(o.MinInSyncReplicas) {
+	if o != nil && o.MinInSyncReplicas != nil {
 		return true
 	}
 
@@ -423,7 +422,7 @@ func (o *SupportedKafkaSize) SetMinInSyncReplicas(v int32) {
 
 // GetReplicationFactor returns the ReplicationFactor field value if set, zero value otherwise.
 func (o *SupportedKafkaSize) GetReplicationFactor() int32 {
-	if o == nil || isNil(o.ReplicationFactor) {
+	if o == nil || o.ReplicationFactor == nil {
 		var ret int32
 		return ret
 	}
@@ -433,15 +432,15 @@ func (o *SupportedKafkaSize) GetReplicationFactor() int32 {
 // GetReplicationFactorOk returns a tuple with the ReplicationFactor field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SupportedKafkaSize) GetReplicationFactorOk() (*int32, bool) {
-	if o == nil || isNil(o.ReplicationFactor) {
-    return nil, false
+	if o == nil || o.ReplicationFactor == nil {
+		return nil, false
 	}
 	return o.ReplicationFactor, true
 }
 
 // HasReplicationFactor returns a boolean if a field has been set.
 func (o *SupportedKafkaSize) HasReplicationFactor() bool {
-	if o != nil && !isNil(o.ReplicationFactor) {
+	if o != nil && o.ReplicationFactor != nil {
 		return true
 	}
 
@@ -455,25 +454,25 @@ func (o *SupportedKafkaSize) SetReplicationFactor(v int32) {
 
 // GetSupportedAzModes returns the SupportedAzModes field value if set, zero value otherwise.
 func (o *SupportedKafkaSize) GetSupportedAzModes() []string {
-	if o == nil || isNil(o.SupportedAzModes) {
+	if o == nil || o.SupportedAzModes == nil {
 		var ret []string
 		return ret
 	}
-	return o.SupportedAzModes
+	return *o.SupportedAzModes
 }
 
 // GetSupportedAzModesOk returns a tuple with the SupportedAzModes field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *SupportedKafkaSize) GetSupportedAzModesOk() ([]string, bool) {
-	if o == nil || isNil(o.SupportedAzModes) {
-    return nil, false
+func (o *SupportedKafkaSize) GetSupportedAzModesOk() (*[]string, bool) {
+	if o == nil || o.SupportedAzModes == nil {
+		return nil, false
 	}
 	return o.SupportedAzModes, true
 }
 
 // HasSupportedAzModes returns a boolean if a field has been set.
 func (o *SupportedKafkaSize) HasSupportedAzModes() bool {
-	if o != nil && !isNil(o.SupportedAzModes) {
+	if o != nil && o.SupportedAzModes != nil {
 		return true
 	}
 
@@ -482,12 +481,12 @@ func (o *SupportedKafkaSize) HasSupportedAzModes() bool {
 
 // SetSupportedAzModes gets a reference to the given []string and assigns it to the SupportedAzModes field.
 func (o *SupportedKafkaSize) SetSupportedAzModes(v []string) {
-	o.SupportedAzModes = v
+	o.SupportedAzModes = &v
 }
 
 // GetLifespanSeconds returns the LifespanSeconds field value if set, zero value otherwise (both if not set or set to explicit null).
 func (o *SupportedKafkaSize) GetLifespanSeconds() int32 {
-	if o == nil || isNil(o.LifespanSeconds.Get()) {
+	if o == nil || o.LifespanSeconds.Get() == nil {
 		var ret int32
 		return ret
 	}
@@ -498,8 +497,8 @@ func (o *SupportedKafkaSize) GetLifespanSeconds() int32 {
 // and a boolean to check if the value has been set.
 // NOTE: If the value is an explicit nil, `nil, true` will be returned
 func (o *SupportedKafkaSize) GetLifespanSecondsOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return o.LifespanSeconds.Get(), o.LifespanSeconds.IsSet()
 }
@@ -529,7 +528,7 @@ func (o *SupportedKafkaSize) UnsetLifespanSeconds() {
 
 // GetQuotaConsumed returns the QuotaConsumed field value if set, zero value otherwise.
 func (o *SupportedKafkaSize) GetQuotaConsumed() int32 {
-	if o == nil || isNil(o.QuotaConsumed) {
+	if o == nil || o.QuotaConsumed == nil {
 		var ret int32
 		return ret
 	}
@@ -539,15 +538,15 @@ func (o *SupportedKafkaSize) GetQuotaConsumed() int32 {
 // GetQuotaConsumedOk returns a tuple with the QuotaConsumed field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SupportedKafkaSize) GetQuotaConsumedOk() (*int32, bool) {
-	if o == nil || isNil(o.QuotaConsumed) {
-    return nil, false
+	if o == nil || o.QuotaConsumed == nil {
+		return nil, false
 	}
 	return o.QuotaConsumed, true
 }
 
 // HasQuotaConsumed returns a boolean if a field has been set.
 func (o *SupportedKafkaSize) HasQuotaConsumed() bool {
-	if o != nil && !isNil(o.QuotaConsumed) {
+	if o != nil && o.QuotaConsumed != nil {
 		return true
 	}
 
@@ -560,9 +559,8 @@ func (o *SupportedKafkaSize) SetQuotaConsumed(v int32) {
 }
 
 // GetQuotaType returns the QuotaType field value if set, zero value otherwise.
-// Deprecated
 func (o *SupportedKafkaSize) GetQuotaType() string {
-	if o == nil || isNil(o.QuotaType) {
+	if o == nil || o.QuotaType == nil {
 		var ret string
 		return ret
 	}
@@ -571,17 +569,16 @@ func (o *SupportedKafkaSize) GetQuotaType() string {
 
 // GetQuotaTypeOk returns a tuple with the QuotaType field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-// Deprecated
 func (o *SupportedKafkaSize) GetQuotaTypeOk() (*string, bool) {
-	if o == nil || isNil(o.QuotaType) {
-    return nil, false
+	if o == nil || o.QuotaType == nil {
+		return nil, false
 	}
 	return o.QuotaType, true
 }
 
 // HasQuotaType returns a boolean if a field has been set.
 func (o *SupportedKafkaSize) HasQuotaType() bool {
-	if o != nil && !isNil(o.QuotaType) {
+	if o != nil && o.QuotaType != nil {
 		return true
 	}
 
@@ -589,14 +586,13 @@ func (o *SupportedKafkaSize) HasQuotaType() bool {
 }
 
 // SetQuotaType gets a reference to the given string and assigns it to the QuotaType field.
-// Deprecated
 func (o *SupportedKafkaSize) SetQuotaType(v string) {
 	o.QuotaType = &v
 }
 
 // GetCapacityConsumed returns the CapacityConsumed field value if set, zero value otherwise.
 func (o *SupportedKafkaSize) GetCapacityConsumed() int32 {
-	if o == nil || isNil(o.CapacityConsumed) {
+	if o == nil || o.CapacityConsumed == nil {
 		var ret int32
 		return ret
 	}
@@ -606,15 +602,15 @@ func (o *SupportedKafkaSize) GetCapacityConsumed() int32 {
 // GetCapacityConsumedOk returns a tuple with the CapacityConsumed field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SupportedKafkaSize) GetCapacityConsumedOk() (*int32, bool) {
-	if o == nil || isNil(o.CapacityConsumed) {
-    return nil, false
+	if o == nil || o.CapacityConsumed == nil {
+		return nil, false
 	}
 	return o.CapacityConsumed, true
 }
 
 // HasCapacityConsumed returns a boolean if a field has been set.
 func (o *SupportedKafkaSize) HasCapacityConsumed() bool {
-	if o != nil && !isNil(o.CapacityConsumed) {
+	if o != nil && o.CapacityConsumed != nil {
 		return true
 	}
 
@@ -628,7 +624,7 @@ func (o *SupportedKafkaSize) SetCapacityConsumed(v int32) {
 
 // GetMaturityStatus returns the MaturityStatus field value if set, zero value otherwise.
 func (o *SupportedKafkaSize) GetMaturityStatus() string {
-	if o == nil || isNil(o.MaturityStatus) {
+	if o == nil || o.MaturityStatus == nil {
 		var ret string
 		return ret
 	}
@@ -638,15 +634,15 @@ func (o *SupportedKafkaSize) GetMaturityStatus() string {
 // GetMaturityStatusOk returns a tuple with the MaturityStatus field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SupportedKafkaSize) GetMaturityStatusOk() (*string, bool) {
-	if o == nil || isNil(o.MaturityStatus) {
-    return nil, false
+	if o == nil || o.MaturityStatus == nil {
+		return nil, false
 	}
 	return o.MaturityStatus, true
 }
 
 // HasMaturityStatus returns a boolean if a field has been set.
 func (o *SupportedKafkaSize) HasMaturityStatus() bool {
-	if o != nil && !isNil(o.MaturityStatus) {
+	if o != nil && o.MaturityStatus != nil {
 		return true
 	}
 
@@ -660,58 +656,58 @@ func (o *SupportedKafkaSize) SetMaturityStatus(v string) {
 
 func (o SupportedKafkaSize) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.DisplayName) {
+	if o.DisplayName != nil {
 		toSerialize["display_name"] = o.DisplayName
 	}
-	if !isNil(o.IngressThroughputPerSec) {
+	if o.IngressThroughputPerSec != nil {
 		toSerialize["ingress_throughput_per_sec"] = o.IngressThroughputPerSec
 	}
-	if !isNil(o.EgressThroughputPerSec) {
+	if o.EgressThroughputPerSec != nil {
 		toSerialize["egress_throughput_per_sec"] = o.EgressThroughputPerSec
 	}
-	if !isNil(o.TotalMaxConnections) {
+	if o.TotalMaxConnections != nil {
 		toSerialize["total_max_connections"] = o.TotalMaxConnections
 	}
-	if !isNil(o.MaxDataRetentionSize) {
+	if o.MaxDataRetentionSize != nil {
 		toSerialize["max_data_retention_size"] = o.MaxDataRetentionSize
 	}
-	if !isNil(o.MaxPartitions) {
+	if o.MaxPartitions != nil {
 		toSerialize["max_partitions"] = o.MaxPartitions
 	}
-	if !isNil(o.MaxDataRetentionPeriod) {
+	if o.MaxDataRetentionPeriod != nil {
 		toSerialize["max_data_retention_period"] = o.MaxDataRetentionPeriod
 	}
-	if !isNil(o.MaxConnectionAttemptsPerSec) {
+	if o.MaxConnectionAttemptsPerSec != nil {
 		toSerialize["max_connection_attempts_per_sec"] = o.MaxConnectionAttemptsPerSec
 	}
-	if !isNil(o.MaxMessageSize) {
+	if o.MaxMessageSize != nil {
 		toSerialize["max_message_size"] = o.MaxMessageSize
 	}
-	if !isNil(o.MinInSyncReplicas) {
+	if o.MinInSyncReplicas != nil {
 		toSerialize["min_in_sync_replicas"] = o.MinInSyncReplicas
 	}
-	if !isNil(o.ReplicationFactor) {
+	if o.ReplicationFactor != nil {
 		toSerialize["replication_factor"] = o.ReplicationFactor
 	}
-	if !isNil(o.SupportedAzModes) {
+	if o.SupportedAzModes != nil {
 		toSerialize["supported_az_modes"] = o.SupportedAzModes
 	}
 	if o.LifespanSeconds.IsSet() {
 		toSerialize["lifespan_seconds"] = o.LifespanSeconds.Get()
 	}
-	if !isNil(o.QuotaConsumed) {
+	if o.QuotaConsumed != nil {
 		toSerialize["quota_consumed"] = o.QuotaConsumed
 	}
-	if !isNil(o.QuotaType) {
+	if o.QuotaType != nil {
 		toSerialize["quota_type"] = o.QuotaType
 	}
-	if !isNil(o.CapacityConsumed) {
+	if o.CapacityConsumed != nil {
 		toSerialize["capacity_consumed"] = o.CapacityConsumed
 	}
-	if !isNil(o.MaturityStatus) {
+	if o.MaturityStatus != nil {
 		toSerialize["maturity_status"] = o.MaturityStatus
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/model_supported_kafka_size_bytes_value_item.go b/app-services-sdk-go/kafkamgmt/apiv1/client/model_supported_kafka_size_bytes_value_item.go
index a473bbef..1262ccc6 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/model_supported_kafka_size_bytes_value_item.go
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/model_supported_kafka_size_bytes_value_item.go
@@ -1,11 +1,11 @@
 /*
-Kafka Management API
-
-Kafka Management API is a REST API to manage Kafka instances
-
-API version: 1.14.0
-Contact: rhosak-support@redhat.com
-*/
+ * Kafka Management API
+ *
+ * Kafka Management API is a REST API to manage Kafka instances
+ *
+ * API version: 1.14.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -39,7 +39,7 @@ func NewSupportedKafkaSizeBytesValueItemWithDefaults() *SupportedKafkaSizeBytesV
 
 // GetBytes returns the Bytes field value if set, zero value otherwise.
 func (o *SupportedKafkaSizeBytesValueItem) GetBytes() int64 {
-	if o == nil || isNil(o.Bytes) {
+	if o == nil || o.Bytes == nil {
 		var ret int64
 		return ret
 	}
@@ -49,15 +49,15 @@ func (o *SupportedKafkaSizeBytesValueItem) GetBytes() int64 {
 // GetBytesOk returns a tuple with the Bytes field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SupportedKafkaSizeBytesValueItem) GetBytesOk() (*int64, bool) {
-	if o == nil || isNil(o.Bytes) {
-    return nil, false
+	if o == nil || o.Bytes == nil {
+		return nil, false
 	}
 	return o.Bytes, true
 }
 
 // HasBytes returns a boolean if a field has been set.
 func (o *SupportedKafkaSizeBytesValueItem) HasBytes() bool {
-	if o != nil && !isNil(o.Bytes) {
+	if o != nil && o.Bytes != nil {
 		return true
 	}
 
@@ -71,7 +71,7 @@ func (o *SupportedKafkaSizeBytesValueItem) SetBytes(v int64) {
 
 func (o SupportedKafkaSizeBytesValueItem) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Bytes) {
+	if o.Bytes != nil {
 		toSerialize["bytes"] = o.Bytes
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/model_values.go b/app-services-sdk-go/kafkamgmt/apiv1/client/model_values.go
index 67622e7e..b427ad8f 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/model_values.go
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/model_values.go
@@ -1,11 +1,11 @@
 /*
-Kafka Management API
-
-Kafka Management API is a REST API to manage Kafka instances
-
-API version: 1.14.0
-Contact: rhosak-support@redhat.com
-*/
+ * Kafka Management API
+ *
+ * Kafka Management API is a REST API to manage Kafka instances
+ *
+ * API version: 1.14.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -41,7 +41,7 @@ func NewValuesWithDefaults() *Values {
 
 // GetTimestamp returns the Timestamp field value if set, zero value otherwise.
 func (o *Values) GetTimestamp() int64 {
-	if o == nil || isNil(o.Timestamp) {
+	if o == nil || o.Timestamp == nil {
 		var ret int64
 		return ret
 	}
@@ -51,15 +51,15 @@ func (o *Values) GetTimestamp() int64 {
 // GetTimestampOk returns a tuple with the Timestamp field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Values) GetTimestampOk() (*int64, bool) {
-	if o == nil || isNil(o.Timestamp) {
-    return nil, false
+	if o == nil || o.Timestamp == nil {
+		return nil, false
 	}
 	return o.Timestamp, true
 }
 
 // HasTimestamp returns a boolean if a field has been set.
 func (o *Values) HasTimestamp() bool {
-	if o != nil && !isNil(o.Timestamp) {
+	if o != nil && o.Timestamp != nil {
 		return true
 	}
 
@@ -84,8 +84,8 @@ func (o *Values) GetValue() float64 {
 // GetValueOk returns a tuple with the Value field value
 // and a boolean to check if the value has been set.
 func (o *Values) GetValueOk() (*float64, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Value, true
 }
@@ -97,7 +97,7 @@ func (o *Values) SetValue(v float64) {
 
 func (o Values) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Timestamp) {
+	if o.Timestamp != nil {
 		toSerialize["timestamp"] = o.Timestamp
 	}
 	if true {
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/model_version_metadata.go b/app-services-sdk-go/kafkamgmt/apiv1/client/model_version_metadata.go
index 00c7e450..4d06459a 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/model_version_metadata.go
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/model_version_metadata.go
@@ -1,11 +1,11 @@
 /*
-Kafka Management API
-
-Kafka Management API is a REST API to manage Kafka instances
-
-API version: 1.14.0
-Contact: rhosak-support@redhat.com
-*/
+ * Kafka Management API
+ *
+ * Kafka Management API is a REST API to manage Kafka instances
+ *
+ * API version: 1.14.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -21,7 +21,7 @@ type VersionMetadata struct {
 	Kind string `json:"kind"`
 	Href string `json:"href"`
 	ServerVersion *string `json:"server_version,omitempty"`
-	Collections []ObjectReference `json:"collections,omitempty"`
+	Collections *[]ObjectReference `json:"collections,omitempty"`
 }
 
 // NewVersionMetadata instantiates a new VersionMetadata object
@@ -57,8 +57,8 @@ func (o *VersionMetadata) GetId() string {
 // GetIdOk returns a tuple with the Id field value
 // and a boolean to check if the value has been set.
 func (o *VersionMetadata) GetIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Id, true
 }
@@ -81,8 +81,8 @@ func (o *VersionMetadata) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *VersionMetadata) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -105,8 +105,8 @@ func (o *VersionMetadata) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value
 // and a boolean to check if the value has been set.
 func (o *VersionMetadata) GetHrefOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Href, true
 }
@@ -118,7 +118,7 @@ func (o *VersionMetadata) SetHref(v string) {
 
 // GetServerVersion returns the ServerVersion field value if set, zero value otherwise.
 func (o *VersionMetadata) GetServerVersion() string {
-	if o == nil || isNil(o.ServerVersion) {
+	if o == nil || o.ServerVersion == nil {
 		var ret string
 		return ret
 	}
@@ -128,15 +128,15 @@ func (o *VersionMetadata) GetServerVersion() string {
 // GetServerVersionOk returns a tuple with the ServerVersion field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *VersionMetadata) GetServerVersionOk() (*string, bool) {
-	if o == nil || isNil(o.ServerVersion) {
-    return nil, false
+	if o == nil || o.ServerVersion == nil {
+		return nil, false
 	}
 	return o.ServerVersion, true
 }
 
 // HasServerVersion returns a boolean if a field has been set.
 func (o *VersionMetadata) HasServerVersion() bool {
-	if o != nil && !isNil(o.ServerVersion) {
+	if o != nil && o.ServerVersion != nil {
 		return true
 	}
 
@@ -150,25 +150,25 @@ func (o *VersionMetadata) SetServerVersion(v string) {
 
 // GetCollections returns the Collections field value if set, zero value otherwise.
 func (o *VersionMetadata) GetCollections() []ObjectReference {
-	if o == nil || isNil(o.Collections) {
+	if o == nil || o.Collections == nil {
 		var ret []ObjectReference
 		return ret
 	}
-	return o.Collections
+	return *o.Collections
 }
 
 // GetCollectionsOk returns a tuple with the Collections field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *VersionMetadata) GetCollectionsOk() ([]ObjectReference, bool) {
-	if o == nil || isNil(o.Collections) {
-    return nil, false
+func (o *VersionMetadata) GetCollectionsOk() (*[]ObjectReference, bool) {
+	if o == nil || o.Collections == nil {
+		return nil, false
 	}
 	return o.Collections, true
 }
 
 // HasCollections returns a boolean if a field has been set.
 func (o *VersionMetadata) HasCollections() bool {
-	if o != nil && !isNil(o.Collections) {
+	if o != nil && o.Collections != nil {
 		return true
 	}
 
@@ -177,7 +177,7 @@ func (o *VersionMetadata) HasCollections() bool {
 
 // SetCollections gets a reference to the given []ObjectReference and assigns it to the Collections field.
 func (o *VersionMetadata) SetCollections(v []ObjectReference) {
-	o.Collections = v
+	o.Collections = &v
 }
 
 func (o VersionMetadata) MarshalJSON() ([]byte, error) {
@@ -191,10 +191,10 @@ func (o VersionMetadata) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["href"] = o.Href
 	}
-	if !isNil(o.ServerVersion) {
+	if o.ServerVersion != nil {
 		toSerialize["server_version"] = o.ServerVersion
 	}
-	if !isNil(o.Collections) {
+	if o.Collections != nil {
 		toSerialize["collections"] = o.Collections
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/model_version_metadata_all_of.go b/app-services-sdk-go/kafkamgmt/apiv1/client/model_version_metadata_all_of.go
index 5ab1ec58..73e3cac7 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/model_version_metadata_all_of.go
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/model_version_metadata_all_of.go
@@ -1,11 +1,11 @@
 /*
-Kafka Management API
-
-Kafka Management API is a REST API to manage Kafka instances
-
-API version: 1.14.0
-Contact: rhosak-support@redhat.com
-*/
+ * Kafka Management API
+ *
+ * Kafka Management API is a REST API to manage Kafka instances
+ *
+ * API version: 1.14.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -18,7 +18,7 @@ import (
 // VersionMetadataAllOf struct for VersionMetadataAllOf
 type VersionMetadataAllOf struct {
 	ServerVersion *string `json:"server_version,omitempty"`
-	Collections []ObjectReference `json:"collections,omitempty"`
+	Collections *[]ObjectReference `json:"collections,omitempty"`
 }
 
 // NewVersionMetadataAllOf instantiates a new VersionMetadataAllOf object
@@ -40,7 +40,7 @@ func NewVersionMetadataAllOfWithDefaults() *VersionMetadataAllOf {
 
 // GetServerVersion returns the ServerVersion field value if set, zero value otherwise.
 func (o *VersionMetadataAllOf) GetServerVersion() string {
-	if o == nil || isNil(o.ServerVersion) {
+	if o == nil || o.ServerVersion == nil {
 		var ret string
 		return ret
 	}
@@ -50,15 +50,15 @@ func (o *VersionMetadataAllOf) GetServerVersion() string {
 // GetServerVersionOk returns a tuple with the ServerVersion field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *VersionMetadataAllOf) GetServerVersionOk() (*string, bool) {
-	if o == nil || isNil(o.ServerVersion) {
-    return nil, false
+	if o == nil || o.ServerVersion == nil {
+		return nil, false
 	}
 	return o.ServerVersion, true
 }
 
 // HasServerVersion returns a boolean if a field has been set.
 func (o *VersionMetadataAllOf) HasServerVersion() bool {
-	if o != nil && !isNil(o.ServerVersion) {
+	if o != nil && o.ServerVersion != nil {
 		return true
 	}
 
@@ -72,25 +72,25 @@ func (o *VersionMetadataAllOf) SetServerVersion(v string) {
 
 // GetCollections returns the Collections field value if set, zero value otherwise.
 func (o *VersionMetadataAllOf) GetCollections() []ObjectReference {
-	if o == nil || isNil(o.Collections) {
+	if o == nil || o.Collections == nil {
 		var ret []ObjectReference
 		return ret
 	}
-	return o.Collections
+	return *o.Collections
 }
 
 // GetCollectionsOk returns a tuple with the Collections field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *VersionMetadataAllOf) GetCollectionsOk() ([]ObjectReference, bool) {
-	if o == nil || isNil(o.Collections) {
-    return nil, false
+func (o *VersionMetadataAllOf) GetCollectionsOk() (*[]ObjectReference, bool) {
+	if o == nil || o.Collections == nil {
+		return nil, false
 	}
 	return o.Collections, true
 }
 
 // HasCollections returns a boolean if a field has been set.
 func (o *VersionMetadataAllOf) HasCollections() bool {
-	if o != nil && !isNil(o.Collections) {
+	if o != nil && o.Collections != nil {
 		return true
 	}
 
@@ -99,15 +99,15 @@ func (o *VersionMetadataAllOf) HasCollections() bool {
 
 // SetCollections gets a reference to the given []ObjectReference and assigns it to the Collections field.
 func (o *VersionMetadataAllOf) SetCollections(v []ObjectReference) {
-	o.Collections = v
+	o.Collections = &v
 }
 
 func (o VersionMetadataAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.ServerVersion) {
+	if o.ServerVersion != nil {
 		toSerialize["server_version"] = o.ServerVersion
 	}
-	if !isNil(o.Collections) {
+	if o.Collections != nil {
 		toSerialize["collections"] = o.Collections
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/response.go b/app-services-sdk-go/kafkamgmt/apiv1/client/response.go
index 5e7f0c1a..7b7b7790 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/response.go
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/response.go
@@ -1,11 +1,11 @@
 /*
-Kafka Management API
-
-Kafka Management API is a REST API to manage Kafka instances
-
-API version: 1.14.0
-Contact: rhosak-support@redhat.com
-*/
+ * Kafka Management API
+ *
+ * Kafka Management API is a REST API to manage Kafka instances
+ *
+ * API version: 1.14.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/test/api_default_test.go b/app-services-sdk-go/kafkamgmt/apiv1/client/test/api_default_test.go
deleted file mode 100644
index 23bc006a..00000000
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/test/api_default_test.go
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
-Kafka Management API
-
-Testing DefaultApiService
-
-*/
-
-// Code generated by OpenAPI Generator (https://openapi-generator.tech);
-
-package kafkamgmtclient
-
-import (
-    "context"
-    "github.com/stretchr/testify/assert"
-    "github.com/stretchr/testify/require"
-    "testing"
-    openapiclient "./openapi"
-)
-
-func Test_kafkamgmtclient_DefaultApiService(t *testing.T) {
-
-    configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-
-    t.Run("Test DefaultApiService CreateKafka", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.DefaultApi.CreateKafka(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService DeleteKafkaById", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.DefaultApi.DeleteKafkaById(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService FederateMetrics", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.DefaultApi.FederateMetrics(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService GetCloudProviderRegions", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.DefaultApi.GetCloudProviderRegions(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService GetCloudProviders", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.DefaultApi.GetCloudProviders(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService GetInstanceTypesByCloudProviderAndRegion", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var cloudProvider string
-        var cloudRegion string
-
-        resp, httpRes, err := apiClient.DefaultApi.GetInstanceTypesByCloudProviderAndRegion(context.Background(), cloudProvider, cloudRegion).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService GetKafkaById", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.DefaultApi.GetKafkaById(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService GetKafkas", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.DefaultApi.GetKafkas(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService GetMetricsByInstantQuery", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.DefaultApi.GetMetricsByInstantQuery(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService GetMetricsByRangeQuery", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.DefaultApi.GetMetricsByRangeQuery(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService GetVersionMetadata", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.DefaultApi.GetVersionMetadata(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService UpdateKafkaById", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.DefaultApi.UpdateKafkaById(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-}
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/test/api_errors_test.go b/app-services-sdk-go/kafkamgmt/apiv1/client/test/api_errors_test.go
deleted file mode 100644
index 6df36c9b..00000000
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/test/api_errors_test.go
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-Kafka Management API
-
-Testing ErrorsApiService
-
-*/
-
-// Code generated by OpenAPI Generator (https://openapi-generator.tech);
-
-package kafkamgmtclient
-
-import (
-    "context"
-    "github.com/stretchr/testify/assert"
-    "github.com/stretchr/testify/require"
-    "testing"
-    openapiclient "./openapi"
-)
-
-func Test_kafkamgmtclient_ErrorsApiService(t *testing.T) {
-
-    configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-
-    t.Run("Test ErrorsApiService GetErrorById", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.ErrorsApi.GetErrorById(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test ErrorsApiService GetErrors", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.ErrorsApi.GetErrors(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-}
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/test/api_security_test.go b/app-services-sdk-go/kafkamgmt/apiv1/client/test/api_security_test.go
deleted file mode 100644
index bec82f65..00000000
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/test/api_security_test.go
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-Kafka Management API
-
-Testing SecurityApiService
-
-*/
-
-// Code generated by OpenAPI Generator (https://openapi-generator.tech);
-
-package kafkamgmtclient
-
-import (
-    "context"
-    "github.com/stretchr/testify/assert"
-    "github.com/stretchr/testify/require"
-    "testing"
-    openapiclient "./openapi"
-)
-
-func Test_kafkamgmtclient_SecurityApiService(t *testing.T) {
-
-    configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-
-    t.Run("Test SecurityApiService CreateServiceAccount", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.SecurityApi.CreateServiceAccount(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test SecurityApiService DeleteServiceAccountById", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.SecurityApi.DeleteServiceAccountById(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test SecurityApiService GetServiceAccountById", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.SecurityApi.GetServiceAccountById(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test SecurityApiService GetServiceAccounts", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.SecurityApi.GetServiceAccounts(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test SecurityApiService GetSsoProviders", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.SecurityApi.GetSsoProviders(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test SecurityApiService ResetServiceAccountCreds", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.SecurityApi.ResetServiceAccountCreds(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-}
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/client/utils.go b/app-services-sdk-go/kafkamgmt/apiv1/client/utils.go
index c2a4ef1c..329949fb 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/client/utils.go
+++ b/app-services-sdk-go/kafkamgmt/apiv1/client/utils.go
@@ -1,11 +1,11 @@
 /*
-Kafka Management API
-
-Kafka Management API is a REST API to manage Kafka instances
-
-API version: 1.14.0
-Contact: rhosak-support@redhat.com
-*/
+ * Kafka Management API
+ *
+ * Kafka Management API is a REST API to manage Kafka instances
+ *
+ * API version: 1.14.0
+ * Contact: rhosak-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -13,7 +13,6 @@ package kafkamgmtclient
 
 import (
 	"encoding/json"
-    "reflect"
 	"time"
 )
 
@@ -328,17 +327,3 @@ func (v *NullableTime) UnmarshalJSON(src []byte) error {
 	v.isSet = true
 	return json.Unmarshal(src, &v.value)
 }
-
-// isNil checks if an input is nil
-func isNil(i interface{}) bool {
-    if i == nil {
-        return true
-    }
-    switch reflect.TypeOf(i).Kind() {
-    case reflect.Chan, reflect.Func, reflect.Map, reflect.Ptr, reflect.UnsafePointer, reflect.Interface, reflect.Slice:
-        return reflect.ValueOf(i).IsNil()
-    case reflect.Array:
-        return reflect.ValueOf(i).IsZero()
-    }
-    return false
-}
\ No newline at end of file
diff --git a/app-services-sdk-go/kafkamgmt/apiv1/error/error_sdk.go b/app-services-sdk-go/kafkamgmt/apiv1/error/error_sdk.go
index b6df77eb..222e7551 100644
--- a/app-services-sdk-go/kafkamgmt/apiv1/error/error_sdk.go
+++ b/app-services-sdk-go/kafkamgmt/apiv1/error/error_sdk.go
@@ -3,7 +3,7 @@ package error
 import (
 	"errors"
 
-	kafkamgmtclient "github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client"
+	kafkamgmtclient "github.com/jackdelahunt/app-services-sdk-core/app-services-sdk-go/kafkamgmt/apiv1/client"
 )
 
 // GetAPIError gets a strongly typed error from an error
diff --git a/app-services-sdk-go/kafkamgmt/go.mod b/app-services-sdk-go/kafkamgmt/go.mod
index 78068578..f78f75ba 100644
--- a/app-services-sdk-go/kafkamgmt/go.mod
+++ b/app-services-sdk-go/kafkamgmt/go.mod
@@ -1,8 +1,8 @@
-module github.com/redhat-developer/app-services-sdk-go/kafkamgmt
+module github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go/kafkamgmt
 
 go 1.15
 
 require (
-	github.com/redhat-developer/app-services-sdk-go v0.10.0
+	github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go v0.1.0
 	golang.org/x/oauth2 v0.0.0-20220630143837-2104d58473e0
 )
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/api_client.go b/app-services-sdk-go/registryinstance/apiv1internal/api_client.go
index 2124d99a..f82875a2 100644
--- a/app-services-sdk-go/registryinstance/apiv1internal/api_client.go
+++ b/app-services-sdk-go/registryinstance/apiv1internal/api_client.go
@@ -1,9 +1,9 @@
 package registryinstance
 
 import (
-	"github.com/redhat-developer/app-services-sdk-go/core"
+	"github.com/jackdelahunt/app-services-sdk-core/app-services-sdk-go/core"
 
-	apiv1 "github.com/redhat-developer/app-services-sdk-go/registryinstance/apiv1internal/client"
+	apiv1 "github.com/jackdelahunt/app-services-sdk-core/app-services-sdk-go/registryinstance/apiv1internal/client"
 )
 
 // Config defines the available configuration options
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/.openapi-generator/FILES b/app-services-sdk-go/registryinstance/apiv1internal/client/.openapi-generator/FILES
index ca6d97fd..3358c896 100644
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/.openapi-generator/FILES
+++ b/app-services-sdk-go/registryinstance/apiv1internal/client/.openapi-generator/FILES
@@ -54,8 +54,6 @@ docs/UsersApi.md
 docs/VersionMetaData.md
 docs/VersionSearchResults.md
 docs/VersionsApi.md
-go.mod
-go.sum
 model_artifact_meta_data.go
 model_artifact_owner.go
 model_artifact_reference.go
@@ -92,13 +90,4 @@ model_user_info.go
 model_version_meta_data.go
 model_version_search_results.go
 response.go
-test/api_admin_test.go
-test/api_artifact_rules_test.go
-test/api_artifacts_test.go
-test/api_global_rules_test.go
-test/api_metadata_test.go
-test/api_search_test.go
-test/api_system_test.go
-test/api_users_test.go
-test/api_versions_test.go
 utils.go
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/.openapi-generator/VERSION b/app-services-sdk-go/registryinstance/apiv1internal/client/.openapi-generator/VERSION
index 0df17dd0..7cbea073 100644
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/.openapi-generator/VERSION
+++ b/app-services-sdk-go/registryinstance/apiv1internal/client/.openapi-generator/VERSION
@@ -1 +1 @@
-6.2.1
\ No newline at end of file
+5.2.0
\ No newline at end of file
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/api/openapi.yaml b/app-services-sdk-go/registryinstance/apiv1internal/client/api/openapi.yaml
index 325f12c6..1e9271be 100644
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/api/openapi.yaml
+++ b/app-services-sdk-go/registryinstance/apiv1internal/client/api/openapi.yaml
@@ -4,12 +4,26 @@ info:
     email: apicurio@lists.jboss.org
     name: Apicurio
     url: https://github.com/apicurio/apicurio-registry
-  description: "Service Registry Instance API \nNOTE: This API cannot be called directly\
-    \ from the portal."
+  description: "Apicurio Registry is a datastore for standard event schemas and API\
+    \ designs. Apicurio Registry enables developers to manage and share the structure\
+    \ of their data using a REST interface. For example, client applications can dynamically\
+    \ push or pull the latest updates to or from the registry without needing to redeploy.\
+    \ Apicurio Registry also enables developers to create rules that govern how registry\
+    \ content can evolve over time. For example, this includes rules for content validation\
+    \ and version compatibility.\n\nThe Apicurio Registry REST API enables client\
+    \ applications to manage the artifacts in the registry. This API provides create,\
+    \ read, update, and delete operations for schema and API artifacts, rules, versions,\
+    \ and metadata. \n\nThe supported artifact types include:\n- Apache Avro schema\n\
+    - AsyncAPI specification\n- Google protocol buffers\n- GraphQL schema\n- JSON\
+    \ Schema\n- Kafka Connect schema\n- OpenAPI specification\n- Web Services Description\
+    \ Language\n- XML Schema Definition\n\n\n**Important**: The Apicurio Registry\
+    \ REST API is available from `https://MY-REGISTRY-URL/apis/registry/v2` by default.\
+    \ Therefore you must prefix all API operation paths with `../apis/registry/v2`\
+    \ in this case. For example: `../apis/registry/v2/ids/globalIds/{globalId}`.\n"
   license:
     name: Apache 2.0
     url: https://www.apache.org/licenses/LICENSE-2.0
-  title: Service Registry API
+  title: Apicurio Registry API [v2]
   version: 2.2.5.Final
 servers:
 - url: /
@@ -43,10 +57,10 @@ tags:
 - description: 'The search API is used to browse or find artifacts in the registry.
     This section describes the operations for searching for artifacts and versions. '
   name: Search
-- description: "Application functionality that is only accessible to admin users.\
-    \  Includes logging, global rules, and export/import of registry data."
+- description: Application functionality that is only accessible to admin users.  Includes
+    logging, global rules, and export/import of registry data.
   name: Admin
-- description: "System level functionality, including versioning and status information."
+- description: System level functionality, including versioning and status information.
   name: System
 - description: Some operations related to users.
   name: Users
@@ -600,9 +614,9 @@ paths:
       tags:
       - Admin
     get:
-      description: "Returns the configured logger configuration for the provided logger\
-        \ name, if no logger configuration is persisted it will return the current\
-        \ default log configuration in the system."
+      description: Returns the configured logger configuration for the provided logger
+        name, if no logger configuration is persisted it will return the current default
+        log configuration in the system.
       operationId: getLogConfiguration
       parameters:
       - description: The name of a single logger.
@@ -690,7 +704,7 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/SystemInfo'
-          description: "On success, returns the system information."
+          description: On success, returns the system information.
         "500":
           content:
             application/json:
@@ -740,7 +754,7 @@ paths:
           default: 20
           type: integer
         style: form
-      - description: "Sort order, ascending (`asc`) or descending (`desc`)."
+      - description: Sort order, ascending (`asc`) or descending (`desc`).
         explode: true
         in: query
         name: order
@@ -849,11 +863,11 @@ paths:
         posted content.
       operationId: searchArtifactsByContent
       parameters:
-      - description: "Parameter that can be set to `true` to indicate that the server\
-          \ should \"canonicalize\" the content when searching for matching artifacts.\
-          \  Canonicalization is unique to each artifact type, but typically involves\
-          \ removing any extra whitespace and formatting the content in a consistent\
-          \ manner.  Must be used along with the `artifactType` query parameter."
+      - description: Parameter that can be set to `true` to indicate that the server
+          should "canonicalize" the content when searching for matching artifacts.  Canonicalization
+          is unique to each artifact type, but typically involves removing any extra
+          whitespace and formatting the content in a consistent manner.  Must be used
+          along with the `artifactType` query parameter.
         explode: true
         in: query
         name: canonical
@@ -861,10 +875,10 @@ paths:
         schema:
           type: boolean
         style: form
-      - description: "Indicates the type of artifact represented by the content being\
-          \ used for the search.  This is only needed when using the `canonical` query\
-          \ parameter, so that the server knows how to canonicalize the content prior\
-          \ to searching for matching artifacts."
+      - description: Indicates the type of artifact represented by the content being
+          used for the search.  This is only needed when using the `canonical` query
+          parameter, so that the server knows how to canonicalize the content prior
+          to searching for matching artifacts.
         explode: true
         in: query
         name: artifactType
@@ -891,7 +905,7 @@ paths:
           default: 20
           type: integer
         style: form
-      - description: "Sort order, ascending (`asc`) or descending (`desc`)."
+      - description: Sort order, ascending (`asc`) or descending (`desc`).
         explode: true
         in: query
         name: order
@@ -954,10 +968,17 @@ paths:
       description: Exports registry data as a ZIP archive.
       operationId: exportData
       parameters:
-      - description: "Indicates if the operation is done for a browser.  If true,\
-          \ the response will be a JSON payload with a property called `href`.  This\
-          \ `href` will be a single-use, naked download link suitable for use by a\
-          \ web browser to download the content."
+      - explode: false
+        in: header
+        name: Accept
+        required: false
+        schema:
+          type: string
+        style: simple
+      - description: Indicates if the operation is done for a browser.  If true, the
+          response will be a JSON payload with a property called `href`.  This `href`
+          will be a single-use, naked download link suitable for use by a web browser
+          to download the content.
         explode: true
         in: query
         name: forBrowser
@@ -994,9 +1015,9 @@ paths:
         operation.
       operationId: importData
       parameters:
-      - description: "If this header is set to false, global ids of imported data\
-          \ will be ignored and replaced by next id in global id sequence. This allows\
-          \ to import any data even thought the global ids would cause a conflict."
+      - description: If this header is set to false, global ids of imported data will
+          be ignored and replaced by next id in global id sequence. This allows to
+          import any data even thought the global ids would cause a conflict.
         explode: false
         in: header
         name: X-Registry-Preserve-GlobalId
@@ -1004,10 +1025,10 @@ paths:
         schema:
           type: boolean
         style: simple
-      - description: "If this header is set to false, content ids of imported data\
-          \ will be ignored and replaced by next id in content id sequence. The mapping\
-          \ between content and artifacts will be preserved. This allows to import\
-          \ any data even thought the content ids would cause a conflict."
+      - description: If this header is set to false, content ids of imported data
+          will be ignored and replaced by next id in content id sequence. The mapping
+          between content and artifacts will be preserved. This allows to import any
+          data even thought the content ids would cause a conflict.
         explode: false
         in: header
         name: X-Registry-Preserve-ContentId
@@ -1051,8 +1072,8 @@ paths:
         \ (HTTP error `404`)\n* A server error occurred (HTTP error `500`)\n"
       operationId: updateArtifactState
       parameters:
-      - description: "The artifact group ID.  Must be a string provided by the client,\
-          \ representing the name of the grouping of artifacts."
+      - description: The artifact group ID.  Must be a string provided by the client,
+          representing the name of the grouping of artifacts.
         explode: false
         in: path
         name: groupId
@@ -1060,8 +1081,8 @@ paths:
         schema:
           $ref: '#/components/schemas/GroupId'
         style: simple
-      - description: "The artifact ID.  Can be a string (client-provided) or UUID\
-          \ (server-generated), representing the unique artifact identifier."
+      - description: The artifact ID.  Can be a string (client-provided) or UUID (server-generated),
+          representing the unique artifact identifier.
         explode: false
         in: path
         name: artifactId
@@ -1126,8 +1147,8 @@ paths:
         * A server error occurred (HTTP error `500`)
       operationId: deleteArtifactVersionMetaData
       parameters:
-      - description: "The artifact group ID.  Must be a string provided by the client,\
-          \ representing the name of the grouping of artifacts."
+      - description: The artifact group ID.  Must be a string provided by the client,
+          representing the name of the grouping of artifacts.
         explode: false
         in: path
         name: groupId
@@ -1135,8 +1156,8 @@ paths:
         schema:
           $ref: '#/components/schemas/GroupId'
         style: simple
-      - description: "The artifact ID.  Can be a string (client-provided) or UUID\
-          \ (server-generated), representing the unique artifact identifier."
+      - description: The artifact ID.  Can be a string (client-provided) or UUID (server-generated),
+          representing the unique artifact identifier.
         explode: false
         in: path
         name: artifactId
@@ -1193,8 +1214,8 @@ paths:
         \ (HTTP error `500`)\n"
       operationId: getArtifactVersionMetaData
       parameters:
-      - description: "The artifact group ID.  Must be a string provided by the client,\
-          \ representing the name of the grouping of artifacts."
+      - description: The artifact group ID.  Must be a string provided by the client,
+          representing the name of the grouping of artifacts.
         explode: false
         in: path
         name: groupId
@@ -1202,8 +1223,8 @@ paths:
         schema:
           $ref: '#/components/schemas/GroupId'
         style: simple
-      - description: "The artifact ID.  Can be a string (client-provided) or UUID\
-          \ (server-generated), representing the unique artifact identifier."
+      - description: The artifact ID.  Can be a string (client-provided) or UUID (server-generated),
+          representing the unique artifact identifier.
         explode: false
         in: path
         name: artifactId
@@ -1262,8 +1283,8 @@ paths:
         \ error `404`)\n* A server error occurred (HTTP error `500`)\n"
       operationId: updateArtifactVersionMetaData
       parameters:
-      - description: "The artifact group ID.  Must be a string provided by the client,\
-          \ representing the name of the grouping of artifacts."
+      - description: The artifact group ID.  Must be a string provided by the client,
+          representing the name of the grouping of artifacts.
         explode: false
         in: path
         name: groupId
@@ -1271,8 +1292,8 @@ paths:
         schema:
           $ref: '#/components/schemas/GroupId'
         style: simple
-      - description: "The artifact ID.  Can be a string (client-provided) or UUID\
-          \ (server-generated), representing the unique artifact identifier."
+      - description: The artifact ID.  Can be a string (client-provided) or UUID (server-generated),
+          representing the unique artifact identifier.
         explode: false
         in: path
         name: artifactId
@@ -1337,8 +1358,8 @@ paths:
         \ (HTTP error `500`)\n"
       operationId: getArtifactVersion
       parameters:
-      - description: "The artifact group ID.  Must be a string provided by the client,\
-          \ representing the name of the grouping of artifacts."
+      - description: The artifact group ID.  Must be a string provided by the client,
+          representing the name of the grouping of artifacts.
         explode: false
         in: path
         name: groupId
@@ -1346,8 +1367,8 @@ paths:
         schema:
           $ref: '#/components/schemas/GroupId'
         style: simple
-      - description: "The artifact ID.  Can be a string (client-provided) or UUID\
-          \ (server-generated), representing the unique artifact identifier."
+      - description: The artifact ID.  Can be a string (client-provided) or UUID (server-generated),
+          representing the unique artifact identifier.
         explode: false
         in: path
         name: artifactId
@@ -1424,8 +1445,8 @@ paths:
         \ error `404`)\n* A server error occurred (HTTP error `500`)\n"
       operationId: updateArtifactVersionState
       parameters:
-      - description: "The artifact group ID.  Must be a string provided by the client,\
-          \ representing the name of the grouping of artifacts."
+      - description: The artifact group ID.  Must be a string provided by the client,
+          representing the name of the grouping of artifacts.
         explode: false
         in: path
         name: groupId
@@ -1433,8 +1454,8 @@ paths:
         schema:
           $ref: '#/components/schemas/GroupId'
         style: simple
-      - description: "The artifact ID.  Can be a string (client-provided) or UUID\
-          \ (server-generated), representing the unique artifact identifier."
+      - description: The artifact ID.  Can be a string (client-provided) or UUID (server-generated),
+          representing the unique artifact identifier.
         explode: false
         in: path
         name: artifactId
@@ -1506,8 +1527,8 @@ paths:
         * A server error occurred (HTTP error `500`)
       operationId: deleteArtifactRules
       parameters:
-      - description: "The artifact group ID.  Must be a string provided by the client,\
-          \ representing the name of the grouping of artifacts."
+      - description: The artifact group ID.  Must be a string provided by the client,
+          representing the name of the grouping of artifacts.
         explode: false
         in: path
         name: groupId
@@ -1515,8 +1536,8 @@ paths:
         schema:
           $ref: '#/components/schemas/GroupId'
         style: simple
-      - description: "The artifact ID.  Can be a string (client-provided) or UUID\
-          \ (server-generated), representing the unique artifact identifier."
+      - description: The artifact ID.  Can be a string (client-provided) or UUID (server-generated),
+          representing the unique artifact identifier.
         explode: false
         in: path
         name: artifactId
@@ -1564,8 +1585,8 @@ paths:
         \ error `404`)\n* A server error occurred (HTTP error `500`)"
       operationId: listArtifactRules
       parameters:
-      - description: "The artifact group ID.  Must be a string provided by the client,\
-          \ representing the name of the grouping of artifacts."
+      - description: The artifact group ID.  Must be a string provided by the client,
+          representing the name of the grouping of artifacts.
         explode: false
         in: path
         name: groupId
@@ -1573,8 +1594,8 @@ paths:
         schema:
           $ref: '#/components/schemas/GroupId'
         style: simple
-      - description: "The artifact ID.  Can be a string (client-provided) or UUID\
-          \ (server-generated), representing the unique artifact identifier."
+      - description: The artifact ID.  Can be a string (client-provided) or UUID (server-generated),
+          representing the unique artifact identifier.
         explode: false
         in: path
         name: artifactId
@@ -1630,8 +1651,8 @@ paths:
         * A server error occurred (HTTP error `500`)
       operationId: createArtifactRule
       parameters:
-      - description: "The artifact group ID.  Must be a string provided by the client,\
-          \ representing the name of the grouping of artifacts."
+      - description: The artifact group ID.  Must be a string provided by the client,
+          representing the name of the grouping of artifacts.
         explode: false
         in: path
         name: groupId
@@ -1639,8 +1660,8 @@ paths:
         schema:
           $ref: '#/components/schemas/GroupId'
         style: simple
-      - description: "The artifact ID.  Can be a string (client-provided) or UUID\
-          \ (server-generated), representing the unique artifact identifier."
+      - description: The artifact ID.  Can be a string (client-provided) or UUID (server-generated),
+          representing the unique artifact identifier.
         explode: false
         in: path
         name: artifactId
@@ -1704,8 +1725,8 @@ paths:
         * A server error occurred (HTTP error `500`)"
       operationId: deleteArtifactRule
       parameters:
-      - description: "The artifact group ID.  Must be a string provided by the client,\
-          \ representing the name of the grouping of artifacts."
+      - description: The artifact group ID.  Must be a string provided by the client,
+          representing the name of the grouping of artifacts.
         explode: false
         in: path
         name: groupId
@@ -1713,8 +1734,8 @@ paths:
         schema:
           $ref: '#/components/schemas/GroupId'
         style: simple
-      - description: "The artifact ID.  Can be a string (client-provided) or UUID\
-          \ (server-generated), representing the unique artifact identifier."
+      - description: The artifact ID.  Can be a string (client-provided) or UUID (server-generated),
+          representing the unique artifact identifier.
         explode: false
         in: path
         name: artifactId
@@ -1776,8 +1797,8 @@ paths:
         * A server error occurred (HTTP error `500`)
       operationId: getArtifactRuleConfig
       parameters:
-      - description: "The artifact group ID.  Must be a string provided by the client,\
-          \ representing the name of the grouping of artifacts."
+      - description: The artifact group ID.  Must be a string provided by the client,
+          representing the name of the grouping of artifacts.
         explode: false
         in: path
         name: groupId
@@ -1785,8 +1806,8 @@ paths:
         schema:
           $ref: '#/components/schemas/GroupId'
         style: simple
-      - description: "The artifact ID.  Can be a string (client-provided) or UUID\
-          \ (server-generated), representing the unique artifact identifier."
+      - description: The artifact ID.  Can be a string (client-provided) or UUID (server-generated),
+          representing the unique artifact identifier.
         explode: false
         in: path
         name: artifactId
@@ -1850,8 +1871,8 @@ paths:
         \ `500`)\n"
       operationId: updateArtifactRuleConfig
       parameters:
-      - description: "The artifact group ID.  Must be a string provided by the client,\
-          \ representing the name of the grouping of artifacts."
+      - description: The artifact group ID.  Must be a string provided by the client,
+          representing the name of the grouping of artifacts.
         explode: false
         in: path
         name: groupId
@@ -1859,8 +1880,8 @@ paths:
         schema:
           $ref: '#/components/schemas/GroupId'
         style: simple
-      - description: "The artifact ID.  Can be a string (client-provided) or UUID\
-          \ (server-generated), representing the unique artifact identifier."
+      - description: The artifact ID.  Can be a string (client-provided) or UUID (server-generated),
+          representing the unique artifact identifier.
         explode: false
         in: path
         name: artifactId
@@ -1995,7 +2016,7 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/RoleMapping'
-          description: "When successful, returns the details of a role mapping."
+          description: When successful, returns the details of a role mapping.
         "404":
           content:
             application/json:
@@ -2281,8 +2302,8 @@ paths:
         \ (HTTP error `500`)\n"
       operationId: getArtifactVersionReferences
       parameters:
-      - description: "The artifact group ID.  Must be a string provided by the client,\
-          \ representing the name of the grouping of artifacts."
+      - description: The artifact group ID.  Must be a string provided by the client,
+          representing the name of the grouping of artifacts.
         explode: false
         in: path
         name: groupId
@@ -2290,8 +2311,8 @@ paths:
         schema:
           $ref: '#/components/schemas/GroupId'
         style: simple
-      - description: "The artifact ID.  Can be a string (client-provided) or UUID\
-          \ (server-generated), representing the unique artifact identifier."
+      - description: The artifact ID.  Can be a string (client-provided) or UUID (server-generated),
+          representing the unique artifact identifier.
         explode: false
         in: path
         name: artifactId
@@ -2361,8 +2382,7 @@ paths:
                 items:
                   $ref: '#/components/schemas/ConfigurationProperty'
                 type: array
-          description: "On a successful response, returns a list of configuration\
-            \ properties."
+          description: On a successful response, returns a list of configuration properties.
         "500":
           content:
             application/json:
@@ -2539,8 +2559,8 @@ paths:
     summary: Manage a single configuration property (by name).
   /system/limits:
     get:
-      description: "This operation retrieves the list of limitations on used resources,\
-        \ that are applied on the current instance of Registry."
+      description: This operation retrieves the list of limitations on used resources,
+        that are applied on the current instance of Registry.
       operationId: getResourceLimits
       responses:
         "200":
@@ -2548,7 +2568,7 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/Limits'
-          description: "On success, returns resource limits"
+          description: On success, returns resource limits
         "500":
           content:
             application/json:
@@ -2575,8 +2595,8 @@ paths:
         * A server error occurred (HTTP error `500`)
       operationId: deleteArtifact
       parameters:
-      - description: "The artifact group ID.  Must be a string provided by the client,\
-          \ representing the name of the grouping of artifacts."
+      - description: The artifact group ID.  Must be a string provided by the client,
+          representing the name of the grouping of artifacts.
         explode: false
         in: path
         name: groupId
@@ -2584,8 +2604,8 @@ paths:
         schema:
           $ref: '#/components/schemas/GroupId'
         style: simple
-      - description: "The artifact ID.  Can be a string (client-provided) or UUID\
-          \ (server-generated), representing the unique artifact identifier."
+      - description: The artifact ID.  Can be a string (client-provided) or UUID (server-generated),
+          representing the unique artifact identifier.
         explode: false
         in: path
         name: artifactId
@@ -2632,8 +2652,8 @@ paths:
         * A server error occurred (HTTP error `500`)\n"
       operationId: getLatestArtifact
       parameters:
-      - description: "The artifact group ID.  Must be a string provided by the client,\
-          \ representing the name of the grouping of artifacts."
+      - description: The artifact group ID.  Must be a string provided by the client,
+          representing the name of the grouping of artifacts.
         explode: false
         in: path
         name: groupId
@@ -2641,8 +2661,8 @@ paths:
         schema:
           $ref: '#/components/schemas/GroupId'
         style: simple
-      - description: "The artifact ID.  Can be a string (client-provided) or UUID\
-          \ (server-generated), representing the unique artifact identifier."
+      - description: The artifact ID.  Can be a string (client-provided) or UUID (server-generated),
+          representing the unique artifact identifier.
         explode: false
         in: path
         name: artifactId
@@ -2721,8 +2741,8 @@ paths:
         (and therefore official) version of the artifact.
       operationId: updateArtifact
       parameters:
-      - description: "The artifact group ID.  Must be a string provided by the client,\
-          \ representing the name of the grouping of artifacts."
+      - description: The artifact group ID.  Must be a string provided by the client,
+          representing the name of the grouping of artifacts.
         explode: false
         in: path
         name: groupId
@@ -2730,8 +2750,8 @@ paths:
         schema:
           $ref: '#/components/schemas/GroupId'
         style: simple
-      - description: "The artifact ID.  Can be a string (client-provided) or UUID\
-          \ (server-generated), representing the unique artifact identifier."
+      - description: The artifact ID.  Can be a string (client-provided) or UUID (server-generated),
+          representing the unique artifact identifier.
         explode: false
         in: path
         name: artifactId
@@ -2760,9 +2780,9 @@ paths:
         schema:
           $ref: '#/components/schemas/ArtifactName'
         style: simple
-      - description: "Specifies the artifact name of this new version of the artifact\
-          \ content. Value of this must be Base64 encoded string. If this is not provided,\
-          \ the server will extract the name from the artifact content."
+      - description: Specifies the artifact name of this new version of the artifact
+          content. Value of this must be Base64 encoded string. If this is not provided,
+          the server will extract the name from the artifact content.
         explode: false
         in: header
         name: X-Registry-Name-Encoded
@@ -2770,9 +2790,9 @@ paths:
         schema:
           $ref: '#/components/schemas/EncodedArtifactName'
         style: simple
-      - description: "Specifies the artifact description of this new version of the\
-          \ artifact content. Description must be ASCII-only string. If this is not\
-          \ provided, the server will extract the description from the artifact content."
+      - description: Specifies the artifact description of this new version of the
+          artifact content. Description must be ASCII-only string. If this is not
+          provided, the server will extract the description from the artifact content.
         explode: false
         in: header
         name: X-Registry-Description
@@ -2780,10 +2800,10 @@ paths:
         schema:
           $ref: '#/components/schemas/ArtifactDescription'
         style: simple
-      - description: "Specifies the artifact description of this new version of the\
-          \ artifact content. Value of this must be Base64 encoded string. If this\
-          \ is not provided, the server will extract the description from the artifact\
-          \ content."
+      - description: Specifies the artifact description of this new version of the
+          artifact content. Value of this must be Base64 encoded string. If this is
+          not provided, the server will extract the description from the artifact
+          content.
         explode: false
         in: header
         name: X-Registry-Description-Encoded
@@ -2853,7 +2873,7 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/ArtifactMetaData'
-          description: "When successful, returns the updated artifact metadata."
+          description: When successful, returns the updated artifact metadata.
         "404":
           content:
             application/json:
@@ -2909,7 +2929,7 @@ paths:
         style: simple
       responses:
         "204":
-          description: "When the delete operation is successful, a simple 204 is returned."
+          description: When the delete operation is successful, a simple 204 is returned.
         "500":
           content:
             application/json:
@@ -2954,7 +2974,7 @@ paths:
         schema:
           type: integer
         style: form
-      - description: "Sort order, ascending (`asc`) or descending (`desc`)."
+      - description: Sort order, ascending (`asc`) or descending (`desc`).
         explode: true
         in: query
         name: order
@@ -2980,7 +3000,7 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/ArtifactSearchResults'
-          description: "On a successful response, returns a bounded set of artifacts."
+          description: On a successful response, returns a bounded set of artifacts.
         "500":
           content:
             application/json:
@@ -3060,7 +3080,7 @@ paths:
         schema:
           $ref: '#/components/schemas/ArtifactType'
         style: simple
-      - description: "A client-provided, globally unique identifier for the new artifact."
+      - description: A client-provided, globally unique identifier for the new artifact.
         explode: false
         in: header
         name: X-Registry-ArtifactId
@@ -3088,12 +3108,11 @@ paths:
         schema:
           $ref: '#/components/schemas/IfExists'
         style: form
-      - description: "Used only when the `ifExists` query parameter is set to `RETURN_OR_UPDATE`,\
-          \ this parameter can be set to `true` to indicate that the server should\
-          \ \"canonicalize\" the content when searching for a matching version.  The\
-          \ canonicalization algorithm is unique to each artifact type, but typically\
-          \ involves removing extra whitespace and formatting the content in a consistent\
-          \ manner."
+      - description: Used only when the `ifExists` query parameter is set to `RETURN_OR_UPDATE`,
+          this parameter can be set to `true` to indicate that the server should "canonicalize"
+          the content when searching for a matching version.  The canonicalization
+          algorithm is unique to each artifact type, but typically involves removing
+          extra whitespace and formatting the content in a consistent manner.
         explode: true
         in: query
         name: canonical
@@ -3101,9 +3120,9 @@ paths:
         schema:
           type: boolean
         style: form
-      - description: "Specifies the description of artifact being added. Description\
-          \ must be ASCII-only string. If this is not provided, the server will extract\
-          \ the description from the artifact content."
+      - description: Specifies the description of artifact being added. Description
+          must be ASCII-only string. If this is not provided, the server will extract
+          the description from the artifact content.
         explode: false
         in: header
         name: X-Registry-Description
@@ -3111,9 +3130,9 @@ paths:
         schema:
           $ref: '#/components/schemas/ArtifactDescription'
         style: simple
-      - description: "Specifies the description of artifact being added. Value of\
-          \ this must be Base64 encoded string. If this is not provided, the server\
-          \ will extract the description from the artifact content."
+      - description: Specifies the description of artifact being added. Value of this
+          must be Base64 encoded string. If this is not provided, the server will
+          extract the description from the artifact content.
         explode: false
         in: header
         name: X-Registry-Description-Encoded
@@ -3121,9 +3140,9 @@ paths:
         schema:
           $ref: '#/components/schemas/EncodedArtifactDescription'
         style: simple
-      - description: "Specifies the name of artifact being added. Name must be ASCII-only\
-          \ string. If this is not provided, the server will extract the name from\
-          \ the artifact content."
+      - description: Specifies the name of artifact being added. Name must be ASCII-only
+          string. If this is not provided, the server will extract the name from the
+          artifact content.
         explode: false
         in: header
         name: X-Registry-Name
@@ -3131,9 +3150,9 @@ paths:
         schema:
           $ref: '#/components/schemas/ArtifactName'
         style: simple
-      - description: "Specifies the name of artifact being added. Value of this must\
-          \ be Base64 encoded string. If this is not provided, the server will extract\
-          \ the name from the artifact content."
+      - description: Specifies the name of artifact being added. Value of this must
+          be Base64 encoded string. If this is not provided, the server will extract
+          the name from the artifact content.
         explode: false
         in: header
         name: X-Registry-Name-Encoded
@@ -3149,8 +3168,8 @@ paths:
         schema:
           type: string
         style: simple
-      - description: "The algorithm to use when checking the content validity. (available:\
-          \ SHA256, MD5; default: SHA256)"
+      - description: 'The algorithm to use when checking the content validity. (available:
+          SHA256, MD5; default: SHA256)'
         explode: false
         in: header
         name: X-Registry-Hash-Algorithm
@@ -3199,7 +3218,9 @@ paths:
                         example:
                           property-1: value1
                           property-2: true
-            schema: {}
+            schema:
+              format: binary
+              type: string
           application/json:
             schema:
               $ref: '#/components/schemas/ContentCreateRequest'
@@ -3241,9 +3262,9 @@ paths:
                     message: The artifact content was invalid
                     causes:
                     - description: API is missing a title
-                      context: "/info[title]"
+                      context: /info[title]
                     - description: Operation IDs must be unique
-                      context: "/paths[/invoices]/put[operationId]"
+                      context: /paths[/invoices]/put[operationId]
               schema:
                 $ref: '#/components/schemas/RuleViolationError'
           description: Common response used when an input conflicts with existing
@@ -3284,8 +3305,8 @@ paths:
         \ are enabled)."
       operationId: testUpdateArtifact
       parameters:
-      - description: "The artifact group ID.  Must be a string provided by the client,\
-          \ representing the name of the grouping of artifacts."
+      - description: The artifact group ID.  Must be a string provided by the client,
+          representing the name of the grouping of artifacts.
         explode: false
         in: path
         name: groupId
@@ -3293,8 +3314,8 @@ paths:
         schema:
           $ref: '#/components/schemas/GroupId'
         style: simple
-      - description: "The artifact ID.  Can be a string (client-provided) or UUID\
-          \ (server-generated), representing the unique artifact identifier."
+      - description: The artifact ID.  Can be a string (client-provided) or UUID (server-generated),
+          representing the unique artifact identifier.
         explode: false
         in: path
         name: artifactId
@@ -3347,9 +3368,9 @@ paths:
                     message: The artifact content was invalid
                     causes:
                     - description: API is missing a title
-                      context: "/info[title]"
+                      context: /info[title]
                     - description: Operation IDs must be unique
-                      context: "/paths[/invoices]/put[operationId]"
+                      context: /paths[/invoices]/put[operationId]
               schema:
                 $ref: '#/components/schemas/RuleViolationError'
           description: Common response used when an input conflicts with existing
@@ -3381,8 +3402,8 @@ paths:
         * A server error occurred (HTTP error `500`)
       operationId: listArtifactVersions
       parameters:
-      - description: "The artifact group ID.  Must be a string provided by the client,\
-          \ representing the name of the grouping of artifacts."
+      - description: The artifact group ID.  Must be a string provided by the client,
+          representing the name of the grouping of artifacts.
         explode: false
         in: path
         name: groupId
@@ -3390,8 +3411,8 @@ paths:
         schema:
           $ref: '#/components/schemas/GroupId'
         style: simple
-      - description: "The artifact ID.  Can be a string (client-provided) or UUID\
-          \ (server-generated), representing the unique artifact identifier."
+      - description: The artifact ID.  Can be a string (client-provided) or UUID (server-generated),
+          representing the unique artifact identifier.
         explode: false
         in: path
         name: artifactId
@@ -3473,8 +3494,8 @@ paths:
         \ `500`)\n"
       operationId: createArtifactVersion
       parameters:
-      - description: "The artifact group ID.  Must be a string provided by the client,\
-          \ representing the name of the grouping of artifacts."
+      - description: The artifact group ID.  Must be a string provided by the client,
+          representing the name of the grouping of artifacts.
         explode: false
         in: path
         name: groupId
@@ -3482,8 +3503,8 @@ paths:
         schema:
           $ref: '#/components/schemas/GroupId'
         style: simple
-      - description: "The artifact ID.  Can be a string (client-provided) or UUID\
-          \ (server-generated), representing the unique artifact identifier."
+      - description: The artifact ID.  Can be a string (client-provided) or UUID (server-generated),
+          representing the unique artifact identifier.
         explode: false
         in: path
         name: artifactId
@@ -3512,9 +3533,9 @@ paths:
         schema:
           $ref: '#/components/schemas/ArtifactName'
         style: simple
-      - description: "Specifies the artifact description of this new version of the\
-          \ artifact content. Description must be ASCII-only string. If this is not\
-          \ provided, the server will extract the description from the artifact content."
+      - description: Specifies the artifact description of this new version of the
+          artifact content. Description must be ASCII-only string. If this is not
+          provided, the server will extract the description from the artifact content.
         explode: false
         in: header
         name: X-Registry-Description
@@ -3522,10 +3543,10 @@ paths:
         schema:
           $ref: '#/components/schemas/ArtifactDescription'
         style: simple
-      - description: "Specifies the artifact description of this new version of the\
-          \ artifact content. Value of this must be Base64 encoded string. If this\
-          \ is not provided, the server will extract the description from the artifact\
-          \ content."
+      - description: Specifies the artifact description of this new version of the
+          artifact content. Value of this must be Base64 encoded string. If this is
+          not provided, the server will extract the description from the artifact
+          content.
         explode: false
         in: header
         name: X-Registry-Description-Encoded
@@ -3533,9 +3554,9 @@ paths:
         schema:
           $ref: '#/components/schemas/EncodedArtifactDescription'
         style: simple
-      - description: "Specifies the artifact name of this new version of the artifact\
-          \ content. Value of this must be Base64 encoded string. If this is not provided,\
-          \ the server will extract the name from the artifact content."
+      - description: Specifies the artifact name of this new version of the artifact
+          content. Value of this must be Base64 encoded string. If this is not provided,
+          the server will extract the name from the artifact content.
         explode: false
         in: header
         name: X-Registry-Name-Encoded
@@ -3628,9 +3649,9 @@ paths:
                     message: The artifact content was invalid
                     causes:
                     - description: API is missing a title
-                      context: "/info[title]"
+                      context: /info[title]
                     - description: Operation IDs must be unique
-                      context: "/paths[/invoices]/put[operationId]"
+                      context: /paths[/invoices]/put[operationId]
               schema:
                 $ref: '#/components/schemas/RuleViolationError'
           description: Common response used when an input conflicts with existing
@@ -3663,8 +3684,8 @@ paths:
         * A server error occurred (HTTP error `500`)
       operationId: getArtifactMetaData
       parameters:
-      - description: "The artifact group ID.  Must be a string provided by the client,\
-          \ representing the name of the grouping of artifacts."
+      - description: The artifact group ID.  Must be a string provided by the client,
+          representing the name of the grouping of artifacts.
         explode: false
         in: path
         name: groupId
@@ -3672,8 +3693,8 @@ paths:
         schema:
           $ref: '#/components/schemas/GroupId'
         style: simple
-      - description: "The artifact ID.  Can be a string (client-provided) or UUID\
-          \ (server-generated), representing the unique artifact identifier."
+      - description: The artifact ID.  Can be a string (client-provided) or UUID (server-generated),
+          representing the unique artifact identifier.
         explode: false
         in: path
         name: artifactId
@@ -3729,8 +3750,8 @@ paths:
         * A server error occurred (HTTP error `500`)
       operationId: getArtifactVersionMetaDataByContent
       parameters:
-      - description: "The artifact group ID.  Must be a string provided by the client,\
-          \ representing the name of the grouping of artifacts."
+      - description: The artifact group ID.  Must be a string provided by the client,
+          representing the name of the grouping of artifacts.
         explode: false
         in: path
         name: groupId
@@ -3738,8 +3759,8 @@ paths:
         schema:
           $ref: '#/components/schemas/GroupId'
         style: simple
-      - description: "The artifact ID.  Can be a string (client-provided) or UUID\
-          \ (server-generated), representing the unique artifact identifier."
+      - description: The artifact ID.  Can be a string (client-provided) or UUID (server-generated),
+          representing the unique artifact identifier.
         explode: false
         in: path
         name: artifactId
@@ -3747,11 +3768,10 @@ paths:
         schema:
           $ref: '#/components/schemas/ArtifactId'
         style: simple
-      - description: "Parameter that can be set to `true` to indicate that the server\
-          \ should \"canonicalize\" the content when searching for a matching version.\
-          \  Canonicalization is unique to each artifact type, but typically involves\
-          \ removing any extra whitespace and formatting the content in a consistent\
-          \ manner."
+      - description: Parameter that can be set to `true` to indicate that the server
+          should "canonicalize" the content when searching for a matching version.  Canonicalization
+          is unique to each artifact type, but typically involves removing any extra
+          whitespace and formatting the content in a consistent manner.
         explode: true
         in: query
         name: canonical
@@ -3846,8 +3866,8 @@ paths:
         * A server error occurred (HTTP error `500`)
       operationId: updateArtifactMetaData
       parameters:
-      - description: "The artifact group ID.  Must be a string provided by the client,\
-          \ representing the name of the grouping of artifacts."
+      - description: The artifact group ID.  Must be a string provided by the client,
+          representing the name of the grouping of artifacts.
         explode: false
         in: path
         name: groupId
@@ -3855,8 +3875,8 @@ paths:
         schema:
           $ref: '#/components/schemas/GroupId'
         style: simple
-      - description: "The artifact ID.  Can be a string (client-provided) or UUID\
-          \ (server-generated), representing the unique artifact identifier."
+      - description: The artifact ID.  Can be a string (client-provided) or UUID (server-generated),
+          representing the unique artifact identifier.
         explode: false
         in: path
         name: artifactId
@@ -3913,8 +3933,8 @@ paths:
         * A server error occurred (HTTP error `500`)
       operationId: getArtifactOwner
       parameters:
-      - description: "The artifact group ID.  Must be a string provided by the client,\
-          \ representing the name of the grouping of artifacts."
+      - description: The artifact group ID.  Must be a string provided by the client,
+          representing the name of the grouping of artifacts.
         explode: false
         in: path
         name: groupId
@@ -3922,8 +3942,8 @@ paths:
         schema:
           $ref: '#/components/schemas/GroupId'
         style: simple
-      - description: "The artifact ID.  Can be a string (client-provided) or UUID\
-          \ (server-generated), representing the unique artifact identifier."
+      - description: The artifact ID.  Can be a string (client-provided) or UUID (server-generated),
+          representing the unique artifact identifier.
         explode: false
         in: path
         name: artifactId
@@ -3975,8 +3995,8 @@ paths:
         * A server error occurred (HTTP error `500`)
       operationId: updateArtifactOwner
       parameters:
-      - description: "The artifact group ID.  Must be a string provided by the client,\
-          \ representing the name of the grouping of artifacts."
+      - description: The artifact group ID.  Must be a string provided by the client,
+          representing the name of the grouping of artifacts.
         explode: false
         in: path
         name: groupId
@@ -3984,8 +4004,8 @@ paths:
         schema:
           $ref: '#/components/schemas/GroupId'
         style: simple
-      - description: "The artifact ID.  Can be a string (client-provided) or UUID\
-          \ (server-generated), representing the unique artifact identifier."
+      - description: The artifact ID.  Can be a string (client-provided) or UUID (server-generated),
+          representing the unique artifact identifier.
         explode: false
         in: path
         name: artifactId
@@ -4082,9 +4102,9 @@ components:
                 message: The artifact content was invalid
                 causes:
                 - description: API is missing a title
-                  context: "/info[title]"
+                  context: /info[title]
                 - description: Operation IDs must be unique
-                  context: "/paths[/invoices]/put[operationId]"
+                  context: /paths[/invoices]/put[operationId]
           schema:
             $ref: '#/components/schemas/RuleViolationError'
       description: Common response used when an input conflicts with existing data.
@@ -4104,7 +4124,6 @@ components:
       description: The content of one version of one artifact.
   schemas:
     EditableMetaData:
-      description: ""
       example:
         name: Artifact Name
         description: The description of the artifact.
@@ -4120,7 +4139,6 @@ components:
         description:
           type: string
         labels:
-          description: ""
           items:
             type: string
           type: array
@@ -4134,7 +4152,6 @@ components:
       title: Root Type for EditableArtifactMetaData
       type: object
     Rule:
-      description: ""
       example:
         type: VALIDITY
         config: FULL
@@ -4163,8 +4180,8 @@ components:
           format: int32
           type: integer
         detail:
-          description: "Full details about the error.  This might contain a server\
-            \ stack trace, for example."
+          description: Full details about the error.  This might contain a server
+            stack trace, for example.
           type: string
         name:
           description: The error name - typically the classname of the exception thrown
@@ -4173,7 +4190,6 @@ components:
       title: Root Type for Error
       type: object
     RuleType:
-      description: ""
       enum:
       - VALIDITY
       - COMPATIBILITY
@@ -4181,7 +4197,6 @@ components:
       type: string
       x-codegen-package: io.apicurio.registry.types
     ArtifactType:
-      description: ""
       enum:
       - AVRO
       - PROTOBUF
@@ -4197,7 +4212,6 @@ components:
       type: string
       x-codegen-package: io.apicurio.registry.types
     UpdateState:
-      description: ""
       example:
         state: DISABLED
       properties:
@@ -4264,7 +4278,6 @@ components:
       - count
       type: object
     SortOrder:
-      description: ""
       enum:
       - asc
       - desc
@@ -4319,11 +4332,10 @@ components:
       - versions
       type: object
     RuleViolationCause:
-      description: ""
       example:
         description: External documentation URL is not valid (it must be formatted
           as a URL).
-        context: "/info/externalDocs[url]"
+        context: /info/externalDocs[url]
       properties:
         description:
           type: string
@@ -4333,23 +4345,21 @@ components:
       type: object
     GroupId:
       description: An ID of a single artifact group.
-      example: '"my-group"'
+      example: my-group
       type: string
     ArtifactId:
       description: The ID of a single artifact.
-      example: '"example-artifact"'
+      example: example-artifact
       type: string
     Version:
       description: |-
         A single version of an artifact.  Can be provided by the client when creating a new version,
         or it can be server-generated.  The value can be any string unique to the artifact, but it is
         recommended to use a simple integer or a semver value.
-      example: '"3.1.6"'
+      example: 3.1.6
       type: string
     LogConfiguration:
-      description: ""
-      example:
-        level: null
+      example: {}
       properties:
         level:
           $ref: '#/components/schemas/LogLevel'
@@ -4360,7 +4370,6 @@ components:
       allOf:
       - $ref: '#/components/schemas/NamedLogConfiguration_allOf'
       - $ref: '#/components/schemas/LogConfiguration'
-      description: ""
       type: object
     Properties:
       additionalProperties:
@@ -4370,7 +4379,6 @@ components:
       x-codegen-inline: true
       x-codegen-type: StringMap
     IfExists:
-      description: ""
       enum:
       - FAIL
       - UPDATE
@@ -4378,13 +4386,11 @@ components:
       - RETURN_OR_UPDATE
       type: string
     SortBy:
-      description: ""
       enum:
       - name
       - createdOn
       type: string
     LogLevel:
-      description: ""
       enum:
       - DEBUG
       - TRACE
@@ -4400,7 +4406,6 @@ components:
       type: string
       x-codegen-package: io.apicurio.registry.types
     SystemInfo:
-      description: ""
       example:
         name: Apicurio Registry (SQL)
         description: The Apicurio Registry application.
@@ -4430,7 +4435,6 @@ components:
         role: READ_ONLY
       properties:
         principalId:
-          description: ""
           type: string
         role:
           $ref: '#/components/schemas/RoleType'
@@ -4442,7 +4446,6 @@ components:
       - role
       type: object
     RoleType:
-      description: ""
       enum:
       - READ_ONLY
       - DEVELOPER
@@ -4450,7 +4453,6 @@ components:
       type: string
       x-codegen-package: io.apicurio.registry.types
     UpdateRole:
-      description: ""
       example:
         role: READ_ONLY
       properties:
@@ -4483,22 +4485,22 @@ components:
       type: object
     EncodedArtifactName:
       description: Base64 encoded name of the artifact.
-      example: '"QXJ0aWZhY3QgbmFtZQo="'
+      example: QXJ0aWZhY3QgbmFtZQo=
       type: string
       x-codegen-inline: true
     EncodedArtifactDescription:
       description: Base64 encoded description of the artifact.
-      example: '"QXJ0aWZhY3QgZGVzY3JpcHRpb24K"'
+      example: QXJ0aWZhY3QgZGVzY3JpcHRpb24K
       type: string
       x-codegen-inline: true
     ArtifactName:
       description: Name of the artifact.
-      example: '"Artifact name"'
+      example: Artifact name
       type: string
       x-codegen-inline: true
     ArtifactDescription:
       description: Description of the artifact.
-      example: '"Artifact description"'
+      example: Artifact description
       type: string
       x-codegen-inline: true
     DownloadRef:
@@ -4516,7 +4518,6 @@ components:
       title: Root Type for Download
       type: object
     ArtifactMetaData:
-      description: ""
       example:
         groupId: My-Group
         id: Procurement-Invoice
@@ -4560,21 +4561,18 @@ components:
           x-codegen-formatPattern: yyyy-MM-dd'T'HH:mm:ssZ
         id:
           description: The ID of a single artifact.
-          example: '"example-artifact"'
+          example: example-artifact
           type: string
         version:
-          description: ""
           type: string
         type:
           $ref: '#/components/schemas/ArtifactType'
         globalId:
-          description: ""
           format: int64
           type: integer
         state:
           $ref: '#/components/schemas/ArtifactState'
         labels:
-          description: ""
           items:
             type: string
           type: array
@@ -4587,14 +4585,12 @@ components:
           x-codegen-type: StringMap
         groupId:
           description: An ID of a single artifact group.
-          example: '"my-group"'
+          example: my-group
           type: string
         contentId:
-          description: ""
           format: int64
           type: integer
         references:
-          description: ""
           items:
             $ref: '#/components/schemas/ArtifactReference'
           type: array
@@ -4630,42 +4626,35 @@ components:
       properties:
         id:
           description: The ID of a single artifact.
-          example: '"example-artifact"'
+          example: example-artifact
           type: string
         name:
-          description: ""
           type: string
         description:
-          description: ""
           type: string
         createdOn:
-          description: ""
           format: utc-date
           type: string
           x-codegen-formatPattern: yyyy-MM-dd'T'HH:mm:ssZ
         createdBy:
-          description: ""
           type: string
         type:
           $ref: '#/components/schemas/ArtifactType'
         labels:
-          description: ""
           items:
             type: string
           type: array
         state:
           $ref: '#/components/schemas/ArtifactState'
         modifiedOn:
-          description: ""
           format: utc-date
           type: string
           x-codegen-formatPattern: yyyy-MM-dd'T'HH:mm:ssZ
         modifiedBy:
-          description: ""
           type: string
         groupId:
           description: An ID of a single artifact group.
-          example: '"my-group"'
+          example: my-group
           type: string
       required:
       - createdBy
@@ -4676,7 +4665,6 @@ components:
       - type
       type: object
     VersionMetaData:
-      description: ""
       example:
         groupId: My-Group
         id: my-artifact-id
@@ -4715,17 +4703,15 @@ components:
         type:
           $ref: '#/components/schemas/ArtifactType'
         globalId:
-          description: ""
           format: int64
           type: integer
         state:
           $ref: '#/components/schemas/ArtifactState'
         id:
           description: The ID of a single artifact.
-          example: '"example-artifact"'
+          example: example-artifact
           type: string
         labels:
-          description: ""
           items:
             type: string
           type: array
@@ -4738,10 +4724,9 @@ components:
           x-codegen-type: StringMap
         groupId:
           description: An ID of a single artifact group.
-          example: '"my-group"'
+          example: my-group
           type: string
         contentId:
-          description: ""
           format: int64
           type: integer
       required:
@@ -4774,34 +4759,27 @@ components:
         references: {}
       properties:
         name:
-          description: ""
           type: string
         description:
-          description: ""
           type: string
         createdOn:
-          description: ""
           format: utc-date
           type: string
           x-codegen-formatPattern: yyyy-MM-dd'T'HH:mm:ssZ
         createdBy:
-          description: ""
           type: string
         type:
           $ref: '#/components/schemas/ArtifactType'
         labels:
-          description: ""
           items:
             type: string
           type: array
         state:
           $ref: '#/components/schemas/ArtifactState'
         globalId:
-          description: ""
           format: int64
           type: integer
         version:
-          description: ""
           type: string
         properties:
           additionalProperties:
@@ -4811,11 +4789,9 @@ components:
           x-codegen-inline: true
           x-codegen-type: StringMap
         contentId:
-          description: ""
           format: int64
           type: integer
         references:
-          description: ""
           items:
             $ref: '#/components/schemas/ArtifactReference'
           type: array
@@ -4841,9 +4817,9 @@ components:
         message: Artifact failed validation
         causes:
         - description: API is missing a title
-          context: "/info[title]"
+          context: /info[title]
         - description: Operation IDs must be unique
-          context: "/paths[/invoices]/put[operationId]"
+          context: /paths[/invoices]/put[operationId]
       title: Root Type for Error
       type: object
       x-codegen-extendsClass: io.apicurio.registry.rest.v2.beans.Error
@@ -4871,7 +4847,6 @@ components:
       title: Root Type for ArtifactReference
       type: object
     ContentCreateRequest:
-      description: ""
       properties:
         content:
           description: Raw content of the artifact or a valid (and accessible) URL
@@ -4888,27 +4863,23 @@ components:
       - references
       type: object
     ConfigurationProperty:
-      description: ""
       example:
         name: registry.auth.owner-only-authorization
         value: "true"
         type: boolean
         label: Owner Only Authorization
-        description: "When enabled, the registry will allow only the artifact owner\
-          \ (creator) to modify an artifact."
+        description: When enabled, the registry will allow only the artifact owner
+          (creator) to modify an artifact.
       properties:
         name:
           type: string
         value:
           type: string
         type:
-          description: ""
           type: string
         label:
-          description: ""
           type: string
         description:
-          description: ""
           type: string
       required:
       - description
@@ -4919,7 +4890,6 @@ components:
       title: Root Type for ConfigurationProperty
       type: object
     UpdateConfigurationProperty:
-      description: ""
       example:
         value: "true"
       properties:
@@ -4998,12 +4968,10 @@ components:
     NamedLogConfiguration_allOf:
       properties:
         name:
-          description: ""
           type: string
       required:
       - name
       type: object
-      example: null
     RuleViolationError_allOf:
       properties:
         causes:
@@ -5014,4 +4982,3 @@ components:
       required:
       - causes
       type: object
-      example: null
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/api_admin.go b/app-services-sdk-go/registryinstance/apiv1internal/client/api_admin.go
index 9a044f41..90503db3 100644
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/api_admin.go
+++ b/app-services-sdk-go/registryinstance/apiv1internal/client/api_admin.go
@@ -1,11 +1,11 @@
 /*
-Service Registry API
-
-Service Registry Instance API  NOTE: This API cannot be called directly from the portal.
-
-API version: 2.2.5.Final
-Contact: apicurio@lists.jboss.org
-*/
+ * Apicurio Registry API [v2]
+ *
+ * Apicurio Registry is a datastore for standard event schemas and API designs. Apicurio Registry enables developers to manage and share the structure of their data using a REST interface. For example, client applications can dynamically push or pull the latest updates to or from the registry without needing to redeploy. Apicurio Registry also enables developers to create rules that govern how registry content can evolve over time. For example, this includes rules for content validation and version compatibility.  The Apicurio Registry REST API enables client applications to manage the artifacts in the registry. This API provides create, read, update, and delete operations for schema and API artifacts, rules, versions, and metadata.   The supported artifact types include: - Apache Avro schema - AsyncAPI specification - Google protocol buffers - GraphQL schema - JSON Schema - Kafka Connect schema - OpenAPI specification - Web Services Description Language - XML Schema Definition   **Important**: The Apicurio Registry REST API is available from `https://MY-REGISTRY-URL/apis/registry/v2` by default. Therefore you must prefix all API operation paths with `../apis/registry/v2` in this case. For example: `../apis/registry/v2/ids/globalIds/{globalId}`. 
+ *
+ * API version: 2.2.5.Final
+ * Contact: apicurio@lists.jboss.org
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -13,212 +13,215 @@ package registryinstanceclient
 
 import (
 	"bytes"
-	"context"
-	"io/ioutil"
-	"net/http"
-	"net/url"
+	_context "context"
+	_ioutil "io/ioutil"
+	_nethttp "net/http"
+	_neturl "net/url"
 	"strings"
 	"os"
 )
 
+// Linger please
+var (
+	_ _context.Context
+)
 
 type AdminApi interface {
 
 	/*
-	CreateRoleMapping Create a new role mapping
-
-	Creates a new mapping between a user/principal and a role.
+	 * CreateRoleMapping Create a new role mapping
+	 * Creates a new mapping between a user/principal and a role.
 
 This operation can fail for the following reasons:
 
 * A server error occurred (HTTP error `500`)
 
 
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiCreateRoleMappingRequest
-	*/
-	CreateRoleMapping(ctx context.Context) ApiCreateRoleMappingRequest
-
-	// CreateRoleMappingExecute executes the request
-	CreateRoleMappingExecute(r ApiCreateRoleMappingRequest) (*http.Response, error)
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiCreateRoleMappingRequest
+	 */
+	CreateRoleMapping(ctx _context.Context) ApiCreateRoleMappingRequest
 
 	/*
-	DeleteRoleMapping Delete a role mapping
+	 * CreateRoleMappingExecute executes the request
+	 */
+	CreateRoleMappingExecute(r ApiCreateRoleMappingRequest) (*_nethttp.Response, error)
 
-	Deletes a single role mapping, effectively denying access to a user/principal.
+	/*
+	 * DeleteRoleMapping Delete a role mapping
+	 * Deletes a single role mapping, effectively denying access to a user/principal.
 
 This operation can fail for the following reasons:
 
 * No role mapping for the principalId exists (HTTP error `404`)
 * A server error occurred (HTTP error `500`)
 
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param principalId Unique id of a principal (typically either a user or service account).
-	@return ApiDeleteRoleMappingRequest
-	*/
-	DeleteRoleMapping(ctx context.Context, principalId string) ApiDeleteRoleMappingRequest
-
-	// DeleteRoleMappingExecute executes the request
-	DeleteRoleMappingExecute(r ApiDeleteRoleMappingRequest) (*http.Response, error)
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param principalId Unique id of a principal (typically either a user or service account).
+	 * @return ApiDeleteRoleMappingRequest
+	 */
+	DeleteRoleMapping(ctx _context.Context, principalId string) ApiDeleteRoleMappingRequest
 
 	/*
-	ExportData Export registry data
-
-	Exports registry data as a ZIP archive.
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiExportDataRequest
-	*/
-	ExportData(ctx context.Context) ApiExportDataRequest
+	 * DeleteRoleMappingExecute executes the request
+	 */
+	DeleteRoleMappingExecute(r ApiDeleteRoleMappingRequest) (*_nethttp.Response, error)
 
-	// ExportDataExecute executes the request
-	//  @return *os.File
-	ExportDataExecute(r ApiExportDataRequest) (**os.File, *http.Response, error)
+	/*
+	 * ExportData Export registry data
+	 * Exports registry data as a ZIP archive.
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiExportDataRequest
+	 */
+	ExportData(ctx _context.Context) ApiExportDataRequest
 
 	/*
-	GetConfigProperty Get configuration property value
+	 * ExportDataExecute executes the request
+	 * @return *os.File
+	 */
+	ExportDataExecute(r ApiExportDataRequest) (*os.File, *_nethttp.Response, error)
 
-	Returns the value of a single configuration property.
+	/*
+	 * GetConfigProperty Get configuration property value
+	 * Returns the value of a single configuration property.
 
 This operation may fail for one of the following reasons:
 
 * Property not found or not configured (HTTP error `404`)
 * A server error occurred (HTTP error `500`)
 
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param propertyName The name of a configuration property.
-	@return ApiGetConfigPropertyRequest
-	*/
-	GetConfigProperty(ctx context.Context, propertyName string) ApiGetConfigPropertyRequest
-
-	// GetConfigPropertyExecute executes the request
-	//  @return ConfigurationProperty
-	GetConfigPropertyExecute(r ApiGetConfigPropertyRequest) (*ConfigurationProperty, *http.Response, error)
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param propertyName The name of a configuration property.
+	 * @return ApiGetConfigPropertyRequest
+	 */
+	GetConfigProperty(ctx _context.Context, propertyName string) ApiGetConfigPropertyRequest
 
 	/*
-	GetLogConfiguration Get a single logger configuration
-
-	Returns the configured logger configuration for the provided logger name, if no logger configuration is persisted it will return the current default log configuration in the system.
+	 * GetConfigPropertyExecute executes the request
+	 * @return ConfigurationProperty
+	 */
+	GetConfigPropertyExecute(r ApiGetConfigPropertyRequest) (ConfigurationProperty, *_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param logger The name of a single logger.
-	@return ApiGetLogConfigurationRequest
-	*/
-	GetLogConfiguration(ctx context.Context, logger string) ApiGetLogConfigurationRequest
-
-	// GetLogConfigurationExecute executes the request
-	//  @return NamedLogConfiguration
-	GetLogConfigurationExecute(r ApiGetLogConfigurationRequest) (*NamedLogConfiguration, *http.Response, error)
+	/*
+	 * GetLogConfiguration Get a single logger configuration
+	 * Returns the configured logger configuration for the provided logger name, if no logger configuration is persisted it will return the current default log configuration in the system.
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param logger The name of a single logger.
+	 * @return ApiGetLogConfigurationRequest
+	 */
+	GetLogConfiguration(ctx _context.Context, logger string) ApiGetLogConfigurationRequest
 
 	/*
-	GetRoleMapping Return a single role mapping
+	 * GetLogConfigurationExecute executes the request
+	 * @return NamedLogConfiguration
+	 */
+	GetLogConfigurationExecute(r ApiGetLogConfigurationRequest) (NamedLogConfiguration, *_nethttp.Response, error)
 
-	Gets the details of a single role mapping (by `principalId`).
+	/*
+	 * GetRoleMapping Return a single role mapping
+	 * Gets the details of a single role mapping (by `principalId`).
 
 This operation can fail for the following reasons:
 
 * No role mapping for the `principalId` exists (HTTP error `404`)
 * A server error occurred (HTTP error `500`)
 
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param principalId Unique id of a principal (typically either a user or service account).
-	@return ApiGetRoleMappingRequest
-	*/
-	GetRoleMapping(ctx context.Context, principalId string) ApiGetRoleMappingRequest
-
-	// GetRoleMappingExecute executes the request
-	//  @return RoleMapping
-	GetRoleMappingExecute(r ApiGetRoleMappingRequest) (*RoleMapping, *http.Response, error)
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param principalId Unique id of a principal (typically either a user or service account).
+	 * @return ApiGetRoleMappingRequest
+	 */
+	GetRoleMapping(ctx _context.Context, principalId string) ApiGetRoleMappingRequest
 
 	/*
-	ImportData Import registry data
+	 * GetRoleMappingExecute executes the request
+	 * @return RoleMapping
+	 */
+	GetRoleMappingExecute(r ApiGetRoleMappingRequest) (RoleMapping, *_nethttp.Response, error)
 
-	Imports registry data that was previously exported using the `/admin/export` operation.
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiImportDataRequest
-	*/
-	ImportData(ctx context.Context) ApiImportDataRequest
-
-	// ImportDataExecute executes the request
-	ImportDataExecute(r ApiImportDataRequest) (*http.Response, error)
+	/*
+	 * ImportData Import registry data
+	 * Imports registry data that was previously exported using the `/admin/export` operation.
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiImportDataRequest
+	 */
+	ImportData(ctx _context.Context) ApiImportDataRequest
 
 	/*
-	ListConfigProperties List all configuration properties
+	 * ImportDataExecute executes the request
+	 */
+	ImportDataExecute(r ApiImportDataRequest) (*_nethttp.Response, error)
 
-	Returns a list of all configuration properties that have been set.  The list is not paged.
+	/*
+	 * ListConfigProperties List all configuration properties
+	 * Returns a list of all configuration properties that have been set.  The list is not paged.
 
 This operation may fail for one of the following reasons:
 
 * A server error occurred (HTTP error `500`)
 
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiListConfigPropertiesRequest
-	*/
-	ListConfigProperties(ctx context.Context) ApiListConfigPropertiesRequest
-
-	// ListConfigPropertiesExecute executes the request
-	//  @return []ConfigurationProperty
-	ListConfigPropertiesExecute(r ApiListConfigPropertiesRequest) ([]ConfigurationProperty, *http.Response, error)
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiListConfigPropertiesRequest
+	 */
+	ListConfigProperties(ctx _context.Context) ApiListConfigPropertiesRequest
 
 	/*
-	ListLogConfigurations List logging configurations
+	 * ListConfigPropertiesExecute executes the request
+	 * @return []ConfigurationProperty
+	 */
+	ListConfigPropertiesExecute(r ApiListConfigPropertiesRequest) ([]ConfigurationProperty, *_nethttp.Response, error)
 
-	List all of the configured logging levels.  These override the default
+	/*
+	 * ListLogConfigurations List logging configurations
+	 * List all of the configured logging levels.  These override the default
 logging configuration.
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiListLogConfigurationsRequest
-	*/
-	ListLogConfigurations(ctx context.Context) ApiListLogConfigurationsRequest
-
-	// ListLogConfigurationsExecute executes the request
-	//  @return []NamedLogConfiguration
-	ListLogConfigurationsExecute(r ApiListLogConfigurationsRequest) ([]NamedLogConfiguration, *http.Response, error)
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiListLogConfigurationsRequest
+	 */
+	ListLogConfigurations(ctx _context.Context) ApiListLogConfigurationsRequest
 
 	/*
-	ListRoleMappings List all role mappings
+	 * ListLogConfigurationsExecute executes the request
+	 * @return []NamedLogConfiguration
+	 */
+	ListLogConfigurationsExecute(r ApiListLogConfigurationsRequest) ([]NamedLogConfiguration, *_nethttp.Response, error)
 
-	Gets a list of all role mappings configured in the registry (if any).
+	/*
+	 * ListRoleMappings List all role mappings
+	 * Gets a list of all role mappings configured in the registry (if any).
 
 This operation can fail for the following reasons:
 
 * A server error occurred (HTTP error `500`)
 
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiListRoleMappingsRequest
-	*/
-	ListRoleMappings(ctx context.Context) ApiListRoleMappingsRequest
-
-	// ListRoleMappingsExecute executes the request
-	//  @return []RoleMapping
-	ListRoleMappingsExecute(r ApiListRoleMappingsRequest) ([]RoleMapping, *http.Response, error)
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiListRoleMappingsRequest
+	 */
+	ListRoleMappings(ctx _context.Context) ApiListRoleMappingsRequest
 
 	/*
-	RemoveLogConfiguration Removes logger configuration
-
-	Removes the configured logger configuration (if any) for the given logger.
+	 * ListRoleMappingsExecute executes the request
+	 * @return []RoleMapping
+	 */
+	ListRoleMappingsExecute(r ApiListRoleMappingsRequest) ([]RoleMapping, *_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param logger The name of a single logger.
-	@return ApiRemoveLogConfigurationRequest
-	*/
-	RemoveLogConfiguration(ctx context.Context, logger string) ApiRemoveLogConfigurationRequest
-
-	// RemoveLogConfigurationExecute executes the request
-	//  @return NamedLogConfiguration
-	RemoveLogConfigurationExecute(r ApiRemoveLogConfigurationRequest) (*NamedLogConfiguration, *http.Response, error)
+	/*
+	 * RemoveLogConfiguration Removes logger configuration
+	 * Removes the configured logger configuration (if any) for the given logger.
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param logger The name of a single logger.
+	 * @return ApiRemoveLogConfigurationRequest
+	 */
+	RemoveLogConfiguration(ctx _context.Context, logger string) ApiRemoveLogConfigurationRequest
 
 	/*
-	ResetConfigProperty Reset a configuration property
+	 * RemoveLogConfigurationExecute executes the request
+	 * @return NamedLogConfiguration
+	 */
+	RemoveLogConfigurationExecute(r ApiRemoveLogConfigurationRequest) (NamedLogConfiguration, *_nethttp.Response, error)
 
-	Resets the value of a single configuration property.  This will return the property to
+	/*
+	 * ResetConfigProperty Reset a configuration property
+	 * Resets the value of a single configuration property.  This will return the property to
 its default value (see external documentation for supported properties and their default
 values).
 
@@ -227,77 +230,78 @@ This operation may fail for one of the following reasons:
 * Property not found or not configured (HTTP error `404`)
 * A server error occurred (HTTP error `500`)
 
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param propertyName The name of a configuration property.
-	@return ApiResetConfigPropertyRequest
-	*/
-	ResetConfigProperty(ctx context.Context, propertyName string) ApiResetConfigPropertyRequest
-
-	// ResetConfigPropertyExecute executes the request
-	ResetConfigPropertyExecute(r ApiResetConfigPropertyRequest) (*http.Response, error)
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param propertyName The name of a configuration property.
+	 * @return ApiResetConfigPropertyRequest
+	 */
+	ResetConfigProperty(ctx _context.Context, propertyName string) ApiResetConfigPropertyRequest
 
 	/*
-	SetLogConfiguration Set a logger's configuration
-
-	Configures the logger referenced by the provided logger name with the given configuration.
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param logger The name of a single logger.
-	@return ApiSetLogConfigurationRequest
-	*/
-	SetLogConfiguration(ctx context.Context, logger string) ApiSetLogConfigurationRequest
+	 * ResetConfigPropertyExecute executes the request
+	 */
+	ResetConfigPropertyExecute(r ApiResetConfigPropertyRequest) (*_nethttp.Response, error)
 
-	// SetLogConfigurationExecute executes the request
-	//  @return NamedLogConfiguration
-	SetLogConfigurationExecute(r ApiSetLogConfigurationRequest) (*NamedLogConfiguration, *http.Response, error)
+	/*
+	 * SetLogConfiguration Set a logger's configuration
+	 * Configures the logger referenced by the provided logger name with the given configuration.
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param logger The name of a single logger.
+	 * @return ApiSetLogConfigurationRequest
+	 */
+	SetLogConfiguration(ctx _context.Context, logger string) ApiSetLogConfigurationRequest
 
 	/*
-	UpdateConfigProperty Update a configuration property
+	 * SetLogConfigurationExecute executes the request
+	 * @return NamedLogConfiguration
+	 */
+	SetLogConfigurationExecute(r ApiSetLogConfigurationRequest) (NamedLogConfiguration, *_nethttp.Response, error)
 
-	Updates the value of a single configuration property.
+	/*
+	 * UpdateConfigProperty Update a configuration property
+	 * Updates the value of a single configuration property.
 
 This operation may fail for one of the following reasons:
 
 * Property not found or not configured (HTTP error `404`)
 * A server error occurred (HTTP error `500`)
 
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param propertyName The name of a configuration property.
-	@return ApiUpdateConfigPropertyRequest
-	*/
-	UpdateConfigProperty(ctx context.Context, propertyName string) ApiUpdateConfigPropertyRequest
-
-	// UpdateConfigPropertyExecute executes the request
-	UpdateConfigPropertyExecute(r ApiUpdateConfigPropertyRequest) (*http.Response, error)
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param propertyName The name of a configuration property.
+	 * @return ApiUpdateConfigPropertyRequest
+	 */
+	UpdateConfigProperty(ctx _context.Context, propertyName string) ApiUpdateConfigPropertyRequest
 
 	/*
-	UpdateRoleMapping Update a role mapping
+	 * UpdateConfigPropertyExecute executes the request
+	 */
+	UpdateConfigPropertyExecute(r ApiUpdateConfigPropertyRequest) (*_nethttp.Response, error)
 
-	Updates a single role mapping for one user/principal.
+	/*
+	 * UpdateRoleMapping Update a role mapping
+	 * Updates a single role mapping for one user/principal.
 
 This operation can fail for the following reasons:
 
 * No role mapping for the principalId exists (HTTP error `404`)
 * A server error occurred (HTTP error `500`)
 
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param principalId Unique id of a principal (typically either a user or service account).
+	 * @return ApiUpdateRoleMappingRequest
+	 */
+	UpdateRoleMapping(ctx _context.Context, principalId string) ApiUpdateRoleMappingRequest
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param principalId Unique id of a principal (typically either a user or service account).
-	@return ApiUpdateRoleMappingRequest
-	*/
-	UpdateRoleMapping(ctx context.Context, principalId string) ApiUpdateRoleMappingRequest
-
-	// UpdateRoleMappingExecute executes the request
-	UpdateRoleMappingExecute(r ApiUpdateRoleMappingRequest) (*http.Response, error)
+	/*
+	 * UpdateRoleMappingExecute executes the request
+	 */
+	UpdateRoleMappingExecute(r ApiUpdateRoleMappingRequest) (*_nethttp.Response, error)
 }
 
 // AdminApiService AdminApi service
 type AdminApiService service
 
 type ApiCreateRoleMappingRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService AdminApi
 	roleMapping *RoleMapping
 }
@@ -307,49 +311,51 @@ func (r ApiCreateRoleMappingRequest) RoleMapping(roleMapping RoleMapping) ApiCre
 	return r
 }
 
-func (r ApiCreateRoleMappingRequest) Execute() (*http.Response, error) {
+func (r ApiCreateRoleMappingRequest) Execute() (*_nethttp.Response, error) {
 	return r.ApiService.CreateRoleMappingExecute(r)
 }
 
 /*
-CreateRoleMapping Create a new role mapping
-
-Creates a new mapping between a user/principal and a role.
+ * CreateRoleMapping Create a new role mapping
+ * Creates a new mapping between a user/principal and a role.
 
 This operation can fail for the following reasons:
 
 * A server error occurred (HTTP error `500`)
 
 
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiCreateRoleMappingRequest
-*/
-func (a *AdminApiService) CreateRoleMapping(ctx context.Context) ApiCreateRoleMappingRequest {
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiCreateRoleMappingRequest
+ */
+func (a *AdminApiService) CreateRoleMapping(ctx _context.Context) ApiCreateRoleMappingRequest {
 	return ApiCreateRoleMappingRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-func (a *AdminApiService) CreateRoleMappingExecute(r ApiCreateRoleMappingRequest) (*http.Response, error) {
+/*
+ * Execute executes the request
+ */
+func (a *AdminApiService) CreateRoleMappingExecute(r ApiCreateRoleMappingRequest) (*_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "AdminApiService.CreateRoleMapping")
 	if err != nil {
-		return nil, &GenericOpenAPIError{error: err.Error()}
+		return nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/admin/roleMappings"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.roleMapping == nil {
 		return nil, reportError("roleMapping is required and must be specified")
 	}
@@ -373,7 +379,7 @@ func (a *AdminApiService) CreateRoleMappingExecute(r ApiCreateRoleMappingRequest
 	}
 	// body params
 	localVarPostBody = r.roleMapping
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return nil, err
 	}
@@ -383,15 +389,15 @@ func (a *AdminApiService) CreateRoleMappingExecute(r ApiCreateRoleMappingRequest
 		return localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -402,8 +408,7 @@ func (a *AdminApiService) CreateRoleMappingExecute(r ApiCreateRoleMappingRequest
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarHTTPResponse, newErr
 	}
@@ -412,31 +417,30 @@ func (a *AdminApiService) CreateRoleMappingExecute(r ApiCreateRoleMappingRequest
 }
 
 type ApiDeleteRoleMappingRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService AdminApi
 	principalId string
 }
 
-func (r ApiDeleteRoleMappingRequest) Execute() (*http.Response, error) {
+
+func (r ApiDeleteRoleMappingRequest) Execute() (*_nethttp.Response, error) {
 	return r.ApiService.DeleteRoleMappingExecute(r)
 }
 
 /*
-DeleteRoleMapping Delete a role mapping
-
-Deletes a single role mapping, effectively denying access to a user/principal.
+ * DeleteRoleMapping Delete a role mapping
+ * Deletes a single role mapping, effectively denying access to a user/principal.
 
 This operation can fail for the following reasons:
 
 * No role mapping for the principalId exists (HTTP error `404`)
 * A server error occurred (HTTP error `500`)
 
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param principalId Unique id of a principal (typically either a user or service account).
- @return ApiDeleteRoleMappingRequest
-*/
-func (a *AdminApiService) DeleteRoleMapping(ctx context.Context, principalId string) ApiDeleteRoleMappingRequest {
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param principalId Unique id of a principal (typically either a user or service account).
+ * @return ApiDeleteRoleMappingRequest
+ */
+func (a *AdminApiService) DeleteRoleMapping(ctx _context.Context, principalId string) ApiDeleteRoleMappingRequest {
 	return ApiDeleteRoleMappingRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -444,25 +448,29 @@ func (a *AdminApiService) DeleteRoleMapping(ctx context.Context, principalId str
 	}
 }
 
-// Execute executes the request
-func (a *AdminApiService) DeleteRoleMappingExecute(r ApiDeleteRoleMappingRequest) (*http.Response, error) {
+/*
+ * Execute executes the request
+ */
+func (a *AdminApiService) DeleteRoleMappingExecute(r ApiDeleteRoleMappingRequest) (*_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodDelete
+		localVarHTTPMethod   = _nethttp.MethodDelete
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "AdminApiService.DeleteRoleMapping")
 	if err != nil {
-		return nil, &GenericOpenAPIError{error: err.Error()}
+		return nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/admin/roleMappings/{principalId}"
-	localVarPath = strings.Replace(localVarPath, "{"+"principalId"+"}", url.PathEscape(parameterToString(r.principalId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"principalId"+"}", _neturl.PathEscape(parameterToString(r.principalId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -481,7 +489,7 @@ func (a *AdminApiService) DeleteRoleMappingExecute(r ApiDeleteRoleMappingRequest
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return nil, err
 	}
@@ -491,15 +499,15 @@ func (a *AdminApiService) DeleteRoleMappingExecute(r ApiDeleteRoleMappingRequest
 		return localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -510,8 +518,7 @@ func (a *AdminApiService) DeleteRoleMappingExecute(r ApiDeleteRoleMappingRequest
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -521,8 +528,7 @@ func (a *AdminApiService) DeleteRoleMappingExecute(r ApiDeleteRoleMappingRequest
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarHTTPResponse, newErr
 	}
@@ -531,56 +537,62 @@ func (a *AdminApiService) DeleteRoleMappingExecute(r ApiDeleteRoleMappingRequest
 }
 
 type ApiExportDataRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService AdminApi
+	accept *string
 	forBrowser *bool
 }
 
-// Indicates if the operation is done for a browser.  If true, the response will be a JSON payload with a property called &#x60;href&#x60;.  This &#x60;href&#x60; will be a single-use, naked download link suitable for use by a web browser to download the content.
+func (r ApiExportDataRequest) Accept(accept string) ApiExportDataRequest {
+	r.accept = &accept
+	return r
+}
 func (r ApiExportDataRequest) ForBrowser(forBrowser bool) ApiExportDataRequest {
 	r.forBrowser = &forBrowser
 	return r
 }
 
-func (r ApiExportDataRequest) Execute() (**os.File, *http.Response, error) {
+func (r ApiExportDataRequest) Execute() (*os.File, *_nethttp.Response, error) {
 	return r.ApiService.ExportDataExecute(r)
 }
 
 /*
-ExportData Export registry data
-
-Exports registry data as a ZIP archive.
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiExportDataRequest
-*/
-func (a *AdminApiService) ExportData(ctx context.Context) ApiExportDataRequest {
+ * ExportData Export registry data
+ * Exports registry data as a ZIP archive.
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiExportDataRequest
+ */
+func (a *AdminApiService) ExportData(ctx _context.Context) ApiExportDataRequest {
 	return ApiExportDataRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return *os.File
-func (a *AdminApiService) ExportDataExecute(r ApiExportDataRequest) (**os.File, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return *os.File
+ */
+func (a *AdminApiService) ExportDataExecute(r ApiExportDataRequest) (*os.File, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  **os.File
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  *os.File
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "AdminApiService.ExportData")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/admin/export"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.forBrowser != nil {
 		localVarQueryParams.Add("forBrowser", parameterToString(*r.forBrowser, ""))
@@ -602,7 +614,10 @@ func (a *AdminApiService) ExportDataExecute(r ApiExportDataRequest) (**os.File,
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	if r.accept != nil {
+		localVarHeaderParams["Accept"] = parameterToString(*r.accept, "")
+	}
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -612,15 +627,15 @@ func (a *AdminApiService) ExportDataExecute(r ApiExportDataRequest) (**os.File,
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -631,15 +646,14 @@ func (a *AdminApiService) ExportDataExecute(r ApiExportDataRequest) (**os.File,
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -650,31 +664,30 @@ func (a *AdminApiService) ExportDataExecute(r ApiExportDataRequest) (**os.File,
 }
 
 type ApiGetConfigPropertyRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService AdminApi
 	propertyName string
 }
 
-func (r ApiGetConfigPropertyRequest) Execute() (*ConfigurationProperty, *http.Response, error) {
+
+func (r ApiGetConfigPropertyRequest) Execute() (ConfigurationProperty, *_nethttp.Response, error) {
 	return r.ApiService.GetConfigPropertyExecute(r)
 }
 
 /*
-GetConfigProperty Get configuration property value
-
-Returns the value of a single configuration property.
+ * GetConfigProperty Get configuration property value
+ * Returns the value of a single configuration property.
 
 This operation may fail for one of the following reasons:
 
 * Property not found or not configured (HTTP error `404`)
 * A server error occurred (HTTP error `500`)
 
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param propertyName The name of a configuration property.
- @return ApiGetConfigPropertyRequest
-*/
-func (a *AdminApiService) GetConfigProperty(ctx context.Context, propertyName string) ApiGetConfigPropertyRequest {
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param propertyName The name of a configuration property.
+ * @return ApiGetConfigPropertyRequest
+ */
+func (a *AdminApiService) GetConfigProperty(ctx _context.Context, propertyName string) ApiGetConfigPropertyRequest {
 	return ApiGetConfigPropertyRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -682,27 +695,31 @@ func (a *AdminApiService) GetConfigProperty(ctx context.Context, propertyName st
 	}
 }
 
-// Execute executes the request
-//  @return ConfigurationProperty
-func (a *AdminApiService) GetConfigPropertyExecute(r ApiGetConfigPropertyRequest) (*ConfigurationProperty, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return ConfigurationProperty
+ */
+func (a *AdminApiService) GetConfigPropertyExecute(r ApiGetConfigPropertyRequest) (ConfigurationProperty, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *ConfigurationProperty
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  ConfigurationProperty
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "AdminApiService.GetConfigProperty")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/admin/config/properties/{propertyName}"
-	localVarPath = strings.Replace(localVarPath, "{"+"propertyName"+"}", url.PathEscape(parameterToString(r.propertyName, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"propertyName"+"}", _neturl.PathEscape(parameterToString(r.propertyName, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -721,7 +738,7 @@ func (a *AdminApiService) GetConfigPropertyExecute(r ApiGetConfigPropertyRequest
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -731,15 +748,15 @@ func (a *AdminApiService) GetConfigPropertyExecute(r ApiGetConfigPropertyRequest
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -750,8 +767,7 @@ func (a *AdminApiService) GetConfigPropertyExecute(r ApiGetConfigPropertyRequest
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -761,15 +777,14 @@ func (a *AdminApiService) GetConfigPropertyExecute(r ApiGetConfigPropertyRequest
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -780,25 +795,24 @@ func (a *AdminApiService) GetConfigPropertyExecute(r ApiGetConfigPropertyRequest
 }
 
 type ApiGetLogConfigurationRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService AdminApi
 	logger string
 }
 
-func (r ApiGetLogConfigurationRequest) Execute() (*NamedLogConfiguration, *http.Response, error) {
+
+func (r ApiGetLogConfigurationRequest) Execute() (NamedLogConfiguration, *_nethttp.Response, error) {
 	return r.ApiService.GetLogConfigurationExecute(r)
 }
 
 /*
-GetLogConfiguration Get a single logger configuration
-
-Returns the configured logger configuration for the provided logger name, if no logger configuration is persisted it will return the current default log configuration in the system.
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param logger The name of a single logger.
- @return ApiGetLogConfigurationRequest
-*/
-func (a *AdminApiService) GetLogConfiguration(ctx context.Context, logger string) ApiGetLogConfigurationRequest {
+ * GetLogConfiguration Get a single logger configuration
+ * Returns the configured logger configuration for the provided logger name, if no logger configuration is persisted it will return the current default log configuration in the system.
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param logger The name of a single logger.
+ * @return ApiGetLogConfigurationRequest
+ */
+func (a *AdminApiService) GetLogConfiguration(ctx _context.Context, logger string) ApiGetLogConfigurationRequest {
 	return ApiGetLogConfigurationRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -806,27 +820,31 @@ func (a *AdminApiService) GetLogConfiguration(ctx context.Context, logger string
 	}
 }
 
-// Execute executes the request
-//  @return NamedLogConfiguration
-func (a *AdminApiService) GetLogConfigurationExecute(r ApiGetLogConfigurationRequest) (*NamedLogConfiguration, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return NamedLogConfiguration
+ */
+func (a *AdminApiService) GetLogConfigurationExecute(r ApiGetLogConfigurationRequest) (NamedLogConfiguration, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *NamedLogConfiguration
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  NamedLogConfiguration
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "AdminApiService.GetLogConfiguration")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/admin/loggers/{logger}"
-	localVarPath = strings.Replace(localVarPath, "{"+"logger"+"}", url.PathEscape(parameterToString(r.logger, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"logger"+"}", _neturl.PathEscape(parameterToString(r.logger, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -845,7 +863,7 @@ func (a *AdminApiService) GetLogConfigurationExecute(r ApiGetLogConfigurationReq
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -855,15 +873,15 @@ func (a *AdminApiService) GetLogConfigurationExecute(r ApiGetLogConfigurationReq
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -874,15 +892,14 @@ func (a *AdminApiService) GetLogConfigurationExecute(r ApiGetLogConfigurationReq
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -893,31 +910,30 @@ func (a *AdminApiService) GetLogConfigurationExecute(r ApiGetLogConfigurationReq
 }
 
 type ApiGetRoleMappingRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService AdminApi
 	principalId string
 }
 
-func (r ApiGetRoleMappingRequest) Execute() (*RoleMapping, *http.Response, error) {
+
+func (r ApiGetRoleMappingRequest) Execute() (RoleMapping, *_nethttp.Response, error) {
 	return r.ApiService.GetRoleMappingExecute(r)
 }
 
 /*
-GetRoleMapping Return a single role mapping
-
-Gets the details of a single role mapping (by `principalId`).
+ * GetRoleMapping Return a single role mapping
+ * Gets the details of a single role mapping (by `principalId`).
 
 This operation can fail for the following reasons:
 
 * No role mapping for the `principalId` exists (HTTP error `404`)
 * A server error occurred (HTTP error `500`)
 
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param principalId Unique id of a principal (typically either a user or service account).
- @return ApiGetRoleMappingRequest
-*/
-func (a *AdminApiService) GetRoleMapping(ctx context.Context, principalId string) ApiGetRoleMappingRequest {
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param principalId Unique id of a principal (typically either a user or service account).
+ * @return ApiGetRoleMappingRequest
+ */
+func (a *AdminApiService) GetRoleMapping(ctx _context.Context, principalId string) ApiGetRoleMappingRequest {
 	return ApiGetRoleMappingRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -925,27 +941,31 @@ func (a *AdminApiService) GetRoleMapping(ctx context.Context, principalId string
 	}
 }
 
-// Execute executes the request
-//  @return RoleMapping
-func (a *AdminApiService) GetRoleMappingExecute(r ApiGetRoleMappingRequest) (*RoleMapping, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return RoleMapping
+ */
+func (a *AdminApiService) GetRoleMappingExecute(r ApiGetRoleMappingRequest) (RoleMapping, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *RoleMapping
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  RoleMapping
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "AdminApiService.GetRoleMapping")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/admin/roleMappings/{principalId}"
-	localVarPath = strings.Replace(localVarPath, "{"+"principalId"+"}", url.PathEscape(parameterToString(r.principalId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"principalId"+"}", _neturl.PathEscape(parameterToString(r.principalId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -964,7 +984,7 @@ func (a *AdminApiService) GetRoleMappingExecute(r ApiGetRoleMappingRequest) (*Ro
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -974,15 +994,15 @@ func (a *AdminApiService) GetRoleMappingExecute(r ApiGetRoleMappingRequest) (*Ro
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -993,8 +1013,7 @@ func (a *AdminApiService) GetRoleMappingExecute(r ApiGetRoleMappingRequest) (*Ro
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -1004,15 +1023,14 @@ func (a *AdminApiService) GetRoleMappingExecute(r ApiGetRoleMappingRequest) (*Ro
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -1023,68 +1041,65 @@ func (a *AdminApiService) GetRoleMappingExecute(r ApiGetRoleMappingRequest) (*Ro
 }
 
 type ApiImportDataRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService AdminApi
 	body **os.File
 	xRegistryPreserveGlobalId *bool
 	xRegistryPreserveContentId *bool
 }
 
-// The ZIP file representing the previously exported registry data.
 func (r ApiImportDataRequest) Body(body *os.File) ApiImportDataRequest {
 	r.body = &body
 	return r
 }
-
-// If this header is set to false, global ids of imported data will be ignored and replaced by next id in global id sequence. This allows to import any data even thought the global ids would cause a conflict.
 func (r ApiImportDataRequest) XRegistryPreserveGlobalId(xRegistryPreserveGlobalId bool) ApiImportDataRequest {
 	r.xRegistryPreserveGlobalId = &xRegistryPreserveGlobalId
 	return r
 }
-
-// If this header is set to false, content ids of imported data will be ignored and replaced by next id in content id sequence. The mapping between content and artifacts will be preserved. This allows to import any data even thought the content ids would cause a conflict.
 func (r ApiImportDataRequest) XRegistryPreserveContentId(xRegistryPreserveContentId bool) ApiImportDataRequest {
 	r.xRegistryPreserveContentId = &xRegistryPreserveContentId
 	return r
 }
 
-func (r ApiImportDataRequest) Execute() (*http.Response, error) {
+func (r ApiImportDataRequest) Execute() (*_nethttp.Response, error) {
 	return r.ApiService.ImportDataExecute(r)
 }
 
 /*
-ImportData Import registry data
-
-Imports registry data that was previously exported using the `/admin/export` operation.
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiImportDataRequest
-*/
-func (a *AdminApiService) ImportData(ctx context.Context) ApiImportDataRequest {
+ * ImportData Import registry data
+ * Imports registry data that was previously exported using the `/admin/export` operation.
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiImportDataRequest
+ */
+func (a *AdminApiService) ImportData(ctx _context.Context) ApiImportDataRequest {
 	return ApiImportDataRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-func (a *AdminApiService) ImportDataExecute(r ApiImportDataRequest) (*http.Response, error) {
+/*
+ * Execute executes the request
+ */
+func (a *AdminApiService) ImportDataExecute(r ApiImportDataRequest) (*_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "AdminApiService.ImportData")
 	if err != nil {
-		return nil, &GenericOpenAPIError{error: err.Error()}
+		return nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/admin/import"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.body == nil {
 		return nil, reportError("body is required and must be specified")
 	}
@@ -1114,7 +1129,7 @@ func (a *AdminApiService) ImportDataExecute(r ApiImportDataRequest) (*http.Respo
 	}
 	// body params
 	localVarPostBody = r.body
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return nil, err
 	}
@@ -1124,15 +1139,15 @@ func (a *AdminApiService) ImportDataExecute(r ApiImportDataRequest) (*http.Respo
 		return localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -1143,8 +1158,7 @@ func (a *AdminApiService) ImportDataExecute(r ApiImportDataRequest) (*http.Respo
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarHTTPResponse, newErr
 	}
@@ -1153,54 +1167,57 @@ func (a *AdminApiService) ImportDataExecute(r ApiImportDataRequest) (*http.Respo
 }
 
 type ApiListConfigPropertiesRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService AdminApi
 }
 
-func (r ApiListConfigPropertiesRequest) Execute() ([]ConfigurationProperty, *http.Response, error) {
+
+func (r ApiListConfigPropertiesRequest) Execute() ([]ConfigurationProperty, *_nethttp.Response, error) {
 	return r.ApiService.ListConfigPropertiesExecute(r)
 }
 
 /*
-ListConfigProperties List all configuration properties
-
-Returns a list of all configuration properties that have been set.  The list is not paged.
+ * ListConfigProperties List all configuration properties
+ * Returns a list of all configuration properties that have been set.  The list is not paged.
 
 This operation may fail for one of the following reasons:
 
 * A server error occurred (HTTP error `500`)
 
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiListConfigPropertiesRequest
-*/
-func (a *AdminApiService) ListConfigProperties(ctx context.Context) ApiListConfigPropertiesRequest {
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiListConfigPropertiesRequest
+ */
+func (a *AdminApiService) ListConfigProperties(ctx _context.Context) ApiListConfigPropertiesRequest {
 	return ApiListConfigPropertiesRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return []ConfigurationProperty
-func (a *AdminApiService) ListConfigPropertiesExecute(r ApiListConfigPropertiesRequest) ([]ConfigurationProperty, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return []ConfigurationProperty
+ */
+func (a *AdminApiService) ListConfigPropertiesExecute(r ApiListConfigPropertiesRequest) ([]ConfigurationProperty, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 		localVarReturnValue  []ConfigurationProperty
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "AdminApiService.ListConfigProperties")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/admin/config/properties"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -1219,7 +1236,7 @@ func (a *AdminApiService) ListConfigPropertiesExecute(r ApiListConfigPropertiesR
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -1229,15 +1246,15 @@ func (a *AdminApiService) ListConfigPropertiesExecute(r ApiListConfigPropertiesR
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -1248,15 +1265,14 @@ func (a *AdminApiService) ListConfigPropertiesExecute(r ApiListConfigPropertiesR
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -1267,50 +1283,53 @@ func (a *AdminApiService) ListConfigPropertiesExecute(r ApiListConfigPropertiesR
 }
 
 type ApiListLogConfigurationsRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService AdminApi
 }
 
-func (r ApiListLogConfigurationsRequest) Execute() ([]NamedLogConfiguration, *http.Response, error) {
+
+func (r ApiListLogConfigurationsRequest) Execute() ([]NamedLogConfiguration, *_nethttp.Response, error) {
 	return r.ApiService.ListLogConfigurationsExecute(r)
 }
 
 /*
-ListLogConfigurations List logging configurations
-
-List all of the configured logging levels.  These override the default
+ * ListLogConfigurations List logging configurations
+ * List all of the configured logging levels.  These override the default
 logging configuration.
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiListLogConfigurationsRequest
-*/
-func (a *AdminApiService) ListLogConfigurations(ctx context.Context) ApiListLogConfigurationsRequest {
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiListLogConfigurationsRequest
+ */
+func (a *AdminApiService) ListLogConfigurations(ctx _context.Context) ApiListLogConfigurationsRequest {
 	return ApiListLogConfigurationsRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return []NamedLogConfiguration
-func (a *AdminApiService) ListLogConfigurationsExecute(r ApiListLogConfigurationsRequest) ([]NamedLogConfiguration, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return []NamedLogConfiguration
+ */
+func (a *AdminApiService) ListLogConfigurationsExecute(r ApiListLogConfigurationsRequest) ([]NamedLogConfiguration, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 		localVarReturnValue  []NamedLogConfiguration
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "AdminApiService.ListLogConfigurations")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/admin/loggers"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -1329,7 +1348,7 @@ func (a *AdminApiService) ListLogConfigurationsExecute(r ApiListLogConfiguration
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -1339,15 +1358,15 @@ func (a *AdminApiService) ListLogConfigurationsExecute(r ApiListLogConfiguration
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -1358,15 +1377,14 @@ func (a *AdminApiService) ListLogConfigurationsExecute(r ApiListLogConfiguration
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -1377,54 +1395,57 @@ func (a *AdminApiService) ListLogConfigurationsExecute(r ApiListLogConfiguration
 }
 
 type ApiListRoleMappingsRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService AdminApi
 }
 
-func (r ApiListRoleMappingsRequest) Execute() ([]RoleMapping, *http.Response, error) {
+
+func (r ApiListRoleMappingsRequest) Execute() ([]RoleMapping, *_nethttp.Response, error) {
 	return r.ApiService.ListRoleMappingsExecute(r)
 }
 
 /*
-ListRoleMappings List all role mappings
-
-Gets a list of all role mappings configured in the registry (if any).
+ * ListRoleMappings List all role mappings
+ * Gets a list of all role mappings configured in the registry (if any).
 
 This operation can fail for the following reasons:
 
 * A server error occurred (HTTP error `500`)
 
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiListRoleMappingsRequest
-*/
-func (a *AdminApiService) ListRoleMappings(ctx context.Context) ApiListRoleMappingsRequest {
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiListRoleMappingsRequest
+ */
+func (a *AdminApiService) ListRoleMappings(ctx _context.Context) ApiListRoleMappingsRequest {
 	return ApiListRoleMappingsRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return []RoleMapping
-func (a *AdminApiService) ListRoleMappingsExecute(r ApiListRoleMappingsRequest) ([]RoleMapping, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return []RoleMapping
+ */
+func (a *AdminApiService) ListRoleMappingsExecute(r ApiListRoleMappingsRequest) ([]RoleMapping, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 		localVarReturnValue  []RoleMapping
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "AdminApiService.ListRoleMappings")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/admin/roleMappings"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -1443,7 +1464,7 @@ func (a *AdminApiService) ListRoleMappingsExecute(r ApiListRoleMappingsRequest)
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -1453,15 +1474,15 @@ func (a *AdminApiService) ListRoleMappingsExecute(r ApiListRoleMappingsRequest)
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -1472,15 +1493,14 @@ func (a *AdminApiService) ListRoleMappingsExecute(r ApiListRoleMappingsRequest)
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -1491,25 +1511,24 @@ func (a *AdminApiService) ListRoleMappingsExecute(r ApiListRoleMappingsRequest)
 }
 
 type ApiRemoveLogConfigurationRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService AdminApi
 	logger string
 }
 
-func (r ApiRemoveLogConfigurationRequest) Execute() (*NamedLogConfiguration, *http.Response, error) {
+
+func (r ApiRemoveLogConfigurationRequest) Execute() (NamedLogConfiguration, *_nethttp.Response, error) {
 	return r.ApiService.RemoveLogConfigurationExecute(r)
 }
 
 /*
-RemoveLogConfiguration Removes logger configuration
-
-Removes the configured logger configuration (if any) for the given logger.
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param logger The name of a single logger.
- @return ApiRemoveLogConfigurationRequest
-*/
-func (a *AdminApiService) RemoveLogConfiguration(ctx context.Context, logger string) ApiRemoveLogConfigurationRequest {
+ * RemoveLogConfiguration Removes logger configuration
+ * Removes the configured logger configuration (if any) for the given logger.
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param logger The name of a single logger.
+ * @return ApiRemoveLogConfigurationRequest
+ */
+func (a *AdminApiService) RemoveLogConfiguration(ctx _context.Context, logger string) ApiRemoveLogConfigurationRequest {
 	return ApiRemoveLogConfigurationRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -1517,27 +1536,31 @@ func (a *AdminApiService) RemoveLogConfiguration(ctx context.Context, logger str
 	}
 }
 
-// Execute executes the request
-//  @return NamedLogConfiguration
-func (a *AdminApiService) RemoveLogConfigurationExecute(r ApiRemoveLogConfigurationRequest) (*NamedLogConfiguration, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return NamedLogConfiguration
+ */
+func (a *AdminApiService) RemoveLogConfigurationExecute(r ApiRemoveLogConfigurationRequest) (NamedLogConfiguration, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodDelete
+		localVarHTTPMethod   = _nethttp.MethodDelete
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *NamedLogConfiguration
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  NamedLogConfiguration
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "AdminApiService.RemoveLogConfiguration")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/admin/loggers/{logger}"
-	localVarPath = strings.Replace(localVarPath, "{"+"logger"+"}", url.PathEscape(parameterToString(r.logger, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"logger"+"}", _neturl.PathEscape(parameterToString(r.logger, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -1556,7 +1579,7 @@ func (a *AdminApiService) RemoveLogConfigurationExecute(r ApiRemoveLogConfigurat
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -1566,15 +1589,15 @@ func (a *AdminApiService) RemoveLogConfigurationExecute(r ApiRemoveLogConfigurat
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -1585,15 +1608,14 @@ func (a *AdminApiService) RemoveLogConfigurationExecute(r ApiRemoveLogConfigurat
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -1604,19 +1626,19 @@ func (a *AdminApiService) RemoveLogConfigurationExecute(r ApiRemoveLogConfigurat
 }
 
 type ApiResetConfigPropertyRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService AdminApi
 	propertyName string
 }
 
-func (r ApiResetConfigPropertyRequest) Execute() (*http.Response, error) {
+
+func (r ApiResetConfigPropertyRequest) Execute() (*_nethttp.Response, error) {
 	return r.ApiService.ResetConfigPropertyExecute(r)
 }
 
 /*
-ResetConfigProperty Reset a configuration property
-
-Resets the value of a single configuration property.  This will return the property to
+ * ResetConfigProperty Reset a configuration property
+ * Resets the value of a single configuration property.  This will return the property to
 its default value (see external documentation for supported properties and their default
 values).
 
@@ -1625,12 +1647,11 @@ This operation may fail for one of the following reasons:
 * Property not found or not configured (HTTP error `404`)
 * A server error occurred (HTTP error `500`)
 
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param propertyName The name of a configuration property.
- @return ApiResetConfigPropertyRequest
-*/
-func (a *AdminApiService) ResetConfigProperty(ctx context.Context, propertyName string) ApiResetConfigPropertyRequest {
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param propertyName The name of a configuration property.
+ * @return ApiResetConfigPropertyRequest
+ */
+func (a *AdminApiService) ResetConfigProperty(ctx _context.Context, propertyName string) ApiResetConfigPropertyRequest {
 	return ApiResetConfigPropertyRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -1638,25 +1659,29 @@ func (a *AdminApiService) ResetConfigProperty(ctx context.Context, propertyName
 	}
 }
 
-// Execute executes the request
-func (a *AdminApiService) ResetConfigPropertyExecute(r ApiResetConfigPropertyRequest) (*http.Response, error) {
+/*
+ * Execute executes the request
+ */
+func (a *AdminApiService) ResetConfigPropertyExecute(r ApiResetConfigPropertyRequest) (*_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodDelete
+		localVarHTTPMethod   = _nethttp.MethodDelete
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "AdminApiService.ResetConfigProperty")
 	if err != nil {
-		return nil, &GenericOpenAPIError{error: err.Error()}
+		return nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/admin/config/properties/{propertyName}"
-	localVarPath = strings.Replace(localVarPath, "{"+"propertyName"+"}", url.PathEscape(parameterToString(r.propertyName, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"propertyName"+"}", _neturl.PathEscape(parameterToString(r.propertyName, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -1675,7 +1700,7 @@ func (a *AdminApiService) ResetConfigPropertyExecute(r ApiResetConfigPropertyReq
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return nil, err
 	}
@@ -1685,15 +1710,15 @@ func (a *AdminApiService) ResetConfigPropertyExecute(r ApiResetConfigPropertyReq
 		return localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -1704,8 +1729,7 @@ func (a *AdminApiService) ResetConfigPropertyExecute(r ApiResetConfigPropertyReq
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -1715,8 +1739,7 @@ func (a *AdminApiService) ResetConfigPropertyExecute(r ApiResetConfigPropertyReq
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarHTTPResponse, newErr
 	}
@@ -1725,32 +1748,29 @@ func (a *AdminApiService) ResetConfigPropertyExecute(r ApiResetConfigPropertyReq
 }
 
 type ApiSetLogConfigurationRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService AdminApi
 	logger string
 	logConfiguration *LogConfiguration
 }
 
-// The new logger configuration.
 func (r ApiSetLogConfigurationRequest) LogConfiguration(logConfiguration LogConfiguration) ApiSetLogConfigurationRequest {
 	r.logConfiguration = &logConfiguration
 	return r
 }
 
-func (r ApiSetLogConfigurationRequest) Execute() (*NamedLogConfiguration, *http.Response, error) {
+func (r ApiSetLogConfigurationRequest) Execute() (NamedLogConfiguration, *_nethttp.Response, error) {
 	return r.ApiService.SetLogConfigurationExecute(r)
 }
 
 /*
-SetLogConfiguration Set a logger's configuration
-
-Configures the logger referenced by the provided logger name with the given configuration.
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param logger The name of a single logger.
- @return ApiSetLogConfigurationRequest
-*/
-func (a *AdminApiService) SetLogConfiguration(ctx context.Context, logger string) ApiSetLogConfigurationRequest {
+ * SetLogConfiguration Set a logger's configuration
+ * Configures the logger referenced by the provided logger name with the given configuration.
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param logger The name of a single logger.
+ * @return ApiSetLogConfigurationRequest
+ */
+func (a *AdminApiService) SetLogConfiguration(ctx _context.Context, logger string) ApiSetLogConfigurationRequest {
 	return ApiSetLogConfigurationRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -1758,27 +1778,31 @@ func (a *AdminApiService) SetLogConfiguration(ctx context.Context, logger string
 	}
 }
 
-// Execute executes the request
-//  @return NamedLogConfiguration
-func (a *AdminApiService) SetLogConfigurationExecute(r ApiSetLogConfigurationRequest) (*NamedLogConfiguration, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return NamedLogConfiguration
+ */
+func (a *AdminApiService) SetLogConfigurationExecute(r ApiSetLogConfigurationRequest) (NamedLogConfiguration, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPut
+		localVarHTTPMethod   = _nethttp.MethodPut
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *NamedLogConfiguration
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  NamedLogConfiguration
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "AdminApiService.SetLogConfiguration")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/admin/loggers/{logger}"
-	localVarPath = strings.Replace(localVarPath, "{"+"logger"+"}", url.PathEscape(parameterToString(r.logger, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"logger"+"}", _neturl.PathEscape(parameterToString(r.logger, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.logConfiguration == nil {
 		return localVarReturnValue, nil, reportError("logConfiguration is required and must be specified")
 	}
@@ -1802,7 +1826,7 @@ func (a *AdminApiService) SetLogConfigurationExecute(r ApiSetLogConfigurationReq
 	}
 	// body params
 	localVarPostBody = r.logConfiguration
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -1812,15 +1836,15 @@ func (a *AdminApiService) SetLogConfigurationExecute(r ApiSetLogConfigurationReq
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -1831,15 +1855,14 @@ func (a *AdminApiService) SetLogConfigurationExecute(r ApiSetLogConfigurationReq
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -1850,7 +1873,7 @@ func (a *AdminApiService) SetLogConfigurationExecute(r ApiSetLogConfigurationReq
 }
 
 type ApiUpdateConfigPropertyRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService AdminApi
 	propertyName string
 	updateConfigurationProperty *UpdateConfigurationProperty
@@ -1861,26 +1884,24 @@ func (r ApiUpdateConfigPropertyRequest) UpdateConfigurationProperty(updateConfig
 	return r
 }
 
-func (r ApiUpdateConfigPropertyRequest) Execute() (*http.Response, error) {
+func (r ApiUpdateConfigPropertyRequest) Execute() (*_nethttp.Response, error) {
 	return r.ApiService.UpdateConfigPropertyExecute(r)
 }
 
 /*
-UpdateConfigProperty Update a configuration property
-
-Updates the value of a single configuration property.
+ * UpdateConfigProperty Update a configuration property
+ * Updates the value of a single configuration property.
 
 This operation may fail for one of the following reasons:
 
 * Property not found or not configured (HTTP error `404`)
 * A server error occurred (HTTP error `500`)
 
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param propertyName The name of a configuration property.
- @return ApiUpdateConfigPropertyRequest
-*/
-func (a *AdminApiService) UpdateConfigProperty(ctx context.Context, propertyName string) ApiUpdateConfigPropertyRequest {
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param propertyName The name of a configuration property.
+ * @return ApiUpdateConfigPropertyRequest
+ */
+func (a *AdminApiService) UpdateConfigProperty(ctx _context.Context, propertyName string) ApiUpdateConfigPropertyRequest {
 	return ApiUpdateConfigPropertyRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -1888,25 +1909,29 @@ func (a *AdminApiService) UpdateConfigProperty(ctx context.Context, propertyName
 	}
 }
 
-// Execute executes the request
-func (a *AdminApiService) UpdateConfigPropertyExecute(r ApiUpdateConfigPropertyRequest) (*http.Response, error) {
+/*
+ * Execute executes the request
+ */
+func (a *AdminApiService) UpdateConfigPropertyExecute(r ApiUpdateConfigPropertyRequest) (*_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPut
+		localVarHTTPMethod   = _nethttp.MethodPut
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "AdminApiService.UpdateConfigProperty")
 	if err != nil {
-		return nil, &GenericOpenAPIError{error: err.Error()}
+		return nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/admin/config/properties/{propertyName}"
-	localVarPath = strings.Replace(localVarPath, "{"+"propertyName"+"}", url.PathEscape(parameterToString(r.propertyName, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"propertyName"+"}", _neturl.PathEscape(parameterToString(r.propertyName, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.updateConfigurationProperty == nil {
 		return nil, reportError("updateConfigurationProperty is required and must be specified")
 	}
@@ -1930,7 +1955,7 @@ func (a *AdminApiService) UpdateConfigPropertyExecute(r ApiUpdateConfigPropertyR
 	}
 	// body params
 	localVarPostBody = r.updateConfigurationProperty
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return nil, err
 	}
@@ -1940,15 +1965,15 @@ func (a *AdminApiService) UpdateConfigPropertyExecute(r ApiUpdateConfigPropertyR
 		return localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -1959,8 +1984,7 @@ func (a *AdminApiService) UpdateConfigPropertyExecute(r ApiUpdateConfigPropertyR
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -1970,8 +1994,7 @@ func (a *AdminApiService) UpdateConfigPropertyExecute(r ApiUpdateConfigPropertyR
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarHTTPResponse, newErr
 	}
@@ -1980,7 +2003,7 @@ func (a *AdminApiService) UpdateConfigPropertyExecute(r ApiUpdateConfigPropertyR
 }
 
 type ApiUpdateRoleMappingRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService AdminApi
 	principalId string
 	updateRole *UpdateRole
@@ -1991,26 +2014,24 @@ func (r ApiUpdateRoleMappingRequest) UpdateRole(updateRole UpdateRole) ApiUpdate
 	return r
 }
 
-func (r ApiUpdateRoleMappingRequest) Execute() (*http.Response, error) {
+func (r ApiUpdateRoleMappingRequest) Execute() (*_nethttp.Response, error) {
 	return r.ApiService.UpdateRoleMappingExecute(r)
 }
 
 /*
-UpdateRoleMapping Update a role mapping
-
-Updates a single role mapping for one user/principal.
+ * UpdateRoleMapping Update a role mapping
+ * Updates a single role mapping for one user/principal.
 
 This operation can fail for the following reasons:
 
 * No role mapping for the principalId exists (HTTP error `404`)
 * A server error occurred (HTTP error `500`)
 
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param principalId Unique id of a principal (typically either a user or service account).
- @return ApiUpdateRoleMappingRequest
-*/
-func (a *AdminApiService) UpdateRoleMapping(ctx context.Context, principalId string) ApiUpdateRoleMappingRequest {
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param principalId Unique id of a principal (typically either a user or service account).
+ * @return ApiUpdateRoleMappingRequest
+ */
+func (a *AdminApiService) UpdateRoleMapping(ctx _context.Context, principalId string) ApiUpdateRoleMappingRequest {
 	return ApiUpdateRoleMappingRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -2018,25 +2039,29 @@ func (a *AdminApiService) UpdateRoleMapping(ctx context.Context, principalId str
 	}
 }
 
-// Execute executes the request
-func (a *AdminApiService) UpdateRoleMappingExecute(r ApiUpdateRoleMappingRequest) (*http.Response, error) {
+/*
+ * Execute executes the request
+ */
+func (a *AdminApiService) UpdateRoleMappingExecute(r ApiUpdateRoleMappingRequest) (*_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPut
+		localVarHTTPMethod   = _nethttp.MethodPut
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "AdminApiService.UpdateRoleMapping")
 	if err != nil {
-		return nil, &GenericOpenAPIError{error: err.Error()}
+		return nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/admin/roleMappings/{principalId}"
-	localVarPath = strings.Replace(localVarPath, "{"+"principalId"+"}", url.PathEscape(parameterToString(r.principalId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"principalId"+"}", _neturl.PathEscape(parameterToString(r.principalId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.updateRole == nil {
 		return nil, reportError("updateRole is required and must be specified")
 	}
@@ -2060,7 +2085,7 @@ func (a *AdminApiService) UpdateRoleMappingExecute(r ApiUpdateRoleMappingRequest
 	}
 	// body params
 	localVarPostBody = r.updateRole
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return nil, err
 	}
@@ -2070,15 +2095,15 @@ func (a *AdminApiService) UpdateRoleMappingExecute(r ApiUpdateRoleMappingRequest
 		return localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -2089,8 +2114,7 @@ func (a *AdminApiService) UpdateRoleMappingExecute(r ApiUpdateRoleMappingRequest
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -2100,8 +2124,7 @@ func (a *AdminApiService) UpdateRoleMappingExecute(r ApiUpdateRoleMappingRequest
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarHTTPResponse, newErr
 	}
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/api_artifact_rules.go b/app-services-sdk-go/registryinstance/apiv1internal/client/api_artifact_rules.go
index 8475055c..e5a9effb 100644
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/api_artifact_rules.go
+++ b/app-services-sdk-go/registryinstance/apiv1internal/client/api_artifact_rules.go
@@ -1,11 +1,11 @@
 /*
-Service Registry API
-
-Service Registry Instance API  NOTE: This API cannot be called directly from the portal.
-
-API version: 2.2.5.Final
-Contact: apicurio@lists.jboss.org
-*/
+ * Apicurio Registry API [v2]
+ *
+ * Apicurio Registry is a datastore for standard event schemas and API designs. Apicurio Registry enables developers to manage and share the structure of their data using a REST interface. For example, client applications can dynamically push or pull the latest updates to or from the registry without needing to redeploy. Apicurio Registry also enables developers to create rules that govern how registry content can evolve over time. For example, this includes rules for content validation and version compatibility.  The Apicurio Registry REST API enables client applications to manage the artifacts in the registry. This API provides create, read, update, and delete operations for schema and API artifacts, rules, versions, and metadata.   The supported artifact types include: - Apache Avro schema - AsyncAPI specification - Google protocol buffers - GraphQL schema - JSON Schema - Kafka Connect schema - OpenAPI specification - Web Services Description Language - XML Schema Definition   **Important**: The Apicurio Registry REST API is available from `https://MY-REGISTRY-URL/apis/registry/v2` by default. Therefore you must prefix all API operation paths with `../apis/registry/v2` in this case. For example: `../apis/registry/v2/ids/globalIds/{globalId}`. 
+ *
+ * API version: 2.2.5.Final
+ * Contact: apicurio@lists.jboss.org
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -13,20 +13,23 @@ package registryinstanceclient
 
 import (
 	"bytes"
-	"context"
-	"io/ioutil"
-	"net/http"
-	"net/url"
+	_context "context"
+	_ioutil "io/ioutil"
+	_nethttp "net/http"
+	_neturl "net/url"
 	"strings"
 )
 
+// Linger please
+var (
+	_ _context.Context
+)
 
 type ArtifactRulesApi interface {
 
 	/*
-	CreateArtifactRule Create artifact rule
-
-	Adds a rule to the list of rules that get applied to the artifact when adding new
+	 * CreateArtifactRule Create artifact rule
+	 * Adds a rule to the list of rules that get applied to the artifact when adding new
 versions.  All configured rules must pass to successfully add a new artifact version.
 
 This operation can fail for the following reasons:
@@ -34,21 +37,21 @@ This operation can fail for the following reasons:
 * No artifact with this `artifactId` exists (HTTP error `404`)
 * Rule (named in the request body) is unknown (HTTP error `400`)
 * A server error occurred (HTTP error `500`)
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
-	@param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
-	@return ApiCreateArtifactRuleRequest
-	*/
-	CreateArtifactRule(ctx context.Context, groupId string, artifactId string) ApiCreateArtifactRuleRequest
-
-	// CreateArtifactRuleExecute executes the request
-	CreateArtifactRuleExecute(r ApiCreateArtifactRuleRequest) (*http.Response, error)
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
+	 * @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
+	 * @return ApiCreateArtifactRuleRequest
+	 */
+	CreateArtifactRule(ctx _context.Context, groupId string, artifactId string) ApiCreateArtifactRuleRequest
 
 	/*
-	DeleteArtifactRule Delete artifact rule
+	 * CreateArtifactRuleExecute executes the request
+	 */
+	CreateArtifactRuleExecute(r ApiCreateArtifactRuleRequest) (*_nethttp.Response, error)
 
-	Deletes a rule from the artifact.  This results in the rule no longer applying for
+	/*
+	 * DeleteArtifactRule Delete artifact rule
+	 * Deletes a rule from the artifact.  This results in the rule no longer applying for
 this artifact.  If this is the only rule configured for the artifact, this is the 
 same as deleting **all** rules, and the globally configured rules now apply to
 this artifact.
@@ -59,43 +62,43 @@ This operation can fail for the following reasons:
 * No rule with this name/type is configured for this artifact (HTTP error `404`)
 * Invalid rule type (HTTP error `400`)
 * A server error occurred (HTTP error `500`)
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
-	@param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
-	@param rule The unique name/type of a rule.
-	@return ApiDeleteArtifactRuleRequest
-	*/
-	DeleteArtifactRule(ctx context.Context, groupId string, artifactId string, rule string) ApiDeleteArtifactRuleRequest
-
-	// DeleteArtifactRuleExecute executes the request
-	DeleteArtifactRuleExecute(r ApiDeleteArtifactRuleRequest) (*http.Response, error)
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
+	 * @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
+	 * @param rule The unique name/type of a rule.
+	 * @return ApiDeleteArtifactRuleRequest
+	 */
+	DeleteArtifactRule(ctx _context.Context, groupId string, artifactId string, rule string) ApiDeleteArtifactRuleRequest
 
 	/*
-	DeleteArtifactRules Delete artifact rules
+	 * DeleteArtifactRuleExecute executes the request
+	 */
+	DeleteArtifactRuleExecute(r ApiDeleteArtifactRuleRequest) (*_nethttp.Response, error)
 
-	Deletes all of the rules configured for the artifact.  After this is done, the global
+	/*
+	 * DeleteArtifactRules Delete artifact rules
+	 * Deletes all of the rules configured for the artifact.  After this is done, the global
 rules apply to the artifact again.
 
 This operation can fail for the following reasons:
 
 * No artifact with this `artifactId` exists (HTTP error `404`)
 * A server error occurred (HTTP error `500`)
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
-	@param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
-	@return ApiDeleteArtifactRulesRequest
-	*/
-	DeleteArtifactRules(ctx context.Context, groupId string, artifactId string) ApiDeleteArtifactRulesRequest
-
-	// DeleteArtifactRulesExecute executes the request
-	DeleteArtifactRulesExecute(r ApiDeleteArtifactRulesRequest) (*http.Response, error)
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
+	 * @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
+	 * @return ApiDeleteArtifactRulesRequest
+	 */
+	DeleteArtifactRules(ctx _context.Context, groupId string, artifactId string) ApiDeleteArtifactRulesRequest
 
 	/*
-	GetArtifactRuleConfig Get artifact rule configuration
+	 * DeleteArtifactRulesExecute executes the request
+	 */
+	DeleteArtifactRulesExecute(r ApiDeleteArtifactRulesRequest) (*_nethttp.Response, error)
 
-	Returns information about a single rule configured for an artifact.  This is useful
+	/*
+	 * GetArtifactRuleConfig Get artifact rule configuration
+	 * Returns information about a single rule configured for an artifact.  This is useful
 when you want to know what the current configuration settings are for a specific rule.
 
 This operation can fail for the following reasons:
@@ -104,23 +107,23 @@ This operation can fail for the following reasons:
 * No rule with this name/type is configured for this artifact (HTTP error `404`)
 * Invalid rule type (HTTP error `400`)
 * A server error occurred (HTTP error `500`)
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
-	@param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
-	@param rule The unique name/type of a rule.
-	@return ApiGetArtifactRuleConfigRequest
-	*/
-	GetArtifactRuleConfig(ctx context.Context, groupId string, artifactId string, rule string) ApiGetArtifactRuleConfigRequest
-
-	// GetArtifactRuleConfigExecute executes the request
-	//  @return Rule
-	GetArtifactRuleConfigExecute(r ApiGetArtifactRuleConfigRequest) (*Rule, *http.Response, error)
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
+	 * @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
+	 * @param rule The unique name/type of a rule.
+	 * @return ApiGetArtifactRuleConfigRequest
+	 */
+	GetArtifactRuleConfig(ctx _context.Context, groupId string, artifactId string, rule string) ApiGetArtifactRuleConfigRequest
 
 	/*
-	ListArtifactRules List artifact rules
+	 * GetArtifactRuleConfigExecute executes the request
+	 * @return Rule
+	 */
+	GetArtifactRuleConfigExecute(r ApiGetArtifactRuleConfigRequest) (Rule, *_nethttp.Response, error)
 
-	Returns a list of all rules configured for the artifact.  The set of rules determines
+	/*
+	 * ListArtifactRules List artifact rules
+	 * Returns a list of all rules configured for the artifact.  The set of rules determines
 how the content of an artifact can evolve over time.  If no rules are configured for
 an artifact, the set of globally configured rules are used.  If no global rules 
 are defined, there are no restrictions on content evolution.
@@ -129,22 +132,22 @@ This operation can fail for the following reasons:
 
 * No artifact with this `artifactId` exists (HTTP error `404`)
 * A server error occurred (HTTP error `500`)
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
-	@param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
-	@return ApiListArtifactRulesRequest
-	*/
-	ListArtifactRules(ctx context.Context, groupId string, artifactId string) ApiListArtifactRulesRequest
-
-	// ListArtifactRulesExecute executes the request
-	//  @return []RuleType
-	ListArtifactRulesExecute(r ApiListArtifactRulesRequest) ([]RuleType, *http.Response, error)
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
+	 * @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
+	 * @return ApiListArtifactRulesRequest
+	 */
+	ListArtifactRules(ctx _context.Context, groupId string, artifactId string) ApiListArtifactRulesRequest
 
 	/*
-	TestUpdateArtifact Test update artifact
+	 * ListArtifactRulesExecute executes the request
+	 * @return []RuleType
+	 */
+	ListArtifactRulesExecute(r ApiListArtifactRulesRequest) ([]RuleType, *_nethttp.Response, error)
 
-	Tests whether an update to the artifact's content *would* succeed for the provided content.
+	/*
+	 * TestUpdateArtifact Test update artifact
+	 * Tests whether an update to the artifact's content *would* succeed for the provided content.
 Ultimately, this applies any rules configured for the artifact against the given content
 to determine whether the rules would pass or fail, but without actually updating the artifact
 content.
@@ -164,21 +167,21 @@ The update could fail for a number of reasons including:
 When successful, this operation simply returns a *No Content* response.  This response
 indicates that the content is valid against the configured content rules for the 
 artifact (or the global rules if no artifact rules are enabled).
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
-	@param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
-	@return ApiTestUpdateArtifactRequest
-	*/
-	TestUpdateArtifact(ctx context.Context, groupId string, artifactId string) ApiTestUpdateArtifactRequest
-
-	// TestUpdateArtifactExecute executes the request
-	TestUpdateArtifactExecute(r ApiTestUpdateArtifactRequest) (*http.Response, error)
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
+	 * @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
+	 * @return ApiTestUpdateArtifactRequest
+	 */
+	TestUpdateArtifact(ctx _context.Context, groupId string, artifactId string) ApiTestUpdateArtifactRequest
 
 	/*
-	UpdateArtifactRuleConfig Update artifact rule configuration
+	 * TestUpdateArtifactExecute executes the request
+	 */
+	TestUpdateArtifactExecute(r ApiTestUpdateArtifactRequest) (*_nethttp.Response, error)
 
-	Updates the configuration of a single rule for the artifact.  The configuration data
+	/*
+	 * UpdateArtifactRuleConfig Update artifact rule configuration
+	 * Updates the configuration of a single rule for the artifact.  The configuration data
 is specific to each rule type, so the configuration of the `COMPATIBILITY` rule 
 is in a different format from the configuration of the `VALIDITY` rule.
 
@@ -189,25 +192,26 @@ This operation can fail for the following reasons:
 * Invalid rule type (HTTP error `400`)
 * A server error occurred (HTTP error `500`)
 
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
+	 * @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
+	 * @param rule The unique name/type of a rule.
+	 * @return ApiUpdateArtifactRuleConfigRequest
+	 */
+	UpdateArtifactRuleConfig(ctx _context.Context, groupId string, artifactId string, rule string) ApiUpdateArtifactRuleConfigRequest
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
-	@param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
-	@param rule The unique name/type of a rule.
-	@return ApiUpdateArtifactRuleConfigRequest
-	*/
-	UpdateArtifactRuleConfig(ctx context.Context, groupId string, artifactId string, rule string) ApiUpdateArtifactRuleConfigRequest
-
-	// UpdateArtifactRuleConfigExecute executes the request
-	//  @return Rule
-	UpdateArtifactRuleConfigExecute(r ApiUpdateArtifactRuleConfigRequest) (*Rule, *http.Response, error)
+	/*
+	 * UpdateArtifactRuleConfigExecute executes the request
+	 * @return Rule
+	 */
+	UpdateArtifactRuleConfigExecute(r ApiUpdateArtifactRuleConfigRequest) (Rule, *_nethttp.Response, error)
 }
 
 // ArtifactRulesApiService ArtifactRulesApi service
 type ArtifactRulesApiService service
 
 type ApiCreateArtifactRuleRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService ArtifactRulesApi
 	groupId string
 	artifactId string
@@ -219,14 +223,13 @@ func (r ApiCreateArtifactRuleRequest) Rule(rule Rule) ApiCreateArtifactRuleReque
 	return r
 }
 
-func (r ApiCreateArtifactRuleRequest) Execute() (*http.Response, error) {
+func (r ApiCreateArtifactRuleRequest) Execute() (*_nethttp.Response, error) {
 	return r.ApiService.CreateArtifactRuleExecute(r)
 }
 
 /*
-CreateArtifactRule Create artifact rule
-
-Adds a rule to the list of rules that get applied to the artifact when adding new
+ * CreateArtifactRule Create artifact rule
+ * Adds a rule to the list of rules that get applied to the artifact when adding new
 versions.  All configured rules must pass to successfully add a new artifact version.
 
 This operation can fail for the following reasons:
@@ -234,13 +237,12 @@ This operation can fail for the following reasons:
 * No artifact with this `artifactId` exists (HTTP error `404`)
 * Rule (named in the request body) is unknown (HTTP error `400`)
 * A server error occurred (HTTP error `500`)
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
- @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
- @return ApiCreateArtifactRuleRequest
-*/
-func (a *ArtifactRulesApiService) CreateArtifactRule(ctx context.Context, groupId string, artifactId string) ApiCreateArtifactRuleRequest {
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
+ * @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
+ * @return ApiCreateArtifactRuleRequest
+ */
+func (a *ArtifactRulesApiService) CreateArtifactRule(ctx _context.Context, groupId string, artifactId string) ApiCreateArtifactRuleRequest {
 	return ApiCreateArtifactRuleRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -249,26 +251,30 @@ func (a *ArtifactRulesApiService) CreateArtifactRule(ctx context.Context, groupI
 	}
 }
 
-// Execute executes the request
-func (a *ArtifactRulesApiService) CreateArtifactRuleExecute(r ApiCreateArtifactRuleRequest) (*http.Response, error) {
+/*
+ * Execute executes the request
+ */
+func (a *ArtifactRulesApiService) CreateArtifactRuleExecute(r ApiCreateArtifactRuleRequest) (*_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "ArtifactRulesApiService.CreateArtifactRule")
 	if err != nil {
-		return nil, &GenericOpenAPIError{error: err.Error()}
+		return nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/groups/{groupId}/artifacts/{artifactId}/rules"
-	localVarPath = strings.Replace(localVarPath, "{"+"groupId"+"}", url.PathEscape(parameterToString(r.groupId, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"artifactId"+"}", url.PathEscape(parameterToString(r.artifactId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"groupId"+"}", _neturl.PathEscape(parameterToString(r.groupId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"artifactId"+"}", _neturl.PathEscape(parameterToString(r.artifactId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.rule == nil {
 		return nil, reportError("rule is required and must be specified")
 	}
@@ -292,7 +298,7 @@ func (a *ArtifactRulesApiService) CreateArtifactRuleExecute(r ApiCreateArtifactR
 	}
 	// body params
 	localVarPostBody = r.rule
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return nil, err
 	}
@@ -302,15 +308,15 @@ func (a *ArtifactRulesApiService) CreateArtifactRuleExecute(r ApiCreateArtifactR
 		return localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -321,8 +327,7 @@ func (a *ArtifactRulesApiService) CreateArtifactRuleExecute(r ApiCreateArtifactR
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -332,8 +337,7 @@ func (a *ArtifactRulesApiService) CreateArtifactRuleExecute(r ApiCreateArtifactR
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -343,8 +347,7 @@ func (a *ArtifactRulesApiService) CreateArtifactRuleExecute(r ApiCreateArtifactR
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarHTTPResponse, newErr
 	}
@@ -353,21 +356,21 @@ func (a *ArtifactRulesApiService) CreateArtifactRuleExecute(r ApiCreateArtifactR
 }
 
 type ApiDeleteArtifactRuleRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService ArtifactRulesApi
 	groupId string
 	artifactId string
 	rule string
 }
 
-func (r ApiDeleteArtifactRuleRequest) Execute() (*http.Response, error) {
+
+func (r ApiDeleteArtifactRuleRequest) Execute() (*_nethttp.Response, error) {
 	return r.ApiService.DeleteArtifactRuleExecute(r)
 }
 
 /*
-DeleteArtifactRule Delete artifact rule
-
-Deletes a rule from the artifact.  This results in the rule no longer applying for
+ * DeleteArtifactRule Delete artifact rule
+ * Deletes a rule from the artifact.  This results in the rule no longer applying for
 this artifact.  If this is the only rule configured for the artifact, this is the 
 same as deleting **all** rules, and the globally configured rules now apply to
 this artifact.
@@ -378,14 +381,13 @@ This operation can fail for the following reasons:
 * No rule with this name/type is configured for this artifact (HTTP error `404`)
 * Invalid rule type (HTTP error `400`)
 * A server error occurred (HTTP error `500`)
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
- @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
- @param rule The unique name/type of a rule.
- @return ApiDeleteArtifactRuleRequest
-*/
-func (a *ArtifactRulesApiService) DeleteArtifactRule(ctx context.Context, groupId string, artifactId string, rule string) ApiDeleteArtifactRuleRequest {
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
+ * @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
+ * @param rule The unique name/type of a rule.
+ * @return ApiDeleteArtifactRuleRequest
+ */
+func (a *ArtifactRulesApiService) DeleteArtifactRule(ctx _context.Context, groupId string, artifactId string, rule string) ApiDeleteArtifactRuleRequest {
 	return ApiDeleteArtifactRuleRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -395,27 +397,31 @@ func (a *ArtifactRulesApiService) DeleteArtifactRule(ctx context.Context, groupI
 	}
 }
 
-// Execute executes the request
-func (a *ArtifactRulesApiService) DeleteArtifactRuleExecute(r ApiDeleteArtifactRuleRequest) (*http.Response, error) {
+/*
+ * Execute executes the request
+ */
+func (a *ArtifactRulesApiService) DeleteArtifactRuleExecute(r ApiDeleteArtifactRuleRequest) (*_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodDelete
+		localVarHTTPMethod   = _nethttp.MethodDelete
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "ArtifactRulesApiService.DeleteArtifactRule")
 	if err != nil {
-		return nil, &GenericOpenAPIError{error: err.Error()}
+		return nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/groups/{groupId}/artifacts/{artifactId}/rules/{rule}"
-	localVarPath = strings.Replace(localVarPath, "{"+"groupId"+"}", url.PathEscape(parameterToString(r.groupId, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"artifactId"+"}", url.PathEscape(parameterToString(r.artifactId, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"rule"+"}", url.PathEscape(parameterToString(r.rule, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"groupId"+"}", _neturl.PathEscape(parameterToString(r.groupId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"artifactId"+"}", _neturl.PathEscape(parameterToString(r.artifactId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"rule"+"}", _neturl.PathEscape(parameterToString(r.rule, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -434,7 +440,7 @@ func (a *ArtifactRulesApiService) DeleteArtifactRuleExecute(r ApiDeleteArtifactR
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return nil, err
 	}
@@ -444,15 +450,15 @@ func (a *ArtifactRulesApiService) DeleteArtifactRuleExecute(r ApiDeleteArtifactR
 		return localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -463,8 +469,7 @@ func (a *ArtifactRulesApiService) DeleteArtifactRuleExecute(r ApiDeleteArtifactR
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -474,8 +479,7 @@ func (a *ArtifactRulesApiService) DeleteArtifactRuleExecute(r ApiDeleteArtifactR
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarHTTPResponse, newErr
 	}
@@ -484,33 +488,32 @@ func (a *ArtifactRulesApiService) DeleteArtifactRuleExecute(r ApiDeleteArtifactR
 }
 
 type ApiDeleteArtifactRulesRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService ArtifactRulesApi
 	groupId string
 	artifactId string
 }
 
-func (r ApiDeleteArtifactRulesRequest) Execute() (*http.Response, error) {
+
+func (r ApiDeleteArtifactRulesRequest) Execute() (*_nethttp.Response, error) {
 	return r.ApiService.DeleteArtifactRulesExecute(r)
 }
 
 /*
-DeleteArtifactRules Delete artifact rules
-
-Deletes all of the rules configured for the artifact.  After this is done, the global
+ * DeleteArtifactRules Delete artifact rules
+ * Deletes all of the rules configured for the artifact.  After this is done, the global
 rules apply to the artifact again.
 
 This operation can fail for the following reasons:
 
 * No artifact with this `artifactId` exists (HTTP error `404`)
 * A server error occurred (HTTP error `500`)
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
- @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
- @return ApiDeleteArtifactRulesRequest
-*/
-func (a *ArtifactRulesApiService) DeleteArtifactRules(ctx context.Context, groupId string, artifactId string) ApiDeleteArtifactRulesRequest {
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
+ * @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
+ * @return ApiDeleteArtifactRulesRequest
+ */
+func (a *ArtifactRulesApiService) DeleteArtifactRules(ctx _context.Context, groupId string, artifactId string) ApiDeleteArtifactRulesRequest {
 	return ApiDeleteArtifactRulesRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -519,26 +522,30 @@ func (a *ArtifactRulesApiService) DeleteArtifactRules(ctx context.Context, group
 	}
 }
 
-// Execute executes the request
-func (a *ArtifactRulesApiService) DeleteArtifactRulesExecute(r ApiDeleteArtifactRulesRequest) (*http.Response, error) {
+/*
+ * Execute executes the request
+ */
+func (a *ArtifactRulesApiService) DeleteArtifactRulesExecute(r ApiDeleteArtifactRulesRequest) (*_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodDelete
+		localVarHTTPMethod   = _nethttp.MethodDelete
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "ArtifactRulesApiService.DeleteArtifactRules")
 	if err != nil {
-		return nil, &GenericOpenAPIError{error: err.Error()}
+		return nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/groups/{groupId}/artifacts/{artifactId}/rules"
-	localVarPath = strings.Replace(localVarPath, "{"+"groupId"+"}", url.PathEscape(parameterToString(r.groupId, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"artifactId"+"}", url.PathEscape(parameterToString(r.artifactId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"groupId"+"}", _neturl.PathEscape(parameterToString(r.groupId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"artifactId"+"}", _neturl.PathEscape(parameterToString(r.artifactId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -557,7 +564,7 @@ func (a *ArtifactRulesApiService) DeleteArtifactRulesExecute(r ApiDeleteArtifact
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return nil, err
 	}
@@ -567,15 +574,15 @@ func (a *ArtifactRulesApiService) DeleteArtifactRulesExecute(r ApiDeleteArtifact
 		return localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -586,8 +593,7 @@ func (a *ArtifactRulesApiService) DeleteArtifactRulesExecute(r ApiDeleteArtifact
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -597,8 +603,7 @@ func (a *ArtifactRulesApiService) DeleteArtifactRulesExecute(r ApiDeleteArtifact
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarHTTPResponse, newErr
 	}
@@ -607,21 +612,21 @@ func (a *ArtifactRulesApiService) DeleteArtifactRulesExecute(r ApiDeleteArtifact
 }
 
 type ApiGetArtifactRuleConfigRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService ArtifactRulesApi
 	groupId string
 	artifactId string
 	rule string
 }
 
-func (r ApiGetArtifactRuleConfigRequest) Execute() (*Rule, *http.Response, error) {
+
+func (r ApiGetArtifactRuleConfigRequest) Execute() (Rule, *_nethttp.Response, error) {
 	return r.ApiService.GetArtifactRuleConfigExecute(r)
 }
 
 /*
-GetArtifactRuleConfig Get artifact rule configuration
-
-Returns information about a single rule configured for an artifact.  This is useful
+ * GetArtifactRuleConfig Get artifact rule configuration
+ * Returns information about a single rule configured for an artifact.  This is useful
 when you want to know what the current configuration settings are for a specific rule.
 
 This operation can fail for the following reasons:
@@ -630,14 +635,13 @@ This operation can fail for the following reasons:
 * No rule with this name/type is configured for this artifact (HTTP error `404`)
 * Invalid rule type (HTTP error `400`)
 * A server error occurred (HTTP error `500`)
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
- @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
- @param rule The unique name/type of a rule.
- @return ApiGetArtifactRuleConfigRequest
-*/
-func (a *ArtifactRulesApiService) GetArtifactRuleConfig(ctx context.Context, groupId string, artifactId string, rule string) ApiGetArtifactRuleConfigRequest {
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
+ * @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
+ * @param rule The unique name/type of a rule.
+ * @return ApiGetArtifactRuleConfigRequest
+ */
+func (a *ArtifactRulesApiService) GetArtifactRuleConfig(ctx _context.Context, groupId string, artifactId string, rule string) ApiGetArtifactRuleConfigRequest {
 	return ApiGetArtifactRuleConfigRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -647,29 +651,33 @@ func (a *ArtifactRulesApiService) GetArtifactRuleConfig(ctx context.Context, gro
 	}
 }
 
-// Execute executes the request
-//  @return Rule
-func (a *ArtifactRulesApiService) GetArtifactRuleConfigExecute(r ApiGetArtifactRuleConfigRequest) (*Rule, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return Rule
+ */
+func (a *ArtifactRulesApiService) GetArtifactRuleConfigExecute(r ApiGetArtifactRuleConfigRequest) (Rule, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *Rule
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  Rule
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "ArtifactRulesApiService.GetArtifactRuleConfig")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/groups/{groupId}/artifacts/{artifactId}/rules/{rule}"
-	localVarPath = strings.Replace(localVarPath, "{"+"groupId"+"}", url.PathEscape(parameterToString(r.groupId, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"artifactId"+"}", url.PathEscape(parameterToString(r.artifactId, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"rule"+"}", url.PathEscape(parameterToString(r.rule, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"groupId"+"}", _neturl.PathEscape(parameterToString(r.groupId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"artifactId"+"}", _neturl.PathEscape(parameterToString(r.artifactId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"rule"+"}", _neturl.PathEscape(parameterToString(r.rule, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -688,7 +696,7 @@ func (a *ArtifactRulesApiService) GetArtifactRuleConfigExecute(r ApiGetArtifactR
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -698,15 +706,15 @@ func (a *ArtifactRulesApiService) GetArtifactRuleConfigExecute(r ApiGetArtifactR
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -717,8 +725,7 @@ func (a *ArtifactRulesApiService) GetArtifactRuleConfigExecute(r ApiGetArtifactR
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -728,15 +735,14 @@ func (a *ArtifactRulesApiService) GetArtifactRuleConfigExecute(r ApiGetArtifactR
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -747,20 +753,20 @@ func (a *ArtifactRulesApiService) GetArtifactRuleConfigExecute(r ApiGetArtifactR
 }
 
 type ApiListArtifactRulesRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService ArtifactRulesApi
 	groupId string
 	artifactId string
 }
 
-func (r ApiListArtifactRulesRequest) Execute() ([]RuleType, *http.Response, error) {
+
+func (r ApiListArtifactRulesRequest) Execute() ([]RuleType, *_nethttp.Response, error) {
 	return r.ApiService.ListArtifactRulesExecute(r)
 }
 
 /*
-ListArtifactRules List artifact rules
-
-Returns a list of all rules configured for the artifact.  The set of rules determines
+ * ListArtifactRules List artifact rules
+ * Returns a list of all rules configured for the artifact.  The set of rules determines
 how the content of an artifact can evolve over time.  If no rules are configured for
 an artifact, the set of globally configured rules are used.  If no global rules 
 are defined, there are no restrictions on content evolution.
@@ -769,13 +775,12 @@ This operation can fail for the following reasons:
 
 * No artifact with this `artifactId` exists (HTTP error `404`)
 * A server error occurred (HTTP error `500`)
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
- @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
- @return ApiListArtifactRulesRequest
-*/
-func (a *ArtifactRulesApiService) ListArtifactRules(ctx context.Context, groupId string, artifactId string) ApiListArtifactRulesRequest {
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
+ * @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
+ * @return ApiListArtifactRulesRequest
+ */
+func (a *ArtifactRulesApiService) ListArtifactRules(ctx _context.Context, groupId string, artifactId string) ApiListArtifactRulesRequest {
 	return ApiListArtifactRulesRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -784,28 +789,32 @@ func (a *ArtifactRulesApiService) ListArtifactRules(ctx context.Context, groupId
 	}
 }
 
-// Execute executes the request
-//  @return []RuleType
-func (a *ArtifactRulesApiService) ListArtifactRulesExecute(r ApiListArtifactRulesRequest) ([]RuleType, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return []RuleType
+ */
+func (a *ArtifactRulesApiService) ListArtifactRulesExecute(r ApiListArtifactRulesRequest) ([]RuleType, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 		localVarReturnValue  []RuleType
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "ArtifactRulesApiService.ListArtifactRules")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/groups/{groupId}/artifacts/{artifactId}/rules"
-	localVarPath = strings.Replace(localVarPath, "{"+"groupId"+"}", url.PathEscape(parameterToString(r.groupId, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"artifactId"+"}", url.PathEscape(parameterToString(r.artifactId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"groupId"+"}", _neturl.PathEscape(parameterToString(r.groupId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"artifactId"+"}", _neturl.PathEscape(parameterToString(r.artifactId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -824,7 +833,7 @@ func (a *ArtifactRulesApiService) ListArtifactRulesExecute(r ApiListArtifactRule
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -834,15 +843,15 @@ func (a *ArtifactRulesApiService) ListArtifactRulesExecute(r ApiListArtifactRule
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -853,8 +862,7 @@ func (a *ArtifactRulesApiService) ListArtifactRulesExecute(r ApiListArtifactRule
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -864,15 +872,14 @@ func (a *ArtifactRulesApiService) ListArtifactRulesExecute(r ApiListArtifactRule
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -883,27 +890,25 @@ func (a *ArtifactRulesApiService) ListArtifactRulesExecute(r ApiListArtifactRule
 }
 
 type ApiTestUpdateArtifactRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService ArtifactRulesApi
 	groupId string
 	artifactId string
 	body *interface{}
 }
 
-// The content of the artifact being tested. This is often, but not always, JSON data representing one of the supported artifact types:  * Avro (&#x60;AVRO&#x60;) * Protobuf (&#x60;PROTOBUF&#x60;) * JSON Schema (&#x60;JSON&#x60;) * Kafka Connect (&#x60;KCONNECT&#x60;) * OpenAPI (&#x60;OPENAPI&#x60;) * AsyncAPI (&#x60;ASYNCAPI&#x60;) * GraphQL (&#x60;GRAPHQL&#x60;) * Web Services Description Language (&#x60;WSDL&#x60;) * XML Schema (&#x60;XSD&#x60;) 
 func (r ApiTestUpdateArtifactRequest) Body(body interface{}) ApiTestUpdateArtifactRequest {
 	r.body = &body
 	return r
 }
 
-func (r ApiTestUpdateArtifactRequest) Execute() (*http.Response, error) {
+func (r ApiTestUpdateArtifactRequest) Execute() (*_nethttp.Response, error) {
 	return r.ApiService.TestUpdateArtifactExecute(r)
 }
 
 /*
-TestUpdateArtifact Test update artifact
-
-Tests whether an update to the artifact's content *would* succeed for the provided content.
+ * TestUpdateArtifact Test update artifact
+ * Tests whether an update to the artifact's content *would* succeed for the provided content.
 Ultimately, this applies any rules configured for the artifact against the given content
 to determine whether the rules would pass or fail, but without actually updating the artifact
 content.
@@ -923,13 +928,12 @@ The update could fail for a number of reasons including:
 When successful, this operation simply returns a *No Content* response.  This response
 indicates that the content is valid against the configured content rules for the 
 artifact (or the global rules if no artifact rules are enabled).
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
- @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
- @return ApiTestUpdateArtifactRequest
-*/
-func (a *ArtifactRulesApiService) TestUpdateArtifact(ctx context.Context, groupId string, artifactId string) ApiTestUpdateArtifactRequest {
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
+ * @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
+ * @return ApiTestUpdateArtifactRequest
+ */
+func (a *ArtifactRulesApiService) TestUpdateArtifact(ctx _context.Context, groupId string, artifactId string) ApiTestUpdateArtifactRequest {
 	return ApiTestUpdateArtifactRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -938,26 +942,30 @@ func (a *ArtifactRulesApiService) TestUpdateArtifact(ctx context.Context, groupI
 	}
 }
 
-// Execute executes the request
-func (a *ArtifactRulesApiService) TestUpdateArtifactExecute(r ApiTestUpdateArtifactRequest) (*http.Response, error) {
+/*
+ * Execute executes the request
+ */
+func (a *ArtifactRulesApiService) TestUpdateArtifactExecute(r ApiTestUpdateArtifactRequest) (*_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPut
+		localVarHTTPMethod   = _nethttp.MethodPut
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "ArtifactRulesApiService.TestUpdateArtifact")
 	if err != nil {
-		return nil, &GenericOpenAPIError{error: err.Error()}
+		return nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/groups/{groupId}/artifacts/{artifactId}/test"
-	localVarPath = strings.Replace(localVarPath, "{"+"groupId"+"}", url.PathEscape(parameterToString(r.groupId, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"artifactId"+"}", url.PathEscape(parameterToString(r.artifactId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"groupId"+"}", _neturl.PathEscape(parameterToString(r.groupId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"artifactId"+"}", _neturl.PathEscape(parameterToString(r.artifactId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.body == nil {
 		return nil, reportError("body is required and must be specified")
 	}
@@ -981,7 +989,7 @@ func (a *ArtifactRulesApiService) TestUpdateArtifactExecute(r ApiTestUpdateArtif
 	}
 	// body params
 	localVarPostBody = r.body
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return nil, err
 	}
@@ -991,15 +999,15 @@ func (a *ArtifactRulesApiService) TestUpdateArtifactExecute(r ApiTestUpdateArtif
 		return localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -1010,8 +1018,7 @@ func (a *ArtifactRulesApiService) TestUpdateArtifactExecute(r ApiTestUpdateArtif
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 409 {
@@ -1021,8 +1028,7 @@ func (a *ArtifactRulesApiService) TestUpdateArtifactExecute(r ApiTestUpdateArtif
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -1032,8 +1038,7 @@ func (a *ArtifactRulesApiService) TestUpdateArtifactExecute(r ApiTestUpdateArtif
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarHTTPResponse, newErr
 	}
@@ -1042,7 +1047,7 @@ func (a *ArtifactRulesApiService) TestUpdateArtifactExecute(r ApiTestUpdateArtif
 }
 
 type ApiUpdateArtifactRuleConfigRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService ArtifactRulesApi
 	groupId string
 	artifactId string
@@ -1055,14 +1060,13 @@ func (r ApiUpdateArtifactRuleConfigRequest) Rule2(rule2 Rule) ApiUpdateArtifactR
 	return r
 }
 
-func (r ApiUpdateArtifactRuleConfigRequest) Execute() (*Rule, *http.Response, error) {
+func (r ApiUpdateArtifactRuleConfigRequest) Execute() (Rule, *_nethttp.Response, error) {
 	return r.ApiService.UpdateArtifactRuleConfigExecute(r)
 }
 
 /*
-UpdateArtifactRuleConfig Update artifact rule configuration
-
-Updates the configuration of a single rule for the artifact.  The configuration data
+ * UpdateArtifactRuleConfig Update artifact rule configuration
+ * Updates the configuration of a single rule for the artifact.  The configuration data
 is specific to each rule type, so the configuration of the `COMPATIBILITY` rule 
 is in a different format from the configuration of the `VALIDITY` rule.
 
@@ -1073,14 +1077,13 @@ This operation can fail for the following reasons:
 * Invalid rule type (HTTP error `400`)
 * A server error occurred (HTTP error `500`)
 
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
- @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
- @param rule The unique name/type of a rule.
- @return ApiUpdateArtifactRuleConfigRequest
-*/
-func (a *ArtifactRulesApiService) UpdateArtifactRuleConfig(ctx context.Context, groupId string, artifactId string, rule string) ApiUpdateArtifactRuleConfigRequest {
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
+ * @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
+ * @param rule The unique name/type of a rule.
+ * @return ApiUpdateArtifactRuleConfigRequest
+ */
+func (a *ArtifactRulesApiService) UpdateArtifactRuleConfig(ctx _context.Context, groupId string, artifactId string, rule string) ApiUpdateArtifactRuleConfigRequest {
 	return ApiUpdateArtifactRuleConfigRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -1090,29 +1093,33 @@ func (a *ArtifactRulesApiService) UpdateArtifactRuleConfig(ctx context.Context,
 	}
 }
 
-// Execute executes the request
-//  @return Rule
-func (a *ArtifactRulesApiService) UpdateArtifactRuleConfigExecute(r ApiUpdateArtifactRuleConfigRequest) (*Rule, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return Rule
+ */
+func (a *ArtifactRulesApiService) UpdateArtifactRuleConfigExecute(r ApiUpdateArtifactRuleConfigRequest) (Rule, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPut
+		localVarHTTPMethod   = _nethttp.MethodPut
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *Rule
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  Rule
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "ArtifactRulesApiService.UpdateArtifactRuleConfig")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/groups/{groupId}/artifacts/{artifactId}/rules/{rule}"
-	localVarPath = strings.Replace(localVarPath, "{"+"groupId"+"}", url.PathEscape(parameterToString(r.groupId, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"artifactId"+"}", url.PathEscape(parameterToString(r.artifactId, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"rule"+"}", url.PathEscape(parameterToString(r.rule, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"groupId"+"}", _neturl.PathEscape(parameterToString(r.groupId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"artifactId"+"}", _neturl.PathEscape(parameterToString(r.artifactId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"rule"+"}", _neturl.PathEscape(parameterToString(r.rule, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.rule2 == nil {
 		return localVarReturnValue, nil, reportError("rule2 is required and must be specified")
 	}
@@ -1136,7 +1143,7 @@ func (a *ArtifactRulesApiService) UpdateArtifactRuleConfigExecute(r ApiUpdateArt
 	}
 	// body params
 	localVarPostBody = r.rule2
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -1146,15 +1153,15 @@ func (a *ArtifactRulesApiService) UpdateArtifactRuleConfigExecute(r ApiUpdateArt
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -1165,8 +1172,7 @@ func (a *ArtifactRulesApiService) UpdateArtifactRuleConfigExecute(r ApiUpdateArt
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -1176,15 +1182,14 @@ func (a *ArtifactRulesApiService) UpdateArtifactRuleConfigExecute(r ApiUpdateArt
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/api_artifacts.go b/app-services-sdk-go/registryinstance/apiv1internal/client/api_artifacts.go
index a5d92225..e309482d 100644
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/api_artifacts.go
+++ b/app-services-sdk-go/registryinstance/apiv1internal/client/api_artifacts.go
@@ -1,11 +1,11 @@
 /*
-Service Registry API
-
-Service Registry Instance API  NOTE: This API cannot be called directly from the portal.
-
-API version: 2.2.5.Final
-Contact: apicurio@lists.jboss.org
-*/
+ * Apicurio Registry API [v2]
+ *
+ * Apicurio Registry is a datastore for standard event schemas and API designs. Apicurio Registry enables developers to manage and share the structure of their data using a REST interface. For example, client applications can dynamically push or pull the latest updates to or from the registry without needing to redeploy. Apicurio Registry also enables developers to create rules that govern how registry content can evolve over time. For example, this includes rules for content validation and version compatibility.  The Apicurio Registry REST API enables client applications to manage the artifacts in the registry. This API provides create, read, update, and delete operations for schema and API artifacts, rules, versions, and metadata.   The supported artifact types include: - Apache Avro schema - AsyncAPI specification - Google protocol buffers - GraphQL schema - JSON Schema - Kafka Connect schema - OpenAPI specification - Web Services Description Language - XML Schema Definition   **Important**: The Apicurio Registry REST API is available from `https://MY-REGISTRY-URL/apis/registry/v2` by default. Therefore you must prefix all API operation paths with `../apis/registry/v2` in this case. For example: `../apis/registry/v2/ids/globalIds/{globalId}`. 
+ *
+ * API version: 2.2.5.Final
+ * Contact: apicurio@lists.jboss.org
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -13,21 +13,24 @@ package registryinstanceclient
 
 import (
 	"bytes"
-	"context"
-	"io/ioutil"
-	"net/http"
-	"net/url"
+	_context "context"
+	_ioutil "io/ioutil"
+	_nethttp "net/http"
+	_neturl "net/url"
 	"strings"
 	"os"
 )
 
+// Linger please
+var (
+	_ _context.Context
+)
 
 type ArtifactsApi interface {
 
 	/*
-	CreateArtifact Create artifact
-
-	Creates a new artifact by posting the artifact content.  The body of the request should
+	 * CreateArtifact Create artifact
+	 * Creates a new artifact by posting the artifact content.  The body of the request should
 be the raw content of the artifact.  This is typically in JSON format for *most* of the 
 supported types, but may be in another format for a few (for example, `PROTOBUF`).
 
@@ -79,54 +82,54 @@ This operation may fail for one of the following reasons:
 * The content violates one of the configured global rules (HTTP error `409`)
 * A server error occurred (HTTP error `500`)
 
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param groupId Unique ID of an artifact group.
-	@return ApiCreateArtifactRequest
-	*/
-	CreateArtifact(ctx context.Context, groupId string) ApiCreateArtifactRequest
-
-	// CreateArtifactExecute executes the request
-	//  @return ArtifactMetaData
-	CreateArtifactExecute(r ApiCreateArtifactRequest) (*ArtifactMetaData, *http.Response, error)
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param groupId Unique ID of an artifact group.
+	 * @return ApiCreateArtifactRequest
+	 */
+	CreateArtifact(ctx _context.Context, groupId string) ApiCreateArtifactRequest
 
 	/*
-	DeleteArtifact Delete artifact
+	 * CreateArtifactExecute executes the request
+	 * @return ArtifactMetaData
+	 */
+	CreateArtifactExecute(r ApiCreateArtifactRequest) (ArtifactMetaData, *_nethttp.Response, error)
 
-	Deletes an artifact completely, resulting in all versions of the artifact also being
+	/*
+	 * DeleteArtifact Delete artifact
+	 * Deletes an artifact completely, resulting in all versions of the artifact also being
 deleted.  This may fail for one of the following reasons:
 
 * No artifact with the `artifactId` exists (HTTP error `404`)
 * A server error occurred (HTTP error `500`)
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
-	@param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
-	@return ApiDeleteArtifactRequest
-	*/
-	DeleteArtifact(ctx context.Context, groupId string, artifactId string) ApiDeleteArtifactRequest
-
-	// DeleteArtifactExecute executes the request
-	DeleteArtifactExecute(r ApiDeleteArtifactRequest) (*http.Response, error)
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
+	 * @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
+	 * @return ApiDeleteArtifactRequest
+	 */
+	DeleteArtifact(ctx _context.Context, groupId string, artifactId string) ApiDeleteArtifactRequest
 
 	/*
-	DeleteArtifactsInGroup Delete artifacts in group
-
-	Deletes all of the artifacts that exist in a given group.
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param groupId Unique ID of an artifact group.
-	@return ApiDeleteArtifactsInGroupRequest
-	*/
-	DeleteArtifactsInGroup(ctx context.Context, groupId string) ApiDeleteArtifactsInGroupRequest
+	 * DeleteArtifactExecute executes the request
+	 */
+	DeleteArtifactExecute(r ApiDeleteArtifactRequest) (*_nethttp.Response, error)
 
-	// DeleteArtifactsInGroupExecute executes the request
-	DeleteArtifactsInGroupExecute(r ApiDeleteArtifactsInGroupRequest) (*http.Response, error)
+	/*
+	 * DeleteArtifactsInGroup Delete artifacts in group
+	 * Deletes all of the artifacts that exist in a given group.
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param groupId Unique ID of an artifact group.
+	 * @return ApiDeleteArtifactsInGroupRequest
+	 */
+	DeleteArtifactsInGroup(ctx _context.Context, groupId string) ApiDeleteArtifactsInGroupRequest
 
 	/*
-	GetContentByGlobalId Get artifact by global ID
+	 * DeleteArtifactsInGroupExecute executes the request
+	 */
+	DeleteArtifactsInGroupExecute(r ApiDeleteArtifactsInGroupRequest) (*_nethttp.Response, error)
 
-	Gets the content for an artifact version in the registry using its globally unique
+	/*
+	 * GetContentByGlobalId Get artifact by global ID
+	 * Gets the content for an artifact version in the registry using its globally unique
 identifier.
 
 This operation may fail for one of the following reasons:
@@ -134,21 +137,21 @@ This operation may fail for one of the following reasons:
 * No artifact version with this `globalId` exists (HTTP error `404`)
 * A server error occurred (HTTP error `500`)
 
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param globalId Global identifier for an artifact version.
-	@return ApiGetContentByGlobalIdRequest
-	*/
-	GetContentByGlobalId(ctx context.Context, globalId int64) ApiGetContentByGlobalIdRequest
-
-	// GetContentByGlobalIdExecute executes the request
-	//  @return *os.File
-	GetContentByGlobalIdExecute(r ApiGetContentByGlobalIdRequest) (**os.File, *http.Response, error)
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param globalId Global identifier for an artifact version.
+	 * @return ApiGetContentByGlobalIdRequest
+	 */
+	GetContentByGlobalId(ctx _context.Context, globalId int64) ApiGetContentByGlobalIdRequest
 
 	/*
-	GetContentByHash Get artifact content by SHA-256 hash
+	 * GetContentByGlobalIdExecute executes the request
+	 * @return *os.File
+	 */
+	GetContentByGlobalIdExecute(r ApiGetContentByGlobalIdRequest) (*os.File, *_nethttp.Response, error)
 
-	Gets the content for an artifact version in the registry using the 
+	/*
+	 * GetContentByHash Get artifact content by SHA-256 hash
+	 * Gets the content for an artifact version in the registry using the 
 SHA-256 hash of the content.  This content hash may be shared by multiple artifact
 versions in the case where the artifact versions have identical content.
 
@@ -157,21 +160,21 @@ This operation may fail for one of the following reasons:
 * No content with this `contentHash` exists (HTTP error `404`)
 * A server error occurred (HTTP error `500`)
 
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param contentHash SHA-256 content hash for a single artifact content.
-	@return ApiGetContentByHashRequest
-	*/
-	GetContentByHash(ctx context.Context, contentHash string) ApiGetContentByHashRequest
-
-	// GetContentByHashExecute executes the request
-	//  @return *os.File
-	GetContentByHashExecute(r ApiGetContentByHashRequest) (**os.File, *http.Response, error)
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param contentHash SHA-256 content hash for a single artifact content.
+	 * @return ApiGetContentByHashRequest
+	 */
+	GetContentByHash(ctx _context.Context, contentHash string) ApiGetContentByHashRequest
 
 	/*
-	GetContentById Get artifact content by ID
+	 * GetContentByHashExecute executes the request
+	 * @return *os.File
+	 */
+	GetContentByHashExecute(r ApiGetContentByHashRequest) (*os.File, *_nethttp.Response, error)
 
-	Gets the content for an artifact version in the registry using the unique content
+	/*
+	 * GetContentById Get artifact content by ID
+	 * Gets the content for an artifact version in the registry using the unique content
 identifier for that content.  This content ID may be shared by multiple artifact
 versions in the case where the artifact versions are identical.
 
@@ -180,21 +183,21 @@ This operation may fail for one of the following reasons:
 * No content with this `contentId` exists (HTTP error `404`)
 * A server error occurred (HTTP error `500`)
 
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param contentId Global identifier for a single artifact content.
-	@return ApiGetContentByIdRequest
-	*/
-	GetContentById(ctx context.Context, contentId int64) ApiGetContentByIdRequest
-
-	// GetContentByIdExecute executes the request
-	//  @return *os.File
-	GetContentByIdExecute(r ApiGetContentByIdRequest) (**os.File, *http.Response, error)
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param contentId Global identifier for a single artifact content.
+	 * @return ApiGetContentByIdRequest
+	 */
+	GetContentById(ctx _context.Context, contentId int64) ApiGetContentByIdRequest
 
 	/*
-	GetLatestArtifact Get latest artifact
+	 * GetContentByIdExecute executes the request
+	 * @return *os.File
+	 */
+	GetContentByIdExecute(r ApiGetContentByIdRequest) (*os.File, *_nethttp.Response, error)
 
-	Returns the latest version of the artifact in its raw form.  The `Content-Type` of the
+	/*
+	 * GetLatestArtifact Get latest artifact
+	 * Returns the latest version of the artifact in its raw form.  The `Content-Type` of the
 response depends on the artifact type.  In most cases, this is `application/json`, but 
 for some types it may be different (for example, `PROTOBUF`).
 
@@ -203,95 +206,95 @@ This operation may fail for one of the following reasons:
 * No artifact with this `artifactId` exists (HTTP error `404`)
 * A server error occurred (HTTP error `500`)
 
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
-	@param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
-	@return ApiGetLatestArtifactRequest
-	*/
-	GetLatestArtifact(ctx context.Context, groupId string, artifactId string) ApiGetLatestArtifactRequest
-
-	// GetLatestArtifactExecute executes the request
-	//  @return *os.File
-	GetLatestArtifactExecute(r ApiGetLatestArtifactRequest) (**os.File, *http.Response, error)
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
+	 * @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
+	 * @return ApiGetLatestArtifactRequest
+	 */
+	GetLatestArtifact(ctx _context.Context, groupId string, artifactId string) ApiGetLatestArtifactRequest
 
 	/*
-	ListArtifactsInGroup List artifacts in group
+	 * GetLatestArtifactExecute executes the request
+	 * @return *os.File
+	 */
+	GetLatestArtifactExecute(r ApiGetLatestArtifactRequest) (*os.File, *_nethttp.Response, error)
 
-	Returns a list of all artifacts in the group.  This list is paged.
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param groupId Unique ID of an artifact group.
-	@return ApiListArtifactsInGroupRequest
-	*/
-	ListArtifactsInGroup(ctx context.Context, groupId string) ApiListArtifactsInGroupRequest
-
-	// ListArtifactsInGroupExecute executes the request
-	//  @return ArtifactSearchResults
-	ListArtifactsInGroupExecute(r ApiListArtifactsInGroupRequest) (*ArtifactSearchResults, *http.Response, error)
+	/*
+	 * ListArtifactsInGroup List artifacts in group
+	 * Returns a list of all artifacts in the group.  This list is paged.
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param groupId Unique ID of an artifact group.
+	 * @return ApiListArtifactsInGroupRequest
+	 */
+	ListArtifactsInGroup(ctx _context.Context, groupId string) ApiListArtifactsInGroupRequest
 
 	/*
-	ReferencesByContentHash List artifact references by hash
+	 * ListArtifactsInGroupExecute executes the request
+	 * @return ArtifactSearchResults
+	 */
+	ListArtifactsInGroupExecute(r ApiListArtifactsInGroupRequest) (ArtifactSearchResults, *_nethttp.Response, error)
 
-	Returns a list containing all the artifact references using the artifact content hash.
+	/*
+	 * ReferencesByContentHash List artifact references by hash
+	 * Returns a list containing all the artifact references using the artifact content hash.
 
 This operation may fail for one of the following reasons:
 
 * A server error occurred (HTTP error `500`)
 
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param contentHash SHA-256 content hash for a single artifact content.
-	@return ApiReferencesByContentHashRequest
-	*/
-	ReferencesByContentHash(ctx context.Context, contentHash string) ApiReferencesByContentHashRequest
-
-	// ReferencesByContentHashExecute executes the request
-	//  @return []ArtifactReference
-	ReferencesByContentHashExecute(r ApiReferencesByContentHashRequest) ([]ArtifactReference, *http.Response, error)
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param contentHash SHA-256 content hash for a single artifact content.
+	 * @return ApiReferencesByContentHashRequest
+	 */
+	ReferencesByContentHash(ctx _context.Context, contentHash string) ApiReferencesByContentHashRequest
 
 	/*
-	ReferencesByContentId List artifact references by content ID
+	 * ReferencesByContentHashExecute executes the request
+	 * @return []ArtifactReference
+	 */
+	ReferencesByContentHashExecute(r ApiReferencesByContentHashRequest) ([]ArtifactReference, *_nethttp.Response, error)
 
-	Returns a list containing all the artifact references using the artifact content ID.
+	/*
+	 * ReferencesByContentId List artifact references by content ID
+	 * Returns a list containing all the artifact references using the artifact content ID.
 
 This operation may fail for one of the following reasons:
 
 * A server error occurred (HTTP error `500`)
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param contentId Global identifier for a single artifact content.
-	@return ApiReferencesByContentIdRequest
-	*/
-	ReferencesByContentId(ctx context.Context, contentId int64) ApiReferencesByContentIdRequest
-
-	// ReferencesByContentIdExecute executes the request
-	//  @return []ArtifactReference
-	ReferencesByContentIdExecute(r ApiReferencesByContentIdRequest) ([]ArtifactReference, *http.Response, error)
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param contentId Global identifier for a single artifact content.
+	 * @return ApiReferencesByContentIdRequest
+	 */
+	ReferencesByContentId(ctx _context.Context, contentId int64) ApiReferencesByContentIdRequest
 
 	/*
-	ReferencesByGlobalId Returns a list with all the references for the artifact with the given global id.
+	 * ReferencesByContentIdExecute executes the request
+	 * @return []ArtifactReference
+	 */
+	ReferencesByContentIdExecute(r ApiReferencesByContentIdRequest) ([]ArtifactReference, *_nethttp.Response, error)
 
-	Returns a list containing all the artifact references using the artifact global id.
+	/*
+	 * ReferencesByGlobalId Returns a list with all the references for the artifact with the given global id.
+	 * Returns a list containing all the artifact references using the artifact global id.
 
 This operation may fail for one of the following reasons:
 
 * A server error occurred (HTTP error `500`)
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param globalId Global identifier for an artifact version.
-	@return ApiReferencesByGlobalIdRequest
-	*/
-	ReferencesByGlobalId(ctx context.Context, globalId int64) ApiReferencesByGlobalIdRequest
-
-	// ReferencesByGlobalIdExecute executes the request
-	//  @return []ArtifactReference
-	ReferencesByGlobalIdExecute(r ApiReferencesByGlobalIdRequest) ([]ArtifactReference, *http.Response, error)
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param globalId Global identifier for an artifact version.
+	 * @return ApiReferencesByGlobalIdRequest
+	 */
+	ReferencesByGlobalId(ctx _context.Context, globalId int64) ApiReferencesByGlobalIdRequest
 
 	/*
-	UpdateArtifact Update artifact
+	 * ReferencesByGlobalIdExecute executes the request
+	 * @return []ArtifactReference
+	 */
+	ReferencesByGlobalIdExecute(r ApiReferencesByGlobalIdRequest) ([]ArtifactReference, *_nethttp.Response, error)
 
-	Updates an artifact by uploading new content.  The body of the request can
+	/*
+	 * UpdateArtifact Update artifact
+	 * Updates an artifact by uploading new content.  The body of the request can
 be the raw content of the artifact or a JSON object containing both the raw content and
 a set of references to other artifacts..  This is typically in JSON format for *most*
 of the supported types, but may be in another format for a few (for example, `PROTOBUF`).
@@ -307,22 +310,22 @@ The update could fail for a number of reasons including:
 
 When successful, this creates a new version of the artifact, making it the most recent
 (and therefore official) version of the artifact.
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
-	@param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
-	@return ApiUpdateArtifactRequest
-	*/
-	UpdateArtifact(ctx context.Context, groupId string, artifactId string) ApiUpdateArtifactRequest
-
-	// UpdateArtifactExecute executes the request
-	//  @return ArtifactMetaData
-	UpdateArtifactExecute(r ApiUpdateArtifactRequest) (*ArtifactMetaData, *http.Response, error)
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
+	 * @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
+	 * @return ApiUpdateArtifactRequest
+	 */
+	UpdateArtifact(ctx _context.Context, groupId string, artifactId string) ApiUpdateArtifactRequest
 
 	/*
-	UpdateArtifactState Update artifact state
+	 * UpdateArtifactExecute executes the request
+	 * @return ArtifactMetaData
+	 */
+	UpdateArtifactExecute(r ApiUpdateArtifactRequest) (ArtifactMetaData, *_nethttp.Response, error)
 
-	Updates the state of the artifact.  For example, you can use this to mark the latest
+	/*
+	 * UpdateArtifactState Update artifact state
+	 * Updates the state of the artifact.  For example, you can use this to mark the latest
 version of an artifact as `DEPRECATED`.  The operation changes the state of the latest 
 version of the artifact.  If multiple versions exist, only the most recent is changed.
 
@@ -331,26 +334,27 @@ This operation can fail for the following reasons:
 * No artifact with this `artifactId` exists (HTTP error `404`)
 * A server error occurred (HTTP error `500`)
 
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
+	 * @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
+	 * @return ApiUpdateArtifactStateRequest
+	 */
+	UpdateArtifactState(ctx _context.Context, groupId string, artifactId string) ApiUpdateArtifactStateRequest
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
-	@param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
-	@return ApiUpdateArtifactStateRequest
-	*/
-	UpdateArtifactState(ctx context.Context, groupId string, artifactId string) ApiUpdateArtifactStateRequest
-
-	// UpdateArtifactStateExecute executes the request
-	UpdateArtifactStateExecute(r ApiUpdateArtifactStateRequest) (*http.Response, error)
+	/*
+	 * UpdateArtifactStateExecute executes the request
+	 */
+	UpdateArtifactStateExecute(r ApiUpdateArtifactStateRequest) (*_nethttp.Response, error)
 }
 
 // ArtifactsApiService ArtifactsApi service
 type ArtifactsApiService service
 
 type ApiCreateArtifactRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService ArtifactsApi
 	groupId string
-	body *interface{}
+	body **os.File
 	xRegistryArtifactType *ArtifactType
 	xRegistryArtifactId *string
 	xRegistryVersion *string
@@ -364,86 +368,62 @@ type ApiCreateArtifactRequest struct {
 	xRegistryHashAlgorithm *string
 }
 
-// The content of the artifact being created. This is often, but not always, JSON data representing one of the supported artifact types:  * Avro (&#x60;AVRO&#x60;) * Protobuf (&#x60;PROTOBUF&#x60;) * JSON Schema (&#x60;JSON&#x60;) * Kafka Connect (&#x60;KCONNECT&#x60;) * OpenAPI (&#x60;OPENAPI&#x60;) * AsyncAPI (&#x60;ASYNCAPI&#x60;) * GraphQL (&#x60;GRAPHQL&#x60;) * Web Services Description Language (&#x60;WSDL&#x60;) * XML Schema (&#x60;XSD&#x60;) 
-func (r ApiCreateArtifactRequest) Body(body interface{}) ApiCreateArtifactRequest {
+func (r ApiCreateArtifactRequest) Body(body *os.File) ApiCreateArtifactRequest {
 	r.body = &body
 	return r
 }
-
-// Specifies the type of the artifact being added. Possible values include:  * Avro (&#x60;AVRO&#x60;) * Protobuf (&#x60;PROTOBUF&#x60;) * JSON Schema (&#x60;JSON&#x60;) * Kafka Connect (&#x60;KCONNECT&#x60;) * OpenAPI (&#x60;OPENAPI&#x60;) * AsyncAPI (&#x60;ASYNCAPI&#x60;) * GraphQL (&#x60;GRAPHQL&#x60;) * Web Services Description Language (&#x60;WSDL&#x60;) * XML Schema (&#x60;XSD&#x60;)
 func (r ApiCreateArtifactRequest) XRegistryArtifactType(xRegistryArtifactType ArtifactType) ApiCreateArtifactRequest {
 	r.xRegistryArtifactType = &xRegistryArtifactType
 	return r
 }
-
-// A client-provided, globally unique identifier for the new artifact.
 func (r ApiCreateArtifactRequest) XRegistryArtifactId(xRegistryArtifactId string) ApiCreateArtifactRequest {
 	r.xRegistryArtifactId = &xRegistryArtifactId
 	return r
 }
-
-// Specifies the version number of this initial version of the artifact content.  This would typically be a simple integer or a SemVer value.  If not provided, the server will assign a version number automatically (starting with version &#x60;1&#x60;).
 func (r ApiCreateArtifactRequest) XRegistryVersion(xRegistryVersion string) ApiCreateArtifactRequest {
 	r.xRegistryVersion = &xRegistryVersion
 	return r
 }
-
-// Set this option to instruct the server on what to do if the artifact already exists.
 func (r ApiCreateArtifactRequest) IfExists(ifExists IfExists) ApiCreateArtifactRequest {
 	r.ifExists = &ifExists
 	return r
 }
-
-// Used only when the &#x60;ifExists&#x60; query parameter is set to &#x60;RETURN_OR_UPDATE&#x60;, this parameter can be set to &#x60;true&#x60; to indicate that the server should \&quot;canonicalize\&quot; the content when searching for a matching version.  The canonicalization algorithm is unique to each artifact type, but typically involves removing extra whitespace and formatting the content in a consistent manner.
 func (r ApiCreateArtifactRequest) Canonical(canonical bool) ApiCreateArtifactRequest {
 	r.canonical = &canonical
 	return r
 }
-
-// Specifies the description of artifact being added. Description must be ASCII-only string. If this is not provided, the server will extract the description from the artifact content.
 func (r ApiCreateArtifactRequest) XRegistryDescription(xRegistryDescription string) ApiCreateArtifactRequest {
 	r.xRegistryDescription = &xRegistryDescription
 	return r
 }
-
-// Specifies the description of artifact being added. Value of this must be Base64 encoded string. If this is not provided, the server will extract the description from the artifact content.
 func (r ApiCreateArtifactRequest) XRegistryDescriptionEncoded(xRegistryDescriptionEncoded string) ApiCreateArtifactRequest {
 	r.xRegistryDescriptionEncoded = &xRegistryDescriptionEncoded
 	return r
 }
-
-// Specifies the name of artifact being added. Name must be ASCII-only string. If this is not provided, the server will extract the name from the artifact content.
 func (r ApiCreateArtifactRequest) XRegistryName(xRegistryName string) ApiCreateArtifactRequest {
 	r.xRegistryName = &xRegistryName
 	return r
 }
-
-// Specifies the name of artifact being added. Value of this must be Base64 encoded string. If this is not provided, the server will extract the name from the artifact content.
 func (r ApiCreateArtifactRequest) XRegistryNameEncoded(xRegistryNameEncoded string) ApiCreateArtifactRequest {
 	r.xRegistryNameEncoded = &xRegistryNameEncoded
 	return r
 }
-
-// Specifies the (optional) hash of the artifact to be verified.
 func (r ApiCreateArtifactRequest) XRegistryContentHash(xRegistryContentHash string) ApiCreateArtifactRequest {
 	r.xRegistryContentHash = &xRegistryContentHash
 	return r
 }
-
-// The algorithm to use when checking the content validity. (available: SHA256, MD5; default: SHA256)
 func (r ApiCreateArtifactRequest) XRegistryHashAlgorithm(xRegistryHashAlgorithm string) ApiCreateArtifactRequest {
 	r.xRegistryHashAlgorithm = &xRegistryHashAlgorithm
 	return r
 }
 
-func (r ApiCreateArtifactRequest) Execute() (*ArtifactMetaData, *http.Response, error) {
+func (r ApiCreateArtifactRequest) Execute() (ArtifactMetaData, *_nethttp.Response, error) {
 	return r.ApiService.CreateArtifactExecute(r)
 }
 
 /*
-CreateArtifact Create artifact
-
-Creates a new artifact by posting the artifact content.  The body of the request should
+ * CreateArtifact Create artifact
+ * Creates a new artifact by posting the artifact content.  The body of the request should
 be the raw content of the artifact.  This is typically in JSON format for *most* of the 
 supported types, but may be in another format for a few (for example, `PROTOBUF`).
 
@@ -495,12 +475,11 @@ This operation may fail for one of the following reasons:
 * The content violates one of the configured global rules (HTTP error `409`)
 * A server error occurred (HTTP error `500`)
 
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param groupId Unique ID of an artifact group.
- @return ApiCreateArtifactRequest
-*/
-func (a *ArtifactsApiService) CreateArtifact(ctx context.Context, groupId string) ApiCreateArtifactRequest {
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param groupId Unique ID of an artifact group.
+ * @return ApiCreateArtifactRequest
+ */
+func (a *ArtifactsApiService) CreateArtifact(ctx _context.Context, groupId string) ApiCreateArtifactRequest {
 	return ApiCreateArtifactRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -508,27 +487,31 @@ func (a *ArtifactsApiService) CreateArtifact(ctx context.Context, groupId string
 	}
 }
 
-// Execute executes the request
-//  @return ArtifactMetaData
-func (a *ArtifactsApiService) CreateArtifactExecute(r ApiCreateArtifactRequest) (*ArtifactMetaData, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return ArtifactMetaData
+ */
+func (a *ArtifactsApiService) CreateArtifactExecute(r ApiCreateArtifactRequest) (ArtifactMetaData, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *ArtifactMetaData
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  ArtifactMetaData
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "ArtifactsApiService.CreateArtifact")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/groups/{groupId}/artifacts"
-	localVarPath = strings.Replace(localVarPath, "{"+"groupId"+"}", url.PathEscape(parameterToString(r.groupId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"groupId"+"}", _neturl.PathEscape(parameterToString(r.groupId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.body == nil {
 		return localVarReturnValue, nil, reportError("body is required and must be specified")
 	}
@@ -585,7 +568,7 @@ func (a *ArtifactsApiService) CreateArtifactExecute(r ApiCreateArtifactRequest)
 	}
 	// body params
 	localVarPostBody = r.body
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -595,15 +578,15 @@ func (a *ArtifactsApiService) CreateArtifactExecute(r ApiCreateArtifactRequest)
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -614,8 +597,7 @@ func (a *ArtifactsApiService) CreateArtifactExecute(r ApiCreateArtifactRequest)
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 409 {
@@ -625,8 +607,7 @@ func (a *ArtifactsApiService) CreateArtifactExecute(r ApiCreateArtifactRequest)
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -636,15 +617,14 @@ func (a *ArtifactsApiService) CreateArtifactExecute(r ApiCreateArtifactRequest)
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -655,31 +635,30 @@ func (a *ArtifactsApiService) CreateArtifactExecute(r ApiCreateArtifactRequest)
 }
 
 type ApiDeleteArtifactRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService ArtifactsApi
 	groupId string
 	artifactId string
 }
 
-func (r ApiDeleteArtifactRequest) Execute() (*http.Response, error) {
+
+func (r ApiDeleteArtifactRequest) Execute() (*_nethttp.Response, error) {
 	return r.ApiService.DeleteArtifactExecute(r)
 }
 
 /*
-DeleteArtifact Delete artifact
-
-Deletes an artifact completely, resulting in all versions of the artifact also being
+ * DeleteArtifact Delete artifact
+ * Deletes an artifact completely, resulting in all versions of the artifact also being
 deleted.  This may fail for one of the following reasons:
 
 * No artifact with the `artifactId` exists (HTTP error `404`)
 * A server error occurred (HTTP error `500`)
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
- @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
- @return ApiDeleteArtifactRequest
-*/
-func (a *ArtifactsApiService) DeleteArtifact(ctx context.Context, groupId string, artifactId string) ApiDeleteArtifactRequest {
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
+ * @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
+ * @return ApiDeleteArtifactRequest
+ */
+func (a *ArtifactsApiService) DeleteArtifact(ctx _context.Context, groupId string, artifactId string) ApiDeleteArtifactRequest {
 	return ApiDeleteArtifactRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -688,26 +667,30 @@ func (a *ArtifactsApiService) DeleteArtifact(ctx context.Context, groupId string
 	}
 }
 
-// Execute executes the request
-func (a *ArtifactsApiService) DeleteArtifactExecute(r ApiDeleteArtifactRequest) (*http.Response, error) {
+/*
+ * Execute executes the request
+ */
+func (a *ArtifactsApiService) DeleteArtifactExecute(r ApiDeleteArtifactRequest) (*_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodDelete
+		localVarHTTPMethod   = _nethttp.MethodDelete
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "ArtifactsApiService.DeleteArtifact")
 	if err != nil {
-		return nil, &GenericOpenAPIError{error: err.Error()}
+		return nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/groups/{groupId}/artifacts/{artifactId}"
-	localVarPath = strings.Replace(localVarPath, "{"+"groupId"+"}", url.PathEscape(parameterToString(r.groupId, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"artifactId"+"}", url.PathEscape(parameterToString(r.artifactId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"groupId"+"}", _neturl.PathEscape(parameterToString(r.groupId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"artifactId"+"}", _neturl.PathEscape(parameterToString(r.artifactId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -726,7 +709,7 @@ func (a *ArtifactsApiService) DeleteArtifactExecute(r ApiDeleteArtifactRequest)
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return nil, err
 	}
@@ -736,15 +719,15 @@ func (a *ArtifactsApiService) DeleteArtifactExecute(r ApiDeleteArtifactRequest)
 		return localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -755,8 +738,7 @@ func (a *ArtifactsApiService) DeleteArtifactExecute(r ApiDeleteArtifactRequest)
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -766,8 +748,7 @@ func (a *ArtifactsApiService) DeleteArtifactExecute(r ApiDeleteArtifactRequest)
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarHTTPResponse, newErr
 	}
@@ -776,25 +757,24 @@ func (a *ArtifactsApiService) DeleteArtifactExecute(r ApiDeleteArtifactRequest)
 }
 
 type ApiDeleteArtifactsInGroupRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService ArtifactsApi
 	groupId string
 }
 
-func (r ApiDeleteArtifactsInGroupRequest) Execute() (*http.Response, error) {
+
+func (r ApiDeleteArtifactsInGroupRequest) Execute() (*_nethttp.Response, error) {
 	return r.ApiService.DeleteArtifactsInGroupExecute(r)
 }
 
 /*
-DeleteArtifactsInGroup Delete artifacts in group
-
-Deletes all of the artifacts that exist in a given group.
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param groupId Unique ID of an artifact group.
- @return ApiDeleteArtifactsInGroupRequest
-*/
-func (a *ArtifactsApiService) DeleteArtifactsInGroup(ctx context.Context, groupId string) ApiDeleteArtifactsInGroupRequest {
+ * DeleteArtifactsInGroup Delete artifacts in group
+ * Deletes all of the artifacts that exist in a given group.
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param groupId Unique ID of an artifact group.
+ * @return ApiDeleteArtifactsInGroupRequest
+ */
+func (a *ArtifactsApiService) DeleteArtifactsInGroup(ctx _context.Context, groupId string) ApiDeleteArtifactsInGroupRequest {
 	return ApiDeleteArtifactsInGroupRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -802,25 +782,29 @@ func (a *ArtifactsApiService) DeleteArtifactsInGroup(ctx context.Context, groupI
 	}
 }
 
-// Execute executes the request
-func (a *ArtifactsApiService) DeleteArtifactsInGroupExecute(r ApiDeleteArtifactsInGroupRequest) (*http.Response, error) {
+/*
+ * Execute executes the request
+ */
+func (a *ArtifactsApiService) DeleteArtifactsInGroupExecute(r ApiDeleteArtifactsInGroupRequest) (*_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodDelete
+		localVarHTTPMethod   = _nethttp.MethodDelete
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "ArtifactsApiService.DeleteArtifactsInGroup")
 	if err != nil {
-		return nil, &GenericOpenAPIError{error: err.Error()}
+		return nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/groups/{groupId}/artifacts"
-	localVarPath = strings.Replace(localVarPath, "{"+"groupId"+"}", url.PathEscape(parameterToString(r.groupId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"groupId"+"}", _neturl.PathEscape(parameterToString(r.groupId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -839,7 +823,7 @@ func (a *ArtifactsApiService) DeleteArtifactsInGroupExecute(r ApiDeleteArtifacts
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return nil, err
 	}
@@ -849,15 +833,15 @@ func (a *ArtifactsApiService) DeleteArtifactsInGroupExecute(r ApiDeleteArtifacts
 		return localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -868,8 +852,7 @@ func (a *ArtifactsApiService) DeleteArtifactsInGroupExecute(r ApiDeleteArtifacts
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarHTTPResponse, newErr
 	}
@@ -878,26 +861,24 @@ func (a *ArtifactsApiService) DeleteArtifactsInGroupExecute(r ApiDeleteArtifacts
 }
 
 type ApiGetContentByGlobalIdRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService ArtifactsApi
 	globalId int64
 	dereference *bool
 }
 
-// Allows the user to specify if the content should be dereferenced when being returned
 func (r ApiGetContentByGlobalIdRequest) Dereference(dereference bool) ApiGetContentByGlobalIdRequest {
 	r.dereference = &dereference
 	return r
 }
 
-func (r ApiGetContentByGlobalIdRequest) Execute() (**os.File, *http.Response, error) {
+func (r ApiGetContentByGlobalIdRequest) Execute() (*os.File, *_nethttp.Response, error) {
 	return r.ApiService.GetContentByGlobalIdExecute(r)
 }
 
 /*
-GetContentByGlobalId Get artifact by global ID
-
-Gets the content for an artifact version in the registry using its globally unique
+ * GetContentByGlobalId Get artifact by global ID
+ * Gets the content for an artifact version in the registry using its globally unique
 identifier.
 
 This operation may fail for one of the following reasons:
@@ -905,12 +886,11 @@ This operation may fail for one of the following reasons:
 * No artifact version with this `globalId` exists (HTTP error `404`)
 * A server error occurred (HTTP error `500`)
 
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param globalId Global identifier for an artifact version.
- @return ApiGetContentByGlobalIdRequest
-*/
-func (a *ArtifactsApiService) GetContentByGlobalId(ctx context.Context, globalId int64) ApiGetContentByGlobalIdRequest {
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param globalId Global identifier for an artifact version.
+ * @return ApiGetContentByGlobalIdRequest
+ */
+func (a *ArtifactsApiService) GetContentByGlobalId(ctx _context.Context, globalId int64) ApiGetContentByGlobalIdRequest {
 	return ApiGetContentByGlobalIdRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -918,27 +898,31 @@ func (a *ArtifactsApiService) GetContentByGlobalId(ctx context.Context, globalId
 	}
 }
 
-// Execute executes the request
-//  @return *os.File
-func (a *ArtifactsApiService) GetContentByGlobalIdExecute(r ApiGetContentByGlobalIdRequest) (**os.File, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return *os.File
+ */
+func (a *ArtifactsApiService) GetContentByGlobalIdExecute(r ApiGetContentByGlobalIdRequest) (*os.File, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  **os.File
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  *os.File
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "ArtifactsApiService.GetContentByGlobalId")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/ids/globalIds/{globalId}"
-	localVarPath = strings.Replace(localVarPath, "{"+"globalId"+"}", url.PathEscape(parameterToString(r.globalId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"globalId"+"}", _neturl.PathEscape(parameterToString(r.globalId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.dereference != nil {
 		localVarQueryParams.Add("dereference", parameterToString(*r.dereference, ""))
@@ -960,7 +944,7 @@ func (a *ArtifactsApiService) GetContentByGlobalIdExecute(r ApiGetContentByGloba
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -970,15 +954,15 @@ func (a *ArtifactsApiService) GetContentByGlobalIdExecute(r ApiGetContentByGloba
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -989,8 +973,7 @@ func (a *ArtifactsApiService) GetContentByGlobalIdExecute(r ApiGetContentByGloba
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -1000,15 +983,14 @@ func (a *ArtifactsApiService) GetContentByGlobalIdExecute(r ApiGetContentByGloba
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -1019,19 +1001,19 @@ func (a *ArtifactsApiService) GetContentByGlobalIdExecute(r ApiGetContentByGloba
 }
 
 type ApiGetContentByHashRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService ArtifactsApi
 	contentHash string
 }
 
-func (r ApiGetContentByHashRequest) Execute() (**os.File, *http.Response, error) {
+
+func (r ApiGetContentByHashRequest) Execute() (*os.File, *_nethttp.Response, error) {
 	return r.ApiService.GetContentByHashExecute(r)
 }
 
 /*
-GetContentByHash Get artifact content by SHA-256 hash
-
-Gets the content for an artifact version in the registry using the 
+ * GetContentByHash Get artifact content by SHA-256 hash
+ * Gets the content for an artifact version in the registry using the 
 SHA-256 hash of the content.  This content hash may be shared by multiple artifact
 versions in the case where the artifact versions have identical content.
 
@@ -1040,12 +1022,11 @@ This operation may fail for one of the following reasons:
 * No content with this `contentHash` exists (HTTP error `404`)
 * A server error occurred (HTTP error `500`)
 
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param contentHash SHA-256 content hash for a single artifact content.
- @return ApiGetContentByHashRequest
-*/
-func (a *ArtifactsApiService) GetContentByHash(ctx context.Context, contentHash string) ApiGetContentByHashRequest {
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param contentHash SHA-256 content hash for a single artifact content.
+ * @return ApiGetContentByHashRequest
+ */
+func (a *ArtifactsApiService) GetContentByHash(ctx _context.Context, contentHash string) ApiGetContentByHashRequest {
 	return ApiGetContentByHashRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -1053,27 +1034,31 @@ func (a *ArtifactsApiService) GetContentByHash(ctx context.Context, contentHash
 	}
 }
 
-// Execute executes the request
-//  @return *os.File
-func (a *ArtifactsApiService) GetContentByHashExecute(r ApiGetContentByHashRequest) (**os.File, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return *os.File
+ */
+func (a *ArtifactsApiService) GetContentByHashExecute(r ApiGetContentByHashRequest) (*os.File, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  **os.File
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  *os.File
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "ArtifactsApiService.GetContentByHash")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/ids/contentHashes/{contentHash}/"
-	localVarPath = strings.Replace(localVarPath, "{"+"contentHash"+"}", url.PathEscape(parameterToString(r.contentHash, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"contentHash"+"}", _neturl.PathEscape(parameterToString(r.contentHash, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -1092,7 +1077,7 @@ func (a *ArtifactsApiService) GetContentByHashExecute(r ApiGetContentByHashReque
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -1102,15 +1087,15 @@ func (a *ArtifactsApiService) GetContentByHashExecute(r ApiGetContentByHashReque
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -1121,8 +1106,7 @@ func (a *ArtifactsApiService) GetContentByHashExecute(r ApiGetContentByHashReque
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -1132,15 +1116,14 @@ func (a *ArtifactsApiService) GetContentByHashExecute(r ApiGetContentByHashReque
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -1151,19 +1134,19 @@ func (a *ArtifactsApiService) GetContentByHashExecute(r ApiGetContentByHashReque
 }
 
 type ApiGetContentByIdRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService ArtifactsApi
 	contentId int64
 }
 
-func (r ApiGetContentByIdRequest) Execute() (**os.File, *http.Response, error) {
+
+func (r ApiGetContentByIdRequest) Execute() (*os.File, *_nethttp.Response, error) {
 	return r.ApiService.GetContentByIdExecute(r)
 }
 
 /*
-GetContentById Get artifact content by ID
-
-Gets the content for an artifact version in the registry using the unique content
+ * GetContentById Get artifact content by ID
+ * Gets the content for an artifact version in the registry using the unique content
 identifier for that content.  This content ID may be shared by multiple artifact
 versions in the case where the artifact versions are identical.
 
@@ -1172,12 +1155,11 @@ This operation may fail for one of the following reasons:
 * No content with this `contentId` exists (HTTP error `404`)
 * A server error occurred (HTTP error `500`)
 
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param contentId Global identifier for a single artifact content.
- @return ApiGetContentByIdRequest
-*/
-func (a *ArtifactsApiService) GetContentById(ctx context.Context, contentId int64) ApiGetContentByIdRequest {
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param contentId Global identifier for a single artifact content.
+ * @return ApiGetContentByIdRequest
+ */
+func (a *ArtifactsApiService) GetContentById(ctx _context.Context, contentId int64) ApiGetContentByIdRequest {
 	return ApiGetContentByIdRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -1185,27 +1167,31 @@ func (a *ArtifactsApiService) GetContentById(ctx context.Context, contentId int6
 	}
 }
 
-// Execute executes the request
-//  @return *os.File
-func (a *ArtifactsApiService) GetContentByIdExecute(r ApiGetContentByIdRequest) (**os.File, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return *os.File
+ */
+func (a *ArtifactsApiService) GetContentByIdExecute(r ApiGetContentByIdRequest) (*os.File, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  **os.File
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  *os.File
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "ArtifactsApiService.GetContentById")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/ids/contentIds/{contentId}/"
-	localVarPath = strings.Replace(localVarPath, "{"+"contentId"+"}", url.PathEscape(parameterToString(r.contentId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"contentId"+"}", _neturl.PathEscape(parameterToString(r.contentId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -1224,7 +1210,7 @@ func (a *ArtifactsApiService) GetContentByIdExecute(r ApiGetContentByIdRequest)
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -1234,15 +1220,15 @@ func (a *ArtifactsApiService) GetContentByIdExecute(r ApiGetContentByIdRequest)
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -1253,8 +1239,7 @@ func (a *ArtifactsApiService) GetContentByIdExecute(r ApiGetContentByIdRequest)
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -1264,15 +1249,14 @@ func (a *ArtifactsApiService) GetContentByIdExecute(r ApiGetContentByIdRequest)
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -1283,27 +1267,25 @@ func (a *ArtifactsApiService) GetContentByIdExecute(r ApiGetContentByIdRequest)
 }
 
 type ApiGetLatestArtifactRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService ArtifactsApi
 	groupId string
 	artifactId string
 	dereference *bool
 }
 
-// Allows the user to specify if the content should be dereferenced when being returned
 func (r ApiGetLatestArtifactRequest) Dereference(dereference bool) ApiGetLatestArtifactRequest {
 	r.dereference = &dereference
 	return r
 }
 
-func (r ApiGetLatestArtifactRequest) Execute() (**os.File, *http.Response, error) {
+func (r ApiGetLatestArtifactRequest) Execute() (*os.File, *_nethttp.Response, error) {
 	return r.ApiService.GetLatestArtifactExecute(r)
 }
 
 /*
-GetLatestArtifact Get latest artifact
-
-Returns the latest version of the artifact in its raw form.  The `Content-Type` of the
+ * GetLatestArtifact Get latest artifact
+ * Returns the latest version of the artifact in its raw form.  The `Content-Type` of the
 response depends on the artifact type.  In most cases, this is `application/json`, but 
 for some types it may be different (for example, `PROTOBUF`).
 
@@ -1312,13 +1294,12 @@ This operation may fail for one of the following reasons:
 * No artifact with this `artifactId` exists (HTTP error `404`)
 * A server error occurred (HTTP error `500`)
 
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
- @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
- @return ApiGetLatestArtifactRequest
-*/
-func (a *ArtifactsApiService) GetLatestArtifact(ctx context.Context, groupId string, artifactId string) ApiGetLatestArtifactRequest {
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
+ * @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
+ * @return ApiGetLatestArtifactRequest
+ */
+func (a *ArtifactsApiService) GetLatestArtifact(ctx _context.Context, groupId string, artifactId string) ApiGetLatestArtifactRequest {
 	return ApiGetLatestArtifactRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -1327,28 +1308,32 @@ func (a *ArtifactsApiService) GetLatestArtifact(ctx context.Context, groupId str
 	}
 }
 
-// Execute executes the request
-//  @return *os.File
-func (a *ArtifactsApiService) GetLatestArtifactExecute(r ApiGetLatestArtifactRequest) (**os.File, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return *os.File
+ */
+func (a *ArtifactsApiService) GetLatestArtifactExecute(r ApiGetLatestArtifactRequest) (*os.File, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  **os.File
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  *os.File
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "ArtifactsApiService.GetLatestArtifact")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/groups/{groupId}/artifacts/{artifactId}"
-	localVarPath = strings.Replace(localVarPath, "{"+"groupId"+"}", url.PathEscape(parameterToString(r.groupId, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"artifactId"+"}", url.PathEscape(parameterToString(r.artifactId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"groupId"+"}", _neturl.PathEscape(parameterToString(r.groupId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"artifactId"+"}", _neturl.PathEscape(parameterToString(r.artifactId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.dereference != nil {
 		localVarQueryParams.Add("dereference", parameterToString(*r.dereference, ""))
@@ -1370,7 +1355,7 @@ func (a *ArtifactsApiService) GetLatestArtifactExecute(r ApiGetLatestArtifactReq
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -1380,15 +1365,15 @@ func (a *ArtifactsApiService) GetLatestArtifactExecute(r ApiGetLatestArtifactReq
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -1399,8 +1384,7 @@ func (a *ArtifactsApiService) GetLatestArtifactExecute(r ApiGetLatestArtifactReq
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -1410,15 +1394,14 @@ func (a *ArtifactsApiService) GetLatestArtifactExecute(r ApiGetLatestArtifactReq
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -1429,7 +1412,7 @@ func (a *ArtifactsApiService) GetLatestArtifactExecute(r ApiGetLatestArtifactReq
 }
 
 type ApiListArtifactsInGroupRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService ArtifactsApi
 	groupId string
 	limit *int32
@@ -1438,44 +1421,35 @@ type ApiListArtifactsInGroupRequest struct {
 	orderby *SortBy
 }
 
-// The number of artifacts to return.  Defaults to 20.
 func (r ApiListArtifactsInGroupRequest) Limit(limit int32) ApiListArtifactsInGroupRequest {
 	r.limit = &limit
 	return r
 }
-
-// The number of artifacts to skip before starting the result set.  Defaults to 0.
 func (r ApiListArtifactsInGroupRequest) Offset(offset int32) ApiListArtifactsInGroupRequest {
 	r.offset = &offset
 	return r
 }
-
-// Sort order, ascending (&#x60;asc&#x60;) or descending (&#x60;desc&#x60;).
 func (r ApiListArtifactsInGroupRequest) Order(order SortOrder) ApiListArtifactsInGroupRequest {
 	r.order = &order
 	return r
 }
-
-// The field to sort by.  Can be one of:  * &#x60;name&#x60; * &#x60;createdOn&#x60; 
 func (r ApiListArtifactsInGroupRequest) Orderby(orderby SortBy) ApiListArtifactsInGroupRequest {
 	r.orderby = &orderby
 	return r
 }
 
-func (r ApiListArtifactsInGroupRequest) Execute() (*ArtifactSearchResults, *http.Response, error) {
+func (r ApiListArtifactsInGroupRequest) Execute() (ArtifactSearchResults, *_nethttp.Response, error) {
 	return r.ApiService.ListArtifactsInGroupExecute(r)
 }
 
 /*
-ListArtifactsInGroup List artifacts in group
-
-Returns a list of all artifacts in the group.  This list is paged.
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param groupId Unique ID of an artifact group.
- @return ApiListArtifactsInGroupRequest
-*/
-func (a *ArtifactsApiService) ListArtifactsInGroup(ctx context.Context, groupId string) ApiListArtifactsInGroupRequest {
+ * ListArtifactsInGroup List artifacts in group
+ * Returns a list of all artifacts in the group.  This list is paged.
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param groupId Unique ID of an artifact group.
+ * @return ApiListArtifactsInGroupRequest
+ */
+func (a *ArtifactsApiService) ListArtifactsInGroup(ctx _context.Context, groupId string) ApiListArtifactsInGroupRequest {
 	return ApiListArtifactsInGroupRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -1483,27 +1457,31 @@ func (a *ArtifactsApiService) ListArtifactsInGroup(ctx context.Context, groupId
 	}
 }
 
-// Execute executes the request
-//  @return ArtifactSearchResults
-func (a *ArtifactsApiService) ListArtifactsInGroupExecute(r ApiListArtifactsInGroupRequest) (*ArtifactSearchResults, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return ArtifactSearchResults
+ */
+func (a *ArtifactsApiService) ListArtifactsInGroupExecute(r ApiListArtifactsInGroupRequest) (ArtifactSearchResults, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *ArtifactSearchResults
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  ArtifactSearchResults
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "ArtifactsApiService.ListArtifactsInGroup")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/groups/{groupId}/artifacts"
-	localVarPath = strings.Replace(localVarPath, "{"+"groupId"+"}", url.PathEscape(parameterToString(r.groupId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"groupId"+"}", _neturl.PathEscape(parameterToString(r.groupId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.limit != nil {
 		localVarQueryParams.Add("limit", parameterToString(*r.limit, ""))
@@ -1534,7 +1512,7 @@ func (a *ArtifactsApiService) ListArtifactsInGroupExecute(r ApiListArtifactsInGr
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -1544,15 +1522,15 @@ func (a *ArtifactsApiService) ListArtifactsInGroupExecute(r ApiListArtifactsInGr
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -1563,15 +1541,14 @@ func (a *ArtifactsApiService) ListArtifactsInGroupExecute(r ApiListArtifactsInGr
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -1582,30 +1559,29 @@ func (a *ArtifactsApiService) ListArtifactsInGroupExecute(r ApiListArtifactsInGr
 }
 
 type ApiReferencesByContentHashRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService ArtifactsApi
 	contentHash string
 }
 
-func (r ApiReferencesByContentHashRequest) Execute() ([]ArtifactReference, *http.Response, error) {
+
+func (r ApiReferencesByContentHashRequest) Execute() ([]ArtifactReference, *_nethttp.Response, error) {
 	return r.ApiService.ReferencesByContentHashExecute(r)
 }
 
 /*
-ReferencesByContentHash List artifact references by hash
-
-Returns a list containing all the artifact references using the artifact content hash.
+ * ReferencesByContentHash List artifact references by hash
+ * Returns a list containing all the artifact references using the artifact content hash.
 
 This operation may fail for one of the following reasons:
 
 * A server error occurred (HTTP error `500`)
 
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param contentHash SHA-256 content hash for a single artifact content.
- @return ApiReferencesByContentHashRequest
-*/
-func (a *ArtifactsApiService) ReferencesByContentHash(ctx context.Context, contentHash string) ApiReferencesByContentHashRequest {
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param contentHash SHA-256 content hash for a single artifact content.
+ * @return ApiReferencesByContentHashRequest
+ */
+func (a *ArtifactsApiService) ReferencesByContentHash(ctx _context.Context, contentHash string) ApiReferencesByContentHashRequest {
 	return ApiReferencesByContentHashRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -1613,27 +1589,31 @@ func (a *ArtifactsApiService) ReferencesByContentHash(ctx context.Context, conte
 	}
 }
 
-// Execute executes the request
-//  @return []ArtifactReference
-func (a *ArtifactsApiService) ReferencesByContentHashExecute(r ApiReferencesByContentHashRequest) ([]ArtifactReference, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return []ArtifactReference
+ */
+func (a *ArtifactsApiService) ReferencesByContentHashExecute(r ApiReferencesByContentHashRequest) ([]ArtifactReference, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 		localVarReturnValue  []ArtifactReference
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "ArtifactsApiService.ReferencesByContentHash")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/ids/contentHashes/{contentHash}/references"
-	localVarPath = strings.Replace(localVarPath, "{"+"contentHash"+"}", url.PathEscape(parameterToString(r.contentHash, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"contentHash"+"}", _neturl.PathEscape(parameterToString(r.contentHash, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -1652,7 +1632,7 @@ func (a *ArtifactsApiService) ReferencesByContentHashExecute(r ApiReferencesByCo
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -1662,15 +1642,15 @@ func (a *ArtifactsApiService) ReferencesByContentHashExecute(r ApiReferencesByCo
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -1679,7 +1659,7 @@ func (a *ArtifactsApiService) ReferencesByContentHashExecute(r ApiReferencesByCo
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -1690,29 +1670,28 @@ func (a *ArtifactsApiService) ReferencesByContentHashExecute(r ApiReferencesByCo
 }
 
 type ApiReferencesByContentIdRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService ArtifactsApi
 	contentId int64
 }
 
-func (r ApiReferencesByContentIdRequest) Execute() ([]ArtifactReference, *http.Response, error) {
+
+func (r ApiReferencesByContentIdRequest) Execute() ([]ArtifactReference, *_nethttp.Response, error) {
 	return r.ApiService.ReferencesByContentIdExecute(r)
 }
 
 /*
-ReferencesByContentId List artifact references by content ID
-
-Returns a list containing all the artifact references using the artifact content ID.
+ * ReferencesByContentId List artifact references by content ID
+ * Returns a list containing all the artifact references using the artifact content ID.
 
 This operation may fail for one of the following reasons:
 
 * A server error occurred (HTTP error `500`)
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param contentId Global identifier for a single artifact content.
- @return ApiReferencesByContentIdRequest
-*/
-func (a *ArtifactsApiService) ReferencesByContentId(ctx context.Context, contentId int64) ApiReferencesByContentIdRequest {
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param contentId Global identifier for a single artifact content.
+ * @return ApiReferencesByContentIdRequest
+ */
+func (a *ArtifactsApiService) ReferencesByContentId(ctx _context.Context, contentId int64) ApiReferencesByContentIdRequest {
 	return ApiReferencesByContentIdRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -1720,27 +1699,31 @@ func (a *ArtifactsApiService) ReferencesByContentId(ctx context.Context, content
 	}
 }
 
-// Execute executes the request
-//  @return []ArtifactReference
-func (a *ArtifactsApiService) ReferencesByContentIdExecute(r ApiReferencesByContentIdRequest) ([]ArtifactReference, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return []ArtifactReference
+ */
+func (a *ArtifactsApiService) ReferencesByContentIdExecute(r ApiReferencesByContentIdRequest) ([]ArtifactReference, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 		localVarReturnValue  []ArtifactReference
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "ArtifactsApiService.ReferencesByContentId")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/ids/contentIds/{contentId}/references"
-	localVarPath = strings.Replace(localVarPath, "{"+"contentId"+"}", url.PathEscape(parameterToString(r.contentId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"contentId"+"}", _neturl.PathEscape(parameterToString(r.contentId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -1759,7 +1742,7 @@ func (a *ArtifactsApiService) ReferencesByContentIdExecute(r ApiReferencesByCont
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -1769,15 +1752,15 @@ func (a *ArtifactsApiService) ReferencesByContentIdExecute(r ApiReferencesByCont
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -1786,7 +1769,7 @@ func (a *ArtifactsApiService) ReferencesByContentIdExecute(r ApiReferencesByCont
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -1797,29 +1780,28 @@ func (a *ArtifactsApiService) ReferencesByContentIdExecute(r ApiReferencesByCont
 }
 
 type ApiReferencesByGlobalIdRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService ArtifactsApi
 	globalId int64
 }
 
-func (r ApiReferencesByGlobalIdRequest) Execute() ([]ArtifactReference, *http.Response, error) {
+
+func (r ApiReferencesByGlobalIdRequest) Execute() ([]ArtifactReference, *_nethttp.Response, error) {
 	return r.ApiService.ReferencesByGlobalIdExecute(r)
 }
 
 /*
-ReferencesByGlobalId Returns a list with all the references for the artifact with the given global id.
-
-Returns a list containing all the artifact references using the artifact global id.
+ * ReferencesByGlobalId Returns a list with all the references for the artifact with the given global id.
+ * Returns a list containing all the artifact references using the artifact global id.
 
 This operation may fail for one of the following reasons:
 
 * A server error occurred (HTTP error `500`)
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param globalId Global identifier for an artifact version.
- @return ApiReferencesByGlobalIdRequest
-*/
-func (a *ArtifactsApiService) ReferencesByGlobalId(ctx context.Context, globalId int64) ApiReferencesByGlobalIdRequest {
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param globalId Global identifier for an artifact version.
+ * @return ApiReferencesByGlobalIdRequest
+ */
+func (a *ArtifactsApiService) ReferencesByGlobalId(ctx _context.Context, globalId int64) ApiReferencesByGlobalIdRequest {
 	return ApiReferencesByGlobalIdRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -1827,27 +1809,31 @@ func (a *ArtifactsApiService) ReferencesByGlobalId(ctx context.Context, globalId
 	}
 }
 
-// Execute executes the request
-//  @return []ArtifactReference
-func (a *ArtifactsApiService) ReferencesByGlobalIdExecute(r ApiReferencesByGlobalIdRequest) ([]ArtifactReference, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return []ArtifactReference
+ */
+func (a *ArtifactsApiService) ReferencesByGlobalIdExecute(r ApiReferencesByGlobalIdRequest) ([]ArtifactReference, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 		localVarReturnValue  []ArtifactReference
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "ArtifactsApiService.ReferencesByGlobalId")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/ids/globalIds/{globalId}/references"
-	localVarPath = strings.Replace(localVarPath, "{"+"globalId"+"}", url.PathEscape(parameterToString(r.globalId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"globalId"+"}", _neturl.PathEscape(parameterToString(r.globalId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -1866,7 +1852,7 @@ func (a *ArtifactsApiService) ReferencesByGlobalIdExecute(r ApiReferencesByGloba
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -1876,15 +1862,15 @@ func (a *ArtifactsApiService) ReferencesByGlobalIdExecute(r ApiReferencesByGloba
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -1893,7 +1879,7 @@ func (a *ArtifactsApiService) ReferencesByGlobalIdExecute(r ApiReferencesByGloba
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -1904,7 +1890,7 @@ func (a *ArtifactsApiService) ReferencesByGlobalIdExecute(r ApiReferencesByGloba
 }
 
 type ApiUpdateArtifactRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService ArtifactsApi
 	groupId string
 	artifactId string
@@ -1916,50 +1902,38 @@ type ApiUpdateArtifactRequest struct {
 	xRegistryDescriptionEncoded *string
 }
 
-// The new content of the artifact being updated. This is often, but not always, JSON data representing one of the supported artifact types:  * Avro (&#x60;AVRO&#x60;) * Protobuf (&#x60;PROTOBUF&#x60;) * JSON Schema (&#x60;JSON&#x60;) * Kafka Connect (&#x60;KCONNECT&#x60;) * OpenAPI (&#x60;OPENAPI&#x60;) * AsyncAPI (&#x60;ASYNCAPI&#x60;) * GraphQL (&#x60;GRAPHQL&#x60;) * Web Services Description Language (&#x60;WSDL&#x60;) * XML Schema (&#x60;XSD&#x60;) 
 func (r ApiUpdateArtifactRequest) Body(body interface{}) ApiUpdateArtifactRequest {
 	r.body = &body
 	return r
 }
-
-// Specifies the version number of this new version of the artifact content.  This would typically be a simple integer or a SemVer value.  If not provided, the server will assign a version number automatically.
 func (r ApiUpdateArtifactRequest) XRegistryVersion(xRegistryVersion string) ApiUpdateArtifactRequest {
 	r.xRegistryVersion = &xRegistryVersion
 	return r
 }
-
-// Specifies the artifact name of this new version of the artifact content. Name must be ASCII-only string. If this is not provided, the server will extract the name from the artifact content.
 func (r ApiUpdateArtifactRequest) XRegistryName(xRegistryName string) ApiUpdateArtifactRequest {
 	r.xRegistryName = &xRegistryName
 	return r
 }
-
-// Specifies the artifact name of this new version of the artifact content. Value of this must be Base64 encoded string. If this is not provided, the server will extract the name from the artifact content.
 func (r ApiUpdateArtifactRequest) XRegistryNameEncoded(xRegistryNameEncoded string) ApiUpdateArtifactRequest {
 	r.xRegistryNameEncoded = &xRegistryNameEncoded
 	return r
 }
-
-// Specifies the artifact description of this new version of the artifact content. Description must be ASCII-only string. If this is not provided, the server will extract the description from the artifact content.
 func (r ApiUpdateArtifactRequest) XRegistryDescription(xRegistryDescription string) ApiUpdateArtifactRequest {
 	r.xRegistryDescription = &xRegistryDescription
 	return r
 }
-
-// Specifies the artifact description of this new version of the artifact content. Value of this must be Base64 encoded string. If this is not provided, the server will extract the description from the artifact content.
 func (r ApiUpdateArtifactRequest) XRegistryDescriptionEncoded(xRegistryDescriptionEncoded string) ApiUpdateArtifactRequest {
 	r.xRegistryDescriptionEncoded = &xRegistryDescriptionEncoded
 	return r
 }
 
-func (r ApiUpdateArtifactRequest) Execute() (*ArtifactMetaData, *http.Response, error) {
+func (r ApiUpdateArtifactRequest) Execute() (ArtifactMetaData, *_nethttp.Response, error) {
 	return r.ApiService.UpdateArtifactExecute(r)
 }
 
 /*
-UpdateArtifact Update artifact
-
-Updates an artifact by uploading new content.  The body of the request can
+ * UpdateArtifact Update artifact
+ * Updates an artifact by uploading new content.  The body of the request can
 be the raw content of the artifact or a JSON object containing both the raw content and
 a set of references to other artifacts..  This is typically in JSON format for *most*
 of the supported types, but may be in another format for a few (for example, `PROTOBUF`).
@@ -1975,13 +1949,12 @@ The update could fail for a number of reasons including:
 
 When successful, this creates a new version of the artifact, making it the most recent
 (and therefore official) version of the artifact.
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
- @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
- @return ApiUpdateArtifactRequest
-*/
-func (a *ArtifactsApiService) UpdateArtifact(ctx context.Context, groupId string, artifactId string) ApiUpdateArtifactRequest {
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
+ * @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
+ * @return ApiUpdateArtifactRequest
+ */
+func (a *ArtifactsApiService) UpdateArtifact(ctx _context.Context, groupId string, artifactId string) ApiUpdateArtifactRequest {
 	return ApiUpdateArtifactRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -1990,28 +1963,32 @@ func (a *ArtifactsApiService) UpdateArtifact(ctx context.Context, groupId string
 	}
 }
 
-// Execute executes the request
-//  @return ArtifactMetaData
-func (a *ArtifactsApiService) UpdateArtifactExecute(r ApiUpdateArtifactRequest) (*ArtifactMetaData, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return ArtifactMetaData
+ */
+func (a *ArtifactsApiService) UpdateArtifactExecute(r ApiUpdateArtifactRequest) (ArtifactMetaData, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPut
+		localVarHTTPMethod   = _nethttp.MethodPut
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *ArtifactMetaData
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  ArtifactMetaData
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "ArtifactsApiService.UpdateArtifact")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/groups/{groupId}/artifacts/{artifactId}"
-	localVarPath = strings.Replace(localVarPath, "{"+"groupId"+"}", url.PathEscape(parameterToString(r.groupId, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"artifactId"+"}", url.PathEscape(parameterToString(r.artifactId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"groupId"+"}", _neturl.PathEscape(parameterToString(r.groupId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"artifactId"+"}", _neturl.PathEscape(parameterToString(r.artifactId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.body == nil {
 		return localVarReturnValue, nil, reportError("body is required and must be specified")
 	}
@@ -2050,7 +2027,7 @@ func (a *ArtifactsApiService) UpdateArtifactExecute(r ApiUpdateArtifactRequest)
 	}
 	// body params
 	localVarPostBody = r.body
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -2060,15 +2037,15 @@ func (a *ArtifactsApiService) UpdateArtifactExecute(r ApiUpdateArtifactRequest)
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -2079,8 +2056,7 @@ func (a *ArtifactsApiService) UpdateArtifactExecute(r ApiUpdateArtifactRequest)
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 409 {
@@ -2090,8 +2066,7 @@ func (a *ArtifactsApiService) UpdateArtifactExecute(r ApiUpdateArtifactRequest)
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -2101,15 +2076,14 @@ func (a *ArtifactsApiService) UpdateArtifactExecute(r ApiUpdateArtifactRequest)
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -2120,7 +2094,7 @@ func (a *ArtifactsApiService) UpdateArtifactExecute(r ApiUpdateArtifactRequest)
 }
 
 type ApiUpdateArtifactStateRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService ArtifactsApi
 	groupId string
 	artifactId string
@@ -2132,14 +2106,13 @@ func (r ApiUpdateArtifactStateRequest) UpdateState(updateState UpdateState) ApiU
 	return r
 }
 
-func (r ApiUpdateArtifactStateRequest) Execute() (*http.Response, error) {
+func (r ApiUpdateArtifactStateRequest) Execute() (*_nethttp.Response, error) {
 	return r.ApiService.UpdateArtifactStateExecute(r)
 }
 
 /*
-UpdateArtifactState Update artifact state
-
-Updates the state of the artifact.  For example, you can use this to mark the latest
+ * UpdateArtifactState Update artifact state
+ * Updates the state of the artifact.  For example, you can use this to mark the latest
 version of an artifact as `DEPRECATED`.  The operation changes the state of the latest 
 version of the artifact.  If multiple versions exist, only the most recent is changed.
 
@@ -2148,13 +2121,12 @@ This operation can fail for the following reasons:
 * No artifact with this `artifactId` exists (HTTP error `404`)
 * A server error occurred (HTTP error `500`)
 
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
- @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
- @return ApiUpdateArtifactStateRequest
-*/
-func (a *ArtifactsApiService) UpdateArtifactState(ctx context.Context, groupId string, artifactId string) ApiUpdateArtifactStateRequest {
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
+ * @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
+ * @return ApiUpdateArtifactStateRequest
+ */
+func (a *ArtifactsApiService) UpdateArtifactState(ctx _context.Context, groupId string, artifactId string) ApiUpdateArtifactStateRequest {
 	return ApiUpdateArtifactStateRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -2163,26 +2135,30 @@ func (a *ArtifactsApiService) UpdateArtifactState(ctx context.Context, groupId s
 	}
 }
 
-// Execute executes the request
-func (a *ArtifactsApiService) UpdateArtifactStateExecute(r ApiUpdateArtifactStateRequest) (*http.Response, error) {
+/*
+ * Execute executes the request
+ */
+func (a *ArtifactsApiService) UpdateArtifactStateExecute(r ApiUpdateArtifactStateRequest) (*_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPut
+		localVarHTTPMethod   = _nethttp.MethodPut
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "ArtifactsApiService.UpdateArtifactState")
 	if err != nil {
-		return nil, &GenericOpenAPIError{error: err.Error()}
+		return nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/groups/{groupId}/artifacts/{artifactId}/state"
-	localVarPath = strings.Replace(localVarPath, "{"+"groupId"+"}", url.PathEscape(parameterToString(r.groupId, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"artifactId"+"}", url.PathEscape(parameterToString(r.artifactId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"groupId"+"}", _neturl.PathEscape(parameterToString(r.groupId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"artifactId"+"}", _neturl.PathEscape(parameterToString(r.artifactId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.updateState == nil {
 		return nil, reportError("updateState is required and must be specified")
 	}
@@ -2206,7 +2182,7 @@ func (a *ArtifactsApiService) UpdateArtifactStateExecute(r ApiUpdateArtifactStat
 	}
 	// body params
 	localVarPostBody = r.updateState
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return nil, err
 	}
@@ -2216,15 +2192,15 @@ func (a *ArtifactsApiService) UpdateArtifactStateExecute(r ApiUpdateArtifactStat
 		return localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -2235,8 +2211,7 @@ func (a *ArtifactsApiService) UpdateArtifactStateExecute(r ApiUpdateArtifactStat
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -2246,8 +2221,7 @@ func (a *ArtifactsApiService) UpdateArtifactStateExecute(r ApiUpdateArtifactStat
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -2257,8 +2231,7 @@ func (a *ArtifactsApiService) UpdateArtifactStateExecute(r ApiUpdateArtifactStat
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarHTTPResponse, newErr
 	}
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/api_global_rules.go b/app-services-sdk-go/registryinstance/apiv1internal/client/api_global_rules.go
index 6a12ab37..11312b45 100644
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/api_global_rules.go
+++ b/app-services-sdk-go/registryinstance/apiv1internal/client/api_global_rules.go
@@ -1,11 +1,11 @@
 /*
-Service Registry API
-
-Service Registry Instance API  NOTE: This API cannot be called directly from the portal.
-
-API version: 2.2.5.Final
-Contact: apicurio@lists.jboss.org
-*/
+ * Apicurio Registry API [v2]
+ *
+ * Apicurio Registry is a datastore for standard event schemas and API designs. Apicurio Registry enables developers to manage and share the structure of their data using a REST interface. For example, client applications can dynamically push or pull the latest updates to or from the registry without needing to redeploy. Apicurio Registry also enables developers to create rules that govern how registry content can evolve over time. For example, this includes rules for content validation and version compatibility.  The Apicurio Registry REST API enables client applications to manage the artifacts in the registry. This API provides create, read, update, and delete operations for schema and API artifacts, rules, versions, and metadata.   The supported artifact types include: - Apache Avro schema - AsyncAPI specification - Google protocol buffers - GraphQL schema - JSON Schema - Kafka Connect schema - OpenAPI specification - Web Services Description Language - XML Schema Definition   **Important**: The Apicurio Registry REST API is available from `https://MY-REGISTRY-URL/apis/registry/v2` by default. Therefore you must prefix all API operation paths with `../apis/registry/v2` in this case. For example: `../apis/registry/v2/ids/globalIds/{globalId}`. 
+ *
+ * API version: 2.2.5.Final
+ * Contact: apicurio@lists.jboss.org
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -13,20 +13,23 @@ package registryinstanceclient
 
 import (
 	"bytes"
-	"context"
-	"io/ioutil"
-	"net/http"
-	"net/url"
+	_context "context"
+	_ioutil "io/ioutil"
+	_nethttp "net/http"
+	_neturl "net/url"
 	"strings"
 )
 
+// Linger please
+var (
+	_ _context.Context
+)
 
 type GlobalRulesApi interface {
 
 	/*
-	CreateGlobalRule Create global rule
-
-	Adds a rule to the list of globally configured rules.
+	 * CreateGlobalRule Create global rule
+	 * Adds a rule to the list of globally configured rules.
 
 This operation can fail for the following reasons:
 
@@ -34,37 +37,37 @@ This operation can fail for the following reasons:
 * The rule already exists (HTTP error `409`)
 * A server error occurred (HTTP error `500`)
 
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiCreateGlobalRuleRequest
-	*/
-	CreateGlobalRule(ctx context.Context) ApiCreateGlobalRuleRequest
-
-	// CreateGlobalRuleExecute executes the request
-	CreateGlobalRuleExecute(r ApiCreateGlobalRuleRequest) (*http.Response, error)
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiCreateGlobalRuleRequest
+	 */
+	CreateGlobalRule(ctx _context.Context) ApiCreateGlobalRuleRequest
 
 	/*
-	DeleteAllGlobalRules Delete all global rules
+	 * CreateGlobalRuleExecute executes the request
+	 */
+	CreateGlobalRuleExecute(r ApiCreateGlobalRuleRequest) (*_nethttp.Response, error)
 
-	Deletes all globally configured rules.
+	/*
+	 * DeleteAllGlobalRules Delete all global rules
+	 * Deletes all globally configured rules.
 
 This operation can fail for the following reasons:
 
 * A server error occurred (HTTP error `500`)
 
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiDeleteAllGlobalRulesRequest
-	*/
-	DeleteAllGlobalRules(ctx context.Context) ApiDeleteAllGlobalRulesRequest
-
-	// DeleteAllGlobalRulesExecute executes the request
-	DeleteAllGlobalRulesExecute(r ApiDeleteAllGlobalRulesRequest) (*http.Response, error)
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiDeleteAllGlobalRulesRequest
+	 */
+	DeleteAllGlobalRules(ctx _context.Context) ApiDeleteAllGlobalRulesRequest
 
 	/*
-	DeleteGlobalRule Delete global rule
+	 * DeleteAllGlobalRulesExecute executes the request
+	 */
+	DeleteAllGlobalRulesExecute(r ApiDeleteAllGlobalRulesRequest) (*_nethttp.Response, error)
 
-	Deletes a single global rule.  If this is the only rule configured, this is the same
+	/*
+	 * DeleteGlobalRule Delete global rule
+	 * Deletes a single global rule.  If this is the only rule configured, this is the same
 as deleting **all** rules.
 
 This operation can fail for the following reasons:
@@ -74,20 +77,20 @@ This operation can fail for the following reasons:
 * Rule cannot be deleted (HTTP error `409`)
 * A server error occurred (HTTP error `500`)
 
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param rule The unique name/type of a rule.
-	@return ApiDeleteGlobalRuleRequest
-	*/
-	DeleteGlobalRule(ctx context.Context, rule RuleType) ApiDeleteGlobalRuleRequest
-
-	// DeleteGlobalRuleExecute executes the request
-	DeleteGlobalRuleExecute(r ApiDeleteGlobalRuleRequest) (*http.Response, error)
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param rule The unique name/type of a rule.
+	 * @return ApiDeleteGlobalRuleRequest
+	 */
+	DeleteGlobalRule(ctx _context.Context, rule RuleType) ApiDeleteGlobalRuleRequest
 
 	/*
-	GetGlobalRuleConfig Get global rule configuration
+	 * DeleteGlobalRuleExecute executes the request
+	 */
+	DeleteGlobalRuleExecute(r ApiDeleteGlobalRuleRequest) (*_nethttp.Response, error)
 
-	Returns information about the named globally configured rule.
+	/*
+	 * GetGlobalRuleConfig Get global rule configuration
+	 * Returns information about the named globally configured rule.
 
 This operation can fail for the following reasons:
 
@@ -95,40 +98,40 @@ This operation can fail for the following reasons:
 * No rule with name/type `rule` exists (HTTP error `404`)
 * A server error occurred (HTTP error `500`)
 
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param rule The unique name/type of a rule.
-	@return ApiGetGlobalRuleConfigRequest
-	*/
-	GetGlobalRuleConfig(ctx context.Context, rule RuleType) ApiGetGlobalRuleConfigRequest
-
-	// GetGlobalRuleConfigExecute executes the request
-	//  @return Rule
-	GetGlobalRuleConfigExecute(r ApiGetGlobalRuleConfigRequest) (*Rule, *http.Response, error)
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param rule The unique name/type of a rule.
+	 * @return ApiGetGlobalRuleConfigRequest
+	 */
+	GetGlobalRuleConfig(ctx _context.Context, rule RuleType) ApiGetGlobalRuleConfigRequest
 
 	/*
-	ListGlobalRules List global rules
+	 * GetGlobalRuleConfigExecute executes the request
+	 * @return Rule
+	 */
+	GetGlobalRuleConfigExecute(r ApiGetGlobalRuleConfigRequest) (Rule, *_nethttp.Response, error)
 
-	Gets a list of all the currently configured global rules (if any).
+	/*
+	 * ListGlobalRules List global rules
+	 * Gets a list of all the currently configured global rules (if any).
 
 This operation can fail for the following reasons:
 
 * A server error occurred (HTTP error `500`)
 
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiListGlobalRulesRequest
-	*/
-	ListGlobalRules(ctx context.Context) ApiListGlobalRulesRequest
-
-	// ListGlobalRulesExecute executes the request
-	//  @return []RuleType
-	ListGlobalRulesExecute(r ApiListGlobalRulesRequest) ([]RuleType, *http.Response, error)
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiListGlobalRulesRequest
+	 */
+	ListGlobalRules(ctx _context.Context) ApiListGlobalRulesRequest
 
 	/*
-	UpdateGlobalRuleConfig Update global rule configuration
+	 * ListGlobalRulesExecute executes the request
+	 * @return []RuleType
+	 */
+	ListGlobalRulesExecute(r ApiListGlobalRulesRequest) ([]RuleType, *_nethttp.Response, error)
 
-	Updates the configuration for a globally configured rule.
+	/*
+	 * UpdateGlobalRuleConfig Update global rule configuration
+	 * Updates the configuration for a globally configured rule.
 
 This operation can fail for the following reasons:
 
@@ -136,23 +139,24 @@ This operation can fail for the following reasons:
 * No rule with name/type `rule` exists (HTTP error `404`)
 * A server error occurred (HTTP error `500`)
 
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param rule The unique name/type of a rule.
+	 * @return ApiUpdateGlobalRuleConfigRequest
+	 */
+	UpdateGlobalRuleConfig(ctx _context.Context, rule RuleType) ApiUpdateGlobalRuleConfigRequest
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param rule The unique name/type of a rule.
-	@return ApiUpdateGlobalRuleConfigRequest
-	*/
-	UpdateGlobalRuleConfig(ctx context.Context, rule RuleType) ApiUpdateGlobalRuleConfigRequest
-
-	// UpdateGlobalRuleConfigExecute executes the request
-	//  @return Rule
-	UpdateGlobalRuleConfigExecute(r ApiUpdateGlobalRuleConfigRequest) (*Rule, *http.Response, error)
+	/*
+	 * UpdateGlobalRuleConfigExecute executes the request
+	 * @return Rule
+	 */
+	UpdateGlobalRuleConfigExecute(r ApiUpdateGlobalRuleConfigRequest) (Rule, *_nethttp.Response, error)
 }
 
 // GlobalRulesApiService GlobalRulesApi service
 type GlobalRulesApiService service
 
 type ApiCreateGlobalRuleRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService GlobalRulesApi
 	rule *Rule
 }
@@ -162,14 +166,13 @@ func (r ApiCreateGlobalRuleRequest) Rule(rule Rule) ApiCreateGlobalRuleRequest {
 	return r
 }
 
-func (r ApiCreateGlobalRuleRequest) Execute() (*http.Response, error) {
+func (r ApiCreateGlobalRuleRequest) Execute() (*_nethttp.Response, error) {
 	return r.ApiService.CreateGlobalRuleExecute(r)
 }
 
 /*
-CreateGlobalRule Create global rule
-
-Adds a rule to the list of globally configured rules.
+ * CreateGlobalRule Create global rule
+ * Adds a rule to the list of globally configured rules.
 
 This operation can fail for the following reasons:
 
@@ -177,35 +180,38 @@ This operation can fail for the following reasons:
 * The rule already exists (HTTP error `409`)
 * A server error occurred (HTTP error `500`)
 
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiCreateGlobalRuleRequest
-*/
-func (a *GlobalRulesApiService) CreateGlobalRule(ctx context.Context) ApiCreateGlobalRuleRequest {
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiCreateGlobalRuleRequest
+ */
+func (a *GlobalRulesApiService) CreateGlobalRule(ctx _context.Context) ApiCreateGlobalRuleRequest {
 	return ApiCreateGlobalRuleRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-func (a *GlobalRulesApiService) CreateGlobalRuleExecute(r ApiCreateGlobalRuleRequest) (*http.Response, error) {
+/*
+ * Execute executes the request
+ */
+func (a *GlobalRulesApiService) CreateGlobalRuleExecute(r ApiCreateGlobalRuleRequest) (*_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "GlobalRulesApiService.CreateGlobalRule")
 	if err != nil {
-		return nil, &GenericOpenAPIError{error: err.Error()}
+		return nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/admin/rules"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.rule == nil {
 		return nil, reportError("rule is required and must be specified")
 	}
@@ -229,7 +235,7 @@ func (a *GlobalRulesApiService) CreateGlobalRuleExecute(r ApiCreateGlobalRuleReq
 	}
 	// body params
 	localVarPostBody = r.rule
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return nil, err
 	}
@@ -239,15 +245,15 @@ func (a *GlobalRulesApiService) CreateGlobalRuleExecute(r ApiCreateGlobalRuleReq
 		return localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -258,8 +264,7 @@ func (a *GlobalRulesApiService) CreateGlobalRuleExecute(r ApiCreateGlobalRuleReq
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 409 {
@@ -269,8 +274,7 @@ func (a *GlobalRulesApiService) CreateGlobalRuleExecute(r ApiCreateGlobalRuleReq
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -280,8 +284,7 @@ func (a *GlobalRulesApiService) CreateGlobalRuleExecute(r ApiCreateGlobalRuleReq
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarHTTPResponse, newErr
 	}
@@ -290,52 +293,55 @@ func (a *GlobalRulesApiService) CreateGlobalRuleExecute(r ApiCreateGlobalRuleReq
 }
 
 type ApiDeleteAllGlobalRulesRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService GlobalRulesApi
 }
 
-func (r ApiDeleteAllGlobalRulesRequest) Execute() (*http.Response, error) {
+
+func (r ApiDeleteAllGlobalRulesRequest) Execute() (*_nethttp.Response, error) {
 	return r.ApiService.DeleteAllGlobalRulesExecute(r)
 }
 
 /*
-DeleteAllGlobalRules Delete all global rules
-
-Deletes all globally configured rules.
+ * DeleteAllGlobalRules Delete all global rules
+ * Deletes all globally configured rules.
 
 This operation can fail for the following reasons:
 
 * A server error occurred (HTTP error `500`)
 
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiDeleteAllGlobalRulesRequest
-*/
-func (a *GlobalRulesApiService) DeleteAllGlobalRules(ctx context.Context) ApiDeleteAllGlobalRulesRequest {
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiDeleteAllGlobalRulesRequest
+ */
+func (a *GlobalRulesApiService) DeleteAllGlobalRules(ctx _context.Context) ApiDeleteAllGlobalRulesRequest {
 	return ApiDeleteAllGlobalRulesRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-func (a *GlobalRulesApiService) DeleteAllGlobalRulesExecute(r ApiDeleteAllGlobalRulesRequest) (*http.Response, error) {
+/*
+ * Execute executes the request
+ */
+func (a *GlobalRulesApiService) DeleteAllGlobalRulesExecute(r ApiDeleteAllGlobalRulesRequest) (*_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodDelete
+		localVarHTTPMethod   = _nethttp.MethodDelete
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "GlobalRulesApiService.DeleteAllGlobalRules")
 	if err != nil {
-		return nil, &GenericOpenAPIError{error: err.Error()}
+		return nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/admin/rules"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -354,7 +360,7 @@ func (a *GlobalRulesApiService) DeleteAllGlobalRulesExecute(r ApiDeleteAllGlobal
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return nil, err
 	}
@@ -364,15 +370,15 @@ func (a *GlobalRulesApiService) DeleteAllGlobalRulesExecute(r ApiDeleteAllGlobal
 		return localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -383,8 +389,7 @@ func (a *GlobalRulesApiService) DeleteAllGlobalRulesExecute(r ApiDeleteAllGlobal
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarHTTPResponse, newErr
 	}
@@ -393,19 +398,19 @@ func (a *GlobalRulesApiService) DeleteAllGlobalRulesExecute(r ApiDeleteAllGlobal
 }
 
 type ApiDeleteGlobalRuleRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService GlobalRulesApi
 	rule RuleType
 }
 
-func (r ApiDeleteGlobalRuleRequest) Execute() (*http.Response, error) {
+
+func (r ApiDeleteGlobalRuleRequest) Execute() (*_nethttp.Response, error) {
 	return r.ApiService.DeleteGlobalRuleExecute(r)
 }
 
 /*
-DeleteGlobalRule Delete global rule
-
-Deletes a single global rule.  If this is the only rule configured, this is the same
+ * DeleteGlobalRule Delete global rule
+ * Deletes a single global rule.  If this is the only rule configured, this is the same
 as deleting **all** rules.
 
 This operation can fail for the following reasons:
@@ -415,12 +420,11 @@ This operation can fail for the following reasons:
 * Rule cannot be deleted (HTTP error `409`)
 * A server error occurred (HTTP error `500`)
 
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param rule The unique name/type of a rule.
- @return ApiDeleteGlobalRuleRequest
-*/
-func (a *GlobalRulesApiService) DeleteGlobalRule(ctx context.Context, rule RuleType) ApiDeleteGlobalRuleRequest {
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param rule The unique name/type of a rule.
+ * @return ApiDeleteGlobalRuleRequest
+ */
+func (a *GlobalRulesApiService) DeleteGlobalRule(ctx _context.Context, rule RuleType) ApiDeleteGlobalRuleRequest {
 	return ApiDeleteGlobalRuleRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -428,25 +432,29 @@ func (a *GlobalRulesApiService) DeleteGlobalRule(ctx context.Context, rule RuleT
 	}
 }
 
-// Execute executes the request
-func (a *GlobalRulesApiService) DeleteGlobalRuleExecute(r ApiDeleteGlobalRuleRequest) (*http.Response, error) {
+/*
+ * Execute executes the request
+ */
+func (a *GlobalRulesApiService) DeleteGlobalRuleExecute(r ApiDeleteGlobalRuleRequest) (*_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodDelete
+		localVarHTTPMethod   = _nethttp.MethodDelete
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "GlobalRulesApiService.DeleteGlobalRule")
 	if err != nil {
-		return nil, &GenericOpenAPIError{error: err.Error()}
+		return nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/admin/rules/{rule}"
-	localVarPath = strings.Replace(localVarPath, "{"+"rule"+"}", url.PathEscape(parameterToString(r.rule, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"rule"+"}", _neturl.PathEscape(parameterToString(r.rule, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -465,7 +473,7 @@ func (a *GlobalRulesApiService) DeleteGlobalRuleExecute(r ApiDeleteGlobalRuleReq
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return nil, err
 	}
@@ -475,15 +483,15 @@ func (a *GlobalRulesApiService) DeleteGlobalRuleExecute(r ApiDeleteGlobalRuleReq
 		return localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -494,8 +502,7 @@ func (a *GlobalRulesApiService) DeleteGlobalRuleExecute(r ApiDeleteGlobalRuleReq
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -505,8 +512,7 @@ func (a *GlobalRulesApiService) DeleteGlobalRuleExecute(r ApiDeleteGlobalRuleReq
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarHTTPResponse, newErr
 	}
@@ -515,19 +521,19 @@ func (a *GlobalRulesApiService) DeleteGlobalRuleExecute(r ApiDeleteGlobalRuleReq
 }
 
 type ApiGetGlobalRuleConfigRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService GlobalRulesApi
 	rule RuleType
 }
 
-func (r ApiGetGlobalRuleConfigRequest) Execute() (*Rule, *http.Response, error) {
+
+func (r ApiGetGlobalRuleConfigRequest) Execute() (Rule, *_nethttp.Response, error) {
 	return r.ApiService.GetGlobalRuleConfigExecute(r)
 }
 
 /*
-GetGlobalRuleConfig Get global rule configuration
-
-Returns information about the named globally configured rule.
+ * GetGlobalRuleConfig Get global rule configuration
+ * Returns information about the named globally configured rule.
 
 This operation can fail for the following reasons:
 
@@ -535,12 +541,11 @@ This operation can fail for the following reasons:
 * No rule with name/type `rule` exists (HTTP error `404`)
 * A server error occurred (HTTP error `500`)
 
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param rule The unique name/type of a rule.
- @return ApiGetGlobalRuleConfigRequest
-*/
-func (a *GlobalRulesApiService) GetGlobalRuleConfig(ctx context.Context, rule RuleType) ApiGetGlobalRuleConfigRequest {
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param rule The unique name/type of a rule.
+ * @return ApiGetGlobalRuleConfigRequest
+ */
+func (a *GlobalRulesApiService) GetGlobalRuleConfig(ctx _context.Context, rule RuleType) ApiGetGlobalRuleConfigRequest {
 	return ApiGetGlobalRuleConfigRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -548,27 +553,31 @@ func (a *GlobalRulesApiService) GetGlobalRuleConfig(ctx context.Context, rule Ru
 	}
 }
 
-// Execute executes the request
-//  @return Rule
-func (a *GlobalRulesApiService) GetGlobalRuleConfigExecute(r ApiGetGlobalRuleConfigRequest) (*Rule, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return Rule
+ */
+func (a *GlobalRulesApiService) GetGlobalRuleConfigExecute(r ApiGetGlobalRuleConfigRequest) (Rule, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *Rule
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  Rule
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "GlobalRulesApiService.GetGlobalRuleConfig")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/admin/rules/{rule}"
-	localVarPath = strings.Replace(localVarPath, "{"+"rule"+"}", url.PathEscape(parameterToString(r.rule, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"rule"+"}", _neturl.PathEscape(parameterToString(r.rule, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -587,7 +596,7 @@ func (a *GlobalRulesApiService) GetGlobalRuleConfigExecute(r ApiGetGlobalRuleCon
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -597,15 +606,15 @@ func (a *GlobalRulesApiService) GetGlobalRuleConfigExecute(r ApiGetGlobalRuleCon
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -616,8 +625,7 @@ func (a *GlobalRulesApiService) GetGlobalRuleConfigExecute(r ApiGetGlobalRuleCon
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -627,15 +635,14 @@ func (a *GlobalRulesApiService) GetGlobalRuleConfigExecute(r ApiGetGlobalRuleCon
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -646,54 +653,57 @@ func (a *GlobalRulesApiService) GetGlobalRuleConfigExecute(r ApiGetGlobalRuleCon
 }
 
 type ApiListGlobalRulesRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService GlobalRulesApi
 }
 
-func (r ApiListGlobalRulesRequest) Execute() ([]RuleType, *http.Response, error) {
+
+func (r ApiListGlobalRulesRequest) Execute() ([]RuleType, *_nethttp.Response, error) {
 	return r.ApiService.ListGlobalRulesExecute(r)
 }
 
 /*
-ListGlobalRules List global rules
-
-Gets a list of all the currently configured global rules (if any).
+ * ListGlobalRules List global rules
+ * Gets a list of all the currently configured global rules (if any).
 
 This operation can fail for the following reasons:
 
 * A server error occurred (HTTP error `500`)
 
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiListGlobalRulesRequest
-*/
-func (a *GlobalRulesApiService) ListGlobalRules(ctx context.Context) ApiListGlobalRulesRequest {
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiListGlobalRulesRequest
+ */
+func (a *GlobalRulesApiService) ListGlobalRules(ctx _context.Context) ApiListGlobalRulesRequest {
 	return ApiListGlobalRulesRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return []RuleType
-func (a *GlobalRulesApiService) ListGlobalRulesExecute(r ApiListGlobalRulesRequest) ([]RuleType, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return []RuleType
+ */
+func (a *GlobalRulesApiService) ListGlobalRulesExecute(r ApiListGlobalRulesRequest) ([]RuleType, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 		localVarReturnValue  []RuleType
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "GlobalRulesApiService.ListGlobalRules")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/admin/rules"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -712,7 +722,7 @@ func (a *GlobalRulesApiService) ListGlobalRulesExecute(r ApiListGlobalRulesReque
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -722,15 +732,15 @@ func (a *GlobalRulesApiService) ListGlobalRulesExecute(r ApiListGlobalRulesReque
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -741,15 +751,14 @@ func (a *GlobalRulesApiService) ListGlobalRulesExecute(r ApiListGlobalRulesReque
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -760,7 +769,7 @@ func (a *GlobalRulesApiService) ListGlobalRulesExecute(r ApiListGlobalRulesReque
 }
 
 type ApiUpdateGlobalRuleConfigRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService GlobalRulesApi
 	rule RuleType
 	rule2 *Rule
@@ -771,14 +780,13 @@ func (r ApiUpdateGlobalRuleConfigRequest) Rule2(rule2 Rule) ApiUpdateGlobalRuleC
 	return r
 }
 
-func (r ApiUpdateGlobalRuleConfigRequest) Execute() (*Rule, *http.Response, error) {
+func (r ApiUpdateGlobalRuleConfigRequest) Execute() (Rule, *_nethttp.Response, error) {
 	return r.ApiService.UpdateGlobalRuleConfigExecute(r)
 }
 
 /*
-UpdateGlobalRuleConfig Update global rule configuration
-
-Updates the configuration for a globally configured rule.
+ * UpdateGlobalRuleConfig Update global rule configuration
+ * Updates the configuration for a globally configured rule.
 
 This operation can fail for the following reasons:
 
@@ -786,12 +794,11 @@ This operation can fail for the following reasons:
 * No rule with name/type `rule` exists (HTTP error `404`)
 * A server error occurred (HTTP error `500`)
 
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param rule The unique name/type of a rule.
- @return ApiUpdateGlobalRuleConfigRequest
-*/
-func (a *GlobalRulesApiService) UpdateGlobalRuleConfig(ctx context.Context, rule RuleType) ApiUpdateGlobalRuleConfigRequest {
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param rule The unique name/type of a rule.
+ * @return ApiUpdateGlobalRuleConfigRequest
+ */
+func (a *GlobalRulesApiService) UpdateGlobalRuleConfig(ctx _context.Context, rule RuleType) ApiUpdateGlobalRuleConfigRequest {
 	return ApiUpdateGlobalRuleConfigRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -799,27 +806,31 @@ func (a *GlobalRulesApiService) UpdateGlobalRuleConfig(ctx context.Context, rule
 	}
 }
 
-// Execute executes the request
-//  @return Rule
-func (a *GlobalRulesApiService) UpdateGlobalRuleConfigExecute(r ApiUpdateGlobalRuleConfigRequest) (*Rule, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return Rule
+ */
+func (a *GlobalRulesApiService) UpdateGlobalRuleConfigExecute(r ApiUpdateGlobalRuleConfigRequest) (Rule, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPut
+		localVarHTTPMethod   = _nethttp.MethodPut
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *Rule
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  Rule
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "GlobalRulesApiService.UpdateGlobalRuleConfig")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/admin/rules/{rule}"
-	localVarPath = strings.Replace(localVarPath, "{"+"rule"+"}", url.PathEscape(parameterToString(r.rule, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"rule"+"}", _neturl.PathEscape(parameterToString(r.rule, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.rule2 == nil {
 		return localVarReturnValue, nil, reportError("rule2 is required and must be specified")
 	}
@@ -843,7 +854,7 @@ func (a *GlobalRulesApiService) UpdateGlobalRuleConfigExecute(r ApiUpdateGlobalR
 	}
 	// body params
 	localVarPostBody = r.rule2
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -853,15 +864,15 @@ func (a *GlobalRulesApiService) UpdateGlobalRuleConfigExecute(r ApiUpdateGlobalR
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -872,8 +883,7 @@ func (a *GlobalRulesApiService) UpdateGlobalRuleConfigExecute(r ApiUpdateGlobalR
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -883,15 +893,14 @@ func (a *GlobalRulesApiService) UpdateGlobalRuleConfigExecute(r ApiUpdateGlobalR
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/api_metadata.go b/app-services-sdk-go/registryinstance/apiv1internal/client/api_metadata.go
index 1b6533ef..680a7ed1 100644
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/api_metadata.go
+++ b/app-services-sdk-go/registryinstance/apiv1internal/client/api_metadata.go
@@ -1,11 +1,11 @@
 /*
-Service Registry API
-
-Service Registry Instance API  NOTE: This API cannot be called directly from the portal.
-
-API version: 2.2.5.Final
-Contact: apicurio@lists.jboss.org
-*/
+ * Apicurio Registry API [v2]
+ *
+ * Apicurio Registry is a datastore for standard event schemas and API designs. Apicurio Registry enables developers to manage and share the structure of their data using a REST interface. For example, client applications can dynamically push or pull the latest updates to or from the registry without needing to redeploy. Apicurio Registry also enables developers to create rules that govern how registry content can evolve over time. For example, this includes rules for content validation and version compatibility.  The Apicurio Registry REST API enables client applications to manage the artifacts in the registry. This API provides create, read, update, and delete operations for schema and API artifacts, rules, versions, and metadata.   The supported artifact types include: - Apache Avro schema - AsyncAPI specification - Google protocol buffers - GraphQL schema - JSON Schema - Kafka Connect schema - OpenAPI specification - Web Services Description Language - XML Schema Definition   **Important**: The Apicurio Registry REST API is available from `https://MY-REGISTRY-URL/apis/registry/v2` by default. Therefore you must prefix all API operation paths with `../apis/registry/v2` in this case. For example: `../apis/registry/v2/ids/globalIds/{globalId}`. 
+ *
+ * API version: 2.2.5.Final
+ * Contact: apicurio@lists.jboss.org
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -13,20 +13,23 @@ package registryinstanceclient
 
 import (
 	"bytes"
-	"context"
-	"io/ioutil"
-	"net/http"
-	"net/url"
+	_context "context"
+	_ioutil "io/ioutil"
+	_nethttp "net/http"
+	_neturl "net/url"
 	"strings"
 )
 
+// Linger please
+var (
+	_ _context.Context
+)
 
 type MetadataApi interface {
 
 	/*
-	DeleteArtifactVersionMetaData Delete artifact version metadata
-
-	Deletes the user-editable metadata properties of the artifact version.  Any properties
+	 * DeleteArtifactVersionMetaData Delete artifact version metadata
+	 * Deletes the user-editable metadata properties of the artifact version.  Any properties
 that are not user-editable are preserved.
 
 This operation can fail for the following reasons:
@@ -35,65 +38,65 @@ This operation can fail for the following reasons:
 * No version with this `version` exists (HTTP error `404`)
 * A server error occurred (HTTP error `500`)
 
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
-	@param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
-	@param version The unique identifier of a specific version of the artifact content.
-	@return ApiDeleteArtifactVersionMetaDataRequest
-	*/
-	DeleteArtifactVersionMetaData(ctx context.Context, groupId string, artifactId string, version string) ApiDeleteArtifactVersionMetaDataRequest
-
-	// DeleteArtifactVersionMetaDataExecute executes the request
-	DeleteArtifactVersionMetaDataExecute(r ApiDeleteArtifactVersionMetaDataRequest) (*http.Response, error)
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
+	 * @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
+	 * @param version The unique identifier of a specific version of the artifact content.
+	 * @return ApiDeleteArtifactVersionMetaDataRequest
+	 */
+	DeleteArtifactVersionMetaData(ctx _context.Context, groupId string, artifactId string, version string) ApiDeleteArtifactVersionMetaDataRequest
 
 	/*
-	GetArtifactMetaData Get artifact metadata
+	 * DeleteArtifactVersionMetaDataExecute executes the request
+	 */
+	DeleteArtifactVersionMetaDataExecute(r ApiDeleteArtifactVersionMetaDataRequest) (*_nethttp.Response, error)
 
-	Gets the metadata for an artifact in the registry.  The returned metadata includes
+	/*
+	 * GetArtifactMetaData Get artifact metadata
+	 * Gets the metadata for an artifact in the registry.  The returned metadata includes
 both generated (read-only) and editable metadata (such as name and description).
 
 This operation can fail for the following reasons:
 
 * No artifact with this `artifactId` exists (HTTP error `404`)
 * A server error occurred (HTTP error `500`)
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
-	@param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
-	@return ApiGetArtifactMetaDataRequest
-	*/
-	GetArtifactMetaData(ctx context.Context, groupId string, artifactId string) ApiGetArtifactMetaDataRequest
-
-	// GetArtifactMetaDataExecute executes the request
-	//  @return ArtifactMetaData
-	GetArtifactMetaDataExecute(r ApiGetArtifactMetaDataRequest) (*ArtifactMetaData, *http.Response, error)
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
+	 * @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
+	 * @return ApiGetArtifactMetaDataRequest
+	 */
+	GetArtifactMetaData(ctx _context.Context, groupId string, artifactId string) ApiGetArtifactMetaDataRequest
 
 	/*
-	GetArtifactOwner Get artifact owner
+	 * GetArtifactMetaDataExecute executes the request
+	 * @return ArtifactMetaData
+	 */
+	GetArtifactMetaDataExecute(r ApiGetArtifactMetaDataRequest) (ArtifactMetaData, *_nethttp.Response, error)
 
-	Gets the owner of an artifact in the registry.
+	/*
+	 * GetArtifactOwner Get artifact owner
+	 * Gets the owner of an artifact in the registry.
 
 This operation can fail for the following reasons:
 
 * No artifact with this `artifactId` exists (HTTP error `404`)
 * A server error occurred (HTTP error `500`)
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
-	@param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
-	@return ApiGetArtifactOwnerRequest
-	*/
-	GetArtifactOwner(ctx context.Context, groupId string, artifactId string) ApiGetArtifactOwnerRequest
-
-	// GetArtifactOwnerExecute executes the request
-	//  @return ArtifactOwner
-	GetArtifactOwnerExecute(r ApiGetArtifactOwnerRequest) (*ArtifactOwner, *http.Response, error)
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
+	 * @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
+	 * @return ApiGetArtifactOwnerRequest
+	 */
+	GetArtifactOwner(ctx _context.Context, groupId string, artifactId string) ApiGetArtifactOwnerRequest
 
 	/*
-	GetArtifactVersionMetaData Get artifact version metadata
+	 * GetArtifactOwnerExecute executes the request
+	 * @return ArtifactOwner
+	 */
+	GetArtifactOwnerExecute(r ApiGetArtifactOwnerRequest) (ArtifactOwner, *_nethttp.Response, error)
 
-	Retrieves the metadata for a single version of the artifact.  The version metadata is 
+	/*
+	 * GetArtifactVersionMetaData Get artifact version metadata
+	 * Retrieves the metadata for a single version of the artifact.  The version metadata is 
 a subset of the artifact metadata and only includes the metadata that is specific to
 the version (for example, this doesn't include `modifiedOn`).
 
@@ -103,23 +106,23 @@ This operation can fail for the following reasons:
 * No version with this `version` exists (HTTP error `404`)
 * A server error occurred (HTTP error `500`)
 
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
-	@param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
-	@param version The unique identifier of a specific version of the artifact content.
-	@return ApiGetArtifactVersionMetaDataRequest
-	*/
-	GetArtifactVersionMetaData(ctx context.Context, groupId string, artifactId string, version string) ApiGetArtifactVersionMetaDataRequest
-
-	// GetArtifactVersionMetaDataExecute executes the request
-	//  @return VersionMetaData
-	GetArtifactVersionMetaDataExecute(r ApiGetArtifactVersionMetaDataRequest) (*VersionMetaData, *http.Response, error)
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
+	 * @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
+	 * @param version The unique identifier of a specific version of the artifact content.
+	 * @return ApiGetArtifactVersionMetaDataRequest
+	 */
+	GetArtifactVersionMetaData(ctx _context.Context, groupId string, artifactId string, version string) ApiGetArtifactVersionMetaDataRequest
 
 	/*
-	GetArtifactVersionMetaDataByContent Get artifact version metadata by content
+	 * GetArtifactVersionMetaDataExecute executes the request
+	 * @return VersionMetaData
+	 */
+	GetArtifactVersionMetaDataExecute(r ApiGetArtifactVersionMetaDataRequest) (VersionMetaData, *_nethttp.Response, error)
 
-	Gets the metadata for an artifact that matches the raw content.  Searches the registry
+	/*
+	 * GetArtifactVersionMetaDataByContent Get artifact version metadata by content
+	 * Gets the metadata for an artifact that matches the raw content.  Searches the registry
 for a version of the given artifact matching the content provided in the body of the
 POST.
 
@@ -130,63 +133,63 @@ This operation can fail for the following reasons:
 * No artifact version matching the provided content exists (HTTP error `404`)
 * A server error occurred (HTTP error `500`)
 
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
-	@param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
-	@return ApiGetArtifactVersionMetaDataByContentRequest
-	*/
-	GetArtifactVersionMetaDataByContent(ctx context.Context, groupId string, artifactId string) ApiGetArtifactVersionMetaDataByContentRequest
-
-	// GetArtifactVersionMetaDataByContentExecute executes the request
-	//  @return VersionMetaData
-	GetArtifactVersionMetaDataByContentExecute(r ApiGetArtifactVersionMetaDataByContentRequest) (*VersionMetaData, *http.Response, error)
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
+	 * @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
+	 * @return ApiGetArtifactVersionMetaDataByContentRequest
+	 */
+	GetArtifactVersionMetaDataByContent(ctx _context.Context, groupId string, artifactId string) ApiGetArtifactVersionMetaDataByContentRequest
 
 	/*
-	UpdateArtifactMetaData Update artifact metadata
+	 * GetArtifactVersionMetaDataByContentExecute executes the request
+	 * @return VersionMetaData
+	 */
+	GetArtifactVersionMetaDataByContentExecute(r ApiGetArtifactVersionMetaDataByContentRequest) (VersionMetaData, *_nethttp.Response, error)
 
-	Updates the editable parts of the artifact's metadata.  Not all metadata fields can
+	/*
+	 * UpdateArtifactMetaData Update artifact metadata
+	 * Updates the editable parts of the artifact's metadata.  Not all metadata fields can
 be updated.  For example, `createdOn` and `createdBy` are both read-only properties.
 
 This operation can fail for the following reasons:
 
 * No artifact with the `artifactId` exists (HTTP error `404`)
 * A server error occurred (HTTP error `500`)
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
-	@param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
-	@return ApiUpdateArtifactMetaDataRequest
-	*/
-	UpdateArtifactMetaData(ctx context.Context, groupId string, artifactId string) ApiUpdateArtifactMetaDataRequest
-
-	// UpdateArtifactMetaDataExecute executes the request
-	UpdateArtifactMetaDataExecute(r ApiUpdateArtifactMetaDataRequest) (*http.Response, error)
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
+	 * @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
+	 * @return ApiUpdateArtifactMetaDataRequest
+	 */
+	UpdateArtifactMetaData(ctx _context.Context, groupId string, artifactId string) ApiUpdateArtifactMetaDataRequest
 
 	/*
-	UpdateArtifactOwner Update artifact owner
+	 * UpdateArtifactMetaDataExecute executes the request
+	 */
+	UpdateArtifactMetaDataExecute(r ApiUpdateArtifactMetaDataRequest) (*_nethttp.Response, error)
 
-	Changes the ownership of an artifact.
+	/*
+	 * UpdateArtifactOwner Update artifact owner
+	 * Changes the ownership of an artifact.
 
 This operation can fail for the following reasons:
 
 * No artifact with this `artifactId` exists (HTTP error `404`)
 * A server error occurred (HTTP error `500`)
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
-	@param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
-	@return ApiUpdateArtifactOwnerRequest
-	*/
-	UpdateArtifactOwner(ctx context.Context, groupId string, artifactId string) ApiUpdateArtifactOwnerRequest
-
-	// UpdateArtifactOwnerExecute executes the request
-	UpdateArtifactOwnerExecute(r ApiUpdateArtifactOwnerRequest) (*http.Response, error)
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
+	 * @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
+	 * @return ApiUpdateArtifactOwnerRequest
+	 */
+	UpdateArtifactOwner(ctx _context.Context, groupId string, artifactId string) ApiUpdateArtifactOwnerRequest
 
 	/*
-	UpdateArtifactVersionMetaData Update artifact version metadata
+	 * UpdateArtifactOwnerExecute executes the request
+	 */
+	UpdateArtifactOwnerExecute(r ApiUpdateArtifactOwnerRequest) (*_nethttp.Response, error)
 
-	Updates the user-editable portion of the artifact version's metadata.  Only some of 
+	/*
+	 * UpdateArtifactVersionMetaData Update artifact version metadata
+	 * Updates the user-editable portion of the artifact version's metadata.  Only some of 
 the metadata fields are editable by the user.  For example, `description` is editable, 
 but `createdOn` is not.
 
@@ -196,38 +199,39 @@ This operation can fail for the following reasons:
 * No version with this `version` exists (HTTP error `404`)
 * A server error occurred (HTTP error `500`)
 
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
+	 * @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
+	 * @param version The unique identifier of a specific version of the artifact content.
+	 * @return ApiUpdateArtifactVersionMetaDataRequest
+	 */
+	UpdateArtifactVersionMetaData(ctx _context.Context, groupId string, artifactId string, version string) ApiUpdateArtifactVersionMetaDataRequest
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
-	@param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
-	@param version The unique identifier of a specific version of the artifact content.
-	@return ApiUpdateArtifactVersionMetaDataRequest
-	*/
-	UpdateArtifactVersionMetaData(ctx context.Context, groupId string, artifactId string, version string) ApiUpdateArtifactVersionMetaDataRequest
-
-	// UpdateArtifactVersionMetaDataExecute executes the request
-	UpdateArtifactVersionMetaDataExecute(r ApiUpdateArtifactVersionMetaDataRequest) (*http.Response, error)
+	/*
+	 * UpdateArtifactVersionMetaDataExecute executes the request
+	 */
+	UpdateArtifactVersionMetaDataExecute(r ApiUpdateArtifactVersionMetaDataRequest) (*_nethttp.Response, error)
 }
 
 // MetadataApiService MetadataApi service
 type MetadataApiService service
 
 type ApiDeleteArtifactVersionMetaDataRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService MetadataApi
 	groupId string
 	artifactId string
 	version string
 }
 
-func (r ApiDeleteArtifactVersionMetaDataRequest) Execute() (*http.Response, error) {
+
+func (r ApiDeleteArtifactVersionMetaDataRequest) Execute() (*_nethttp.Response, error) {
 	return r.ApiService.DeleteArtifactVersionMetaDataExecute(r)
 }
 
 /*
-DeleteArtifactVersionMetaData Delete artifact version metadata
-
-Deletes the user-editable metadata properties of the artifact version.  Any properties
+ * DeleteArtifactVersionMetaData Delete artifact version metadata
+ * Deletes the user-editable metadata properties of the artifact version.  Any properties
 that are not user-editable are preserved.
 
 This operation can fail for the following reasons:
@@ -236,14 +240,13 @@ This operation can fail for the following reasons:
 * No version with this `version` exists (HTTP error `404`)
 * A server error occurred (HTTP error `500`)
 
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
- @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
- @param version The unique identifier of a specific version of the artifact content.
- @return ApiDeleteArtifactVersionMetaDataRequest
-*/
-func (a *MetadataApiService) DeleteArtifactVersionMetaData(ctx context.Context, groupId string, artifactId string, version string) ApiDeleteArtifactVersionMetaDataRequest {
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
+ * @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
+ * @param version The unique identifier of a specific version of the artifact content.
+ * @return ApiDeleteArtifactVersionMetaDataRequest
+ */
+func (a *MetadataApiService) DeleteArtifactVersionMetaData(ctx _context.Context, groupId string, artifactId string, version string) ApiDeleteArtifactVersionMetaDataRequest {
 	return ApiDeleteArtifactVersionMetaDataRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -253,27 +256,31 @@ func (a *MetadataApiService) DeleteArtifactVersionMetaData(ctx context.Context,
 	}
 }
 
-// Execute executes the request
-func (a *MetadataApiService) DeleteArtifactVersionMetaDataExecute(r ApiDeleteArtifactVersionMetaDataRequest) (*http.Response, error) {
+/*
+ * Execute executes the request
+ */
+func (a *MetadataApiService) DeleteArtifactVersionMetaDataExecute(r ApiDeleteArtifactVersionMetaDataRequest) (*_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodDelete
+		localVarHTTPMethod   = _nethttp.MethodDelete
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "MetadataApiService.DeleteArtifactVersionMetaData")
 	if err != nil {
-		return nil, &GenericOpenAPIError{error: err.Error()}
+		return nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/groups/{groupId}/artifacts/{artifactId}/versions/{version}/meta"
-	localVarPath = strings.Replace(localVarPath, "{"+"groupId"+"}", url.PathEscape(parameterToString(r.groupId, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"artifactId"+"}", url.PathEscape(parameterToString(r.artifactId, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"version"+"}", url.PathEscape(parameterToString(r.version, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"groupId"+"}", _neturl.PathEscape(parameterToString(r.groupId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"artifactId"+"}", _neturl.PathEscape(parameterToString(r.artifactId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"version"+"}", _neturl.PathEscape(parameterToString(r.version, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -292,7 +299,7 @@ func (a *MetadataApiService) DeleteArtifactVersionMetaDataExecute(r ApiDeleteArt
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return nil, err
 	}
@@ -302,15 +309,15 @@ func (a *MetadataApiService) DeleteArtifactVersionMetaDataExecute(r ApiDeleteArt
 		return localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -321,8 +328,7 @@ func (a *MetadataApiService) DeleteArtifactVersionMetaDataExecute(r ApiDeleteArt
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -332,8 +338,7 @@ func (a *MetadataApiService) DeleteArtifactVersionMetaDataExecute(r ApiDeleteArt
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarHTTPResponse, newErr
 	}
@@ -342,33 +347,32 @@ func (a *MetadataApiService) DeleteArtifactVersionMetaDataExecute(r ApiDeleteArt
 }
 
 type ApiGetArtifactMetaDataRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService MetadataApi
 	groupId string
 	artifactId string
 }
 
-func (r ApiGetArtifactMetaDataRequest) Execute() (*ArtifactMetaData, *http.Response, error) {
+
+func (r ApiGetArtifactMetaDataRequest) Execute() (ArtifactMetaData, *_nethttp.Response, error) {
 	return r.ApiService.GetArtifactMetaDataExecute(r)
 }
 
 /*
-GetArtifactMetaData Get artifact metadata
-
-Gets the metadata for an artifact in the registry.  The returned metadata includes
+ * GetArtifactMetaData Get artifact metadata
+ * Gets the metadata for an artifact in the registry.  The returned metadata includes
 both generated (read-only) and editable metadata (such as name and description).
 
 This operation can fail for the following reasons:
 
 * No artifact with this `artifactId` exists (HTTP error `404`)
 * A server error occurred (HTTP error `500`)
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
- @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
- @return ApiGetArtifactMetaDataRequest
-*/
-func (a *MetadataApiService) GetArtifactMetaData(ctx context.Context, groupId string, artifactId string) ApiGetArtifactMetaDataRequest {
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
+ * @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
+ * @return ApiGetArtifactMetaDataRequest
+ */
+func (a *MetadataApiService) GetArtifactMetaData(ctx _context.Context, groupId string, artifactId string) ApiGetArtifactMetaDataRequest {
 	return ApiGetArtifactMetaDataRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -377,28 +381,32 @@ func (a *MetadataApiService) GetArtifactMetaData(ctx context.Context, groupId st
 	}
 }
 
-// Execute executes the request
-//  @return ArtifactMetaData
-func (a *MetadataApiService) GetArtifactMetaDataExecute(r ApiGetArtifactMetaDataRequest) (*ArtifactMetaData, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return ArtifactMetaData
+ */
+func (a *MetadataApiService) GetArtifactMetaDataExecute(r ApiGetArtifactMetaDataRequest) (ArtifactMetaData, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *ArtifactMetaData
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  ArtifactMetaData
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "MetadataApiService.GetArtifactMetaData")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/groups/{groupId}/artifacts/{artifactId}/meta"
-	localVarPath = strings.Replace(localVarPath, "{"+"groupId"+"}", url.PathEscape(parameterToString(r.groupId, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"artifactId"+"}", url.PathEscape(parameterToString(r.artifactId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"groupId"+"}", _neturl.PathEscape(parameterToString(r.groupId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"artifactId"+"}", _neturl.PathEscape(parameterToString(r.artifactId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -417,7 +425,7 @@ func (a *MetadataApiService) GetArtifactMetaDataExecute(r ApiGetArtifactMetaData
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -427,15 +435,15 @@ func (a *MetadataApiService) GetArtifactMetaDataExecute(r ApiGetArtifactMetaData
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -446,8 +454,7 @@ func (a *MetadataApiService) GetArtifactMetaDataExecute(r ApiGetArtifactMetaData
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -457,15 +464,14 @@ func (a *MetadataApiService) GetArtifactMetaDataExecute(r ApiGetArtifactMetaData
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -476,32 +482,31 @@ func (a *MetadataApiService) GetArtifactMetaDataExecute(r ApiGetArtifactMetaData
 }
 
 type ApiGetArtifactOwnerRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService MetadataApi
 	groupId string
 	artifactId string
 }
 
-func (r ApiGetArtifactOwnerRequest) Execute() (*ArtifactOwner, *http.Response, error) {
+
+func (r ApiGetArtifactOwnerRequest) Execute() (ArtifactOwner, *_nethttp.Response, error) {
 	return r.ApiService.GetArtifactOwnerExecute(r)
 }
 
 /*
-GetArtifactOwner Get artifact owner
-
-Gets the owner of an artifact in the registry.
+ * GetArtifactOwner Get artifact owner
+ * Gets the owner of an artifact in the registry.
 
 This operation can fail for the following reasons:
 
 * No artifact with this `artifactId` exists (HTTP error `404`)
 * A server error occurred (HTTP error `500`)
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
- @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
- @return ApiGetArtifactOwnerRequest
-*/
-func (a *MetadataApiService) GetArtifactOwner(ctx context.Context, groupId string, artifactId string) ApiGetArtifactOwnerRequest {
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
+ * @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
+ * @return ApiGetArtifactOwnerRequest
+ */
+func (a *MetadataApiService) GetArtifactOwner(ctx _context.Context, groupId string, artifactId string) ApiGetArtifactOwnerRequest {
 	return ApiGetArtifactOwnerRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -510,28 +515,32 @@ func (a *MetadataApiService) GetArtifactOwner(ctx context.Context, groupId strin
 	}
 }
 
-// Execute executes the request
-//  @return ArtifactOwner
-func (a *MetadataApiService) GetArtifactOwnerExecute(r ApiGetArtifactOwnerRequest) (*ArtifactOwner, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return ArtifactOwner
+ */
+func (a *MetadataApiService) GetArtifactOwnerExecute(r ApiGetArtifactOwnerRequest) (ArtifactOwner, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *ArtifactOwner
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  ArtifactOwner
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "MetadataApiService.GetArtifactOwner")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/groups/{groupId}/artifacts/{artifactId}/owner"
-	localVarPath = strings.Replace(localVarPath, "{"+"groupId"+"}", url.PathEscape(parameterToString(r.groupId, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"artifactId"+"}", url.PathEscape(parameterToString(r.artifactId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"groupId"+"}", _neturl.PathEscape(parameterToString(r.groupId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"artifactId"+"}", _neturl.PathEscape(parameterToString(r.artifactId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -550,7 +559,7 @@ func (a *MetadataApiService) GetArtifactOwnerExecute(r ApiGetArtifactOwnerReques
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -560,15 +569,15 @@ func (a *MetadataApiService) GetArtifactOwnerExecute(r ApiGetArtifactOwnerReques
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -579,8 +588,7 @@ func (a *MetadataApiService) GetArtifactOwnerExecute(r ApiGetArtifactOwnerReques
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -590,15 +598,14 @@ func (a *MetadataApiService) GetArtifactOwnerExecute(r ApiGetArtifactOwnerReques
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -609,21 +616,21 @@ func (a *MetadataApiService) GetArtifactOwnerExecute(r ApiGetArtifactOwnerReques
 }
 
 type ApiGetArtifactVersionMetaDataRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService MetadataApi
 	groupId string
 	artifactId string
 	version string
 }
 
-func (r ApiGetArtifactVersionMetaDataRequest) Execute() (*VersionMetaData, *http.Response, error) {
+
+func (r ApiGetArtifactVersionMetaDataRequest) Execute() (VersionMetaData, *_nethttp.Response, error) {
 	return r.ApiService.GetArtifactVersionMetaDataExecute(r)
 }
 
 /*
-GetArtifactVersionMetaData Get artifact version metadata
-
-Retrieves the metadata for a single version of the artifact.  The version metadata is 
+ * GetArtifactVersionMetaData Get artifact version metadata
+ * Retrieves the metadata for a single version of the artifact.  The version metadata is 
 a subset of the artifact metadata and only includes the metadata that is specific to
 the version (for example, this doesn't include `modifiedOn`).
 
@@ -633,14 +640,13 @@ This operation can fail for the following reasons:
 * No version with this `version` exists (HTTP error `404`)
 * A server error occurred (HTTP error `500`)
 
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
- @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
- @param version The unique identifier of a specific version of the artifact content.
- @return ApiGetArtifactVersionMetaDataRequest
-*/
-func (a *MetadataApiService) GetArtifactVersionMetaData(ctx context.Context, groupId string, artifactId string, version string) ApiGetArtifactVersionMetaDataRequest {
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
+ * @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
+ * @param version The unique identifier of a specific version of the artifact content.
+ * @return ApiGetArtifactVersionMetaDataRequest
+ */
+func (a *MetadataApiService) GetArtifactVersionMetaData(ctx _context.Context, groupId string, artifactId string, version string) ApiGetArtifactVersionMetaDataRequest {
 	return ApiGetArtifactVersionMetaDataRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -650,29 +656,33 @@ func (a *MetadataApiService) GetArtifactVersionMetaData(ctx context.Context, gro
 	}
 }
 
-// Execute executes the request
-//  @return VersionMetaData
-func (a *MetadataApiService) GetArtifactVersionMetaDataExecute(r ApiGetArtifactVersionMetaDataRequest) (*VersionMetaData, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return VersionMetaData
+ */
+func (a *MetadataApiService) GetArtifactVersionMetaDataExecute(r ApiGetArtifactVersionMetaDataRequest) (VersionMetaData, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *VersionMetaData
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  VersionMetaData
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "MetadataApiService.GetArtifactVersionMetaData")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/groups/{groupId}/artifacts/{artifactId}/versions/{version}/meta"
-	localVarPath = strings.Replace(localVarPath, "{"+"groupId"+"}", url.PathEscape(parameterToString(r.groupId, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"artifactId"+"}", url.PathEscape(parameterToString(r.artifactId, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"version"+"}", url.PathEscape(parameterToString(r.version, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"groupId"+"}", _neturl.PathEscape(parameterToString(r.groupId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"artifactId"+"}", _neturl.PathEscape(parameterToString(r.artifactId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"version"+"}", _neturl.PathEscape(parameterToString(r.version, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -691,7 +701,7 @@ func (a *MetadataApiService) GetArtifactVersionMetaDataExecute(r ApiGetArtifactV
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -701,15 +711,15 @@ func (a *MetadataApiService) GetArtifactVersionMetaDataExecute(r ApiGetArtifactV
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -720,8 +730,7 @@ func (a *MetadataApiService) GetArtifactVersionMetaDataExecute(r ApiGetArtifactV
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -731,15 +740,14 @@ func (a *MetadataApiService) GetArtifactVersionMetaDataExecute(r ApiGetArtifactV
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -750,7 +758,7 @@ func (a *MetadataApiService) GetArtifactVersionMetaDataExecute(r ApiGetArtifactV
 }
 
 type ApiGetArtifactVersionMetaDataByContentRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService MetadataApi
 	groupId string
 	artifactId string
@@ -758,26 +766,22 @@ type ApiGetArtifactVersionMetaDataByContentRequest struct {
 	canonical *bool
 }
 
-// The content of an artifact version.
 func (r ApiGetArtifactVersionMetaDataByContentRequest) Body(body interface{}) ApiGetArtifactVersionMetaDataByContentRequest {
 	r.body = &body
 	return r
 }
-
-// Parameter that can be set to &#x60;true&#x60; to indicate that the server should \&quot;canonicalize\&quot; the content when searching for a matching version.  Canonicalization is unique to each artifact type, but typically involves removing any extra whitespace and formatting the content in a consistent manner.
 func (r ApiGetArtifactVersionMetaDataByContentRequest) Canonical(canonical bool) ApiGetArtifactVersionMetaDataByContentRequest {
 	r.canonical = &canonical
 	return r
 }
 
-func (r ApiGetArtifactVersionMetaDataByContentRequest) Execute() (*VersionMetaData, *http.Response, error) {
+func (r ApiGetArtifactVersionMetaDataByContentRequest) Execute() (VersionMetaData, *_nethttp.Response, error) {
 	return r.ApiService.GetArtifactVersionMetaDataByContentExecute(r)
 }
 
 /*
-GetArtifactVersionMetaDataByContent Get artifact version metadata by content
-
-Gets the metadata for an artifact that matches the raw content.  Searches the registry
+ * GetArtifactVersionMetaDataByContent Get artifact version metadata by content
+ * Gets the metadata for an artifact that matches the raw content.  Searches the registry
 for a version of the given artifact matching the content provided in the body of the
 POST.
 
@@ -788,13 +792,12 @@ This operation can fail for the following reasons:
 * No artifact version matching the provided content exists (HTTP error `404`)
 * A server error occurred (HTTP error `500`)
 
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
- @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
- @return ApiGetArtifactVersionMetaDataByContentRequest
-*/
-func (a *MetadataApiService) GetArtifactVersionMetaDataByContent(ctx context.Context, groupId string, artifactId string) ApiGetArtifactVersionMetaDataByContentRequest {
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
+ * @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
+ * @return ApiGetArtifactVersionMetaDataByContentRequest
+ */
+func (a *MetadataApiService) GetArtifactVersionMetaDataByContent(ctx _context.Context, groupId string, artifactId string) ApiGetArtifactVersionMetaDataByContentRequest {
 	return ApiGetArtifactVersionMetaDataByContentRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -803,28 +806,32 @@ func (a *MetadataApiService) GetArtifactVersionMetaDataByContent(ctx context.Con
 	}
 }
 
-// Execute executes the request
-//  @return VersionMetaData
-func (a *MetadataApiService) GetArtifactVersionMetaDataByContentExecute(r ApiGetArtifactVersionMetaDataByContentRequest) (*VersionMetaData, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return VersionMetaData
+ */
+func (a *MetadataApiService) GetArtifactVersionMetaDataByContentExecute(r ApiGetArtifactVersionMetaDataByContentRequest) (VersionMetaData, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *VersionMetaData
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  VersionMetaData
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "MetadataApiService.GetArtifactVersionMetaDataByContent")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/groups/{groupId}/artifacts/{artifactId}/meta"
-	localVarPath = strings.Replace(localVarPath, "{"+"groupId"+"}", url.PathEscape(parameterToString(r.groupId, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"artifactId"+"}", url.PathEscape(parameterToString(r.artifactId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"groupId"+"}", _neturl.PathEscape(parameterToString(r.groupId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"artifactId"+"}", _neturl.PathEscape(parameterToString(r.artifactId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.body == nil {
 		return localVarReturnValue, nil, reportError("body is required and must be specified")
 	}
@@ -851,7 +858,7 @@ func (a *MetadataApiService) GetArtifactVersionMetaDataByContentExecute(r ApiGet
 	}
 	// body params
 	localVarPostBody = r.body
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -861,15 +868,15 @@ func (a *MetadataApiService) GetArtifactVersionMetaDataByContentExecute(r ApiGet
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -880,8 +887,7 @@ func (a *MetadataApiService) GetArtifactVersionMetaDataByContentExecute(r ApiGet
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -891,15 +897,14 @@ func (a *MetadataApiService) GetArtifactVersionMetaDataByContentExecute(r ApiGet
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -910,40 +915,37 @@ func (a *MetadataApiService) GetArtifactVersionMetaDataByContentExecute(r ApiGet
 }
 
 type ApiUpdateArtifactMetaDataRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService MetadataApi
 	groupId string
 	artifactId string
 	editableMetaData *EditableMetaData
 }
 
-// Updated artifact metadata.
 func (r ApiUpdateArtifactMetaDataRequest) EditableMetaData(editableMetaData EditableMetaData) ApiUpdateArtifactMetaDataRequest {
 	r.editableMetaData = &editableMetaData
 	return r
 }
 
-func (r ApiUpdateArtifactMetaDataRequest) Execute() (*http.Response, error) {
+func (r ApiUpdateArtifactMetaDataRequest) Execute() (*_nethttp.Response, error) {
 	return r.ApiService.UpdateArtifactMetaDataExecute(r)
 }
 
 /*
-UpdateArtifactMetaData Update artifact metadata
-
-Updates the editable parts of the artifact's metadata.  Not all metadata fields can
+ * UpdateArtifactMetaData Update artifact metadata
+ * Updates the editable parts of the artifact's metadata.  Not all metadata fields can
 be updated.  For example, `createdOn` and `createdBy` are both read-only properties.
 
 This operation can fail for the following reasons:
 
 * No artifact with the `artifactId` exists (HTTP error `404`)
 * A server error occurred (HTTP error `500`)
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
- @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
- @return ApiUpdateArtifactMetaDataRequest
-*/
-func (a *MetadataApiService) UpdateArtifactMetaData(ctx context.Context, groupId string, artifactId string) ApiUpdateArtifactMetaDataRequest {
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
+ * @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
+ * @return ApiUpdateArtifactMetaDataRequest
+ */
+func (a *MetadataApiService) UpdateArtifactMetaData(ctx _context.Context, groupId string, artifactId string) ApiUpdateArtifactMetaDataRequest {
 	return ApiUpdateArtifactMetaDataRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -952,26 +954,30 @@ func (a *MetadataApiService) UpdateArtifactMetaData(ctx context.Context, groupId
 	}
 }
 
-// Execute executes the request
-func (a *MetadataApiService) UpdateArtifactMetaDataExecute(r ApiUpdateArtifactMetaDataRequest) (*http.Response, error) {
+/*
+ * Execute executes the request
+ */
+func (a *MetadataApiService) UpdateArtifactMetaDataExecute(r ApiUpdateArtifactMetaDataRequest) (*_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPut
+		localVarHTTPMethod   = _nethttp.MethodPut
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "MetadataApiService.UpdateArtifactMetaData")
 	if err != nil {
-		return nil, &GenericOpenAPIError{error: err.Error()}
+		return nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/groups/{groupId}/artifacts/{artifactId}/meta"
-	localVarPath = strings.Replace(localVarPath, "{"+"groupId"+"}", url.PathEscape(parameterToString(r.groupId, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"artifactId"+"}", url.PathEscape(parameterToString(r.artifactId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"groupId"+"}", _neturl.PathEscape(parameterToString(r.groupId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"artifactId"+"}", _neturl.PathEscape(parameterToString(r.artifactId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.editableMetaData == nil {
 		return nil, reportError("editableMetaData is required and must be specified")
 	}
@@ -995,7 +1001,7 @@ func (a *MetadataApiService) UpdateArtifactMetaDataExecute(r ApiUpdateArtifactMe
 	}
 	// body params
 	localVarPostBody = r.editableMetaData
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return nil, err
 	}
@@ -1005,15 +1011,15 @@ func (a *MetadataApiService) UpdateArtifactMetaDataExecute(r ApiUpdateArtifactMe
 		return localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -1024,8 +1030,7 @@ func (a *MetadataApiService) UpdateArtifactMetaDataExecute(r ApiUpdateArtifactMe
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -1035,8 +1040,7 @@ func (a *MetadataApiService) UpdateArtifactMetaDataExecute(r ApiUpdateArtifactMe
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarHTTPResponse, newErr
 	}
@@ -1045,7 +1049,7 @@ func (a *MetadataApiService) UpdateArtifactMetaDataExecute(r ApiUpdateArtifactMe
 }
 
 type ApiUpdateArtifactOwnerRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService MetadataApi
 	groupId string
 	artifactId string
@@ -1057,26 +1061,24 @@ func (r ApiUpdateArtifactOwnerRequest) ArtifactOwner(artifactOwner ArtifactOwner
 	return r
 }
 
-func (r ApiUpdateArtifactOwnerRequest) Execute() (*http.Response, error) {
+func (r ApiUpdateArtifactOwnerRequest) Execute() (*_nethttp.Response, error) {
 	return r.ApiService.UpdateArtifactOwnerExecute(r)
 }
 
 /*
-UpdateArtifactOwner Update artifact owner
-
-Changes the ownership of an artifact.
+ * UpdateArtifactOwner Update artifact owner
+ * Changes the ownership of an artifact.
 
 This operation can fail for the following reasons:
 
 * No artifact with this `artifactId` exists (HTTP error `404`)
 * A server error occurred (HTTP error `500`)
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
- @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
- @return ApiUpdateArtifactOwnerRequest
-*/
-func (a *MetadataApiService) UpdateArtifactOwner(ctx context.Context, groupId string, artifactId string) ApiUpdateArtifactOwnerRequest {
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
+ * @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
+ * @return ApiUpdateArtifactOwnerRequest
+ */
+func (a *MetadataApiService) UpdateArtifactOwner(ctx _context.Context, groupId string, artifactId string) ApiUpdateArtifactOwnerRequest {
 	return ApiUpdateArtifactOwnerRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -1085,26 +1087,30 @@ func (a *MetadataApiService) UpdateArtifactOwner(ctx context.Context, groupId st
 	}
 }
 
-// Execute executes the request
-func (a *MetadataApiService) UpdateArtifactOwnerExecute(r ApiUpdateArtifactOwnerRequest) (*http.Response, error) {
+/*
+ * Execute executes the request
+ */
+func (a *MetadataApiService) UpdateArtifactOwnerExecute(r ApiUpdateArtifactOwnerRequest) (*_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPut
+		localVarHTTPMethod   = _nethttp.MethodPut
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "MetadataApiService.UpdateArtifactOwner")
 	if err != nil {
-		return nil, &GenericOpenAPIError{error: err.Error()}
+		return nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/groups/{groupId}/artifacts/{artifactId}/owner"
-	localVarPath = strings.Replace(localVarPath, "{"+"groupId"+"}", url.PathEscape(parameterToString(r.groupId, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"artifactId"+"}", url.PathEscape(parameterToString(r.artifactId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"groupId"+"}", _neturl.PathEscape(parameterToString(r.groupId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"artifactId"+"}", _neturl.PathEscape(parameterToString(r.artifactId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.artifactOwner == nil {
 		return nil, reportError("artifactOwner is required and must be specified")
 	}
@@ -1128,7 +1134,7 @@ func (a *MetadataApiService) UpdateArtifactOwnerExecute(r ApiUpdateArtifactOwner
 	}
 	// body params
 	localVarPostBody = r.artifactOwner
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return nil, err
 	}
@@ -1138,15 +1144,15 @@ func (a *MetadataApiService) UpdateArtifactOwnerExecute(r ApiUpdateArtifactOwner
 		return localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -1157,8 +1163,7 @@ func (a *MetadataApiService) UpdateArtifactOwnerExecute(r ApiUpdateArtifactOwner
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -1168,8 +1173,7 @@ func (a *MetadataApiService) UpdateArtifactOwnerExecute(r ApiUpdateArtifactOwner
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarHTTPResponse, newErr
 	}
@@ -1178,7 +1182,7 @@ func (a *MetadataApiService) UpdateArtifactOwnerExecute(r ApiUpdateArtifactOwner
 }
 
 type ApiUpdateArtifactVersionMetaDataRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService MetadataApi
 	groupId string
 	artifactId string
@@ -1191,14 +1195,13 @@ func (r ApiUpdateArtifactVersionMetaDataRequest) EditableMetaData(editableMetaDa
 	return r
 }
 
-func (r ApiUpdateArtifactVersionMetaDataRequest) Execute() (*http.Response, error) {
+func (r ApiUpdateArtifactVersionMetaDataRequest) Execute() (*_nethttp.Response, error) {
 	return r.ApiService.UpdateArtifactVersionMetaDataExecute(r)
 }
 
 /*
-UpdateArtifactVersionMetaData Update artifact version metadata
-
-Updates the user-editable portion of the artifact version's metadata.  Only some of 
+ * UpdateArtifactVersionMetaData Update artifact version metadata
+ * Updates the user-editable portion of the artifact version's metadata.  Only some of 
 the metadata fields are editable by the user.  For example, `description` is editable, 
 but `createdOn` is not.
 
@@ -1208,14 +1211,13 @@ This operation can fail for the following reasons:
 * No version with this `version` exists (HTTP error `404`)
 * A server error occurred (HTTP error `500`)
 
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
- @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
- @param version The unique identifier of a specific version of the artifact content.
- @return ApiUpdateArtifactVersionMetaDataRequest
-*/
-func (a *MetadataApiService) UpdateArtifactVersionMetaData(ctx context.Context, groupId string, artifactId string, version string) ApiUpdateArtifactVersionMetaDataRequest {
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
+ * @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
+ * @param version The unique identifier of a specific version of the artifact content.
+ * @return ApiUpdateArtifactVersionMetaDataRequest
+ */
+func (a *MetadataApiService) UpdateArtifactVersionMetaData(ctx _context.Context, groupId string, artifactId string, version string) ApiUpdateArtifactVersionMetaDataRequest {
 	return ApiUpdateArtifactVersionMetaDataRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -1225,27 +1227,31 @@ func (a *MetadataApiService) UpdateArtifactVersionMetaData(ctx context.Context,
 	}
 }
 
-// Execute executes the request
-func (a *MetadataApiService) UpdateArtifactVersionMetaDataExecute(r ApiUpdateArtifactVersionMetaDataRequest) (*http.Response, error) {
+/*
+ * Execute executes the request
+ */
+func (a *MetadataApiService) UpdateArtifactVersionMetaDataExecute(r ApiUpdateArtifactVersionMetaDataRequest) (*_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPut
+		localVarHTTPMethod   = _nethttp.MethodPut
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "MetadataApiService.UpdateArtifactVersionMetaData")
 	if err != nil {
-		return nil, &GenericOpenAPIError{error: err.Error()}
+		return nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/groups/{groupId}/artifacts/{artifactId}/versions/{version}/meta"
-	localVarPath = strings.Replace(localVarPath, "{"+"groupId"+"}", url.PathEscape(parameterToString(r.groupId, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"artifactId"+"}", url.PathEscape(parameterToString(r.artifactId, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"version"+"}", url.PathEscape(parameterToString(r.version, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"groupId"+"}", _neturl.PathEscape(parameterToString(r.groupId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"artifactId"+"}", _neturl.PathEscape(parameterToString(r.artifactId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"version"+"}", _neturl.PathEscape(parameterToString(r.version, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.editableMetaData == nil {
 		return nil, reportError("editableMetaData is required and must be specified")
 	}
@@ -1269,7 +1275,7 @@ func (a *MetadataApiService) UpdateArtifactVersionMetaDataExecute(r ApiUpdateArt
 	}
 	// body params
 	localVarPostBody = r.editableMetaData
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return nil, err
 	}
@@ -1279,15 +1285,15 @@ func (a *MetadataApiService) UpdateArtifactVersionMetaDataExecute(r ApiUpdateArt
 		return localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -1298,8 +1304,7 @@ func (a *MetadataApiService) UpdateArtifactVersionMetaDataExecute(r ApiUpdateArt
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -1309,8 +1314,7 @@ func (a *MetadataApiService) UpdateArtifactVersionMetaDataExecute(r ApiUpdateArt
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarHTTPResponse, newErr
 	}
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/api_search.go b/app-services-sdk-go/registryinstance/apiv1internal/client/api_search.go
index 52c740da..18c7d67b 100644
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/api_search.go
+++ b/app-services-sdk-go/registryinstance/apiv1internal/client/api_search.go
@@ -1,11 +1,11 @@
 /*
-Service Registry API
-
-Service Registry Instance API  NOTE: This API cannot be called directly from the portal.
-
-API version: 2.2.5.Final
-Contact: apicurio@lists.jboss.org
-*/
+ * Apicurio Registry API [v2]
+ *
+ * Apicurio Registry is a datastore for standard event schemas and API designs. Apicurio Registry enables developers to manage and share the structure of their data using a REST interface. For example, client applications can dynamically push or pull the latest updates to or from the registry without needing to redeploy. Apicurio Registry also enables developers to create rules that govern how registry content can evolve over time. For example, this includes rules for content validation and version compatibility.  The Apicurio Registry REST API enables client applications to manage the artifacts in the registry. This API provides create, read, update, and delete operations for schema and API artifacts, rules, versions, and metadata.   The supported artifact types include: - Apache Avro schema - AsyncAPI specification - Google protocol buffers - GraphQL schema - JSON Schema - Kafka Connect schema - OpenAPI specification - Web Services Description Language - XML Schema Definition   **Important**: The Apicurio Registry REST API is available from `https://MY-REGISTRY-URL/apis/registry/v2` by default. Therefore you must prefix all API operation paths with `../apis/registry/v2` in this case. For example: `../apis/registry/v2/ids/globalIds/{globalId}`. 
+ *
+ * API version: 2.2.5.Final
+ * Contact: apicurio@lists.jboss.org
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -13,54 +13,58 @@ package registryinstanceclient
 
 import (
 	"bytes"
-	"context"
-	"io/ioutil"
-	"net/http"
-	"net/url"
+	_context "context"
+	_ioutil "io/ioutil"
+	_nethttp "net/http"
+	_neturl "net/url"
 	"reflect"
 	"os"
 )
 
+// Linger please
+var (
+	_ _context.Context
+)
 
 type SearchApi interface {
 
 	/*
-	SearchArtifacts Search for artifacts
-
-	Returns a paginated list of all artifacts that match the provided filter criteria.
+	 * SearchArtifacts Search for artifacts
+	 * Returns a paginated list of all artifacts that match the provided filter criteria.
 
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiSearchArtifactsRequest
-	*/
-	SearchArtifacts(ctx context.Context) ApiSearchArtifactsRequest
-
-	// SearchArtifactsExecute executes the request
-	//  @return ArtifactSearchResults
-	SearchArtifactsExecute(r ApiSearchArtifactsRequest) (*ArtifactSearchResults, *http.Response, error)
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiSearchArtifactsRequest
+	 */
+	SearchArtifacts(ctx _context.Context) ApiSearchArtifactsRequest
 
 	/*
-	SearchArtifactsByContent Search for artifacts by content
+	 * SearchArtifactsExecute executes the request
+	 * @return ArtifactSearchResults
+	 */
+	SearchArtifactsExecute(r ApiSearchArtifactsRequest) (ArtifactSearchResults, *_nethttp.Response, error)
 
-	Returns a paginated list of all artifacts with at least one version that matches the
+	/*
+	 * SearchArtifactsByContent Search for artifacts by content
+	 * Returns a paginated list of all artifacts with at least one version that matches the
 posted content.
 
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiSearchArtifactsByContentRequest
+	 */
+	SearchArtifactsByContent(ctx _context.Context) ApiSearchArtifactsByContentRequest
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiSearchArtifactsByContentRequest
-	*/
-	SearchArtifactsByContent(ctx context.Context) ApiSearchArtifactsByContentRequest
-
-	// SearchArtifactsByContentExecute executes the request
-	//  @return ArtifactSearchResults
-	SearchArtifactsByContentExecute(r ApiSearchArtifactsByContentRequest) (*ArtifactSearchResults, *http.Response, error)
+	/*
+	 * SearchArtifactsByContentExecute executes the request
+	 * @return ArtifactSearchResults
+	 */
+	SearchArtifactsByContentExecute(r ApiSearchArtifactsByContentRequest) (ArtifactSearchResults, *_nethttp.Response, error)
 }
 
 // SearchApiService SearchApi service
 type SearchApiService service
 
 type ApiSearchArtifactsRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService SearchApi
 	name *string
 	offset *int32
@@ -75,112 +79,93 @@ type ApiSearchArtifactsRequest struct {
 	contentId *int64
 }
 
-// Filter by artifact name.
 func (r ApiSearchArtifactsRequest) Name(name string) ApiSearchArtifactsRequest {
 	r.name = &name
 	return r
 }
-
-// The number of artifacts to skip before starting to collect the result set.  Defaults to 0.
 func (r ApiSearchArtifactsRequest) Offset(offset int32) ApiSearchArtifactsRequest {
 	r.offset = &offset
 	return r
 }
-
-// The number of artifacts to return.  Defaults to 20.
 func (r ApiSearchArtifactsRequest) Limit(limit int32) ApiSearchArtifactsRequest {
 	r.limit = &limit
 	return r
 }
-
-// Sort order, ascending (&#x60;asc&#x60;) or descending (&#x60;desc&#x60;).
 func (r ApiSearchArtifactsRequest) Order(order SortOrder) ApiSearchArtifactsRequest {
 	r.order = &order
 	return r
 }
-
-// The field to sort by.  Can be one of:  * &#x60;name&#x60; * &#x60;createdOn&#x60; 
 func (r ApiSearchArtifactsRequest) Orderby(orderby SortBy) ApiSearchArtifactsRequest {
 	r.orderby = &orderby
 	return r
 }
-
-// Filter by label.  Include one or more label to only return artifacts containing all of the specified labels.
 func (r ApiSearchArtifactsRequest) Labels(labels []string) ApiSearchArtifactsRequest {
 	r.labels = &labels
 	return r
 }
-
-// Filter by one or more name/value property.  Separate each name/value pair using a colon.  For example &#x60;properties&#x3D;foo:bar&#x60; will return only artifacts with a custom property named &#x60;foo&#x60; and value &#x60;bar&#x60;.
 func (r ApiSearchArtifactsRequest) Properties(properties []string) ApiSearchArtifactsRequest {
 	r.properties = &properties
 	return r
 }
-
-// Filter by description.
 func (r ApiSearchArtifactsRequest) Description(description string) ApiSearchArtifactsRequest {
 	r.description = &description
 	return r
 }
-
-// Filter by artifact group.
 func (r ApiSearchArtifactsRequest) Group(group string) ApiSearchArtifactsRequest {
 	r.group = &group
 	return r
 }
-
-// Filter by globalId.
 func (r ApiSearchArtifactsRequest) GlobalId(globalId int64) ApiSearchArtifactsRequest {
 	r.globalId = &globalId
 	return r
 }
-
-// Filter by contentId.
 func (r ApiSearchArtifactsRequest) ContentId(contentId int64) ApiSearchArtifactsRequest {
 	r.contentId = &contentId
 	return r
 }
 
-func (r ApiSearchArtifactsRequest) Execute() (*ArtifactSearchResults, *http.Response, error) {
+func (r ApiSearchArtifactsRequest) Execute() (ArtifactSearchResults, *_nethttp.Response, error) {
 	return r.ApiService.SearchArtifactsExecute(r)
 }
 
 /*
-SearchArtifacts Search for artifacts
-
-Returns a paginated list of all artifacts that match the provided filter criteria.
+ * SearchArtifacts Search for artifacts
+ * Returns a paginated list of all artifacts that match the provided filter criteria.
 
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiSearchArtifactsRequest
-*/
-func (a *SearchApiService) SearchArtifacts(ctx context.Context) ApiSearchArtifactsRequest {
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiSearchArtifactsRequest
+ */
+func (a *SearchApiService) SearchArtifacts(ctx _context.Context) ApiSearchArtifactsRequest {
 	return ApiSearchArtifactsRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return ArtifactSearchResults
-func (a *SearchApiService) SearchArtifactsExecute(r ApiSearchArtifactsRequest) (*ArtifactSearchResults, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return ArtifactSearchResults
+ */
+func (a *SearchApiService) SearchArtifactsExecute(r ApiSearchArtifactsRequest) (ArtifactSearchResults, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *ArtifactSearchResults
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  ArtifactSearchResults
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "SearchApiService.SearchArtifacts")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/search/artifacts"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.name != nil {
 		localVarQueryParams.Add("name", parameterToString(*r.name, ""))
@@ -248,7 +233,7 @@ func (a *SearchApiService) SearchArtifactsExecute(r ApiSearchArtifactsRequest) (
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -258,15 +243,15 @@ func (a *SearchApiService) SearchArtifactsExecute(r ApiSearchArtifactsRequest) (
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -277,15 +262,14 @@ func (a *SearchApiService) SearchArtifactsExecute(r ApiSearchArtifactsRequest) (
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -296,7 +280,7 @@ func (a *SearchApiService) SearchArtifactsExecute(r ApiSearchArtifactsRequest) (
 }
 
 type ApiSearchArtifactsByContentRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService SearchApi
 	body **os.File
 	canonical *bool
@@ -307,89 +291,78 @@ type ApiSearchArtifactsByContentRequest struct {
 	orderby *string
 }
 
-// The content to search for.
 func (r ApiSearchArtifactsByContentRequest) Body(body *os.File) ApiSearchArtifactsByContentRequest {
 	r.body = &body
 	return r
 }
-
-// Parameter that can be set to &#x60;true&#x60; to indicate that the server should \&quot;canonicalize\&quot; the content when searching for matching artifacts.  Canonicalization is unique to each artifact type, but typically involves removing any extra whitespace and formatting the content in a consistent manner.  Must be used along with the &#x60;artifactType&#x60; query parameter.
 func (r ApiSearchArtifactsByContentRequest) Canonical(canonical bool) ApiSearchArtifactsByContentRequest {
 	r.canonical = &canonical
 	return r
 }
-
-// Indicates the type of artifact represented by the content being used for the search.  This is only needed when using the &#x60;canonical&#x60; query parameter, so that the server knows how to canonicalize the content prior to searching for matching artifacts.
 func (r ApiSearchArtifactsByContentRequest) ArtifactType(artifactType ArtifactType) ApiSearchArtifactsByContentRequest {
 	r.artifactType = &artifactType
 	return r
 }
-
-// The number of artifacts to skip before starting to collect the result set.  Defaults to 0.
 func (r ApiSearchArtifactsByContentRequest) Offset(offset int32) ApiSearchArtifactsByContentRequest {
 	r.offset = &offset
 	return r
 }
-
-// The number of artifacts to return.  Defaults to 20.
 func (r ApiSearchArtifactsByContentRequest) Limit(limit int32) ApiSearchArtifactsByContentRequest {
 	r.limit = &limit
 	return r
 }
-
-// Sort order, ascending (&#x60;asc&#x60;) or descending (&#x60;desc&#x60;).
 func (r ApiSearchArtifactsByContentRequest) Order(order string) ApiSearchArtifactsByContentRequest {
 	r.order = &order
 	return r
 }
-
-// The field to sort by.  Can be one of:  * &#x60;name&#x60; * &#x60;createdOn&#x60; 
 func (r ApiSearchArtifactsByContentRequest) Orderby(orderby string) ApiSearchArtifactsByContentRequest {
 	r.orderby = &orderby
 	return r
 }
 
-func (r ApiSearchArtifactsByContentRequest) Execute() (*ArtifactSearchResults, *http.Response, error) {
+func (r ApiSearchArtifactsByContentRequest) Execute() (ArtifactSearchResults, *_nethttp.Response, error) {
 	return r.ApiService.SearchArtifactsByContentExecute(r)
 }
 
 /*
-SearchArtifactsByContent Search for artifacts by content
-
-Returns a paginated list of all artifacts with at least one version that matches the
+ * SearchArtifactsByContent Search for artifacts by content
+ * Returns a paginated list of all artifacts with at least one version that matches the
 posted content.
 
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiSearchArtifactsByContentRequest
-*/
-func (a *SearchApiService) SearchArtifactsByContent(ctx context.Context) ApiSearchArtifactsByContentRequest {
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiSearchArtifactsByContentRequest
+ */
+func (a *SearchApiService) SearchArtifactsByContent(ctx _context.Context) ApiSearchArtifactsByContentRequest {
 	return ApiSearchArtifactsByContentRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return ArtifactSearchResults
-func (a *SearchApiService) SearchArtifactsByContentExecute(r ApiSearchArtifactsByContentRequest) (*ArtifactSearchResults, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return ArtifactSearchResults
+ */
+func (a *SearchApiService) SearchArtifactsByContentExecute(r ApiSearchArtifactsByContentRequest) (ArtifactSearchResults, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *ArtifactSearchResults
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  ArtifactSearchResults
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "SearchApiService.SearchArtifactsByContent")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/search/artifacts"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.body == nil {
 		return localVarReturnValue, nil, reportError("body is required and must be specified")
 	}
@@ -431,7 +404,7 @@ func (a *SearchApiService) SearchArtifactsByContentExecute(r ApiSearchArtifactsB
 	}
 	// body params
 	localVarPostBody = r.body
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -441,15 +414,15 @@ func (a *SearchApiService) SearchArtifactsByContentExecute(r ApiSearchArtifactsB
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -460,15 +433,14 @@ func (a *SearchApiService) SearchArtifactsByContentExecute(r ApiSearchArtifactsB
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/api_system.go b/app-services-sdk-go/registryinstance/apiv1internal/client/api_system.go
index 414cfef5..ac2821fa 100644
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/api_system.go
+++ b/app-services-sdk-go/registryinstance/apiv1internal/client/api_system.go
@@ -1,11 +1,11 @@
 /*
-Service Registry API
-
-Service Registry Instance API  NOTE: This API cannot be called directly from the portal.
-
-API version: 2.2.5.Final
-Contact: apicurio@lists.jboss.org
-*/
+ * Apicurio Registry API [v2]
+ *
+ * Apicurio Registry is a datastore for standard event schemas and API designs. Apicurio Registry enables developers to manage and share the structure of their data using a REST interface. For example, client applications can dynamically push or pull the latest updates to or from the registry without needing to redeploy. Apicurio Registry also enables developers to create rules that govern how registry content can evolve over time. For example, this includes rules for content validation and version compatibility.  The Apicurio Registry REST API enables client applications to manage the artifacts in the registry. This API provides create, read, update, and delete operations for schema and API artifacts, rules, versions, and metadata.   The supported artifact types include: - Apache Avro schema - AsyncAPI specification - Google protocol buffers - GraphQL schema - JSON Schema - Kafka Connect schema - OpenAPI specification - Web Services Description Language - XML Schema Definition   **Important**: The Apicurio Registry REST API is available from `https://MY-REGISTRY-URL/apis/registry/v2` by default. Therefore you must prefix all API operation paths with `../apis/registry/v2` in this case. For example: `../apis/registry/v2/ids/globalIds/{globalId}`. 
+ *
+ * API version: 2.2.5.Final
+ * Contact: apicurio@lists.jboss.org
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -13,92 +13,99 @@ package registryinstanceclient
 
 import (
 	"bytes"
-	"context"
-	"io/ioutil"
-	"net/http"
-	"net/url"
+	_context "context"
+	_ioutil "io/ioutil"
+	_nethttp "net/http"
+	_neturl "net/url"
 )
 
+// Linger please
+var (
+	_ _context.Context
+)
 
 type SystemApi interface {
 
 	/*
-	GetResourceLimits Get resource limits information
-
-	This operation retrieves the list of limitations on used resources, that are applied on the current instance of Registry.
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiGetResourceLimitsRequest
-	*/
-	GetResourceLimits(ctx context.Context) ApiGetResourceLimitsRequest
-
-	// GetResourceLimitsExecute executes the request
-	//  @return Limits
-	GetResourceLimitsExecute(r ApiGetResourceLimitsRequest) (*Limits, *http.Response, error)
+	 * GetResourceLimits Get resource limits information
+	 * This operation retrieves the list of limitations on used resources, that are applied on the current instance of Registry.
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiGetResourceLimitsRequest
+	 */
+	GetResourceLimits(ctx _context.Context) ApiGetResourceLimitsRequest
 
 	/*
-	GetSystemInfo Get system information
+	 * GetResourceLimitsExecute executes the request
+	 * @return Limits
+	 */
+	GetResourceLimitsExecute(r ApiGetResourceLimitsRequest) (Limits, *_nethttp.Response, error)
 
-	This operation retrieves information about the running registry system, such as the version
+	/*
+	 * GetSystemInfo Get system information
+	 * This operation retrieves information about the running registry system, such as the version
 of the software and when it was built.
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiGetSystemInfoRequest
+	 */
+	GetSystemInfo(ctx _context.Context) ApiGetSystemInfoRequest
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiGetSystemInfoRequest
-	*/
-	GetSystemInfo(ctx context.Context) ApiGetSystemInfoRequest
-
-	// GetSystemInfoExecute executes the request
-	//  @return SystemInfo
-	GetSystemInfoExecute(r ApiGetSystemInfoRequest) (*SystemInfo, *http.Response, error)
+	/*
+	 * GetSystemInfoExecute executes the request
+	 * @return SystemInfo
+	 */
+	GetSystemInfoExecute(r ApiGetSystemInfoRequest) (SystemInfo, *_nethttp.Response, error)
 }
 
 // SystemApiService SystemApi service
 type SystemApiService service
 
 type ApiGetResourceLimitsRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService SystemApi
 }
 
-func (r ApiGetResourceLimitsRequest) Execute() (*Limits, *http.Response, error) {
+
+func (r ApiGetResourceLimitsRequest) Execute() (Limits, *_nethttp.Response, error) {
 	return r.ApiService.GetResourceLimitsExecute(r)
 }
 
 /*
-GetResourceLimits Get resource limits information
-
-This operation retrieves the list of limitations on used resources, that are applied on the current instance of Registry.
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiGetResourceLimitsRequest
-*/
-func (a *SystemApiService) GetResourceLimits(ctx context.Context) ApiGetResourceLimitsRequest {
+ * GetResourceLimits Get resource limits information
+ * This operation retrieves the list of limitations on used resources, that are applied on the current instance of Registry.
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiGetResourceLimitsRequest
+ */
+func (a *SystemApiService) GetResourceLimits(ctx _context.Context) ApiGetResourceLimitsRequest {
 	return ApiGetResourceLimitsRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return Limits
-func (a *SystemApiService) GetResourceLimitsExecute(r ApiGetResourceLimitsRequest) (*Limits, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return Limits
+ */
+func (a *SystemApiService) GetResourceLimitsExecute(r ApiGetResourceLimitsRequest) (Limits, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *Limits
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  Limits
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "SystemApiService.GetResourceLimits")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/system/limits"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -117,7 +124,7 @@ func (a *SystemApiService) GetResourceLimitsExecute(r ApiGetResourceLimitsReques
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -127,15 +134,15 @@ func (a *SystemApiService) GetResourceLimitsExecute(r ApiGetResourceLimitsReques
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -146,15 +153,14 @@ func (a *SystemApiService) GetResourceLimitsExecute(r ApiGetResourceLimitsReques
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -165,50 +171,53 @@ func (a *SystemApiService) GetResourceLimitsExecute(r ApiGetResourceLimitsReques
 }
 
 type ApiGetSystemInfoRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService SystemApi
 }
 
-func (r ApiGetSystemInfoRequest) Execute() (*SystemInfo, *http.Response, error) {
+
+func (r ApiGetSystemInfoRequest) Execute() (SystemInfo, *_nethttp.Response, error) {
 	return r.ApiService.GetSystemInfoExecute(r)
 }
 
 /*
-GetSystemInfo Get system information
-
-This operation retrieves information about the running registry system, such as the version
+ * GetSystemInfo Get system information
+ * This operation retrieves information about the running registry system, such as the version
 of the software and when it was built.
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiGetSystemInfoRequest
-*/
-func (a *SystemApiService) GetSystemInfo(ctx context.Context) ApiGetSystemInfoRequest {
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiGetSystemInfoRequest
+ */
+func (a *SystemApiService) GetSystemInfo(ctx _context.Context) ApiGetSystemInfoRequest {
 	return ApiGetSystemInfoRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return SystemInfo
-func (a *SystemApiService) GetSystemInfoExecute(r ApiGetSystemInfoRequest) (*SystemInfo, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return SystemInfo
+ */
+func (a *SystemApiService) GetSystemInfoExecute(r ApiGetSystemInfoRequest) (SystemInfo, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *SystemInfo
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  SystemInfo
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "SystemApiService.GetSystemInfo")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/system/info"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -227,7 +236,7 @@ func (a *SystemApiService) GetSystemInfoExecute(r ApiGetSystemInfoRequest) (*Sys
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -237,15 +246,15 @@ func (a *SystemApiService) GetSystemInfoExecute(r ApiGetSystemInfoRequest) (*Sys
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -256,15 +265,14 @@ func (a *SystemApiService) GetSystemInfoExecute(r ApiGetSystemInfoRequest) (*Sys
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/api_users.go b/app-services-sdk-go/registryinstance/apiv1internal/client/api_users.go
index 96a55c0b..47975af9 100644
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/api_users.go
+++ b/app-services-sdk-go/registryinstance/apiv1internal/client/api_users.go
@@ -1,11 +1,11 @@
 /*
-Service Registry API
-
-Service Registry Instance API  NOTE: This API cannot be called directly from the portal.
-
-API version: 2.2.5.Final
-Contact: apicurio@lists.jboss.org
-*/
+ * Apicurio Registry API [v2]
+ *
+ * Apicurio Registry is a datastore for standard event schemas and API designs. Apicurio Registry enables developers to manage and share the structure of their data using a REST interface. For example, client applications can dynamically push or pull the latest updates to or from the registry without needing to redeploy. Apicurio Registry also enables developers to create rules that govern how registry content can evolve over time. For example, this includes rules for content validation and version compatibility.  The Apicurio Registry REST API enables client applications to manage the artifacts in the registry. This API provides create, read, update, and delete operations for schema and API artifacts, rules, versions, and metadata.   The supported artifact types include: - Apache Avro schema - AsyncAPI specification - Google protocol buffers - GraphQL schema - JSON Schema - Kafka Connect schema - OpenAPI specification - Web Services Description Language - XML Schema Definition   **Important**: The Apicurio Registry REST API is available from `https://MY-REGISTRY-URL/apis/registry/v2` by default. Therefore you must prefix all API operation paths with `../apis/registry/v2` in this case. For example: `../apis/registry/v2/ids/globalIds/{globalId}`. 
+ *
+ * API version: 2.2.5.Final
+ * Contact: apicurio@lists.jboss.org
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -13,77 +13,84 @@ package registryinstanceclient
 
 import (
 	"bytes"
-	"context"
-	"io/ioutil"
-	"net/http"
-	"net/url"
+	_context "context"
+	_ioutil "io/ioutil"
+	_nethttp "net/http"
+	_neturl "net/url"
 )
 
+// Linger please
+var (
+	_ _context.Context
+)
 
 type UsersApi interface {
 
 	/*
-	GetCurrentUserInfo Get current user
-
-	Returns information about the currently authenticated user.
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiGetCurrentUserInfoRequest
-	*/
-	GetCurrentUserInfo(ctx context.Context) ApiGetCurrentUserInfoRequest
+	 * GetCurrentUserInfo Get current user
+	 * Returns information about the currently authenticated user.
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiGetCurrentUserInfoRequest
+	 */
+	GetCurrentUserInfo(ctx _context.Context) ApiGetCurrentUserInfoRequest
 
-	// GetCurrentUserInfoExecute executes the request
-	//  @return UserInfo
-	GetCurrentUserInfoExecute(r ApiGetCurrentUserInfoRequest) (*UserInfo, *http.Response, error)
+	/*
+	 * GetCurrentUserInfoExecute executes the request
+	 * @return UserInfo
+	 */
+	GetCurrentUserInfoExecute(r ApiGetCurrentUserInfoRequest) (UserInfo, *_nethttp.Response, error)
 }
 
 // UsersApiService UsersApi service
 type UsersApiService service
 
 type ApiGetCurrentUserInfoRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService UsersApi
 }
 
-func (r ApiGetCurrentUserInfoRequest) Execute() (*UserInfo, *http.Response, error) {
+
+func (r ApiGetCurrentUserInfoRequest) Execute() (UserInfo, *_nethttp.Response, error) {
 	return r.ApiService.GetCurrentUserInfoExecute(r)
 }
 
 /*
-GetCurrentUserInfo Get current user
-
-Returns information about the currently authenticated user.
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiGetCurrentUserInfoRequest
-*/
-func (a *UsersApiService) GetCurrentUserInfo(ctx context.Context) ApiGetCurrentUserInfoRequest {
+ * GetCurrentUserInfo Get current user
+ * Returns information about the currently authenticated user.
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiGetCurrentUserInfoRequest
+ */
+func (a *UsersApiService) GetCurrentUserInfo(ctx _context.Context) ApiGetCurrentUserInfoRequest {
 	return ApiGetCurrentUserInfoRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return UserInfo
-func (a *UsersApiService) GetCurrentUserInfoExecute(r ApiGetCurrentUserInfoRequest) (*UserInfo, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return UserInfo
+ */
+func (a *UsersApiService) GetCurrentUserInfoExecute(r ApiGetCurrentUserInfoRequest) (UserInfo, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *UserInfo
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  UserInfo
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "UsersApiService.GetCurrentUserInfo")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/users/me"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -102,7 +109,7 @@ func (a *UsersApiService) GetCurrentUserInfoExecute(r ApiGetCurrentUserInfoReque
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -112,15 +119,15 @@ func (a *UsersApiService) GetCurrentUserInfoExecute(r ApiGetCurrentUserInfoReque
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -131,15 +138,14 @@ func (a *UsersApiService) GetCurrentUserInfoExecute(r ApiGetCurrentUserInfoReque
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/api_versions.go b/app-services-sdk-go/registryinstance/apiv1internal/client/api_versions.go
index 7b308d79..f14d4309 100644
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/api_versions.go
+++ b/app-services-sdk-go/registryinstance/apiv1internal/client/api_versions.go
@@ -1,11 +1,11 @@
 /*
-Service Registry API
-
-Service Registry Instance API  NOTE: This API cannot be called directly from the portal.
-
-API version: 2.2.5.Final
-Contact: apicurio@lists.jboss.org
-*/
+ * Apicurio Registry API [v2]
+ *
+ * Apicurio Registry is a datastore for standard event schemas and API designs. Apicurio Registry enables developers to manage and share the structure of their data using a REST interface. For example, client applications can dynamically push or pull the latest updates to or from the registry without needing to redeploy. Apicurio Registry also enables developers to create rules that govern how registry content can evolve over time. For example, this includes rules for content validation and version compatibility.  The Apicurio Registry REST API enables client applications to manage the artifacts in the registry. This API provides create, read, update, and delete operations for schema and API artifacts, rules, versions, and metadata.   The supported artifact types include: - Apache Avro schema - AsyncAPI specification - Google protocol buffers - GraphQL schema - JSON Schema - Kafka Connect schema - OpenAPI specification - Web Services Description Language - XML Schema Definition   **Important**: The Apicurio Registry REST API is available from `https://MY-REGISTRY-URL/apis/registry/v2` by default. Therefore you must prefix all API operation paths with `../apis/registry/v2` in this case. For example: `../apis/registry/v2/ids/globalIds/{globalId}`. 
+ *
+ * API version: 2.2.5.Final
+ * Contact: apicurio@lists.jboss.org
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -13,21 +13,24 @@ package registryinstanceclient
 
 import (
 	"bytes"
-	"context"
-	"io/ioutil"
-	"net/http"
-	"net/url"
+	_context "context"
+	_ioutil "io/ioutil"
+	_nethttp "net/http"
+	_neturl "net/url"
 	"strings"
 	"os"
 )
 
+// Linger please
+var (
+	_ _context.Context
+)
 
 type VersionsApi interface {
 
 	/*
-	CreateArtifactVersion Create artifact version
-
-	Creates a new version of the artifact by uploading new content.  The configured rules for
+	 * CreateArtifactVersion Create artifact version
+	 * Creates a new version of the artifact by uploading new content.  The configured rules for
 the artifact are applied, and if they all pass, the new content is added as the most recent 
 version of the artifact.  If any of the rules fail, an error is returned.
 
@@ -43,22 +46,22 @@ This operation can fail for the following reasons:
 * The new content violates one of the rules configured for the artifact (HTTP error `409`)
 * A server error occurred (HTTP error `500`)
 
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
-	@param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
-	@return ApiCreateArtifactVersionRequest
-	*/
-	CreateArtifactVersion(ctx context.Context, groupId string, artifactId string) ApiCreateArtifactVersionRequest
-
-	// CreateArtifactVersionExecute executes the request
-	//  @return VersionMetaData
-	CreateArtifactVersionExecute(r ApiCreateArtifactVersionRequest) (*VersionMetaData, *http.Response, error)
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
+	 * @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
+	 * @return ApiCreateArtifactVersionRequest
+	 */
+	CreateArtifactVersion(ctx _context.Context, groupId string, artifactId string) ApiCreateArtifactVersionRequest
 
 	/*
-	GetArtifactVersion Get artifact version
+	 * CreateArtifactVersionExecute executes the request
+	 * @return VersionMetaData
+	 */
+	CreateArtifactVersionExecute(r ApiCreateArtifactVersionRequest) (VersionMetaData, *_nethttp.Response, error)
 
-	Retrieves a single version of the artifact content.  Both the `artifactId` and the
+	/*
+	 * GetArtifactVersion Get artifact version
+	 * Retrieves a single version of the artifact content.  Both the `artifactId` and the
 unique `version` number must be provided.  The `Content-Type` of the response depends 
 on the artifact type.  In most cases, this is `application/json`, but for some types 
 it may be different (for example, `PROTOBUF`).
@@ -69,23 +72,23 @@ This operation can fail for the following reasons:
 * No version with this `version` exists (HTTP error `404`)
 * A server error occurred (HTTP error `500`)
 
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
-	@param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
-	@param version The unique identifier of a specific version of the artifact content.
-	@return ApiGetArtifactVersionRequest
-	*/
-	GetArtifactVersion(ctx context.Context, groupId string, artifactId string, version string) ApiGetArtifactVersionRequest
-
-	// GetArtifactVersionExecute executes the request
-	//  @return *os.File
-	GetArtifactVersionExecute(r ApiGetArtifactVersionRequest) (**os.File, *http.Response, error)
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
+	 * @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
+	 * @param version The unique identifier of a specific version of the artifact content.
+	 * @return ApiGetArtifactVersionRequest
+	 */
+	GetArtifactVersion(ctx _context.Context, groupId string, artifactId string, version string) ApiGetArtifactVersionRequest
 
 	/*
-	GetArtifactVersionReferences Get artifact version
+	 * GetArtifactVersionExecute executes the request
+	 * @return *os.File
+	 */
+	GetArtifactVersionExecute(r ApiGetArtifactVersionRequest) (*os.File, *_nethttp.Response, error)
 
-	Retrieves a single version of the artifact content.  Both the `artifactId` and the
+	/*
+	 * GetArtifactVersionReferences Get artifact version
+	 * Retrieves a single version of the artifact content.  Both the `artifactId` and the
 unique `version` number must be provided.  The `Content-Type` of the response depends 
 on the artifact type.  In most cases, this is `application/json`, but for some types 
 it may be different (for example, `PROTOBUF`).
@@ -96,45 +99,45 @@ This operation can fail for the following reasons:
 * No version with this `version` exists (HTTP error `404`)
 * A server error occurred (HTTP error `500`)
 
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
-	@param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
-	@param version The unique identifier of a specific version of the artifact content.
-	@return ApiGetArtifactVersionReferencesRequest
-	*/
-	GetArtifactVersionReferences(ctx context.Context, groupId string, artifactId string, version string) ApiGetArtifactVersionReferencesRequest
-
-	// GetArtifactVersionReferencesExecute executes the request
-	//  @return []ArtifactReference
-	GetArtifactVersionReferencesExecute(r ApiGetArtifactVersionReferencesRequest) ([]ArtifactReference, *http.Response, error)
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
+	 * @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
+	 * @param version The unique identifier of a specific version of the artifact content.
+	 * @return ApiGetArtifactVersionReferencesRequest
+	 */
+	GetArtifactVersionReferences(ctx _context.Context, groupId string, artifactId string, version string) ApiGetArtifactVersionReferencesRequest
 
 	/*
-	ListArtifactVersions List artifact versions
+	 * GetArtifactVersionReferencesExecute executes the request
+	 * @return []ArtifactReference
+	 */
+	GetArtifactVersionReferencesExecute(r ApiGetArtifactVersionReferencesRequest) ([]ArtifactReference, *_nethttp.Response, error)
 
-	Returns a list of all versions of the artifact.  The result set is paged.
+	/*
+	 * ListArtifactVersions List artifact versions
+	 * Returns a list of all versions of the artifact.  The result set is paged.
 
 This operation can fail for the following reasons:
 
 * No artifact with this `artifactId` exists (HTTP error `404`)
 * A server error occurred (HTTP error `500`)
 
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
-	@param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
-	@return ApiListArtifactVersionsRequest
-	*/
-	ListArtifactVersions(ctx context.Context, groupId string, artifactId string) ApiListArtifactVersionsRequest
-
-	// ListArtifactVersionsExecute executes the request
-	//  @return VersionSearchResults
-	ListArtifactVersionsExecute(r ApiListArtifactVersionsRequest) (*VersionSearchResults, *http.Response, error)
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
+	 * @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
+	 * @return ApiListArtifactVersionsRequest
+	 */
+	ListArtifactVersions(ctx _context.Context, groupId string, artifactId string) ApiListArtifactVersionsRequest
 
 	/*
-	UpdateArtifactVersionState Update artifact version state
+	 * ListArtifactVersionsExecute executes the request
+	 * @return VersionSearchResults
+	 */
+	ListArtifactVersionsExecute(r ApiListArtifactVersionsRequest) (VersionSearchResults, *_nethttp.Response, error)
 
-	Updates the state of a specific version of an artifact.  For example, you can use 
+	/*
+	 * UpdateArtifactVersionState Update artifact version state
+	 * Updates the state of a specific version of an artifact.  For example, you can use 
 this operation to disable a specific version.
 
 This operation can fail for the following reasons:
@@ -143,24 +146,25 @@ This operation can fail for the following reasons:
 * No version with this `version` exists (HTTP error `404`)
 * A server error occurred (HTTP error `500`)
 
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
+	 * @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
+	 * @param version The unique identifier of a specific version of the artifact content.
+	 * @return ApiUpdateArtifactVersionStateRequest
+	 */
+	UpdateArtifactVersionState(ctx _context.Context, groupId string, artifactId string, version string) ApiUpdateArtifactVersionStateRequest
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
-	@param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
-	@param version The unique identifier of a specific version of the artifact content.
-	@return ApiUpdateArtifactVersionStateRequest
-	*/
-	UpdateArtifactVersionState(ctx context.Context, groupId string, artifactId string, version string) ApiUpdateArtifactVersionStateRequest
-
-	// UpdateArtifactVersionStateExecute executes the request
-	UpdateArtifactVersionStateExecute(r ApiUpdateArtifactVersionStateRequest) (*http.Response, error)
+	/*
+	 * UpdateArtifactVersionStateExecute executes the request
+	 */
+	UpdateArtifactVersionStateExecute(r ApiUpdateArtifactVersionStateRequest) (*_nethttp.Response, error)
 }
 
 // VersionsApiService VersionsApi service
 type VersionsApiService service
 
 type ApiCreateArtifactVersionRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService VersionsApi
 	groupId string
 	artifactId string
@@ -172,50 +176,38 @@ type ApiCreateArtifactVersionRequest struct {
 	xRegistryNameEncoded *string
 }
 
-// The content of the artifact version being created or the content and a set of references to other artifacts. This is often, but not always, JSON data representing one of the supported artifact types:  * Avro (&#x60;AVRO&#x60;) * Protobuf (&#x60;PROTOBUF&#x60;) * JSON Schema (&#x60;JSON&#x60;) * Kafka Connect (&#x60;KCONNECT&#x60;) * OpenAPI (&#x60;OPENAPI&#x60;) * AsyncAPI (&#x60;ASYNCAPI&#x60;) * GraphQL (&#x60;GRAPHQL&#x60;) * Web Services Description Language (&#x60;WSDL&#x60;) * XML Schema (&#x60;XSD&#x60;) 
 func (r ApiCreateArtifactVersionRequest) Body(body interface{}) ApiCreateArtifactVersionRequest {
 	r.body = &body
 	return r
 }
-
-// Specifies the version number of this new version of the artifact content.  This would typically be a simple integer or a SemVer value.  It must be unique within the artifact.  If this is not provided, the server will generate a new, unique version number for this new updated content.
 func (r ApiCreateArtifactVersionRequest) XRegistryVersion(xRegistryVersion string) ApiCreateArtifactVersionRequest {
 	r.xRegistryVersion = &xRegistryVersion
 	return r
 }
-
-// Specifies the artifact name of this new version of the artifact content. Name must be ASCII-only string. If this is not provided, the server will extract the name from the artifact content.
 func (r ApiCreateArtifactVersionRequest) XRegistryName(xRegistryName string) ApiCreateArtifactVersionRequest {
 	r.xRegistryName = &xRegistryName
 	return r
 }
-
-// Specifies the artifact description of this new version of the artifact content. Description must be ASCII-only string. If this is not provided, the server will extract the description from the artifact content.
 func (r ApiCreateArtifactVersionRequest) XRegistryDescription(xRegistryDescription string) ApiCreateArtifactVersionRequest {
 	r.xRegistryDescription = &xRegistryDescription
 	return r
 }
-
-// Specifies the artifact description of this new version of the artifact content. Value of this must be Base64 encoded string. If this is not provided, the server will extract the description from the artifact content.
 func (r ApiCreateArtifactVersionRequest) XRegistryDescriptionEncoded(xRegistryDescriptionEncoded string) ApiCreateArtifactVersionRequest {
 	r.xRegistryDescriptionEncoded = &xRegistryDescriptionEncoded
 	return r
 }
-
-// Specifies the artifact name of this new version of the artifact content. Value of this must be Base64 encoded string. If this is not provided, the server will extract the name from the artifact content.
 func (r ApiCreateArtifactVersionRequest) XRegistryNameEncoded(xRegistryNameEncoded string) ApiCreateArtifactVersionRequest {
 	r.xRegistryNameEncoded = &xRegistryNameEncoded
 	return r
 }
 
-func (r ApiCreateArtifactVersionRequest) Execute() (*VersionMetaData, *http.Response, error) {
+func (r ApiCreateArtifactVersionRequest) Execute() (VersionMetaData, *_nethttp.Response, error) {
 	return r.ApiService.CreateArtifactVersionExecute(r)
 }
 
 /*
-CreateArtifactVersion Create artifact version
-
-Creates a new version of the artifact by uploading new content.  The configured rules for
+ * CreateArtifactVersion Create artifact version
+ * Creates a new version of the artifact by uploading new content.  The configured rules for
 the artifact are applied, and if they all pass, the new content is added as the most recent 
 version of the artifact.  If any of the rules fail, an error is returned.
 
@@ -231,13 +223,12 @@ This operation can fail for the following reasons:
 * The new content violates one of the rules configured for the artifact (HTTP error `409`)
 * A server error occurred (HTTP error `500`)
 
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
- @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
- @return ApiCreateArtifactVersionRequest
-*/
-func (a *VersionsApiService) CreateArtifactVersion(ctx context.Context, groupId string, artifactId string) ApiCreateArtifactVersionRequest {
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
+ * @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
+ * @return ApiCreateArtifactVersionRequest
+ */
+func (a *VersionsApiService) CreateArtifactVersion(ctx _context.Context, groupId string, artifactId string) ApiCreateArtifactVersionRequest {
 	return ApiCreateArtifactVersionRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -246,28 +237,32 @@ func (a *VersionsApiService) CreateArtifactVersion(ctx context.Context, groupId
 	}
 }
 
-// Execute executes the request
-//  @return VersionMetaData
-func (a *VersionsApiService) CreateArtifactVersionExecute(r ApiCreateArtifactVersionRequest) (*VersionMetaData, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return VersionMetaData
+ */
+func (a *VersionsApiService) CreateArtifactVersionExecute(r ApiCreateArtifactVersionRequest) (VersionMetaData, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *VersionMetaData
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  VersionMetaData
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "VersionsApiService.CreateArtifactVersion")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/groups/{groupId}/artifacts/{artifactId}/versions"
-	localVarPath = strings.Replace(localVarPath, "{"+"groupId"+"}", url.PathEscape(parameterToString(r.groupId, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"artifactId"+"}", url.PathEscape(parameterToString(r.artifactId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"groupId"+"}", _neturl.PathEscape(parameterToString(r.groupId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"artifactId"+"}", _neturl.PathEscape(parameterToString(r.artifactId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.body == nil {
 		return localVarReturnValue, nil, reportError("body is required and must be specified")
 	}
@@ -306,7 +301,7 @@ func (a *VersionsApiService) CreateArtifactVersionExecute(r ApiCreateArtifactVer
 	}
 	// body params
 	localVarPostBody = r.body
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -316,15 +311,15 @@ func (a *VersionsApiService) CreateArtifactVersionExecute(r ApiCreateArtifactVer
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -335,8 +330,7 @@ func (a *VersionsApiService) CreateArtifactVersionExecute(r ApiCreateArtifactVer
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 409 {
@@ -346,8 +340,7 @@ func (a *VersionsApiService) CreateArtifactVersionExecute(r ApiCreateArtifactVer
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -357,15 +350,14 @@ func (a *VersionsApiService) CreateArtifactVersionExecute(r ApiCreateArtifactVer
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -376,7 +368,7 @@ func (a *VersionsApiService) CreateArtifactVersionExecute(r ApiCreateArtifactVer
 }
 
 type ApiGetArtifactVersionRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService VersionsApi
 	groupId string
 	artifactId string
@@ -384,20 +376,18 @@ type ApiGetArtifactVersionRequest struct {
 	dereference *bool
 }
 
-// Allows the user to specify if the content should be dereferenced when being returned
 func (r ApiGetArtifactVersionRequest) Dereference(dereference bool) ApiGetArtifactVersionRequest {
 	r.dereference = &dereference
 	return r
 }
 
-func (r ApiGetArtifactVersionRequest) Execute() (**os.File, *http.Response, error) {
+func (r ApiGetArtifactVersionRequest) Execute() (*os.File, *_nethttp.Response, error) {
 	return r.ApiService.GetArtifactVersionExecute(r)
 }
 
 /*
-GetArtifactVersion Get artifact version
-
-Retrieves a single version of the artifact content.  Both the `artifactId` and the
+ * GetArtifactVersion Get artifact version
+ * Retrieves a single version of the artifact content.  Both the `artifactId` and the
 unique `version` number must be provided.  The `Content-Type` of the response depends 
 on the artifact type.  In most cases, this is `application/json`, but for some types 
 it may be different (for example, `PROTOBUF`).
@@ -408,14 +398,13 @@ This operation can fail for the following reasons:
 * No version with this `version` exists (HTTP error `404`)
 * A server error occurred (HTTP error `500`)
 
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
- @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
- @param version The unique identifier of a specific version of the artifact content.
- @return ApiGetArtifactVersionRequest
-*/
-func (a *VersionsApiService) GetArtifactVersion(ctx context.Context, groupId string, artifactId string, version string) ApiGetArtifactVersionRequest {
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
+ * @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
+ * @param version The unique identifier of a specific version of the artifact content.
+ * @return ApiGetArtifactVersionRequest
+ */
+func (a *VersionsApiService) GetArtifactVersion(ctx _context.Context, groupId string, artifactId string, version string) ApiGetArtifactVersionRequest {
 	return ApiGetArtifactVersionRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -425,29 +414,33 @@ func (a *VersionsApiService) GetArtifactVersion(ctx context.Context, groupId str
 	}
 }
 
-// Execute executes the request
-//  @return *os.File
-func (a *VersionsApiService) GetArtifactVersionExecute(r ApiGetArtifactVersionRequest) (**os.File, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return *os.File
+ */
+func (a *VersionsApiService) GetArtifactVersionExecute(r ApiGetArtifactVersionRequest) (*os.File, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  **os.File
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  *os.File
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "VersionsApiService.GetArtifactVersion")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/groups/{groupId}/artifacts/{artifactId}/versions/{version}"
-	localVarPath = strings.Replace(localVarPath, "{"+"groupId"+"}", url.PathEscape(parameterToString(r.groupId, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"artifactId"+"}", url.PathEscape(parameterToString(r.artifactId, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"version"+"}", url.PathEscape(parameterToString(r.version, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"groupId"+"}", _neturl.PathEscape(parameterToString(r.groupId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"artifactId"+"}", _neturl.PathEscape(parameterToString(r.artifactId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"version"+"}", _neturl.PathEscape(parameterToString(r.version, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.dereference != nil {
 		localVarQueryParams.Add("dereference", parameterToString(*r.dereference, ""))
@@ -469,7 +462,7 @@ func (a *VersionsApiService) GetArtifactVersionExecute(r ApiGetArtifactVersionRe
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -479,15 +472,15 @@ func (a *VersionsApiService) GetArtifactVersionExecute(r ApiGetArtifactVersionRe
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -498,8 +491,7 @@ func (a *VersionsApiService) GetArtifactVersionExecute(r ApiGetArtifactVersionRe
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -509,15 +501,14 @@ func (a *VersionsApiService) GetArtifactVersionExecute(r ApiGetArtifactVersionRe
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -528,21 +519,21 @@ func (a *VersionsApiService) GetArtifactVersionExecute(r ApiGetArtifactVersionRe
 }
 
 type ApiGetArtifactVersionReferencesRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService VersionsApi
 	groupId string
 	artifactId string
 	version string
 }
 
-func (r ApiGetArtifactVersionReferencesRequest) Execute() ([]ArtifactReference, *http.Response, error) {
+
+func (r ApiGetArtifactVersionReferencesRequest) Execute() ([]ArtifactReference, *_nethttp.Response, error) {
 	return r.ApiService.GetArtifactVersionReferencesExecute(r)
 }
 
 /*
-GetArtifactVersionReferences Get artifact version
-
-Retrieves a single version of the artifact content.  Both the `artifactId` and the
+ * GetArtifactVersionReferences Get artifact version
+ * Retrieves a single version of the artifact content.  Both the `artifactId` and the
 unique `version` number must be provided.  The `Content-Type` of the response depends 
 on the artifact type.  In most cases, this is `application/json`, but for some types 
 it may be different (for example, `PROTOBUF`).
@@ -553,14 +544,13 @@ This operation can fail for the following reasons:
 * No version with this `version` exists (HTTP error `404`)
 * A server error occurred (HTTP error `500`)
 
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
- @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
- @param version The unique identifier of a specific version of the artifact content.
- @return ApiGetArtifactVersionReferencesRequest
-*/
-func (a *VersionsApiService) GetArtifactVersionReferences(ctx context.Context, groupId string, artifactId string, version string) ApiGetArtifactVersionReferencesRequest {
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
+ * @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
+ * @param version The unique identifier of a specific version of the artifact content.
+ * @return ApiGetArtifactVersionReferencesRequest
+ */
+func (a *VersionsApiService) GetArtifactVersionReferences(ctx _context.Context, groupId string, artifactId string, version string) ApiGetArtifactVersionReferencesRequest {
 	return ApiGetArtifactVersionReferencesRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -570,29 +560,33 @@ func (a *VersionsApiService) GetArtifactVersionReferences(ctx context.Context, g
 	}
 }
 
-// Execute executes the request
-//  @return []ArtifactReference
-func (a *VersionsApiService) GetArtifactVersionReferencesExecute(r ApiGetArtifactVersionReferencesRequest) ([]ArtifactReference, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return []ArtifactReference
+ */
+func (a *VersionsApiService) GetArtifactVersionReferencesExecute(r ApiGetArtifactVersionReferencesRequest) ([]ArtifactReference, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 		localVarReturnValue  []ArtifactReference
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "VersionsApiService.GetArtifactVersionReferences")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/groups/{groupId}/artifacts/{artifactId}/versions/{version}/references"
-	localVarPath = strings.Replace(localVarPath, "{"+"groupId"+"}", url.PathEscape(parameterToString(r.groupId, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"artifactId"+"}", url.PathEscape(parameterToString(r.artifactId, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"version"+"}", url.PathEscape(parameterToString(r.version, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"groupId"+"}", _neturl.PathEscape(parameterToString(r.groupId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"artifactId"+"}", _neturl.PathEscape(parameterToString(r.artifactId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"version"+"}", _neturl.PathEscape(parameterToString(r.version, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -611,7 +605,7 @@ func (a *VersionsApiService) GetArtifactVersionReferencesExecute(r ApiGetArtifac
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -621,15 +615,15 @@ func (a *VersionsApiService) GetArtifactVersionReferencesExecute(r ApiGetArtifac
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -640,8 +634,7 @@ func (a *VersionsApiService) GetArtifactVersionReferencesExecute(r ApiGetArtifac
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -651,15 +644,14 @@ func (a *VersionsApiService) GetArtifactVersionReferencesExecute(r ApiGetArtifac
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -670,7 +662,7 @@ func (a *VersionsApiService) GetArtifactVersionReferencesExecute(r ApiGetArtifac
 }
 
 type ApiListArtifactVersionsRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService VersionsApi
 	groupId string
 	artifactId string
@@ -678,39 +670,34 @@ type ApiListArtifactVersionsRequest struct {
 	limit *int32
 }
 
-// The number of versions to skip before starting to collect the result set.  Defaults to 0.
 func (r ApiListArtifactVersionsRequest) Offset(offset int32) ApiListArtifactVersionsRequest {
 	r.offset = &offset
 	return r
 }
-
-// The number of versions to return.  Defaults to 20.
 func (r ApiListArtifactVersionsRequest) Limit(limit int32) ApiListArtifactVersionsRequest {
 	r.limit = &limit
 	return r
 }
 
-func (r ApiListArtifactVersionsRequest) Execute() (*VersionSearchResults, *http.Response, error) {
+func (r ApiListArtifactVersionsRequest) Execute() (VersionSearchResults, *_nethttp.Response, error) {
 	return r.ApiService.ListArtifactVersionsExecute(r)
 }
 
 /*
-ListArtifactVersions List artifact versions
-
-Returns a list of all versions of the artifact.  The result set is paged.
+ * ListArtifactVersions List artifact versions
+ * Returns a list of all versions of the artifact.  The result set is paged.
 
 This operation can fail for the following reasons:
 
 * No artifact with this `artifactId` exists (HTTP error `404`)
 * A server error occurred (HTTP error `500`)
 
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
- @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
- @return ApiListArtifactVersionsRequest
-*/
-func (a *VersionsApiService) ListArtifactVersions(ctx context.Context, groupId string, artifactId string) ApiListArtifactVersionsRequest {
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
+ * @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
+ * @return ApiListArtifactVersionsRequest
+ */
+func (a *VersionsApiService) ListArtifactVersions(ctx _context.Context, groupId string, artifactId string) ApiListArtifactVersionsRequest {
 	return ApiListArtifactVersionsRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -719,28 +706,32 @@ func (a *VersionsApiService) ListArtifactVersions(ctx context.Context, groupId s
 	}
 }
 
-// Execute executes the request
-//  @return VersionSearchResults
-func (a *VersionsApiService) ListArtifactVersionsExecute(r ApiListArtifactVersionsRequest) (*VersionSearchResults, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return VersionSearchResults
+ */
+func (a *VersionsApiService) ListArtifactVersionsExecute(r ApiListArtifactVersionsRequest) (VersionSearchResults, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *VersionSearchResults
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  VersionSearchResults
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "VersionsApiService.ListArtifactVersions")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/groups/{groupId}/artifacts/{artifactId}/versions"
-	localVarPath = strings.Replace(localVarPath, "{"+"groupId"+"}", url.PathEscape(parameterToString(r.groupId, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"artifactId"+"}", url.PathEscape(parameterToString(r.artifactId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"groupId"+"}", _neturl.PathEscape(parameterToString(r.groupId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"artifactId"+"}", _neturl.PathEscape(parameterToString(r.artifactId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.offset != nil {
 		localVarQueryParams.Add("offset", parameterToString(*r.offset, ""))
@@ -765,7 +756,7 @@ func (a *VersionsApiService) ListArtifactVersionsExecute(r ApiListArtifactVersio
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -775,15 +766,15 @@ func (a *VersionsApiService) ListArtifactVersionsExecute(r ApiListArtifactVersio
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -794,8 +785,7 @@ func (a *VersionsApiService) ListArtifactVersionsExecute(r ApiListArtifactVersio
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -805,15 +795,14 @@ func (a *VersionsApiService) ListArtifactVersionsExecute(r ApiListArtifactVersio
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -824,7 +813,7 @@ func (a *VersionsApiService) ListArtifactVersionsExecute(r ApiListArtifactVersio
 }
 
 type ApiUpdateArtifactVersionStateRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService VersionsApi
 	groupId string
 	artifactId string
@@ -837,14 +826,13 @@ func (r ApiUpdateArtifactVersionStateRequest) UpdateState(updateState UpdateStat
 	return r
 }
 
-func (r ApiUpdateArtifactVersionStateRequest) Execute() (*http.Response, error) {
+func (r ApiUpdateArtifactVersionStateRequest) Execute() (*_nethttp.Response, error) {
 	return r.ApiService.UpdateArtifactVersionStateExecute(r)
 }
 
 /*
-UpdateArtifactVersionState Update artifact version state
-
-Updates the state of a specific version of an artifact.  For example, you can use 
+ * UpdateArtifactVersionState Update artifact version state
+ * Updates the state of a specific version of an artifact.  For example, you can use 
 this operation to disable a specific version.
 
 This operation can fail for the following reasons:
@@ -853,14 +841,13 @@ This operation can fail for the following reasons:
 * No version with this `version` exists (HTTP error `404`)
 * A server error occurred (HTTP error `500`)
 
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
- @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
- @param version The unique identifier of a specific version of the artifact content.
- @return ApiUpdateArtifactVersionStateRequest
-*/
-func (a *VersionsApiService) UpdateArtifactVersionState(ctx context.Context, groupId string, artifactId string, version string) ApiUpdateArtifactVersionStateRequest {
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param groupId The artifact group ID.  Must be a string provided by the client, representing the name of the grouping of artifacts.
+ * @param artifactId The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
+ * @param version The unique identifier of a specific version of the artifact content.
+ * @return ApiUpdateArtifactVersionStateRequest
+ */
+func (a *VersionsApiService) UpdateArtifactVersionState(ctx _context.Context, groupId string, artifactId string, version string) ApiUpdateArtifactVersionStateRequest {
 	return ApiUpdateArtifactVersionStateRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -870,27 +857,31 @@ func (a *VersionsApiService) UpdateArtifactVersionState(ctx context.Context, gro
 	}
 }
 
-// Execute executes the request
-func (a *VersionsApiService) UpdateArtifactVersionStateExecute(r ApiUpdateArtifactVersionStateRequest) (*http.Response, error) {
+/*
+ * Execute executes the request
+ */
+func (a *VersionsApiService) UpdateArtifactVersionStateExecute(r ApiUpdateArtifactVersionStateRequest) (*_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPut
+		localVarHTTPMethod   = _nethttp.MethodPut
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "VersionsApiService.UpdateArtifactVersionState")
 	if err != nil {
-		return nil, &GenericOpenAPIError{error: err.Error()}
+		return nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/groups/{groupId}/artifacts/{artifactId}/versions/{version}/state"
-	localVarPath = strings.Replace(localVarPath, "{"+"groupId"+"}", url.PathEscape(parameterToString(r.groupId, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"artifactId"+"}", url.PathEscape(parameterToString(r.artifactId, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"version"+"}", url.PathEscape(parameterToString(r.version, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"groupId"+"}", _neturl.PathEscape(parameterToString(r.groupId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"artifactId"+"}", _neturl.PathEscape(parameterToString(r.artifactId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"version"+"}", _neturl.PathEscape(parameterToString(r.version, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.updateState == nil {
 		return nil, reportError("updateState is required and must be specified")
 	}
@@ -914,7 +905,7 @@ func (a *VersionsApiService) UpdateArtifactVersionStateExecute(r ApiUpdateArtifa
 	}
 	// body params
 	localVarPostBody = r.updateState
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return nil, err
 	}
@@ -924,15 +915,15 @@ func (a *VersionsApiService) UpdateArtifactVersionStateExecute(r ApiUpdateArtifa
 		return localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -943,8 +934,7 @@ func (a *VersionsApiService) UpdateArtifactVersionStateExecute(r ApiUpdateArtifa
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -954,8 +944,7 @@ func (a *VersionsApiService) UpdateArtifactVersionStateExecute(r ApiUpdateArtifa
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -965,8 +954,7 @@ func (a *VersionsApiService) UpdateArtifactVersionStateExecute(r ApiUpdateArtifa
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarHTTPResponse, newErr
 	}
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/client.go b/app-services-sdk-go/registryinstance/apiv1internal/client/client.go
index 1640eac3..c3311cbc 100644
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/client.go
+++ b/app-services-sdk-go/registryinstance/apiv1internal/client/client.go
@@ -1,11 +1,11 @@
 /*
-Service Registry API
-
-Service Registry Instance API  NOTE: This API cannot be called directly from the portal.
-
-API version: 2.2.5.Final
-Contact: apicurio@lists.jboss.org
-*/
+ * Apicurio Registry API [v2]
+ *
+ * Apicurio Registry is a datastore for standard event schemas and API designs. Apicurio Registry enables developers to manage and share the structure of their data using a REST interface. For example, client applications can dynamically push or pull the latest updates to or from the registry without needing to redeploy. Apicurio Registry also enables developers to create rules that govern how registry content can evolve over time. For example, this includes rules for content validation and version compatibility.  The Apicurio Registry REST API enables client applications to manage the artifacts in the registry. This API provides create, read, update, and delete operations for schema and API artifacts, rules, versions, and metadata.   The supported artifact types include: - Apache Avro schema - AsyncAPI specification - Google protocol buffers - GraphQL schema - JSON Schema - Kafka Connect schema - OpenAPI specification - Web Services Description Language - XML Schema Definition   **Important**: The Apicurio Registry REST API is available from `https://MY-REGISTRY-URL/apis/registry/v2` by default. Therefore you must prefix all API operation paths with `../apis/registry/v2` in this case. For example: `../apis/registry/v2/ids/globalIds/{globalId}`. 
+ *
+ * API version: 2.2.5.Final
+ * Contact: apicurio@lists.jboss.org
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -42,7 +42,7 @@ var (
 	xmlCheck  = regexp.MustCompile(`(?i:(?:application|text)/xml)`)
 )
 
-// APIClient manages communication with the Service Registry API API v2.2.5.Final
+// APIClient manages communication with the Apicurio Registry API [v2] API v2.2.5.Final
 // In most cases there should be only one, shared, APIClient.
 type APIClient struct {
 	cfg    *Configuration
@@ -129,7 +129,7 @@ func selectHeaderAccept(accepts []string) string {
 // contains is a case insensitive match, finding needle in a haystack
 func contains(haystack []string, needle string) bool {
 	for _, a := range haystack {
-		if strings.EqualFold(a, needle) {
+		if strings.ToLower(a) == strings.ToLower(needle) {
 			return true
 		}
 	}
@@ -145,7 +145,7 @@ func typeCheckParameter(obj interface{}, expected string, name string) error {
 
 	// Check the type is as expected.
 	if reflect.TypeOf(obj).String() != expected {
-		return fmt.Errorf("expected %s to be of type %s but received %s", name, expected, reflect.TypeOf(obj).String())
+		return fmt.Errorf("Expected %s to be of type %s but received %s.", name, expected, reflect.TypeOf(obj).String())
 	}
 	return nil
 }
@@ -214,12 +214,6 @@ func (c *APIClient) GetConfig() *Configuration {
 	return c.cfg
 }
 
-type formFile struct {
-		fileBytes []byte
-		fileName string
-		formFileName string
-}
-
 // prepareRequest build the request
 func (c *APIClient) prepareRequest(
 	ctx context.Context,
@@ -228,7 +222,9 @@ func (c *APIClient) prepareRequest(
 	headerParams map[string]string,
 	queryParams url.Values,
 	formParams url.Values,
-	formFiles []formFile) (localVarRequest *http.Request, err error) {
+	formFileName string,
+	fileName string,
+	fileBytes []byte) (localVarRequest *http.Request, err error) {
 
 	var body *bytes.Buffer
 
@@ -247,7 +243,7 @@ func (c *APIClient) prepareRequest(
 	}
 
 	// add form parameters and file if available.
-	if strings.HasPrefix(headerParams["Content-Type"], "multipart/form-data") && len(formParams) > 0 || (len(formFiles) > 0) {
+	if strings.HasPrefix(headerParams["Content-Type"], "multipart/form-data") && len(formParams) > 0 || (len(fileBytes) > 0 && fileName != "") {
 		if body != nil {
 			return nil, errors.New("Cannot specify postBody and multipart form at the same time.")
 		}
@@ -266,17 +262,16 @@ func (c *APIClient) prepareRequest(
 				}
 			}
 		}
-		for _, formFile := range formFiles {
-			if len(formFile.fileBytes) > 0 && formFile.fileName != "" {
-				w.Boundary()
-				part, err := w.CreateFormFile(formFile.formFileName, filepath.Base(formFile.fileName))
-				if err != nil {
-						return nil, err
-				}
-				_, err = part.Write(formFile.fileBytes)
-				if err != nil {
-						return nil, err
-				}
+		if len(fileBytes) > 0 && fileName != "" {
+			w.Boundary()
+			//_, fileNm := filepath.Split(fileName)
+			part, err := w.CreateFormFile(formFileName, filepath.Base(fileName))
+			if err != nil {
+				return nil, err
+			}
+			_, err = part.Write(fileBytes)
+			if err != nil {
+				return nil, err
 			}
 		}
 
@@ -339,7 +334,7 @@ func (c *APIClient) prepareRequest(
 	if len(headerParams) > 0 {
 		headers := http.Header{}
 		for h, v := range headerParams {
-			headers[h] = []string{v}
+			headers.Set(h, v)
 		}
 		localVarRequest.Header = headers
 	}
@@ -396,9 +391,6 @@ func (c *APIClient) decode(v interface{}, b []byte, contentType string) (err err
 			return
 		}
 		_, err = (*f).Write(b)
-		if err != nil {
-			return
-		}
 		_, err = (*f).Seek(0, io.SeekStart)
 		return
 	}
@@ -427,14 +419,11 @@ func (c *APIClient) decode(v interface{}, b []byte, contentType string) (err err
 
 // Add a file to the multipart request
 func addFile(w *multipart.Writer, fieldName, path string) error {
-	file, err := os.Open(filepath.Clean(path))
-	if err != nil {
-		return err
-	}
-	err = file.Close()
+	file, err := os.Open(path)
 	if err != nil {
 		return err
 	}
+	defer file.Close()
 
 	part, err := w.CreateFormFile(fieldName, filepath.Base(path))
 	if err != nil {
@@ -450,13 +439,6 @@ func reportError(format string, a ...interface{}) error {
 	return fmt.Errorf(format, a...)
 }
 
-// A wrapper for strict JSON decoding
-func newStrictDecoder(data []byte) *json.Decoder {
-	dec := json.NewDecoder(bytes.NewBuffer(data))
-	dec.DisallowUnknownFields()
-	return dec
-}
-
 // Set request body from an interface{}
 func setBody(body interface{}, contentType string) (bodyBuf *bytes.Buffer, err error) {
 	if bodyBuf == nil {
@@ -484,7 +466,7 @@ func setBody(body interface{}, contentType string) (bodyBuf *bytes.Buffer, err e
 	}
 
 	if bodyBuf.Len() == 0 {
-		err = fmt.Errorf("invalid body type %s\n", contentType)
+		err = fmt.Errorf("Invalid body type %s\n", contentType)
 		return nil, err
 	}
 	return bodyBuf, nil
@@ -586,23 +568,3 @@ func (e GenericOpenAPIError) Body() []byte {
 func (e GenericOpenAPIError) Model() interface{} {
 	return e.model
 }
-
-// format error message using title and detail when model implements rfc7807
-func formatErrorMessage(status string, v interface{}) string {
-
-    str := ""
-    metaValue := reflect.ValueOf(v).Elem()
-
-    field := metaValue.FieldByName("Title")
-    if field != (reflect.Value{}) {
-        str = fmt.Sprintf("%s", field.Interface())
-    }
-
-    field = metaValue.FieldByName("Detail")
-    if field != (reflect.Value{}) {
-        str = fmt.Sprintf("%s (%s)", str, field.Interface())
-    }
-
-    // status title (detail)
-    return fmt.Sprintf("%s %s", status, str)
-}
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/configuration.go b/app-services-sdk-go/registryinstance/apiv1internal/client/configuration.go
index 5bfd1a81..4f6129bc 100644
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/configuration.go
+++ b/app-services-sdk-go/registryinstance/apiv1internal/client/configuration.go
@@ -1,11 +1,11 @@
 /*
-Service Registry API
-
-Service Registry Instance API  NOTE: This API cannot be called directly from the portal.
-
-API version: 2.2.5.Final
-Contact: apicurio@lists.jboss.org
-*/
+ * Apicurio Registry API [v2]
+ *
+ * Apicurio Registry is a datastore for standard event schemas and API designs. Apicurio Registry enables developers to manage and share the structure of their data using a REST interface. For example, client applications can dynamically push or pull the latest updates to or from the registry without needing to redeploy. Apicurio Registry also enables developers to create rules that govern how registry content can evolve over time. For example, this includes rules for content validation and version compatibility.  The Apicurio Registry REST API enables client applications to manage the artifacts in the registry. This API provides create, read, update, and delete operations for schema and API artifacts, rules, versions, and metadata.   The supported artifact types include: - Apache Avro schema - AsyncAPI specification - Google protocol buffers - GraphQL schema - JSON Schema - Kafka Connect schema - OpenAPI specification - Web Services Description Language - XML Schema Definition   **Important**: The Apicurio Registry REST API is available from `https://MY-REGISTRY-URL/apis/registry/v2` by default. Therefore you must prefix all API operation paths with `../apis/registry/v2` in this case. For example: `../apis/registry/v2/ids/globalIds/{globalId}`. 
+ *
+ * API version: 2.2.5.Final
+ * Contact: apicurio@lists.jboss.org
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -124,7 +124,7 @@ func (c *Configuration) AddDefaultHeader(key string, value string) {
 // URL formats template on a index using given variables
 func (sc ServerConfigurations) URL(index int, variables map[string]string) (string, error) {
 	if index < 0 || len(sc) <= index {
-		return "", fmt.Errorf("index %v out of range %v", index, len(sc)-1)
+		return "", fmt.Errorf("Index %v out of range %v", index, len(sc)-1)
 	}
 	server := sc[index]
 	url := server.URL
@@ -139,7 +139,7 @@ func (sc ServerConfigurations) URL(index int, variables map[string]string) (stri
 				}
 			}
 			if !found {
-				return "", fmt.Errorf("the variable %s in the server URL has invalid value %v. Must be %v", name, value, variable.EnumValues)
+				return "", fmt.Errorf("The variable %s in the server URL has invalid value %v. Must be %v", name, value, variable.EnumValues)
 			}
 			url = strings.Replace(url, "{"+name+"}", value, -1)
 		} else {
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/docs/AdminApi.md b/app-services-sdk-go/registryinstance/apiv1internal/client/docs/AdminApi.md
index 13901885..44dda30e 100644
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/docs/AdminApi.md
+++ b/app-services-sdk-go/registryinstance/apiv1internal/client/docs/AdminApi.md
@@ -46,8 +46,8 @@ func main() {
     roleMapping := *openapiclient.NewRoleMapping("PrincipalId_example", openapiclient.RoleType("READ_ONLY")) // RoleMapping | 
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.AdminApi.CreateRoleMapping(context.Background()).RoleMapping(roleMapping).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.AdminApi.CreateRoleMapping(context.Background()).RoleMapping(roleMapping).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `AdminApi.CreateRoleMapping``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -110,8 +110,8 @@ func main() {
     principalId := "principalId_example" // string | Unique id of a principal (typically either a user or service account).
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.AdminApi.DeleteRoleMapping(context.Background(), principalId).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.AdminApi.DeleteRoleMapping(context.Background(), principalId).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `AdminApi.DeleteRoleMapping``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -156,7 +156,7 @@ No authorization required
 
 ## ExportData
 
-> *os.File ExportData(ctx).ForBrowser(forBrowser).Execute()
+> *os.File ExportData(ctx).Accept(accept).ForBrowser(forBrowser).Execute()
 
 Export registry data
 
@@ -175,11 +175,12 @@ import (
 )
 
 func main() {
+    accept := "accept_example" // string |  (optional)
     forBrowser := true // bool | Indicates if the operation is done for a browser.  If true, the response will be a JSON payload with a property called `href`.  This `href` will be a single-use, naked download link suitable for use by a web browser to download the content. (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.AdminApi.ExportData(context.Background()).ForBrowser(forBrowser).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.AdminApi.ExportData(context.Background()).Accept(accept).ForBrowser(forBrowser).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `AdminApi.ExportData``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -200,6 +201,7 @@ Other parameters are passed through a pointer to a apiExportDataRequest struct v
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
+ **accept** | **string** |  | 
  **forBrowser** | **bool** | Indicates if the operation is done for a browser.  If true, the response will be a JSON payload with a property called &#x60;href&#x60;.  This &#x60;href&#x60; will be a single-use, naked download link suitable for use by a web browser to download the content. | 
 
 ### Return type
@@ -244,8 +246,8 @@ func main() {
     propertyName := "propertyName_example" // string | The name of a configuration property.
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.AdminApi.GetConfigProperty(context.Background(), propertyName).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.AdminApi.GetConfigProperty(context.Background(), propertyName).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `AdminApi.GetConfigProperty``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -314,8 +316,8 @@ func main() {
     logger := "logger_example" // string | The name of a single logger.
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.AdminApi.GetLogConfiguration(context.Background(), logger).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.AdminApi.GetLogConfiguration(context.Background(), logger).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `AdminApi.GetLogConfiguration``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -384,8 +386,8 @@ func main() {
     principalId := "principalId_example" // string | Unique id of a principal (typically either a user or service account).
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.AdminApi.GetRoleMapping(context.Background(), principalId).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.AdminApi.GetRoleMapping(context.Background(), principalId).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `AdminApi.GetRoleMapping``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -456,8 +458,8 @@ func main() {
     xRegistryPreserveContentId := true // bool | If this header is set to false, content ids of imported data will be ignored and replaced by next id in content id sequence. The mapping between content and artifacts will be preserved. This allows to import any data even thought the content ids would cause a conflict. (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.AdminApi.ImportData(context.Background()).Body(body).XRegistryPreserveGlobalId(xRegistryPreserveGlobalId).XRegistryPreserveContentId(xRegistryPreserveContentId).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.AdminApi.ImportData(context.Background()).Body(body).XRegistryPreserveGlobalId(xRegistryPreserveGlobalId).XRegistryPreserveContentId(xRegistryPreserveContentId).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `AdminApi.ImportData``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -521,8 +523,8 @@ import (
 func main() {
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.AdminApi.ListConfigProperties(context.Background()).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.AdminApi.ListConfigProperties(context.Background()).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `AdminApi.ListConfigProperties``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -582,8 +584,8 @@ import (
 func main() {
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.AdminApi.ListLogConfigurations(context.Background()).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.AdminApi.ListLogConfigurations(context.Background()).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `AdminApi.ListLogConfigurations``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -643,8 +645,8 @@ import (
 func main() {
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.AdminApi.ListRoleMappings(context.Background()).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.AdminApi.ListRoleMappings(context.Background()).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `AdminApi.ListRoleMappings``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -705,8 +707,8 @@ func main() {
     logger := "logger_example" // string | The name of a single logger.
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.AdminApi.RemoveLogConfiguration(context.Background(), logger).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.AdminApi.RemoveLogConfiguration(context.Background(), logger).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `AdminApi.RemoveLogConfiguration``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -775,8 +777,8 @@ func main() {
     propertyName := "propertyName_example" // string | The name of a configuration property.
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.AdminApi.ResetConfigProperty(context.Background(), propertyName).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.AdminApi.ResetConfigProperty(context.Background(), propertyName).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `AdminApi.ResetConfigProperty``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -844,8 +846,8 @@ func main() {
     logConfiguration := *openapiclient.NewLogConfiguration(openapiclient.LogLevel("DEBUG")) // LogConfiguration | The new logger configuration.
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.AdminApi.SetLogConfiguration(context.Background(), logger).LogConfiguration(logConfiguration).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.AdminApi.SetLogConfiguration(context.Background(), logger).LogConfiguration(logConfiguration).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `AdminApi.SetLogConfiguration``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -916,8 +918,8 @@ func main() {
     updateConfigurationProperty := *openapiclient.NewUpdateConfigurationProperty("Value_example") // UpdateConfigurationProperty | 
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.AdminApi.UpdateConfigProperty(context.Background(), propertyName).UpdateConfigurationProperty(updateConfigurationProperty).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.AdminApi.UpdateConfigProperty(context.Background(), propertyName).UpdateConfigurationProperty(updateConfigurationProperty).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `AdminApi.UpdateConfigProperty``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -986,8 +988,8 @@ func main() {
     updateRole := *openapiclient.NewUpdateRole(openapiclient.RoleType("READ_ONLY")) // UpdateRole | 
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.AdminApi.UpdateRoleMapping(context.Background(), principalId).UpdateRole(updateRole).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.AdminApi.UpdateRoleMapping(context.Background(), principalId).UpdateRole(updateRole).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `AdminApi.UpdateRoleMapping``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/docs/ArtifactRulesApi.md b/app-services-sdk-go/registryinstance/apiv1internal/client/docs/ArtifactRulesApi.md
index 132e6a56..d23245ef 100644
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/docs/ArtifactRulesApi.md
+++ b/app-services-sdk-go/registryinstance/apiv1internal/client/docs/ArtifactRulesApi.md
@@ -40,8 +40,8 @@ func main() {
     rule := *openapiclient.NewRule("Config_example") // Rule | 
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.ArtifactRulesApi.CreateArtifactRule(context.Background(), groupId, artifactId).Rule(rule).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.ArtifactRulesApi.CreateArtifactRule(context.Background(), groupId, artifactId).Rule(rule).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `ArtifactRulesApi.CreateArtifactRule``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -113,8 +113,8 @@ func main() {
     rule := "rule_example" // string | The unique name/type of a rule.
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.ArtifactRulesApi.DeleteArtifactRule(context.Background(), groupId, artifactId, rule).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.ArtifactRulesApi.DeleteArtifactRule(context.Background(), groupId, artifactId, rule).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `ArtifactRulesApi.DeleteArtifactRule``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -186,8 +186,8 @@ func main() {
     artifactId := "artifactId_example" // string | The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.ArtifactRulesApi.DeleteArtifactRules(context.Background(), groupId, artifactId).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.ArtifactRulesApi.DeleteArtifactRules(context.Background(), groupId, artifactId).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `ArtifactRulesApi.DeleteArtifactRules``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -258,8 +258,8 @@ func main() {
     rule := "rule_example" // string | The unique name/type of a rule.
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.ArtifactRulesApi.GetArtifactRuleConfig(context.Background(), groupId, artifactId, rule).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.ArtifactRulesApi.GetArtifactRuleConfig(context.Background(), groupId, artifactId, rule).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `ArtifactRulesApi.GetArtifactRuleConfig``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -333,8 +333,8 @@ func main() {
     artifactId := "artifactId_example" // string | The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.ArtifactRulesApi.ListArtifactRules(context.Background(), groupId, artifactId).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.ArtifactRulesApi.ListArtifactRules(context.Background(), groupId, artifactId).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `ArtifactRulesApi.ListArtifactRules``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -407,8 +407,8 @@ func main() {
     body := interface{}(987) // interface{} | The content of the artifact being tested. This is often, but not always, JSON data representing one of the supported artifact types:  * Avro (`AVRO`) * Protobuf (`PROTOBUF`) * JSON Schema (`JSON`) * Kafka Connect (`KCONNECT`) * OpenAPI (`OPENAPI`) * AsyncAPI (`ASYNCAPI`) * GraphQL (`GRAPHQL`) * Web Services Description Language (`WSDL`) * XML Schema (`XSD`) 
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.ArtifactRulesApi.TestUpdateArtifact(context.Background(), groupId, artifactId).Body(body).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.ArtifactRulesApi.TestUpdateArtifact(context.Background(), groupId, artifactId).Body(body).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `ArtifactRulesApi.TestUpdateArtifact``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -481,8 +481,8 @@ func main() {
     rule2 := *openapiclient.NewRule("Config_example") // Rule | 
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.ArtifactRulesApi.UpdateArtifactRuleConfig(context.Background(), groupId, artifactId, rule).Rule2(rule2).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.ArtifactRulesApi.UpdateArtifactRuleConfig(context.Background(), groupId, artifactId, rule).Rule2(rule2).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `ArtifactRulesApi.UpdateArtifactRuleConfig``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/docs/ArtifactsApi.md b/app-services-sdk-go/registryinstance/apiv1internal/client/docs/ArtifactsApi.md
index c2a950c1..042a2601 100644
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/docs/ArtifactsApi.md
+++ b/app-services-sdk-go/registryinstance/apiv1internal/client/docs/ArtifactsApi.md
@@ -42,7 +42,7 @@ import (
 
 func main() {
     groupId := "groupId_example" // string | Unique ID of an artifact group.
-    body := interface{}({"openapi":"3.0.2","info":{"title":"Empty API","version":"1.0.7","description":"An example API design using OpenAPI."},"paths":{"/widgets":{"get":{"responses":{"200":{"content":{"application/json":{"schema":{"type":"array","items":{"type":"string"}}}},"description":"All widgets"}},"summary":"Get widgets"}}},"components":{"schemas":{"Widget":{"title":"Root Type for Widget","description":"A sample data type.","type":"object","properties":{"property-1":{"type":"string"},"property-2":{"type":"boolean"}},"example":{"property-1":"value1","property-2":true}}}}}) // interface{} | The content of the artifact being created. This is often, but not always, JSON data representing one of the supported artifact types:  * Avro (`AVRO`) * Protobuf (`PROTOBUF`) * JSON Schema (`JSON`) * Kafka Connect (`KCONNECT`) * OpenAPI (`OPENAPI`) * AsyncAPI (`ASYNCAPI`) * GraphQL (`GRAPHQL`) * Web Services Description Language (`WSDL`) * XML Schema (`XSD`) 
+    body := os.NewFile(1234, "some_file") // *os.File | The content of the artifact being created. This is often, but not always, JSON data representing one of the supported artifact types:  * Avro (`AVRO`) * Protobuf (`PROTOBUF`) * JSON Schema (`JSON`) * Kafka Connect (`KCONNECT`) * OpenAPI (`OPENAPI`) * AsyncAPI (`ASYNCAPI`) * GraphQL (`GRAPHQL`) * Web Services Description Language (`WSDL`) * XML Schema (`XSD`) 
     xRegistryArtifactType := openapiclient.ArtifactType("AVRO") // ArtifactType | Specifies the type of the artifact being added. Possible values include:  * Avro (`AVRO`) * Protobuf (`PROTOBUF`) * JSON Schema (`JSON`) * Kafka Connect (`KCONNECT`) * OpenAPI (`OPENAPI`) * AsyncAPI (`ASYNCAPI`) * GraphQL (`GRAPHQL`) * Web Services Description Language (`WSDL`) * XML Schema (`XSD`) (optional)
     xRegistryArtifactId := "xRegistryArtifactId_example" // string | A client-provided, globally unique identifier for the new artifact. (optional)
     xRegistryVersion := "xRegistryVersion_example" // string | Specifies the version number of this initial version of the artifact content.  This would typically be a simple integer or a SemVer value.  If not provided, the server will assign a version number automatically (starting with version `1`). (optional)
@@ -56,8 +56,8 @@ func main() {
     xRegistryHashAlgorithm := "xRegistryHashAlgorithm_example" // string | The algorithm to use when checking the content validity. (available: SHA256, MD5; default: SHA256) (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.ArtifactsApi.CreateArtifact(context.Background(), groupId).Body(body).XRegistryArtifactType(xRegistryArtifactType).XRegistryArtifactId(xRegistryArtifactId).XRegistryVersion(xRegistryVersion).IfExists(ifExists).Canonical(canonical).XRegistryDescription(xRegistryDescription).XRegistryDescriptionEncoded(xRegistryDescriptionEncoded).XRegistryName(xRegistryName).XRegistryNameEncoded(xRegistryNameEncoded).XRegistryContentHash(xRegistryContentHash).XRegistryHashAlgorithm(xRegistryHashAlgorithm).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.ArtifactsApi.CreateArtifact(context.Background(), groupId).Body(body).XRegistryArtifactType(xRegistryArtifactType).XRegistryArtifactId(xRegistryArtifactId).XRegistryVersion(xRegistryVersion).IfExists(ifExists).Canonical(canonical).XRegistryDescription(xRegistryDescription).XRegistryDescriptionEncoded(xRegistryDescriptionEncoded).XRegistryName(xRegistryName).XRegistryNameEncoded(xRegistryNameEncoded).XRegistryContentHash(xRegistryContentHash).XRegistryHashAlgorithm(xRegistryHashAlgorithm).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `ArtifactsApi.CreateArtifact``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -83,7 +83,7 @@ Other parameters are passed through a pointer to a apiCreateArtifactRequest stru
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 
- **body** | **interface{}** | The content of the artifact being created. This is often, but not always, JSON data representing one of the supported artifact types:  * Avro (&#x60;AVRO&#x60;) * Protobuf (&#x60;PROTOBUF&#x60;) * JSON Schema (&#x60;JSON&#x60;) * Kafka Connect (&#x60;KCONNECT&#x60;) * OpenAPI (&#x60;OPENAPI&#x60;) * AsyncAPI (&#x60;ASYNCAPI&#x60;) * GraphQL (&#x60;GRAPHQL&#x60;) * Web Services Description Language (&#x60;WSDL&#x60;) * XML Schema (&#x60;XSD&#x60;)  | 
+ **body** | ***os.File** | The content of the artifact being created. This is often, but not always, JSON data representing one of the supported artifact types:  * Avro (&#x60;AVRO&#x60;) * Protobuf (&#x60;PROTOBUF&#x60;) * JSON Schema (&#x60;JSON&#x60;) * Kafka Connect (&#x60;KCONNECT&#x60;) * OpenAPI (&#x60;OPENAPI&#x60;) * AsyncAPI (&#x60;ASYNCAPI&#x60;) * GraphQL (&#x60;GRAPHQL&#x60;) * Web Services Description Language (&#x60;WSDL&#x60;) * XML Schema (&#x60;XSD&#x60;)  | 
  **xRegistryArtifactType** | [**ArtifactType**](ArtifactType.md) | Specifies the type of the artifact being added. Possible values include:  * Avro (&#x60;AVRO&#x60;) * Protobuf (&#x60;PROTOBUF&#x60;) * JSON Schema (&#x60;JSON&#x60;) * Kafka Connect (&#x60;KCONNECT&#x60;) * OpenAPI (&#x60;OPENAPI&#x60;) * AsyncAPI (&#x60;ASYNCAPI&#x60;) * GraphQL (&#x60;GRAPHQL&#x60;) * Web Services Description Language (&#x60;WSDL&#x60;) * XML Schema (&#x60;XSD&#x60;) | 
  **xRegistryArtifactId** | **string** | A client-provided, globally unique identifier for the new artifact. | 
  **xRegistryVersion** | **string** | Specifies the version number of this initial version of the artifact content.  This would typically be a simple integer or a SemVer value.  If not provided, the server will assign a version number automatically (starting with version &#x60;1&#x60;). | 
@@ -139,8 +139,8 @@ func main() {
     artifactId := "artifactId_example" // string | The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.ArtifactsApi.DeleteArtifact(context.Background(), groupId, artifactId).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.ArtifactsApi.DeleteArtifact(context.Background(), groupId, artifactId).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `ArtifactsApi.DeleteArtifact``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -209,8 +209,8 @@ func main() {
     groupId := "groupId_example" // string | Unique ID of an artifact group.
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.ArtifactsApi.DeleteArtifactsInGroup(context.Background(), groupId).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.ArtifactsApi.DeleteArtifactsInGroup(context.Background(), groupId).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `ArtifactsApi.DeleteArtifactsInGroup``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -278,8 +278,8 @@ func main() {
     dereference := true // bool | Allows the user to specify if the content should be dereferenced when being returned (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.ArtifactsApi.GetContentByGlobalId(context.Background(), globalId).Dereference(dereference).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.ArtifactsApi.GetContentByGlobalId(context.Background(), globalId).Dereference(dereference).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `ArtifactsApi.GetContentByGlobalId``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -349,8 +349,8 @@ func main() {
     contentHash := "contentHash_example" // string | SHA-256 content hash for a single artifact content.
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.ArtifactsApi.GetContentByHash(context.Background(), contentHash).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.ArtifactsApi.GetContentByHash(context.Background(), contentHash).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `ArtifactsApi.GetContentByHash``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -419,8 +419,8 @@ func main() {
     contentId := int64(789) // int64 | Global identifier for a single artifact content.
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.ArtifactsApi.GetContentById(context.Background(), contentId).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.ArtifactsApi.GetContentById(context.Background(), contentId).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `ArtifactsApi.GetContentById``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -491,8 +491,8 @@ func main() {
     dereference := true // bool | Allows the user to specify if the content should be dereferenced when being returned (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.ArtifactsApi.GetLatestArtifact(context.Background(), groupId, artifactId).Dereference(dereference).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.ArtifactsApi.GetLatestArtifact(context.Background(), groupId, artifactId).Dereference(dereference).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `ArtifactsApi.GetLatestArtifact``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -568,8 +568,8 @@ func main() {
     orderby := openapiclient.SortBy("name") // SortBy | The field to sort by.  Can be one of:  * `name` * `createdOn`  (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.ArtifactsApi.ListArtifactsInGroup(context.Background(), groupId).Limit(limit).Offset(offset).Order(order).Orderby(orderby).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.ArtifactsApi.ListArtifactsInGroup(context.Background(), groupId).Limit(limit).Offset(offset).Order(order).Orderby(orderby).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `ArtifactsApi.ListArtifactsInGroup``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -642,8 +642,8 @@ func main() {
     contentHash := "contentHash_example" // string | SHA-256 content hash for a single artifact content.
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.ArtifactsApi.ReferencesByContentHash(context.Background(), contentHash).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.ArtifactsApi.ReferencesByContentHash(context.Background(), contentHash).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `ArtifactsApi.ReferencesByContentHash``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -712,8 +712,8 @@ func main() {
     contentId := int64(789) // int64 | Global identifier for a single artifact content.
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.ArtifactsApi.ReferencesByContentId(context.Background(), contentId).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.ArtifactsApi.ReferencesByContentId(context.Background(), contentId).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `ArtifactsApi.ReferencesByContentId``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -782,8 +782,8 @@ func main() {
     globalId := int64(789) // int64 | Global identifier for an artifact version.
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.ArtifactsApi.ReferencesByGlobalId(context.Background(), globalId).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.ArtifactsApi.ReferencesByGlobalId(context.Background(), globalId).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `ArtifactsApi.ReferencesByGlobalId``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -859,8 +859,8 @@ func main() {
     xRegistryDescriptionEncoded := "xRegistryDescriptionEncoded_example" // string | Specifies the artifact description of this new version of the artifact content. Value of this must be Base64 encoded string. If this is not provided, the server will extract the description from the artifact content. (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.ArtifactsApi.UpdateArtifact(context.Background(), groupId, artifactId).Body(body).XRegistryVersion(xRegistryVersion).XRegistryName(xRegistryName).XRegistryNameEncoded(xRegistryNameEncoded).XRegistryDescription(xRegistryDescription).XRegistryDescriptionEncoded(xRegistryDescriptionEncoded).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.ArtifactsApi.UpdateArtifact(context.Background(), groupId, artifactId).Body(body).XRegistryVersion(xRegistryVersion).XRegistryName(xRegistryName).XRegistryNameEncoded(xRegistryNameEncoded).XRegistryDescription(xRegistryDescription).XRegistryDescriptionEncoded(xRegistryDescriptionEncoded).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `ArtifactsApi.UpdateArtifact``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -939,8 +939,8 @@ func main() {
     updateState := *openapiclient.NewUpdateState(openapiclient.ArtifactState("ENABLED")) // UpdateState | 
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.ArtifactsApi.UpdateArtifactState(context.Background(), groupId, artifactId).UpdateState(updateState).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.ArtifactsApi.UpdateArtifactState(context.Background(), groupId, artifactId).UpdateState(updateState).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `ArtifactsApi.UpdateArtifactState``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/docs/GlobalRulesApi.md b/app-services-sdk-go/registryinstance/apiv1internal/client/docs/GlobalRulesApi.md
index f29706f7..e4e1703d 100644
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/docs/GlobalRulesApi.md
+++ b/app-services-sdk-go/registryinstance/apiv1internal/client/docs/GlobalRulesApi.md
@@ -37,8 +37,8 @@ func main() {
     rule := *openapiclient.NewRule("Config_example") // Rule | 
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.GlobalRulesApi.CreateGlobalRule(context.Background()).Rule(rule).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.GlobalRulesApi.CreateGlobalRule(context.Background()).Rule(rule).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `GlobalRulesApi.CreateGlobalRule``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -100,8 +100,8 @@ import (
 func main() {
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.GlobalRulesApi.DeleteAllGlobalRules(context.Background()).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.GlobalRulesApi.DeleteAllGlobalRules(context.Background()).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `GlobalRulesApi.DeleteAllGlobalRules``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -160,8 +160,8 @@ func main() {
     rule := openapiclient.RuleType("VALIDITY") // RuleType | The unique name/type of a rule.
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.GlobalRulesApi.DeleteGlobalRule(context.Background(), rule).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.GlobalRulesApi.DeleteGlobalRule(context.Background(), rule).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `GlobalRulesApi.DeleteGlobalRule``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -228,8 +228,8 @@ func main() {
     rule := openapiclient.RuleType("VALIDITY") // RuleType | The unique name/type of a rule.
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.GlobalRulesApi.GetGlobalRuleConfig(context.Background(), rule).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.GlobalRulesApi.GetGlobalRuleConfig(context.Background(), rule).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `GlobalRulesApi.GetGlobalRuleConfig``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -297,8 +297,8 @@ import (
 func main() {
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.GlobalRulesApi.ListGlobalRules(context.Background()).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.GlobalRulesApi.ListGlobalRules(context.Background()).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `GlobalRulesApi.ListGlobalRules``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -360,8 +360,8 @@ func main() {
     rule2 := *openapiclient.NewRule("Config_example") // Rule | 
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.GlobalRulesApi.UpdateGlobalRuleConfig(context.Background(), rule).Rule2(rule2).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.GlobalRulesApi.UpdateGlobalRuleConfig(context.Background(), rule).Rule2(rule2).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `GlobalRulesApi.UpdateGlobalRuleConfig``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/docs/MetadataApi.md b/app-services-sdk-go/registryinstance/apiv1internal/client/docs/MetadataApi.md
index 02b19cca..9836985b 100644
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/docs/MetadataApi.md
+++ b/app-services-sdk-go/registryinstance/apiv1internal/client/docs/MetadataApi.md
@@ -41,8 +41,8 @@ func main() {
     version := "version_example" // string | The unique identifier of a specific version of the artifact content.
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.MetadataApi.DeleteArtifactVersionMetaData(context.Background(), groupId, artifactId, version).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.MetadataApi.DeleteArtifactVersionMetaData(context.Background(), groupId, artifactId, version).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `MetadataApi.DeleteArtifactVersionMetaData``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -114,8 +114,8 @@ func main() {
     artifactId := "artifactId_example" // string | The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.MetadataApi.GetArtifactMetaData(context.Background(), groupId, artifactId).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.MetadataApi.GetArtifactMetaData(context.Background(), groupId, artifactId).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `MetadataApi.GetArtifactMetaData``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -187,8 +187,8 @@ func main() {
     artifactId := "artifactId_example" // string | The artifact ID.  Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier.
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.MetadataApi.GetArtifactOwner(context.Background(), groupId, artifactId).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.MetadataApi.GetArtifactOwner(context.Background(), groupId, artifactId).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `MetadataApi.GetArtifactOwner``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -261,8 +261,8 @@ func main() {
     version := "version_example" // string | The unique identifier of a specific version of the artifact content.
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.MetadataApi.GetArtifactVersionMetaData(context.Background(), groupId, artifactId, version).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.MetadataApi.GetArtifactVersionMetaData(context.Background(), groupId, artifactId, version).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `MetadataApi.GetArtifactVersionMetaData``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -338,8 +338,8 @@ func main() {
     canonical := true // bool | Parameter that can be set to `true` to indicate that the server should \"canonicalize\" the content when searching for a matching version.  Canonicalization is unique to each artifact type, but typically involves removing any extra whitespace and formatting the content in a consistent manner. (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.MetadataApi.GetArtifactVersionMetaDataByContent(context.Background(), groupId, artifactId).Body(body).Canonical(canonical).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.MetadataApi.GetArtifactVersionMetaDataByContent(context.Background(), groupId, artifactId).Body(body).Canonical(canonical).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `MetadataApi.GetArtifactVersionMetaDataByContent``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -414,8 +414,8 @@ func main() {
     editableMetaData := *openapiclient.NewEditableMetaData() // EditableMetaData | Updated artifact metadata.
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.MetadataApi.UpdateArtifactMetaData(context.Background(), groupId, artifactId).EditableMetaData(editableMetaData).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.MetadataApi.UpdateArtifactMetaData(context.Background(), groupId, artifactId).EditableMetaData(editableMetaData).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `MetadataApi.UpdateArtifactMetaData``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -487,8 +487,8 @@ func main() {
     artifactOwner := *openapiclient.NewArtifactOwner() // ArtifactOwner | 
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.MetadataApi.UpdateArtifactOwner(context.Background(), groupId, artifactId).ArtifactOwner(artifactOwner).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.MetadataApi.UpdateArtifactOwner(context.Background(), groupId, artifactId).ArtifactOwner(artifactOwner).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `MetadataApi.UpdateArtifactOwner``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -561,8 +561,8 @@ func main() {
     editableMetaData := *openapiclient.NewEditableMetaData() // EditableMetaData | 
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.MetadataApi.UpdateArtifactVersionMetaData(context.Background(), groupId, artifactId, version).EditableMetaData(editableMetaData).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.MetadataApi.UpdateArtifactVersionMetaData(context.Background(), groupId, artifactId, version).EditableMetaData(editableMetaData).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `MetadataApi.UpdateArtifactVersionMetaData``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/docs/SearchApi.md b/app-services-sdk-go/registryinstance/apiv1internal/client/docs/SearchApi.md
index 35374a35..51587692 100644
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/docs/SearchApi.md
+++ b/app-services-sdk-go/registryinstance/apiv1internal/client/docs/SearchApi.md
@@ -43,8 +43,8 @@ func main() {
     contentId := int64(789) // int64 | Filter by contentId. (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.SearchApi.SearchArtifacts(context.Background()).Name(name).Offset(offset).Limit(limit).Order(order).Orderby(orderby).Labels(labels).Properties(properties).Description(description).Group(group).GlobalId(globalId).ContentId(contentId).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.SearchApi.SearchArtifacts(context.Background()).Name(name).Offset(offset).Limit(limit).Order(order).Orderby(orderby).Labels(labels).Properties(properties).Description(description).Group(group).GlobalId(globalId).ContentId(contentId).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `SearchApi.SearchArtifacts``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -125,8 +125,8 @@ func main() {
     orderby := "orderby_example" // string | The field to sort by.  Can be one of:  * `name` * `createdOn`  (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.SearchApi.SearchArtifactsByContent(context.Background()).Body(body).Canonical(canonical).ArtifactType(artifactType).Offset(offset).Limit(limit).Order(order).Orderby(orderby).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.SearchApi.SearchArtifactsByContent(context.Background()).Body(body).Canonical(canonical).ArtifactType(artifactType).Offset(offset).Limit(limit).Order(order).Orderby(orderby).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `SearchApi.SearchArtifactsByContent``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/docs/SystemApi.md b/app-services-sdk-go/registryinstance/apiv1internal/client/docs/SystemApi.md
index 2f5bd2cb..9d3efde8 100644
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/docs/SystemApi.md
+++ b/app-services-sdk-go/registryinstance/apiv1internal/client/docs/SystemApi.md
@@ -32,8 +32,8 @@ import (
 func main() {
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.SystemApi.GetResourceLimits(context.Background()).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.SystemApi.GetResourceLimits(context.Background()).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `SystemApi.GetResourceLimits``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -93,8 +93,8 @@ import (
 func main() {
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.SystemApi.GetSystemInfo(context.Background()).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.SystemApi.GetSystemInfo(context.Background()).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `SystemApi.GetSystemInfo``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/docs/UsersApi.md b/app-services-sdk-go/registryinstance/apiv1internal/client/docs/UsersApi.md
index 746d7050..ad4b1172 100644
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/docs/UsersApi.md
+++ b/app-services-sdk-go/registryinstance/apiv1internal/client/docs/UsersApi.md
@@ -31,8 +31,8 @@ import (
 func main() {
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.UsersApi.GetCurrentUserInfo(context.Background()).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.UsersApi.GetCurrentUserInfo(context.Background()).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `UsersApi.GetCurrentUserInfo``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/docs/VersionsApi.md b/app-services-sdk-go/registryinstance/apiv1internal/client/docs/VersionsApi.md
index bab8f300..1e86de39 100644
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/docs/VersionsApi.md
+++ b/app-services-sdk-go/registryinstance/apiv1internal/client/docs/VersionsApi.md
@@ -43,8 +43,8 @@ func main() {
     xRegistryNameEncoded := "xRegistryNameEncoded_example" // string | Specifies the artifact name of this new version of the artifact content. Value of this must be Base64 encoded string. If this is not provided, the server will extract the name from the artifact content. (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.VersionsApi.CreateArtifactVersion(context.Background(), groupId, artifactId).Body(body).XRegistryVersion(xRegistryVersion).XRegistryName(xRegistryName).XRegistryDescription(xRegistryDescription).XRegistryDescriptionEncoded(xRegistryDescriptionEncoded).XRegistryNameEncoded(xRegistryNameEncoded).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.VersionsApi.CreateArtifactVersion(context.Background(), groupId, artifactId).Body(body).XRegistryVersion(xRegistryVersion).XRegistryName(xRegistryName).XRegistryDescription(xRegistryDescription).XRegistryDescriptionEncoded(xRegistryDescriptionEncoded).XRegistryNameEncoded(xRegistryNameEncoded).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `VersionsApi.CreateArtifactVersion``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -124,8 +124,8 @@ func main() {
     dereference := true // bool | Allows the user to specify if the content should be dereferenced when being returned (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.VersionsApi.GetArtifactVersion(context.Background(), groupId, artifactId, version).Dereference(dereference).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.VersionsApi.GetArtifactVersion(context.Background(), groupId, artifactId, version).Dereference(dereference).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `VersionsApi.GetArtifactVersion``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -201,8 +201,8 @@ func main() {
     version := "version_example" // string | The unique identifier of a specific version of the artifact content.
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.VersionsApi.GetArtifactVersionReferences(context.Background(), groupId, artifactId, version).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.VersionsApi.GetArtifactVersionReferences(context.Background(), groupId, artifactId, version).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `VersionsApi.GetArtifactVersionReferences``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -278,8 +278,8 @@ func main() {
     limit := int32(56) // int32 | The number of versions to return.  Defaults to 20. (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.VersionsApi.ListArtifactVersions(context.Background(), groupId, artifactId).Offset(offset).Limit(limit).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.VersionsApi.ListArtifactVersions(context.Background(), groupId, artifactId).Offset(offset).Limit(limit).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `VersionsApi.ListArtifactVersions``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -355,8 +355,8 @@ func main() {
     updateState := *openapiclient.NewUpdateState(openapiclient.ArtifactState("ENABLED")) // UpdateState | 
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.VersionsApi.UpdateArtifactVersionState(context.Background(), groupId, artifactId, version).UpdateState(updateState).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.VersionsApi.UpdateArtifactVersionState(context.Background(), groupId, artifactId, version).UpdateState(updateState).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `VersionsApi.UpdateArtifactVersionState``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/go.mod b/app-services-sdk-go/registryinstance/apiv1internal/client/go.mod
deleted file mode 100644
index ead32606..00000000
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/go.mod
+++ /dev/null
@@ -1,7 +0,0 @@
-module github.com/GIT_USER_ID/GIT_REPO_ID
-
-go 1.13
-
-require (
-	golang.org/x/oauth2 v0.0.0-20210323180902-22b0adad7558
-)
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/go.sum b/app-services-sdk-go/registryinstance/apiv1internal/client/go.sum
deleted file mode 100644
index 734252e6..00000000
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/go.sum
+++ /dev/null
@@ -1,13 +0,0 @@
-cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
-github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e h1:bRhVy7zSSasaqNksaRZiA5EEI+Ei4I1nO5Jh72wfHlg=
-golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 h1:SVwTIAaPC2U/AvvLNZ2a7OVsmBpC8L5BlwK1whH3hm0=
-golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 h1:YUO/7uOKsKeq9UokNS62b8FYywz3ker1l1vDZRCRefw=
-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508=
-google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/model_artifact_meta_data.go b/app-services-sdk-go/registryinstance/apiv1internal/client/model_artifact_meta_data.go
index 2308e8de..c17eb740 100644
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/model_artifact_meta_data.go
+++ b/app-services-sdk-go/registryinstance/apiv1internal/client/model_artifact_meta_data.go
@@ -1,11 +1,11 @@
 /*
-Service Registry API
-
-Service Registry Instance API  NOTE: This API cannot be called directly from the portal.
-
-API version: 2.2.5.Final
-Contact: apicurio@lists.jboss.org
-*/
+ * Apicurio Registry API [v2]
+ *
+ * Apicurio Registry is a datastore for standard event schemas and API designs. Apicurio Registry enables developers to manage and share the structure of their data using a REST interface. For example, client applications can dynamically push or pull the latest updates to or from the registry without needing to redeploy. Apicurio Registry also enables developers to create rules that govern how registry content can evolve over time. For example, this includes rules for content validation and version compatibility.  The Apicurio Registry REST API enables client applications to manage the artifacts in the registry. This API provides create, read, update, and delete operations for schema and API artifacts, rules, versions, and metadata.   The supported artifact types include: - Apache Avro schema - AsyncAPI specification - Google protocol buffers - GraphQL schema - JSON Schema - Kafka Connect schema - OpenAPI specification - Web Services Description Language - XML Schema Definition   **Important**: The Apicurio Registry REST API is available from `https://MY-REGISTRY-URL/apis/registry/v2` by default. Therefore you must prefix all API operation paths with `../apis/registry/v2` in this case. For example: `../apis/registry/v2/ids/globalIds/{globalId}`. 
+ *
+ * API version: 2.2.5.Final
+ * Contact: apicurio@lists.jboss.org
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -15,7 +15,7 @@ import (
 	"encoding/json"
 )
 
-// ArtifactMetaData 
+// ArtifactMetaData struct for ArtifactMetaData
 type ArtifactMetaData struct {
 	Name *string `json:"name,omitempty"`
 	Description *string `json:"description,omitempty"`
@@ -25,22 +25,17 @@ type ArtifactMetaData struct {
 	ModifiedOn string `json:"modifiedOn"`
 	// The ID of a single artifact.
 	Id string `json:"id"`
-	// 
 	Version string `json:"version"`
 	Type ArtifactType `json:"type"`
-	// 
 	GlobalId int64 `json:"globalId"`
 	State ArtifactState `json:"state"`
-	// 
-	Labels []string `json:"labels,omitempty"`
+	Labels *[]string `json:"labels,omitempty"`
 	// User-defined name-value pairs. Name and value must be strings.
 	Properties *map[string]string `json:"properties,omitempty"`
 	// An ID of a single artifact group.
 	GroupId *string `json:"groupId,omitempty"`
-	// 
 	ContentId int64 `json:"contentId"`
-	// 
-	References []ArtifactReference `json:"references,omitempty"`
+	References *[]ArtifactReference `json:"references,omitempty"`
 }
 
 // NewArtifactMetaData instantiates a new ArtifactMetaData object
@@ -72,7 +67,7 @@ func NewArtifactMetaDataWithDefaults() *ArtifactMetaData {
 
 // GetName returns the Name field value if set, zero value otherwise.
 func (o *ArtifactMetaData) GetName() string {
-	if o == nil || isNil(o.Name) {
+	if o == nil || o.Name == nil {
 		var ret string
 		return ret
 	}
@@ -82,15 +77,15 @@ func (o *ArtifactMetaData) GetName() string {
 // GetNameOk returns a tuple with the Name field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ArtifactMetaData) GetNameOk() (*string, bool) {
-	if o == nil || isNil(o.Name) {
-    return nil, false
+	if o == nil || o.Name == nil {
+		return nil, false
 	}
 	return o.Name, true
 }
 
 // HasName returns a boolean if a field has been set.
 func (o *ArtifactMetaData) HasName() bool {
-	if o != nil && !isNil(o.Name) {
+	if o != nil && o.Name != nil {
 		return true
 	}
 
@@ -104,7 +99,7 @@ func (o *ArtifactMetaData) SetName(v string) {
 
 // GetDescription returns the Description field value if set, zero value otherwise.
 func (o *ArtifactMetaData) GetDescription() string {
-	if o == nil || isNil(o.Description) {
+	if o == nil || o.Description == nil {
 		var ret string
 		return ret
 	}
@@ -114,15 +109,15 @@ func (o *ArtifactMetaData) GetDescription() string {
 // GetDescriptionOk returns a tuple with the Description field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ArtifactMetaData) GetDescriptionOk() (*string, bool) {
-	if o == nil || isNil(o.Description) {
-    return nil, false
+	if o == nil || o.Description == nil {
+		return nil, false
 	}
 	return o.Description, true
 }
 
 // HasDescription returns a boolean if a field has been set.
 func (o *ArtifactMetaData) HasDescription() bool {
-	if o != nil && !isNil(o.Description) {
+	if o != nil && o.Description != nil {
 		return true
 	}
 
@@ -147,8 +142,8 @@ func (o *ArtifactMetaData) GetCreatedBy() string {
 // GetCreatedByOk returns a tuple with the CreatedBy field value
 // and a boolean to check if the value has been set.
 func (o *ArtifactMetaData) GetCreatedByOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.CreatedBy, true
 }
@@ -171,8 +166,8 @@ func (o *ArtifactMetaData) GetCreatedOn() string {
 // GetCreatedOnOk returns a tuple with the CreatedOn field value
 // and a boolean to check if the value has been set.
 func (o *ArtifactMetaData) GetCreatedOnOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.CreatedOn, true
 }
@@ -195,8 +190,8 @@ func (o *ArtifactMetaData) GetModifiedBy() string {
 // GetModifiedByOk returns a tuple with the ModifiedBy field value
 // and a boolean to check if the value has been set.
 func (o *ArtifactMetaData) GetModifiedByOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.ModifiedBy, true
 }
@@ -219,8 +214,8 @@ func (o *ArtifactMetaData) GetModifiedOn() string {
 // GetModifiedOnOk returns a tuple with the ModifiedOn field value
 // and a boolean to check if the value has been set.
 func (o *ArtifactMetaData) GetModifiedOnOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.ModifiedOn, true
 }
@@ -243,8 +238,8 @@ func (o *ArtifactMetaData) GetId() string {
 // GetIdOk returns a tuple with the Id field value
 // and a boolean to check if the value has been set.
 func (o *ArtifactMetaData) GetIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Id, true
 }
@@ -267,8 +262,8 @@ func (o *ArtifactMetaData) GetVersion() string {
 // GetVersionOk returns a tuple with the Version field value
 // and a boolean to check if the value has been set.
 func (o *ArtifactMetaData) GetVersionOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Version, true
 }
@@ -291,8 +286,8 @@ func (o *ArtifactMetaData) GetType() ArtifactType {
 // GetTypeOk returns a tuple with the Type field value
 // and a boolean to check if the value has been set.
 func (o *ArtifactMetaData) GetTypeOk() (*ArtifactType, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Type, true
 }
@@ -315,8 +310,8 @@ func (o *ArtifactMetaData) GetGlobalId() int64 {
 // GetGlobalIdOk returns a tuple with the GlobalId field value
 // and a boolean to check if the value has been set.
 func (o *ArtifactMetaData) GetGlobalIdOk() (*int64, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.GlobalId, true
 }
@@ -339,8 +334,8 @@ func (o *ArtifactMetaData) GetState() ArtifactState {
 // GetStateOk returns a tuple with the State field value
 // and a boolean to check if the value has been set.
 func (o *ArtifactMetaData) GetStateOk() (*ArtifactState, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.State, true
 }
@@ -352,25 +347,25 @@ func (o *ArtifactMetaData) SetState(v ArtifactState) {
 
 // GetLabels returns the Labels field value if set, zero value otherwise.
 func (o *ArtifactMetaData) GetLabels() []string {
-	if o == nil || isNil(o.Labels) {
+	if o == nil || o.Labels == nil {
 		var ret []string
 		return ret
 	}
-	return o.Labels
+	return *o.Labels
 }
 
 // GetLabelsOk returns a tuple with the Labels field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *ArtifactMetaData) GetLabelsOk() ([]string, bool) {
-	if o == nil || isNil(o.Labels) {
-    return nil, false
+func (o *ArtifactMetaData) GetLabelsOk() (*[]string, bool) {
+	if o == nil || o.Labels == nil {
+		return nil, false
 	}
 	return o.Labels, true
 }
 
 // HasLabels returns a boolean if a field has been set.
 func (o *ArtifactMetaData) HasLabels() bool {
-	if o != nil && !isNil(o.Labels) {
+	if o != nil && o.Labels != nil {
 		return true
 	}
 
@@ -379,12 +374,12 @@ func (o *ArtifactMetaData) HasLabels() bool {
 
 // SetLabels gets a reference to the given []string and assigns it to the Labels field.
 func (o *ArtifactMetaData) SetLabels(v []string) {
-	o.Labels = v
+	o.Labels = &v
 }
 
 // GetProperties returns the Properties field value if set, zero value otherwise.
 func (o *ArtifactMetaData) GetProperties() map[string]string {
-	if o == nil || isNil(o.Properties) {
+	if o == nil || o.Properties == nil {
 		var ret map[string]string
 		return ret
 	}
@@ -394,15 +389,15 @@ func (o *ArtifactMetaData) GetProperties() map[string]string {
 // GetPropertiesOk returns a tuple with the Properties field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ArtifactMetaData) GetPropertiesOk() (*map[string]string, bool) {
-	if o == nil || isNil(o.Properties) {
-    return nil, false
+	if o == nil || o.Properties == nil {
+		return nil, false
 	}
 	return o.Properties, true
 }
 
 // HasProperties returns a boolean if a field has been set.
 func (o *ArtifactMetaData) HasProperties() bool {
-	if o != nil && !isNil(o.Properties) {
+	if o != nil && o.Properties != nil {
 		return true
 	}
 
@@ -416,7 +411,7 @@ func (o *ArtifactMetaData) SetProperties(v map[string]string) {
 
 // GetGroupId returns the GroupId field value if set, zero value otherwise.
 func (o *ArtifactMetaData) GetGroupId() string {
-	if o == nil || isNil(o.GroupId) {
+	if o == nil || o.GroupId == nil {
 		var ret string
 		return ret
 	}
@@ -426,15 +421,15 @@ func (o *ArtifactMetaData) GetGroupId() string {
 // GetGroupIdOk returns a tuple with the GroupId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ArtifactMetaData) GetGroupIdOk() (*string, bool) {
-	if o == nil || isNil(o.GroupId) {
-    return nil, false
+	if o == nil || o.GroupId == nil {
+		return nil, false
 	}
 	return o.GroupId, true
 }
 
 // HasGroupId returns a boolean if a field has been set.
 func (o *ArtifactMetaData) HasGroupId() bool {
-	if o != nil && !isNil(o.GroupId) {
+	if o != nil && o.GroupId != nil {
 		return true
 	}
 
@@ -459,8 +454,8 @@ func (o *ArtifactMetaData) GetContentId() int64 {
 // GetContentIdOk returns a tuple with the ContentId field value
 // and a boolean to check if the value has been set.
 func (o *ArtifactMetaData) GetContentIdOk() (*int64, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.ContentId, true
 }
@@ -472,25 +467,25 @@ func (o *ArtifactMetaData) SetContentId(v int64) {
 
 // GetReferences returns the References field value if set, zero value otherwise.
 func (o *ArtifactMetaData) GetReferences() []ArtifactReference {
-	if o == nil || isNil(o.References) {
+	if o == nil || o.References == nil {
 		var ret []ArtifactReference
 		return ret
 	}
-	return o.References
+	return *o.References
 }
 
 // GetReferencesOk returns a tuple with the References field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *ArtifactMetaData) GetReferencesOk() ([]ArtifactReference, bool) {
-	if o == nil || isNil(o.References) {
-    return nil, false
+func (o *ArtifactMetaData) GetReferencesOk() (*[]ArtifactReference, bool) {
+	if o == nil || o.References == nil {
+		return nil, false
 	}
 	return o.References, true
 }
 
 // HasReferences returns a boolean if a field has been set.
 func (o *ArtifactMetaData) HasReferences() bool {
-	if o != nil && !isNil(o.References) {
+	if o != nil && o.References != nil {
 		return true
 	}
 
@@ -499,15 +494,15 @@ func (o *ArtifactMetaData) HasReferences() bool {
 
 // SetReferences gets a reference to the given []ArtifactReference and assigns it to the References field.
 func (o *ArtifactMetaData) SetReferences(v []ArtifactReference) {
-	o.References = v
+	o.References = &v
 }
 
 func (o ArtifactMetaData) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Name) {
+	if o.Name != nil {
 		toSerialize["name"] = o.Name
 	}
-	if !isNil(o.Description) {
+	if o.Description != nil {
 		toSerialize["description"] = o.Description
 	}
 	if true {
@@ -537,19 +532,19 @@ func (o ArtifactMetaData) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["state"] = o.State
 	}
-	if !isNil(o.Labels) {
+	if o.Labels != nil {
 		toSerialize["labels"] = o.Labels
 	}
-	if !isNil(o.Properties) {
+	if o.Properties != nil {
 		toSerialize["properties"] = o.Properties
 	}
-	if !isNil(o.GroupId) {
+	if o.GroupId != nil {
 		toSerialize["groupId"] = o.GroupId
 	}
 	if true {
 		toSerialize["contentId"] = o.ContentId
 	}
-	if !isNil(o.References) {
+	if o.References != nil {
 		toSerialize["references"] = o.References
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/model_artifact_owner.go b/app-services-sdk-go/registryinstance/apiv1internal/client/model_artifact_owner.go
index 3330ded9..7d27f9db 100644
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/model_artifact_owner.go
+++ b/app-services-sdk-go/registryinstance/apiv1internal/client/model_artifact_owner.go
@@ -1,11 +1,11 @@
 /*
-Service Registry API
-
-Service Registry Instance API  NOTE: This API cannot be called directly from the portal.
-
-API version: 2.2.5.Final
-Contact: apicurio@lists.jboss.org
-*/
+ * Apicurio Registry API [v2]
+ *
+ * Apicurio Registry is a datastore for standard event schemas and API designs. Apicurio Registry enables developers to manage and share the structure of their data using a REST interface. For example, client applications can dynamically push or pull the latest updates to or from the registry without needing to redeploy. Apicurio Registry also enables developers to create rules that govern how registry content can evolve over time. For example, this includes rules for content validation and version compatibility.  The Apicurio Registry REST API enables client applications to manage the artifacts in the registry. This API provides create, read, update, and delete operations for schema and API artifacts, rules, versions, and metadata.   The supported artifact types include: - Apache Avro schema - AsyncAPI specification - Google protocol buffers - GraphQL schema - JSON Schema - Kafka Connect schema - OpenAPI specification - Web Services Description Language - XML Schema Definition   **Important**: The Apicurio Registry REST API is available from `https://MY-REGISTRY-URL/apis/registry/v2` by default. Therefore you must prefix all API operation paths with `../apis/registry/v2` in this case. For example: `../apis/registry/v2/ids/globalIds/{globalId}`. 
+ *
+ * API version: 2.2.5.Final
+ * Contact: apicurio@lists.jboss.org
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -39,7 +39,7 @@ func NewArtifactOwnerWithDefaults() *ArtifactOwner {
 
 // GetOwner returns the Owner field value if set, zero value otherwise.
 func (o *ArtifactOwner) GetOwner() string {
-	if o == nil || isNil(o.Owner) {
+	if o == nil || o.Owner == nil {
 		var ret string
 		return ret
 	}
@@ -49,15 +49,15 @@ func (o *ArtifactOwner) GetOwner() string {
 // GetOwnerOk returns a tuple with the Owner field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ArtifactOwner) GetOwnerOk() (*string, bool) {
-	if o == nil || isNil(o.Owner) {
-    return nil, false
+	if o == nil || o.Owner == nil {
+		return nil, false
 	}
 	return o.Owner, true
 }
 
 // HasOwner returns a boolean if a field has been set.
 func (o *ArtifactOwner) HasOwner() bool {
-	if o != nil && !isNil(o.Owner) {
+	if o != nil && o.Owner != nil {
 		return true
 	}
 
@@ -71,7 +71,7 @@ func (o *ArtifactOwner) SetOwner(v string) {
 
 func (o ArtifactOwner) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Owner) {
+	if o.Owner != nil {
 		toSerialize["owner"] = o.Owner
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/model_artifact_reference.go b/app-services-sdk-go/registryinstance/apiv1internal/client/model_artifact_reference.go
index b5461cea..2f65d43c 100644
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/model_artifact_reference.go
+++ b/app-services-sdk-go/registryinstance/apiv1internal/client/model_artifact_reference.go
@@ -1,11 +1,11 @@
 /*
-Service Registry API
-
-Service Registry Instance API  NOTE: This API cannot be called directly from the portal.
-
-API version: 2.2.5.Final
-Contact: apicurio@lists.jboss.org
-*/
+ * Apicurio Registry API [v2]
+ *
+ * Apicurio Registry is a datastore for standard event schemas and API designs. Apicurio Registry enables developers to manage and share the structure of their data using a REST interface. For example, client applications can dynamically push or pull the latest updates to or from the registry without needing to redeploy. Apicurio Registry also enables developers to create rules that govern how registry content can evolve over time. For example, this includes rules for content validation and version compatibility.  The Apicurio Registry REST API enables client applications to manage the artifacts in the registry. This API provides create, read, update, and delete operations for schema and API artifacts, rules, versions, and metadata.   The supported artifact types include: - Apache Avro schema - AsyncAPI specification - Google protocol buffers - GraphQL schema - JSON Schema - Kafka Connect schema - OpenAPI specification - Web Services Description Language - XML Schema Definition   **Important**: The Apicurio Registry REST API is available from `https://MY-REGISTRY-URL/apis/registry/v2` by default. Therefore you must prefix all API operation paths with `../apis/registry/v2` in this case. For example: `../apis/registry/v2/ids/globalIds/{globalId}`. 
+ *
+ * API version: 2.2.5.Final
+ * Contact: apicurio@lists.jboss.org
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -56,8 +56,8 @@ func (o *ArtifactReference) GetGroupId() string {
 // GetGroupIdOk returns a tuple with the GroupId field value
 // and a boolean to check if the value has been set.
 func (o *ArtifactReference) GetGroupIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.GroupId, true
 }
@@ -80,8 +80,8 @@ func (o *ArtifactReference) GetArtifactId() string {
 // GetArtifactIdOk returns a tuple with the ArtifactId field value
 // and a boolean to check if the value has been set.
 func (o *ArtifactReference) GetArtifactIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.ArtifactId, true
 }
@@ -93,7 +93,7 @@ func (o *ArtifactReference) SetArtifactId(v string) {
 
 // GetVersion returns the Version field value if set, zero value otherwise.
 func (o *ArtifactReference) GetVersion() string {
-	if o == nil || isNil(o.Version) {
+	if o == nil || o.Version == nil {
 		var ret string
 		return ret
 	}
@@ -103,15 +103,15 @@ func (o *ArtifactReference) GetVersion() string {
 // GetVersionOk returns a tuple with the Version field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ArtifactReference) GetVersionOk() (*string, bool) {
-	if o == nil || isNil(o.Version) {
-    return nil, false
+	if o == nil || o.Version == nil {
+		return nil, false
 	}
 	return o.Version, true
 }
 
 // HasVersion returns a boolean if a field has been set.
 func (o *ArtifactReference) HasVersion() bool {
-	if o != nil && !isNil(o.Version) {
+	if o != nil && o.Version != nil {
 		return true
 	}
 
@@ -136,8 +136,8 @@ func (o *ArtifactReference) GetName() string {
 // GetNameOk returns a tuple with the Name field value
 // and a boolean to check if the value has been set.
 func (o *ArtifactReference) GetNameOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Name, true
 }
@@ -155,7 +155,7 @@ func (o ArtifactReference) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["artifactId"] = o.ArtifactId
 	}
-	if !isNil(o.Version) {
+	if o.Version != nil {
 		toSerialize["version"] = o.Version
 	}
 	if true {
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/model_artifact_search_results.go b/app-services-sdk-go/registryinstance/apiv1internal/client/model_artifact_search_results.go
index 7921c77b..9a2363b3 100644
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/model_artifact_search_results.go
+++ b/app-services-sdk-go/registryinstance/apiv1internal/client/model_artifact_search_results.go
@@ -1,11 +1,11 @@
 /*
-Service Registry API
-
-Service Registry Instance API  NOTE: This API cannot be called directly from the portal.
-
-API version: 2.2.5.Final
-Contact: apicurio@lists.jboss.org
-*/
+ * Apicurio Registry API [v2]
+ *
+ * Apicurio Registry is a datastore for standard event schemas and API designs. Apicurio Registry enables developers to manage and share the structure of their data using a REST interface. For example, client applications can dynamically push or pull the latest updates to or from the registry without needing to redeploy. Apicurio Registry also enables developers to create rules that govern how registry content can evolve over time. For example, this includes rules for content validation and version compatibility.  The Apicurio Registry REST API enables client applications to manage the artifacts in the registry. This API provides create, read, update, and delete operations for schema and API artifacts, rules, versions, and metadata.   The supported artifact types include: - Apache Avro schema - AsyncAPI specification - Google protocol buffers - GraphQL schema - JSON Schema - Kafka Connect schema - OpenAPI specification - Web Services Description Language - XML Schema Definition   **Important**: The Apicurio Registry REST API is available from `https://MY-REGISTRY-URL/apis/registry/v2` by default. Therefore you must prefix all API operation paths with `../apis/registry/v2` in this case. For example: `../apis/registry/v2/ids/globalIds/{globalId}`. 
+ *
+ * API version: 2.2.5.Final
+ * Contact: apicurio@lists.jboss.org
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -54,11 +54,11 @@ func (o *ArtifactSearchResults) GetArtifacts() []SearchedArtifact {
 
 // GetArtifactsOk returns a tuple with the Artifacts field value
 // and a boolean to check if the value has been set.
-func (o *ArtifactSearchResults) GetArtifactsOk() ([]SearchedArtifact, bool) {
-	if o == nil {
-    return nil, false
+func (o *ArtifactSearchResults) GetArtifactsOk() (*[]SearchedArtifact, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Artifacts, true
+	return &o.Artifacts, true
 }
 
 // SetArtifacts sets field value
@@ -79,8 +79,8 @@ func (o *ArtifactSearchResults) GetCount() int32 {
 // GetCountOk returns a tuple with the Count field value
 // and a boolean to check if the value has been set.
 func (o *ArtifactSearchResults) GetCountOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Count, true
 }
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/model_artifact_state.go b/app-services-sdk-go/registryinstance/apiv1internal/client/model_artifact_state.go
index 2154b22e..a9751cee 100644
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/model_artifact_state.go
+++ b/app-services-sdk-go/registryinstance/apiv1internal/client/model_artifact_state.go
@@ -1,11 +1,11 @@
 /*
-Service Registry API
-
-Service Registry Instance API  NOTE: This API cannot be called directly from the portal.
-
-API version: 2.2.5.Final
-Contact: apicurio@lists.jboss.org
-*/
+ * Apicurio Registry API [v2]
+ *
+ * Apicurio Registry is a datastore for standard event schemas and API designs. Apicurio Registry enables developers to manage and share the structure of their data using a REST interface. For example, client applications can dynamically push or pull the latest updates to or from the registry without needing to redeploy. Apicurio Registry also enables developers to create rules that govern how registry content can evolve over time. For example, this includes rules for content validation and version compatibility.  The Apicurio Registry REST API enables client applications to manage the artifacts in the registry. This API provides create, read, update, and delete operations for schema and API artifacts, rules, versions, and metadata.   The supported artifact types include: - Apache Avro schema - AsyncAPI specification - Google protocol buffers - GraphQL schema - JSON Schema - Kafka Connect schema - OpenAPI specification - Web Services Description Language - XML Schema Definition   **Important**: The Apicurio Registry REST API is available from `https://MY-REGISTRY-URL/apis/registry/v2` by default. Therefore you must prefix all API operation paths with `../apis/registry/v2` in this case. For example: `../apis/registry/v2/ids/globalIds/{globalId}`. 
+ *
+ * API version: 2.2.5.Final
+ * Contact: apicurio@lists.jboss.org
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -26,8 +26,7 @@ const (
 	ARTIFACTSTATE_DEPRECATED ArtifactState = "DEPRECATED"
 )
 
-// All allowed values of ArtifactState enum
-var AllowedArtifactStateEnumValues = []ArtifactState{
+var allowedArtifactStateEnumValues = []ArtifactState{
 	"ENABLED",
 	"DISABLED",
 	"DEPRECATED",
@@ -40,7 +39,7 @@ func (v *ArtifactState) UnmarshalJSON(src []byte) error {
 		return err
 	}
 	enumTypeValue := ArtifactState(value)
-	for _, existing := range AllowedArtifactStateEnumValues {
+	for _, existing := range allowedArtifactStateEnumValues {
 		if existing == enumTypeValue {
 			*v = enumTypeValue
 			return nil
@@ -57,13 +56,13 @@ func NewArtifactStateFromValue(v string) (*ArtifactState, error) {
 	if ev.IsValid() {
 		return &ev, nil
 	} else {
-		return nil, fmt.Errorf("invalid value '%v' for ArtifactState: valid values are %v", v, AllowedArtifactStateEnumValues)
+		return nil, fmt.Errorf("invalid value '%v' for ArtifactState: valid values are %v", v, allowedArtifactStateEnumValues)
 	}
 }
 
 // IsValid return true if the value is valid for the enum, false otherwise
 func (v ArtifactState) IsValid() bool {
-	for _, existing := range AllowedArtifactStateEnumValues {
+	for _, existing := range allowedArtifactStateEnumValues {
 		if existing == v {
 			return true
 		}
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/model_artifact_type.go b/app-services-sdk-go/registryinstance/apiv1internal/client/model_artifact_type.go
index 4187786f..dc286172 100644
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/model_artifact_type.go
+++ b/app-services-sdk-go/registryinstance/apiv1internal/client/model_artifact_type.go
@@ -1,11 +1,11 @@
 /*
-Service Registry API
-
-Service Registry Instance API  NOTE: This API cannot be called directly from the portal.
-
-API version: 2.2.5.Final
-Contact: apicurio@lists.jboss.org
-*/
+ * Apicurio Registry API [v2]
+ *
+ * Apicurio Registry is a datastore for standard event schemas and API designs. Apicurio Registry enables developers to manage and share the structure of their data using a REST interface. For example, client applications can dynamically push or pull the latest updates to or from the registry without needing to redeploy. Apicurio Registry also enables developers to create rules that govern how registry content can evolve over time. For example, this includes rules for content validation and version compatibility.  The Apicurio Registry REST API enables client applications to manage the artifacts in the registry. This API provides create, read, update, and delete operations for schema and API artifacts, rules, versions, and metadata.   The supported artifact types include: - Apache Avro schema - AsyncAPI specification - Google protocol buffers - GraphQL schema - JSON Schema - Kafka Connect schema - OpenAPI specification - Web Services Description Language - XML Schema Definition   **Important**: The Apicurio Registry REST API is available from `https://MY-REGISTRY-URL/apis/registry/v2` by default. Therefore you must prefix all API operation paths with `../apis/registry/v2` in this case. For example: `../apis/registry/v2/ids/globalIds/{globalId}`. 
+ *
+ * API version: 2.2.5.Final
+ * Contact: apicurio@lists.jboss.org
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -16,7 +16,7 @@ import (
 	"fmt"
 )
 
-// ArtifactType 
+// ArtifactType the model 'ArtifactType'
 type ArtifactType string
 
 // List of ArtifactType
@@ -33,8 +33,7 @@ const (
 	ARTIFACTTYPE_XML ArtifactType = "XML"
 )
 
-// All allowed values of ArtifactType enum
-var AllowedArtifactTypeEnumValues = []ArtifactType{
+var allowedArtifactTypeEnumValues = []ArtifactType{
 	"AVRO",
 	"PROTOBUF",
 	"JSON",
@@ -54,7 +53,7 @@ func (v *ArtifactType) UnmarshalJSON(src []byte) error {
 		return err
 	}
 	enumTypeValue := ArtifactType(value)
-	for _, existing := range AllowedArtifactTypeEnumValues {
+	for _, existing := range allowedArtifactTypeEnumValues {
 		if existing == enumTypeValue {
 			*v = enumTypeValue
 			return nil
@@ -71,13 +70,13 @@ func NewArtifactTypeFromValue(v string) (*ArtifactType, error) {
 	if ev.IsValid() {
 		return &ev, nil
 	} else {
-		return nil, fmt.Errorf("invalid value '%v' for ArtifactType: valid values are %v", v, AllowedArtifactTypeEnumValues)
+		return nil, fmt.Errorf("invalid value '%v' for ArtifactType: valid values are %v", v, allowedArtifactTypeEnumValues)
 	}
 }
 
 // IsValid return true if the value is valid for the enum, false otherwise
 func (v ArtifactType) IsValid() bool {
-	for _, existing := range AllowedArtifactTypeEnumValues {
+	for _, existing := range allowedArtifactTypeEnumValues {
 		if existing == v {
 			return true
 		}
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/model_configuration_property.go b/app-services-sdk-go/registryinstance/apiv1internal/client/model_configuration_property.go
index b06245e7..e4aa7b1e 100644
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/model_configuration_property.go
+++ b/app-services-sdk-go/registryinstance/apiv1internal/client/model_configuration_property.go
@@ -1,11 +1,11 @@
 /*
-Service Registry API
-
-Service Registry Instance API  NOTE: This API cannot be called directly from the portal.
-
-API version: 2.2.5.Final
-Contact: apicurio@lists.jboss.org
-*/
+ * Apicurio Registry API [v2]
+ *
+ * Apicurio Registry is a datastore for standard event schemas and API designs. Apicurio Registry enables developers to manage and share the structure of their data using a REST interface. For example, client applications can dynamically push or pull the latest updates to or from the registry without needing to redeploy. Apicurio Registry also enables developers to create rules that govern how registry content can evolve over time. For example, this includes rules for content validation and version compatibility.  The Apicurio Registry REST API enables client applications to manage the artifacts in the registry. This API provides create, read, update, and delete operations for schema and API artifacts, rules, versions, and metadata.   The supported artifact types include: - Apache Avro schema - AsyncAPI specification - Google protocol buffers - GraphQL schema - JSON Schema - Kafka Connect schema - OpenAPI specification - Web Services Description Language - XML Schema Definition   **Important**: The Apicurio Registry REST API is available from `https://MY-REGISTRY-URL/apis/registry/v2` by default. Therefore you must prefix all API operation paths with `../apis/registry/v2` in this case. For example: `../apis/registry/v2/ids/globalIds/{globalId}`. 
+ *
+ * API version: 2.2.5.Final
+ * Contact: apicurio@lists.jboss.org
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -15,15 +15,12 @@ import (
 	"encoding/json"
 )
 
-// ConfigurationProperty 
+// ConfigurationProperty struct for ConfigurationProperty
 type ConfigurationProperty struct {
 	Name string `json:"name"`
 	Value string `json:"value"`
-	// 
 	Type string `json:"type"`
-	// 
 	Label string `json:"label"`
-	// 
 	Description string `json:"description"`
 }
 
@@ -62,8 +59,8 @@ func (o *ConfigurationProperty) GetName() string {
 // GetNameOk returns a tuple with the Name field value
 // and a boolean to check if the value has been set.
 func (o *ConfigurationProperty) GetNameOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Name, true
 }
@@ -86,8 +83,8 @@ func (o *ConfigurationProperty) GetValue() string {
 // GetValueOk returns a tuple with the Value field value
 // and a boolean to check if the value has been set.
 func (o *ConfigurationProperty) GetValueOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Value, true
 }
@@ -110,8 +107,8 @@ func (o *ConfigurationProperty) GetType() string {
 // GetTypeOk returns a tuple with the Type field value
 // and a boolean to check if the value has been set.
 func (o *ConfigurationProperty) GetTypeOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Type, true
 }
@@ -134,8 +131,8 @@ func (o *ConfigurationProperty) GetLabel() string {
 // GetLabelOk returns a tuple with the Label field value
 // and a boolean to check if the value has been set.
 func (o *ConfigurationProperty) GetLabelOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Label, true
 }
@@ -158,8 +155,8 @@ func (o *ConfigurationProperty) GetDescription() string {
 // GetDescriptionOk returns a tuple with the Description field value
 // and a boolean to check if the value has been set.
 func (o *ConfigurationProperty) GetDescriptionOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Description, true
 }
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/model_content_create_request.go b/app-services-sdk-go/registryinstance/apiv1internal/client/model_content_create_request.go
index 13a34bcf..83cbcb31 100644
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/model_content_create_request.go
+++ b/app-services-sdk-go/registryinstance/apiv1internal/client/model_content_create_request.go
@@ -1,11 +1,11 @@
 /*
-Service Registry API
-
-Service Registry Instance API  NOTE: This API cannot be called directly from the portal.
-
-API version: 2.2.5.Final
-Contact: apicurio@lists.jboss.org
-*/
+ * Apicurio Registry API [v2]
+ *
+ * Apicurio Registry is a datastore for standard event schemas and API designs. Apicurio Registry enables developers to manage and share the structure of their data using a REST interface. For example, client applications can dynamically push or pull the latest updates to or from the registry without needing to redeploy. Apicurio Registry also enables developers to create rules that govern how registry content can evolve over time. For example, this includes rules for content validation and version compatibility.  The Apicurio Registry REST API enables client applications to manage the artifacts in the registry. This API provides create, read, update, and delete operations for schema and API artifacts, rules, versions, and metadata.   The supported artifact types include: - Apache Avro schema - AsyncAPI specification - Google protocol buffers - GraphQL schema - JSON Schema - Kafka Connect schema - OpenAPI specification - Web Services Description Language - XML Schema Definition   **Important**: The Apicurio Registry REST API is available from `https://MY-REGISTRY-URL/apis/registry/v2` by default. Therefore you must prefix all API operation paths with `../apis/registry/v2` in this case. For example: `../apis/registry/v2/ids/globalIds/{globalId}`. 
+ *
+ * API version: 2.2.5.Final
+ * Contact: apicurio@lists.jboss.org
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -15,7 +15,7 @@ import (
 	"encoding/json"
 )
 
-// ContentCreateRequest 
+// ContentCreateRequest struct for ContentCreateRequest
 type ContentCreateRequest struct {
 	// Raw content of the artifact or a valid (and accessible) URL where the content can be found.
 	Content string `json:"content"`
@@ -55,8 +55,8 @@ func (o *ContentCreateRequest) GetContent() string {
 // GetContentOk returns a tuple with the Content field value
 // and a boolean to check if the value has been set.
 func (o *ContentCreateRequest) GetContentOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Content, true
 }
@@ -78,11 +78,11 @@ func (o *ContentCreateRequest) GetReferences() []ArtifactReference {
 
 // GetReferencesOk returns a tuple with the References field value
 // and a boolean to check if the value has been set.
-func (o *ContentCreateRequest) GetReferencesOk() ([]ArtifactReference, bool) {
-	if o == nil {
-    return nil, false
+func (o *ContentCreateRequest) GetReferencesOk() (*[]ArtifactReference, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.References, true
+	return &o.References, true
 }
 
 // SetReferences sets field value
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/model_download_ref.go b/app-services-sdk-go/registryinstance/apiv1internal/client/model_download_ref.go
index 134329f8..60b03e75 100644
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/model_download_ref.go
+++ b/app-services-sdk-go/registryinstance/apiv1internal/client/model_download_ref.go
@@ -1,11 +1,11 @@
 /*
-Service Registry API
-
-Service Registry Instance API  NOTE: This API cannot be called directly from the portal.
-
-API version: 2.2.5.Final
-Contact: apicurio@lists.jboss.org
-*/
+ * Apicurio Registry API [v2]
+ *
+ * Apicurio Registry is a datastore for standard event schemas and API designs. Apicurio Registry enables developers to manage and share the structure of their data using a REST interface. For example, client applications can dynamically push or pull the latest updates to or from the registry without needing to redeploy. Apicurio Registry also enables developers to create rules that govern how registry content can evolve over time. For example, this includes rules for content validation and version compatibility.  The Apicurio Registry REST API enables client applications to manage the artifacts in the registry. This API provides create, read, update, and delete operations for schema and API artifacts, rules, versions, and metadata.   The supported artifact types include: - Apache Avro schema - AsyncAPI specification - Google protocol buffers - GraphQL schema - JSON Schema - Kafka Connect schema - OpenAPI specification - Web Services Description Language - XML Schema Definition   **Important**: The Apicurio Registry REST API is available from `https://MY-REGISTRY-URL/apis/registry/v2` by default. Therefore you must prefix all API operation paths with `../apis/registry/v2` in this case. For example: `../apis/registry/v2/ids/globalIds/{globalId}`. 
+ *
+ * API version: 2.2.5.Final
+ * Contact: apicurio@lists.jboss.org
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -52,8 +52,8 @@ func (o *DownloadRef) GetDownloadId() string {
 // GetDownloadIdOk returns a tuple with the DownloadId field value
 // and a boolean to check if the value has been set.
 func (o *DownloadRef) GetDownloadIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.DownloadId, true
 }
@@ -65,7 +65,7 @@ func (o *DownloadRef) SetDownloadId(v string) {
 
 // GetHref returns the Href field value if set, zero value otherwise.
 func (o *DownloadRef) GetHref() string {
-	if o == nil || isNil(o.Href) {
+	if o == nil || o.Href == nil {
 		var ret string
 		return ret
 	}
@@ -75,15 +75,15 @@ func (o *DownloadRef) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *DownloadRef) GetHrefOk() (*string, bool) {
-	if o == nil || isNil(o.Href) {
-    return nil, false
+	if o == nil || o.Href == nil {
+		return nil, false
 	}
 	return o.Href, true
 }
 
 // HasHref returns a boolean if a field has been set.
 func (o *DownloadRef) HasHref() bool {
-	if o != nil && !isNil(o.Href) {
+	if o != nil && o.Href != nil {
 		return true
 	}
 
@@ -100,7 +100,7 @@ func (o DownloadRef) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["downloadId"] = o.DownloadId
 	}
-	if !isNil(o.Href) {
+	if o.Href != nil {
 		toSerialize["href"] = o.Href
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/model_editable_meta_data.go b/app-services-sdk-go/registryinstance/apiv1internal/client/model_editable_meta_data.go
index 35cda88c..7afd16ec 100644
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/model_editable_meta_data.go
+++ b/app-services-sdk-go/registryinstance/apiv1internal/client/model_editable_meta_data.go
@@ -1,11 +1,11 @@
 /*
-Service Registry API
-
-Service Registry Instance API  NOTE: This API cannot be called directly from the portal.
-
-API version: 2.2.5.Final
-Contact: apicurio@lists.jboss.org
-*/
+ * Apicurio Registry API [v2]
+ *
+ * Apicurio Registry is a datastore for standard event schemas and API designs. Apicurio Registry enables developers to manage and share the structure of their data using a REST interface. For example, client applications can dynamically push or pull the latest updates to or from the registry without needing to redeploy. Apicurio Registry also enables developers to create rules that govern how registry content can evolve over time. For example, this includes rules for content validation and version compatibility.  The Apicurio Registry REST API enables client applications to manage the artifacts in the registry. This API provides create, read, update, and delete operations for schema and API artifacts, rules, versions, and metadata.   The supported artifact types include: - Apache Avro schema - AsyncAPI specification - Google protocol buffers - GraphQL schema - JSON Schema - Kafka Connect schema - OpenAPI specification - Web Services Description Language - XML Schema Definition   **Important**: The Apicurio Registry REST API is available from `https://MY-REGISTRY-URL/apis/registry/v2` by default. Therefore you must prefix all API operation paths with `../apis/registry/v2` in this case. For example: `../apis/registry/v2/ids/globalIds/{globalId}`. 
+ *
+ * API version: 2.2.5.Final
+ * Contact: apicurio@lists.jboss.org
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -15,12 +15,11 @@ import (
 	"encoding/json"
 )
 
-// EditableMetaData 
+// EditableMetaData struct for EditableMetaData
 type EditableMetaData struct {
 	Name *string `json:"name,omitempty"`
 	Description *string `json:"description,omitempty"`
-	// 
-	Labels []string `json:"labels,omitempty"`
+	Labels *[]string `json:"labels,omitempty"`
 	// User-defined name-value pairs. Name and value must be strings.
 	Properties *map[string]string `json:"properties,omitempty"`
 }
@@ -44,7 +43,7 @@ func NewEditableMetaDataWithDefaults() *EditableMetaData {
 
 // GetName returns the Name field value if set, zero value otherwise.
 func (o *EditableMetaData) GetName() string {
-	if o == nil || isNil(o.Name) {
+	if o == nil || o.Name == nil {
 		var ret string
 		return ret
 	}
@@ -54,15 +53,15 @@ func (o *EditableMetaData) GetName() string {
 // GetNameOk returns a tuple with the Name field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *EditableMetaData) GetNameOk() (*string, bool) {
-	if o == nil || isNil(o.Name) {
-    return nil, false
+	if o == nil || o.Name == nil {
+		return nil, false
 	}
 	return o.Name, true
 }
 
 // HasName returns a boolean if a field has been set.
 func (o *EditableMetaData) HasName() bool {
-	if o != nil && !isNil(o.Name) {
+	if o != nil && o.Name != nil {
 		return true
 	}
 
@@ -76,7 +75,7 @@ func (o *EditableMetaData) SetName(v string) {
 
 // GetDescription returns the Description field value if set, zero value otherwise.
 func (o *EditableMetaData) GetDescription() string {
-	if o == nil || isNil(o.Description) {
+	if o == nil || o.Description == nil {
 		var ret string
 		return ret
 	}
@@ -86,15 +85,15 @@ func (o *EditableMetaData) GetDescription() string {
 // GetDescriptionOk returns a tuple with the Description field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *EditableMetaData) GetDescriptionOk() (*string, bool) {
-	if o == nil || isNil(o.Description) {
-    return nil, false
+	if o == nil || o.Description == nil {
+		return nil, false
 	}
 	return o.Description, true
 }
 
 // HasDescription returns a boolean if a field has been set.
 func (o *EditableMetaData) HasDescription() bool {
-	if o != nil && !isNil(o.Description) {
+	if o != nil && o.Description != nil {
 		return true
 	}
 
@@ -108,25 +107,25 @@ func (o *EditableMetaData) SetDescription(v string) {
 
 // GetLabels returns the Labels field value if set, zero value otherwise.
 func (o *EditableMetaData) GetLabels() []string {
-	if o == nil || isNil(o.Labels) {
+	if o == nil || o.Labels == nil {
 		var ret []string
 		return ret
 	}
-	return o.Labels
+	return *o.Labels
 }
 
 // GetLabelsOk returns a tuple with the Labels field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *EditableMetaData) GetLabelsOk() ([]string, bool) {
-	if o == nil || isNil(o.Labels) {
-    return nil, false
+func (o *EditableMetaData) GetLabelsOk() (*[]string, bool) {
+	if o == nil || o.Labels == nil {
+		return nil, false
 	}
 	return o.Labels, true
 }
 
 // HasLabels returns a boolean if a field has been set.
 func (o *EditableMetaData) HasLabels() bool {
-	if o != nil && !isNil(o.Labels) {
+	if o != nil && o.Labels != nil {
 		return true
 	}
 
@@ -135,12 +134,12 @@ func (o *EditableMetaData) HasLabels() bool {
 
 // SetLabels gets a reference to the given []string and assigns it to the Labels field.
 func (o *EditableMetaData) SetLabels(v []string) {
-	o.Labels = v
+	o.Labels = &v
 }
 
 // GetProperties returns the Properties field value if set, zero value otherwise.
 func (o *EditableMetaData) GetProperties() map[string]string {
-	if o == nil || isNil(o.Properties) {
+	if o == nil || o.Properties == nil {
 		var ret map[string]string
 		return ret
 	}
@@ -150,15 +149,15 @@ func (o *EditableMetaData) GetProperties() map[string]string {
 // GetPropertiesOk returns a tuple with the Properties field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *EditableMetaData) GetPropertiesOk() (*map[string]string, bool) {
-	if o == nil || isNil(o.Properties) {
-    return nil, false
+	if o == nil || o.Properties == nil {
+		return nil, false
 	}
 	return o.Properties, true
 }
 
 // HasProperties returns a boolean if a field has been set.
 func (o *EditableMetaData) HasProperties() bool {
-	if o != nil && !isNil(o.Properties) {
+	if o != nil && o.Properties != nil {
 		return true
 	}
 
@@ -172,16 +171,16 @@ func (o *EditableMetaData) SetProperties(v map[string]string) {
 
 func (o EditableMetaData) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Name) {
+	if o.Name != nil {
 		toSerialize["name"] = o.Name
 	}
-	if !isNil(o.Description) {
+	if o.Description != nil {
 		toSerialize["description"] = o.Description
 	}
-	if !isNil(o.Labels) {
+	if o.Labels != nil {
 		toSerialize["labels"] = o.Labels
 	}
-	if !isNil(o.Properties) {
+	if o.Properties != nil {
 		toSerialize["properties"] = o.Properties
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/model_error.go b/app-services-sdk-go/registryinstance/apiv1internal/client/model_error.go
index 4682b7de..b882cb5e 100644
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/model_error.go
+++ b/app-services-sdk-go/registryinstance/apiv1internal/client/model_error.go
@@ -1,11 +1,11 @@
 /*
-Service Registry API
-
-Service Registry Instance API  NOTE: This API cannot be called directly from the portal.
-
-API version: 2.2.5.Final
-Contact: apicurio@lists.jboss.org
-*/
+ * Apicurio Registry API [v2]
+ *
+ * Apicurio Registry is a datastore for standard event schemas and API designs. Apicurio Registry enables developers to manage and share the structure of their data using a REST interface. For example, client applications can dynamically push or pull the latest updates to or from the registry without needing to redeploy. Apicurio Registry also enables developers to create rules that govern how registry content can evolve over time. For example, this includes rules for content validation and version compatibility.  The Apicurio Registry REST API enables client applications to manage the artifacts in the registry. This API provides create, read, update, and delete operations for schema and API artifacts, rules, versions, and metadata.   The supported artifact types include: - Apache Avro schema - AsyncAPI specification - Google protocol buffers - GraphQL schema - JSON Schema - Kafka Connect schema - OpenAPI specification - Web Services Description Language - XML Schema Definition   **Important**: The Apicurio Registry REST API is available from `https://MY-REGISTRY-URL/apis/registry/v2` by default. Therefore you must prefix all API operation paths with `../apis/registry/v2` in this case. For example: `../apis/registry/v2/ids/globalIds/{globalId}`. 
+ *
+ * API version: 2.2.5.Final
+ * Contact: apicurio@lists.jboss.org
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -46,7 +46,7 @@ func NewErrorWithDefaults() *Error {
 
 // GetMessage returns the Message field value if set, zero value otherwise.
 func (o *Error) GetMessage() string {
-	if o == nil || isNil(o.Message) {
+	if o == nil || o.Message == nil {
 		var ret string
 		return ret
 	}
@@ -56,15 +56,15 @@ func (o *Error) GetMessage() string {
 // GetMessageOk returns a tuple with the Message field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Error) GetMessageOk() (*string, bool) {
-	if o == nil || isNil(o.Message) {
-    return nil, false
+	if o == nil || o.Message == nil {
+		return nil, false
 	}
 	return o.Message, true
 }
 
 // HasMessage returns a boolean if a field has been set.
 func (o *Error) HasMessage() bool {
-	if o != nil && !isNil(o.Message) {
+	if o != nil && o.Message != nil {
 		return true
 	}
 
@@ -78,7 +78,7 @@ func (o *Error) SetMessage(v string) {
 
 // GetErrorCode returns the ErrorCode field value if set, zero value otherwise.
 func (o *Error) GetErrorCode() int32 {
-	if o == nil || isNil(o.ErrorCode) {
+	if o == nil || o.ErrorCode == nil {
 		var ret int32
 		return ret
 	}
@@ -88,15 +88,15 @@ func (o *Error) GetErrorCode() int32 {
 // GetErrorCodeOk returns a tuple with the ErrorCode field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Error) GetErrorCodeOk() (*int32, bool) {
-	if o == nil || isNil(o.ErrorCode) {
-    return nil, false
+	if o == nil || o.ErrorCode == nil {
+		return nil, false
 	}
 	return o.ErrorCode, true
 }
 
 // HasErrorCode returns a boolean if a field has been set.
 func (o *Error) HasErrorCode() bool {
-	if o != nil && !isNil(o.ErrorCode) {
+	if o != nil && o.ErrorCode != nil {
 		return true
 	}
 
@@ -110,7 +110,7 @@ func (o *Error) SetErrorCode(v int32) {
 
 // GetDetail returns the Detail field value if set, zero value otherwise.
 func (o *Error) GetDetail() string {
-	if o == nil || isNil(o.Detail) {
+	if o == nil || o.Detail == nil {
 		var ret string
 		return ret
 	}
@@ -120,15 +120,15 @@ func (o *Error) GetDetail() string {
 // GetDetailOk returns a tuple with the Detail field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Error) GetDetailOk() (*string, bool) {
-	if o == nil || isNil(o.Detail) {
-    return nil, false
+	if o == nil || o.Detail == nil {
+		return nil, false
 	}
 	return o.Detail, true
 }
 
 // HasDetail returns a boolean if a field has been set.
 func (o *Error) HasDetail() bool {
-	if o != nil && !isNil(o.Detail) {
+	if o != nil && o.Detail != nil {
 		return true
 	}
 
@@ -142,7 +142,7 @@ func (o *Error) SetDetail(v string) {
 
 // GetName returns the Name field value if set, zero value otherwise.
 func (o *Error) GetName() string {
-	if o == nil || isNil(o.Name) {
+	if o == nil || o.Name == nil {
 		var ret string
 		return ret
 	}
@@ -152,15 +152,15 @@ func (o *Error) GetName() string {
 // GetNameOk returns a tuple with the Name field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Error) GetNameOk() (*string, bool) {
-	if o == nil || isNil(o.Name) {
-    return nil, false
+	if o == nil || o.Name == nil {
+		return nil, false
 	}
 	return o.Name, true
 }
 
 // HasName returns a boolean if a field has been set.
 func (o *Error) HasName() bool {
-	if o != nil && !isNil(o.Name) {
+	if o != nil && o.Name != nil {
 		return true
 	}
 
@@ -174,16 +174,16 @@ func (o *Error) SetName(v string) {
 
 func (o Error) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Message) {
+	if o.Message != nil {
 		toSerialize["message"] = o.Message
 	}
-	if !isNil(o.ErrorCode) {
+	if o.ErrorCode != nil {
 		toSerialize["error_code"] = o.ErrorCode
 	}
-	if !isNil(o.Detail) {
+	if o.Detail != nil {
 		toSerialize["detail"] = o.Detail
 	}
-	if !isNil(o.Name) {
+	if o.Name != nil {
 		toSerialize["name"] = o.Name
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/model_if_exists.go b/app-services-sdk-go/registryinstance/apiv1internal/client/model_if_exists.go
index f3aef8fc..762c1b01 100644
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/model_if_exists.go
+++ b/app-services-sdk-go/registryinstance/apiv1internal/client/model_if_exists.go
@@ -1,11 +1,11 @@
 /*
-Service Registry API
-
-Service Registry Instance API  NOTE: This API cannot be called directly from the portal.
-
-API version: 2.2.5.Final
-Contact: apicurio@lists.jboss.org
-*/
+ * Apicurio Registry API [v2]
+ *
+ * Apicurio Registry is a datastore for standard event schemas and API designs. Apicurio Registry enables developers to manage and share the structure of their data using a REST interface. For example, client applications can dynamically push or pull the latest updates to or from the registry without needing to redeploy. Apicurio Registry also enables developers to create rules that govern how registry content can evolve over time. For example, this includes rules for content validation and version compatibility.  The Apicurio Registry REST API enables client applications to manage the artifacts in the registry. This API provides create, read, update, and delete operations for schema and API artifacts, rules, versions, and metadata.   The supported artifact types include: - Apache Avro schema - AsyncAPI specification - Google protocol buffers - GraphQL schema - JSON Schema - Kafka Connect schema - OpenAPI specification - Web Services Description Language - XML Schema Definition   **Important**: The Apicurio Registry REST API is available from `https://MY-REGISTRY-URL/apis/registry/v2` by default. Therefore you must prefix all API operation paths with `../apis/registry/v2` in this case. For example: `../apis/registry/v2/ids/globalIds/{globalId}`. 
+ *
+ * API version: 2.2.5.Final
+ * Contact: apicurio@lists.jboss.org
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -16,7 +16,7 @@ import (
 	"fmt"
 )
 
-// IfExists 
+// IfExists the model 'IfExists'
 type IfExists string
 
 // List of IfExists
@@ -27,8 +27,7 @@ const (
 	IFEXISTS_RETURN_OR_UPDATE IfExists = "RETURN_OR_UPDATE"
 )
 
-// All allowed values of IfExists enum
-var AllowedIfExistsEnumValues = []IfExists{
+var allowedIfExistsEnumValues = []IfExists{
 	"FAIL",
 	"UPDATE",
 	"RETURN",
@@ -42,7 +41,7 @@ func (v *IfExists) UnmarshalJSON(src []byte) error {
 		return err
 	}
 	enumTypeValue := IfExists(value)
-	for _, existing := range AllowedIfExistsEnumValues {
+	for _, existing := range allowedIfExistsEnumValues {
 		if existing == enumTypeValue {
 			*v = enumTypeValue
 			return nil
@@ -59,13 +58,13 @@ func NewIfExistsFromValue(v string) (*IfExists, error) {
 	if ev.IsValid() {
 		return &ev, nil
 	} else {
-		return nil, fmt.Errorf("invalid value '%v' for IfExists: valid values are %v", v, AllowedIfExistsEnumValues)
+		return nil, fmt.Errorf("invalid value '%v' for IfExists: valid values are %v", v, allowedIfExistsEnumValues)
 	}
 }
 
 // IsValid return true if the value is valid for the enum, false otherwise
 func (v IfExists) IsValid() bool {
-	for _, existing := range AllowedIfExistsEnumValues {
+	for _, existing := range allowedIfExistsEnumValues {
 		if existing == v {
 			return true
 		}
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/model_limits.go b/app-services-sdk-go/registryinstance/apiv1internal/client/model_limits.go
index 5f423a5f..3551d988 100644
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/model_limits.go
+++ b/app-services-sdk-go/registryinstance/apiv1internal/client/model_limits.go
@@ -1,11 +1,11 @@
 /*
-Service Registry API
-
-Service Registry Instance API  NOTE: This API cannot be called directly from the portal.
-
-API version: 2.2.5.Final
-Contact: apicurio@lists.jboss.org
-*/
+ * Apicurio Registry API [v2]
+ *
+ * Apicurio Registry is a datastore for standard event schemas and API designs. Apicurio Registry enables developers to manage and share the structure of their data using a REST interface. For example, client applications can dynamically push or pull the latest updates to or from the registry without needing to redeploy. Apicurio Registry also enables developers to create rules that govern how registry content can evolve over time. For example, this includes rules for content validation and version compatibility.  The Apicurio Registry REST API enables client applications to manage the artifacts in the registry. This API provides create, read, update, and delete operations for schema and API artifacts, rules, versions, and metadata.   The supported artifact types include: - Apache Avro schema - AsyncAPI specification - Google protocol buffers - GraphQL schema - JSON Schema - Kafka Connect schema - OpenAPI specification - Web Services Description Language - XML Schema Definition   **Important**: The Apicurio Registry REST API is available from `https://MY-REGISTRY-URL/apis/registry/v2` by default. Therefore you must prefix all API operation paths with `../apis/registry/v2` in this case. For example: `../apis/registry/v2/ids/globalIds/{globalId}`. 
+ *
+ * API version: 2.2.5.Final
+ * Contact: apicurio@lists.jboss.org
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -50,7 +50,7 @@ func NewLimitsWithDefaults() *Limits {
 
 // GetMaxTotalSchemasCount returns the MaxTotalSchemasCount field value if set, zero value otherwise.
 func (o *Limits) GetMaxTotalSchemasCount() int64 {
-	if o == nil || isNil(o.MaxTotalSchemasCount) {
+	if o == nil || o.MaxTotalSchemasCount == nil {
 		var ret int64
 		return ret
 	}
@@ -60,15 +60,15 @@ func (o *Limits) GetMaxTotalSchemasCount() int64 {
 // GetMaxTotalSchemasCountOk returns a tuple with the MaxTotalSchemasCount field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Limits) GetMaxTotalSchemasCountOk() (*int64, bool) {
-	if o == nil || isNil(o.MaxTotalSchemasCount) {
-    return nil, false
+	if o == nil || o.MaxTotalSchemasCount == nil {
+		return nil, false
 	}
 	return o.MaxTotalSchemasCount, true
 }
 
 // HasMaxTotalSchemasCount returns a boolean if a field has been set.
 func (o *Limits) HasMaxTotalSchemasCount() bool {
-	if o != nil && !isNil(o.MaxTotalSchemasCount) {
+	if o != nil && o.MaxTotalSchemasCount != nil {
 		return true
 	}
 
@@ -82,7 +82,7 @@ func (o *Limits) SetMaxTotalSchemasCount(v int64) {
 
 // GetMaxSchemaSizeBytes returns the MaxSchemaSizeBytes field value if set, zero value otherwise.
 func (o *Limits) GetMaxSchemaSizeBytes() int64 {
-	if o == nil || isNil(o.MaxSchemaSizeBytes) {
+	if o == nil || o.MaxSchemaSizeBytes == nil {
 		var ret int64
 		return ret
 	}
@@ -92,15 +92,15 @@ func (o *Limits) GetMaxSchemaSizeBytes() int64 {
 // GetMaxSchemaSizeBytesOk returns a tuple with the MaxSchemaSizeBytes field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Limits) GetMaxSchemaSizeBytesOk() (*int64, bool) {
-	if o == nil || isNil(o.MaxSchemaSizeBytes) {
-    return nil, false
+	if o == nil || o.MaxSchemaSizeBytes == nil {
+		return nil, false
 	}
 	return o.MaxSchemaSizeBytes, true
 }
 
 // HasMaxSchemaSizeBytes returns a boolean if a field has been set.
 func (o *Limits) HasMaxSchemaSizeBytes() bool {
-	if o != nil && !isNil(o.MaxSchemaSizeBytes) {
+	if o != nil && o.MaxSchemaSizeBytes != nil {
 		return true
 	}
 
@@ -114,7 +114,7 @@ func (o *Limits) SetMaxSchemaSizeBytes(v int64) {
 
 // GetMaxArtifactsCount returns the MaxArtifactsCount field value if set, zero value otherwise.
 func (o *Limits) GetMaxArtifactsCount() int64 {
-	if o == nil || isNil(o.MaxArtifactsCount) {
+	if o == nil || o.MaxArtifactsCount == nil {
 		var ret int64
 		return ret
 	}
@@ -124,15 +124,15 @@ func (o *Limits) GetMaxArtifactsCount() int64 {
 // GetMaxArtifactsCountOk returns a tuple with the MaxArtifactsCount field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Limits) GetMaxArtifactsCountOk() (*int64, bool) {
-	if o == nil || isNil(o.MaxArtifactsCount) {
-    return nil, false
+	if o == nil || o.MaxArtifactsCount == nil {
+		return nil, false
 	}
 	return o.MaxArtifactsCount, true
 }
 
 // HasMaxArtifactsCount returns a boolean if a field has been set.
 func (o *Limits) HasMaxArtifactsCount() bool {
-	if o != nil && !isNil(o.MaxArtifactsCount) {
+	if o != nil && o.MaxArtifactsCount != nil {
 		return true
 	}
 
@@ -146,7 +146,7 @@ func (o *Limits) SetMaxArtifactsCount(v int64) {
 
 // GetMaxVersionsPerArtifactCount returns the MaxVersionsPerArtifactCount field value if set, zero value otherwise.
 func (o *Limits) GetMaxVersionsPerArtifactCount() int64 {
-	if o == nil || isNil(o.MaxVersionsPerArtifactCount) {
+	if o == nil || o.MaxVersionsPerArtifactCount == nil {
 		var ret int64
 		return ret
 	}
@@ -156,15 +156,15 @@ func (o *Limits) GetMaxVersionsPerArtifactCount() int64 {
 // GetMaxVersionsPerArtifactCountOk returns a tuple with the MaxVersionsPerArtifactCount field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Limits) GetMaxVersionsPerArtifactCountOk() (*int64, bool) {
-	if o == nil || isNil(o.MaxVersionsPerArtifactCount) {
-    return nil, false
+	if o == nil || o.MaxVersionsPerArtifactCount == nil {
+		return nil, false
 	}
 	return o.MaxVersionsPerArtifactCount, true
 }
 
 // HasMaxVersionsPerArtifactCount returns a boolean if a field has been set.
 func (o *Limits) HasMaxVersionsPerArtifactCount() bool {
-	if o != nil && !isNil(o.MaxVersionsPerArtifactCount) {
+	if o != nil && o.MaxVersionsPerArtifactCount != nil {
 		return true
 	}
 
@@ -178,7 +178,7 @@ func (o *Limits) SetMaxVersionsPerArtifactCount(v int64) {
 
 // GetMaxArtifactPropertiesCount returns the MaxArtifactPropertiesCount field value if set, zero value otherwise.
 func (o *Limits) GetMaxArtifactPropertiesCount() int64 {
-	if o == nil || isNil(o.MaxArtifactPropertiesCount) {
+	if o == nil || o.MaxArtifactPropertiesCount == nil {
 		var ret int64
 		return ret
 	}
@@ -188,15 +188,15 @@ func (o *Limits) GetMaxArtifactPropertiesCount() int64 {
 // GetMaxArtifactPropertiesCountOk returns a tuple with the MaxArtifactPropertiesCount field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Limits) GetMaxArtifactPropertiesCountOk() (*int64, bool) {
-	if o == nil || isNil(o.MaxArtifactPropertiesCount) {
-    return nil, false
+	if o == nil || o.MaxArtifactPropertiesCount == nil {
+		return nil, false
 	}
 	return o.MaxArtifactPropertiesCount, true
 }
 
 // HasMaxArtifactPropertiesCount returns a boolean if a field has been set.
 func (o *Limits) HasMaxArtifactPropertiesCount() bool {
-	if o != nil && !isNil(o.MaxArtifactPropertiesCount) {
+	if o != nil && o.MaxArtifactPropertiesCount != nil {
 		return true
 	}
 
@@ -210,7 +210,7 @@ func (o *Limits) SetMaxArtifactPropertiesCount(v int64) {
 
 // GetMaxPropertyKeySizeBytes returns the MaxPropertyKeySizeBytes field value if set, zero value otherwise.
 func (o *Limits) GetMaxPropertyKeySizeBytes() int64 {
-	if o == nil || isNil(o.MaxPropertyKeySizeBytes) {
+	if o == nil || o.MaxPropertyKeySizeBytes == nil {
 		var ret int64
 		return ret
 	}
@@ -220,15 +220,15 @@ func (o *Limits) GetMaxPropertyKeySizeBytes() int64 {
 // GetMaxPropertyKeySizeBytesOk returns a tuple with the MaxPropertyKeySizeBytes field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Limits) GetMaxPropertyKeySizeBytesOk() (*int64, bool) {
-	if o == nil || isNil(o.MaxPropertyKeySizeBytes) {
-    return nil, false
+	if o == nil || o.MaxPropertyKeySizeBytes == nil {
+		return nil, false
 	}
 	return o.MaxPropertyKeySizeBytes, true
 }
 
 // HasMaxPropertyKeySizeBytes returns a boolean if a field has been set.
 func (o *Limits) HasMaxPropertyKeySizeBytes() bool {
-	if o != nil && !isNil(o.MaxPropertyKeySizeBytes) {
+	if o != nil && o.MaxPropertyKeySizeBytes != nil {
 		return true
 	}
 
@@ -242,7 +242,7 @@ func (o *Limits) SetMaxPropertyKeySizeBytes(v int64) {
 
 // GetMaxPropertyValueSizeBytes returns the MaxPropertyValueSizeBytes field value if set, zero value otherwise.
 func (o *Limits) GetMaxPropertyValueSizeBytes() int64 {
-	if o == nil || isNil(o.MaxPropertyValueSizeBytes) {
+	if o == nil || o.MaxPropertyValueSizeBytes == nil {
 		var ret int64
 		return ret
 	}
@@ -252,15 +252,15 @@ func (o *Limits) GetMaxPropertyValueSizeBytes() int64 {
 // GetMaxPropertyValueSizeBytesOk returns a tuple with the MaxPropertyValueSizeBytes field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Limits) GetMaxPropertyValueSizeBytesOk() (*int64, bool) {
-	if o == nil || isNil(o.MaxPropertyValueSizeBytes) {
-    return nil, false
+	if o == nil || o.MaxPropertyValueSizeBytes == nil {
+		return nil, false
 	}
 	return o.MaxPropertyValueSizeBytes, true
 }
 
 // HasMaxPropertyValueSizeBytes returns a boolean if a field has been set.
 func (o *Limits) HasMaxPropertyValueSizeBytes() bool {
-	if o != nil && !isNil(o.MaxPropertyValueSizeBytes) {
+	if o != nil && o.MaxPropertyValueSizeBytes != nil {
 		return true
 	}
 
@@ -274,7 +274,7 @@ func (o *Limits) SetMaxPropertyValueSizeBytes(v int64) {
 
 // GetMaxArtifactLabelsCount returns the MaxArtifactLabelsCount field value if set, zero value otherwise.
 func (o *Limits) GetMaxArtifactLabelsCount() int64 {
-	if o == nil || isNil(o.MaxArtifactLabelsCount) {
+	if o == nil || o.MaxArtifactLabelsCount == nil {
 		var ret int64
 		return ret
 	}
@@ -284,15 +284,15 @@ func (o *Limits) GetMaxArtifactLabelsCount() int64 {
 // GetMaxArtifactLabelsCountOk returns a tuple with the MaxArtifactLabelsCount field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Limits) GetMaxArtifactLabelsCountOk() (*int64, bool) {
-	if o == nil || isNil(o.MaxArtifactLabelsCount) {
-    return nil, false
+	if o == nil || o.MaxArtifactLabelsCount == nil {
+		return nil, false
 	}
 	return o.MaxArtifactLabelsCount, true
 }
 
 // HasMaxArtifactLabelsCount returns a boolean if a field has been set.
 func (o *Limits) HasMaxArtifactLabelsCount() bool {
-	if o != nil && !isNil(o.MaxArtifactLabelsCount) {
+	if o != nil && o.MaxArtifactLabelsCount != nil {
 		return true
 	}
 
@@ -306,7 +306,7 @@ func (o *Limits) SetMaxArtifactLabelsCount(v int64) {
 
 // GetMaxLabelSizeBytes returns the MaxLabelSizeBytes field value if set, zero value otherwise.
 func (o *Limits) GetMaxLabelSizeBytes() int64 {
-	if o == nil || isNil(o.MaxLabelSizeBytes) {
+	if o == nil || o.MaxLabelSizeBytes == nil {
 		var ret int64
 		return ret
 	}
@@ -316,15 +316,15 @@ func (o *Limits) GetMaxLabelSizeBytes() int64 {
 // GetMaxLabelSizeBytesOk returns a tuple with the MaxLabelSizeBytes field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Limits) GetMaxLabelSizeBytesOk() (*int64, bool) {
-	if o == nil || isNil(o.MaxLabelSizeBytes) {
-    return nil, false
+	if o == nil || o.MaxLabelSizeBytes == nil {
+		return nil, false
 	}
 	return o.MaxLabelSizeBytes, true
 }
 
 // HasMaxLabelSizeBytes returns a boolean if a field has been set.
 func (o *Limits) HasMaxLabelSizeBytes() bool {
-	if o != nil && !isNil(o.MaxLabelSizeBytes) {
+	if o != nil && o.MaxLabelSizeBytes != nil {
 		return true
 	}
 
@@ -338,7 +338,7 @@ func (o *Limits) SetMaxLabelSizeBytes(v int64) {
 
 // GetMaxArtifactNameLengthChars returns the MaxArtifactNameLengthChars field value if set, zero value otherwise.
 func (o *Limits) GetMaxArtifactNameLengthChars() int64 {
-	if o == nil || isNil(o.MaxArtifactNameLengthChars) {
+	if o == nil || o.MaxArtifactNameLengthChars == nil {
 		var ret int64
 		return ret
 	}
@@ -348,15 +348,15 @@ func (o *Limits) GetMaxArtifactNameLengthChars() int64 {
 // GetMaxArtifactNameLengthCharsOk returns a tuple with the MaxArtifactNameLengthChars field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Limits) GetMaxArtifactNameLengthCharsOk() (*int64, bool) {
-	if o == nil || isNil(o.MaxArtifactNameLengthChars) {
-    return nil, false
+	if o == nil || o.MaxArtifactNameLengthChars == nil {
+		return nil, false
 	}
 	return o.MaxArtifactNameLengthChars, true
 }
 
 // HasMaxArtifactNameLengthChars returns a boolean if a field has been set.
 func (o *Limits) HasMaxArtifactNameLengthChars() bool {
-	if o != nil && !isNil(o.MaxArtifactNameLengthChars) {
+	if o != nil && o.MaxArtifactNameLengthChars != nil {
 		return true
 	}
 
@@ -370,7 +370,7 @@ func (o *Limits) SetMaxArtifactNameLengthChars(v int64) {
 
 // GetMaxArtifactDescriptionLengthChars returns the MaxArtifactDescriptionLengthChars field value if set, zero value otherwise.
 func (o *Limits) GetMaxArtifactDescriptionLengthChars() int64 {
-	if o == nil || isNil(o.MaxArtifactDescriptionLengthChars) {
+	if o == nil || o.MaxArtifactDescriptionLengthChars == nil {
 		var ret int64
 		return ret
 	}
@@ -380,15 +380,15 @@ func (o *Limits) GetMaxArtifactDescriptionLengthChars() int64 {
 // GetMaxArtifactDescriptionLengthCharsOk returns a tuple with the MaxArtifactDescriptionLengthChars field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Limits) GetMaxArtifactDescriptionLengthCharsOk() (*int64, bool) {
-	if o == nil || isNil(o.MaxArtifactDescriptionLengthChars) {
-    return nil, false
+	if o == nil || o.MaxArtifactDescriptionLengthChars == nil {
+		return nil, false
 	}
 	return o.MaxArtifactDescriptionLengthChars, true
 }
 
 // HasMaxArtifactDescriptionLengthChars returns a boolean if a field has been set.
 func (o *Limits) HasMaxArtifactDescriptionLengthChars() bool {
-	if o != nil && !isNil(o.MaxArtifactDescriptionLengthChars) {
+	if o != nil && o.MaxArtifactDescriptionLengthChars != nil {
 		return true
 	}
 
@@ -402,7 +402,7 @@ func (o *Limits) SetMaxArtifactDescriptionLengthChars(v int64) {
 
 // GetMaxRequestsPerSecondCount returns the MaxRequestsPerSecondCount field value if set, zero value otherwise.
 func (o *Limits) GetMaxRequestsPerSecondCount() int64 {
-	if o == nil || isNil(o.MaxRequestsPerSecondCount) {
+	if o == nil || o.MaxRequestsPerSecondCount == nil {
 		var ret int64
 		return ret
 	}
@@ -412,15 +412,15 @@ func (o *Limits) GetMaxRequestsPerSecondCount() int64 {
 // GetMaxRequestsPerSecondCountOk returns a tuple with the MaxRequestsPerSecondCount field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Limits) GetMaxRequestsPerSecondCountOk() (*int64, bool) {
-	if o == nil || isNil(o.MaxRequestsPerSecondCount) {
-    return nil, false
+	if o == nil || o.MaxRequestsPerSecondCount == nil {
+		return nil, false
 	}
 	return o.MaxRequestsPerSecondCount, true
 }
 
 // HasMaxRequestsPerSecondCount returns a boolean if a field has been set.
 func (o *Limits) HasMaxRequestsPerSecondCount() bool {
-	if o != nil && !isNil(o.MaxRequestsPerSecondCount) {
+	if o != nil && o.MaxRequestsPerSecondCount != nil {
 		return true
 	}
 
@@ -434,40 +434,40 @@ func (o *Limits) SetMaxRequestsPerSecondCount(v int64) {
 
 func (o Limits) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.MaxTotalSchemasCount) {
+	if o.MaxTotalSchemasCount != nil {
 		toSerialize["maxTotalSchemasCount"] = o.MaxTotalSchemasCount
 	}
-	if !isNil(o.MaxSchemaSizeBytes) {
+	if o.MaxSchemaSizeBytes != nil {
 		toSerialize["maxSchemaSizeBytes"] = o.MaxSchemaSizeBytes
 	}
-	if !isNil(o.MaxArtifactsCount) {
+	if o.MaxArtifactsCount != nil {
 		toSerialize["maxArtifactsCount"] = o.MaxArtifactsCount
 	}
-	if !isNil(o.MaxVersionsPerArtifactCount) {
+	if o.MaxVersionsPerArtifactCount != nil {
 		toSerialize["maxVersionsPerArtifactCount"] = o.MaxVersionsPerArtifactCount
 	}
-	if !isNil(o.MaxArtifactPropertiesCount) {
+	if o.MaxArtifactPropertiesCount != nil {
 		toSerialize["maxArtifactPropertiesCount"] = o.MaxArtifactPropertiesCount
 	}
-	if !isNil(o.MaxPropertyKeySizeBytes) {
+	if o.MaxPropertyKeySizeBytes != nil {
 		toSerialize["maxPropertyKeySizeBytes"] = o.MaxPropertyKeySizeBytes
 	}
-	if !isNil(o.MaxPropertyValueSizeBytes) {
+	if o.MaxPropertyValueSizeBytes != nil {
 		toSerialize["maxPropertyValueSizeBytes"] = o.MaxPropertyValueSizeBytes
 	}
-	if !isNil(o.MaxArtifactLabelsCount) {
+	if o.MaxArtifactLabelsCount != nil {
 		toSerialize["maxArtifactLabelsCount"] = o.MaxArtifactLabelsCount
 	}
-	if !isNil(o.MaxLabelSizeBytes) {
+	if o.MaxLabelSizeBytes != nil {
 		toSerialize["maxLabelSizeBytes"] = o.MaxLabelSizeBytes
 	}
-	if !isNil(o.MaxArtifactNameLengthChars) {
+	if o.MaxArtifactNameLengthChars != nil {
 		toSerialize["maxArtifactNameLengthChars"] = o.MaxArtifactNameLengthChars
 	}
-	if !isNil(o.MaxArtifactDescriptionLengthChars) {
+	if o.MaxArtifactDescriptionLengthChars != nil {
 		toSerialize["maxArtifactDescriptionLengthChars"] = o.MaxArtifactDescriptionLengthChars
 	}
-	if !isNil(o.MaxRequestsPerSecondCount) {
+	if o.MaxRequestsPerSecondCount != nil {
 		toSerialize["maxRequestsPerSecondCount"] = o.MaxRequestsPerSecondCount
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/model_log_configuration.go b/app-services-sdk-go/registryinstance/apiv1internal/client/model_log_configuration.go
index dad3aa0d..701d0b19 100644
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/model_log_configuration.go
+++ b/app-services-sdk-go/registryinstance/apiv1internal/client/model_log_configuration.go
@@ -1,11 +1,11 @@
 /*
-Service Registry API
-
-Service Registry Instance API  NOTE: This API cannot be called directly from the portal.
-
-API version: 2.2.5.Final
-Contact: apicurio@lists.jboss.org
-*/
+ * Apicurio Registry API [v2]
+ *
+ * Apicurio Registry is a datastore for standard event schemas and API designs. Apicurio Registry enables developers to manage and share the structure of their data using a REST interface. For example, client applications can dynamically push or pull the latest updates to or from the registry without needing to redeploy. Apicurio Registry also enables developers to create rules that govern how registry content can evolve over time. For example, this includes rules for content validation and version compatibility.  The Apicurio Registry REST API enables client applications to manage the artifacts in the registry. This API provides create, read, update, and delete operations for schema and API artifacts, rules, versions, and metadata.   The supported artifact types include: - Apache Avro schema - AsyncAPI specification - Google protocol buffers - GraphQL schema - JSON Schema - Kafka Connect schema - OpenAPI specification - Web Services Description Language - XML Schema Definition   **Important**: The Apicurio Registry REST API is available from `https://MY-REGISTRY-URL/apis/registry/v2` by default. Therefore you must prefix all API operation paths with `../apis/registry/v2` in this case. For example: `../apis/registry/v2/ids/globalIds/{globalId}`. 
+ *
+ * API version: 2.2.5.Final
+ * Contact: apicurio@lists.jboss.org
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -15,7 +15,7 @@ import (
 	"encoding/json"
 )
 
-// LogConfiguration 
+// LogConfiguration struct for LogConfiguration
 type LogConfiguration struct {
 	Level LogLevel `json:"level"`
 }
@@ -51,8 +51,8 @@ func (o *LogConfiguration) GetLevel() LogLevel {
 // GetLevelOk returns a tuple with the Level field value
 // and a boolean to check if the value has been set.
 func (o *LogConfiguration) GetLevelOk() (*LogLevel, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Level, true
 }
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/model_log_level.go b/app-services-sdk-go/registryinstance/apiv1internal/client/model_log_level.go
index bfdc1787..f3f01cc2 100644
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/model_log_level.go
+++ b/app-services-sdk-go/registryinstance/apiv1internal/client/model_log_level.go
@@ -1,11 +1,11 @@
 /*
-Service Registry API
-
-Service Registry Instance API  NOTE: This API cannot be called directly from the portal.
-
-API version: 2.2.5.Final
-Contact: apicurio@lists.jboss.org
-*/
+ * Apicurio Registry API [v2]
+ *
+ * Apicurio Registry is a datastore for standard event schemas and API designs. Apicurio Registry enables developers to manage and share the structure of their data using a REST interface. For example, client applications can dynamically push or pull the latest updates to or from the registry without needing to redeploy. Apicurio Registry also enables developers to create rules that govern how registry content can evolve over time. For example, this includes rules for content validation and version compatibility.  The Apicurio Registry REST API enables client applications to manage the artifacts in the registry. This API provides create, read, update, and delete operations for schema and API artifacts, rules, versions, and metadata.   The supported artifact types include: - Apache Avro schema - AsyncAPI specification - Google protocol buffers - GraphQL schema - JSON Schema - Kafka Connect schema - OpenAPI specification - Web Services Description Language - XML Schema Definition   **Important**: The Apicurio Registry REST API is available from `https://MY-REGISTRY-URL/apis/registry/v2` by default. Therefore you must prefix all API operation paths with `../apis/registry/v2` in this case. For example: `../apis/registry/v2/ids/globalIds/{globalId}`. 
+ *
+ * API version: 2.2.5.Final
+ * Contact: apicurio@lists.jboss.org
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -16,7 +16,7 @@ import (
 	"fmt"
 )
 
-// LogLevel 
+// LogLevel the model 'LogLevel'
 type LogLevel string
 
 // List of LogLevel
@@ -34,8 +34,7 @@ const (
 	LOGLEVEL_FINEST LogLevel = "FINEST"
 )
 
-// All allowed values of LogLevel enum
-var AllowedLogLevelEnumValues = []LogLevel{
+var allowedLogLevelEnumValues = []LogLevel{
 	"DEBUG",
 	"TRACE",
 	"WARN",
@@ -56,7 +55,7 @@ func (v *LogLevel) UnmarshalJSON(src []byte) error {
 		return err
 	}
 	enumTypeValue := LogLevel(value)
-	for _, existing := range AllowedLogLevelEnumValues {
+	for _, existing := range allowedLogLevelEnumValues {
 		if existing == enumTypeValue {
 			*v = enumTypeValue
 			return nil
@@ -73,13 +72,13 @@ func NewLogLevelFromValue(v string) (*LogLevel, error) {
 	if ev.IsValid() {
 		return &ev, nil
 	} else {
-		return nil, fmt.Errorf("invalid value '%v' for LogLevel: valid values are %v", v, AllowedLogLevelEnumValues)
+		return nil, fmt.Errorf("invalid value '%v' for LogLevel: valid values are %v", v, allowedLogLevelEnumValues)
 	}
 }
 
 // IsValid return true if the value is valid for the enum, false otherwise
 func (v LogLevel) IsValid() bool {
-	for _, existing := range AllowedLogLevelEnumValues {
+	for _, existing := range allowedLogLevelEnumValues {
 		if existing == v {
 			return true
 		}
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/model_named_log_configuration.go b/app-services-sdk-go/registryinstance/apiv1internal/client/model_named_log_configuration.go
index 631dcee4..c55d3070 100644
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/model_named_log_configuration.go
+++ b/app-services-sdk-go/registryinstance/apiv1internal/client/model_named_log_configuration.go
@@ -1,11 +1,11 @@
 /*
-Service Registry API
-
-Service Registry Instance API  NOTE: This API cannot be called directly from the portal.
-
-API version: 2.2.5.Final
-Contact: apicurio@lists.jboss.org
-*/
+ * Apicurio Registry API [v2]
+ *
+ * Apicurio Registry is a datastore for standard event schemas and API designs. Apicurio Registry enables developers to manage and share the structure of their data using a REST interface. For example, client applications can dynamically push or pull the latest updates to or from the registry without needing to redeploy. Apicurio Registry also enables developers to create rules that govern how registry content can evolve over time. For example, this includes rules for content validation and version compatibility.  The Apicurio Registry REST API enables client applications to manage the artifacts in the registry. This API provides create, read, update, and delete operations for schema and API artifacts, rules, versions, and metadata.   The supported artifact types include: - Apache Avro schema - AsyncAPI specification - Google protocol buffers - GraphQL schema - JSON Schema - Kafka Connect schema - OpenAPI specification - Web Services Description Language - XML Schema Definition   **Important**: The Apicurio Registry REST API is available from `https://MY-REGISTRY-URL/apis/registry/v2` by default. Therefore you must prefix all API operation paths with `../apis/registry/v2` in this case. For example: `../apis/registry/v2/ids/globalIds/{globalId}`. 
+ *
+ * API version: 2.2.5.Final
+ * Contact: apicurio@lists.jboss.org
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -15,9 +15,8 @@ import (
 	"encoding/json"
 )
 
-// NamedLogConfiguration 
+// NamedLogConfiguration struct for NamedLogConfiguration
 type NamedLogConfiguration struct {
-	// 
 	Name string `json:"name"`
 	Level LogLevel `json:"level"`
 }
@@ -54,8 +53,8 @@ func (o *NamedLogConfiguration) GetName() string {
 // GetNameOk returns a tuple with the Name field value
 // and a boolean to check if the value has been set.
 func (o *NamedLogConfiguration) GetNameOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Name, true
 }
@@ -78,8 +77,8 @@ func (o *NamedLogConfiguration) GetLevel() LogLevel {
 // GetLevelOk returns a tuple with the Level field value
 // and a boolean to check if the value has been set.
 func (o *NamedLogConfiguration) GetLevelOk() (*LogLevel, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Level, true
 }
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/model_named_log_configuration_all_of.go b/app-services-sdk-go/registryinstance/apiv1internal/client/model_named_log_configuration_all_of.go
index e02e3a2b..4f63253b 100644
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/model_named_log_configuration_all_of.go
+++ b/app-services-sdk-go/registryinstance/apiv1internal/client/model_named_log_configuration_all_of.go
@@ -1,11 +1,11 @@
 /*
-Service Registry API
-
-Service Registry Instance API  NOTE: This API cannot be called directly from the portal.
-
-API version: 2.2.5.Final
-Contact: apicurio@lists.jboss.org
-*/
+ * Apicurio Registry API [v2]
+ *
+ * Apicurio Registry is a datastore for standard event schemas and API designs. Apicurio Registry enables developers to manage and share the structure of their data using a REST interface. For example, client applications can dynamically push or pull the latest updates to or from the registry without needing to redeploy. Apicurio Registry also enables developers to create rules that govern how registry content can evolve over time. For example, this includes rules for content validation and version compatibility.  The Apicurio Registry REST API enables client applications to manage the artifacts in the registry. This API provides create, read, update, and delete operations for schema and API artifacts, rules, versions, and metadata.   The supported artifact types include: - Apache Avro schema - AsyncAPI specification - Google protocol buffers - GraphQL schema - JSON Schema - Kafka Connect schema - OpenAPI specification - Web Services Description Language - XML Schema Definition   **Important**: The Apicurio Registry REST API is available from `https://MY-REGISTRY-URL/apis/registry/v2` by default. Therefore you must prefix all API operation paths with `../apis/registry/v2` in this case. For example: `../apis/registry/v2/ids/globalIds/{globalId}`. 
+ *
+ * API version: 2.2.5.Final
+ * Contact: apicurio@lists.jboss.org
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -17,7 +17,6 @@ import (
 
 // NamedLogConfigurationAllOf struct for NamedLogConfigurationAllOf
 type NamedLogConfigurationAllOf struct {
-	// 
 	Name string `json:"name"`
 }
 
@@ -52,8 +51,8 @@ func (o *NamedLogConfigurationAllOf) GetName() string {
 // GetNameOk returns a tuple with the Name field value
 // and a boolean to check if the value has been set.
 func (o *NamedLogConfigurationAllOf) GetNameOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Name, true
 }
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/model_role_mapping.go b/app-services-sdk-go/registryinstance/apiv1internal/client/model_role_mapping.go
index 1e5b42d1..491f5925 100644
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/model_role_mapping.go
+++ b/app-services-sdk-go/registryinstance/apiv1internal/client/model_role_mapping.go
@@ -1,11 +1,11 @@
 /*
-Service Registry API
-
-Service Registry Instance API  NOTE: This API cannot be called directly from the portal.
-
-API version: 2.2.5.Final
-Contact: apicurio@lists.jboss.org
-*/
+ * Apicurio Registry API [v2]
+ *
+ * Apicurio Registry is a datastore for standard event schemas and API designs. Apicurio Registry enables developers to manage and share the structure of their data using a REST interface. For example, client applications can dynamically push or pull the latest updates to or from the registry without needing to redeploy. Apicurio Registry also enables developers to create rules that govern how registry content can evolve over time. For example, this includes rules for content validation and version compatibility.  The Apicurio Registry REST API enables client applications to manage the artifacts in the registry. This API provides create, read, update, and delete operations for schema and API artifacts, rules, versions, and metadata.   The supported artifact types include: - Apache Avro schema - AsyncAPI specification - Google protocol buffers - GraphQL schema - JSON Schema - Kafka Connect schema - OpenAPI specification - Web Services Description Language - XML Schema Definition   **Important**: The Apicurio Registry REST API is available from `https://MY-REGISTRY-URL/apis/registry/v2` by default. Therefore you must prefix all API operation paths with `../apis/registry/v2` in this case. For example: `../apis/registry/v2/ids/globalIds/{globalId}`. 
+ *
+ * API version: 2.2.5.Final
+ * Contact: apicurio@lists.jboss.org
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -17,7 +17,6 @@ import (
 
 // RoleMapping The mapping between a user/principal and their role.
 type RoleMapping struct {
-	// 
 	PrincipalId string `json:"principalId"`
 	Role RoleType `json:"role"`
 	// A friendly name for the principal.
@@ -56,8 +55,8 @@ func (o *RoleMapping) GetPrincipalId() string {
 // GetPrincipalIdOk returns a tuple with the PrincipalId field value
 // and a boolean to check if the value has been set.
 func (o *RoleMapping) GetPrincipalIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.PrincipalId, true
 }
@@ -80,8 +79,8 @@ func (o *RoleMapping) GetRole() RoleType {
 // GetRoleOk returns a tuple with the Role field value
 // and a boolean to check if the value has been set.
 func (o *RoleMapping) GetRoleOk() (*RoleType, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Role, true
 }
@@ -93,7 +92,7 @@ func (o *RoleMapping) SetRole(v RoleType) {
 
 // GetPrincipalName returns the PrincipalName field value if set, zero value otherwise.
 func (o *RoleMapping) GetPrincipalName() string {
-	if o == nil || isNil(o.PrincipalName) {
+	if o == nil || o.PrincipalName == nil {
 		var ret string
 		return ret
 	}
@@ -103,15 +102,15 @@ func (o *RoleMapping) GetPrincipalName() string {
 // GetPrincipalNameOk returns a tuple with the PrincipalName field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RoleMapping) GetPrincipalNameOk() (*string, bool) {
-	if o == nil || isNil(o.PrincipalName) {
-    return nil, false
+	if o == nil || o.PrincipalName == nil {
+		return nil, false
 	}
 	return o.PrincipalName, true
 }
 
 // HasPrincipalName returns a boolean if a field has been set.
 func (o *RoleMapping) HasPrincipalName() bool {
-	if o != nil && !isNil(o.PrincipalName) {
+	if o != nil && o.PrincipalName != nil {
 		return true
 	}
 
@@ -131,7 +130,7 @@ func (o RoleMapping) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["role"] = o.Role
 	}
-	if !isNil(o.PrincipalName) {
+	if o.PrincipalName != nil {
 		toSerialize["principalName"] = o.PrincipalName
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/model_role_type.go b/app-services-sdk-go/registryinstance/apiv1internal/client/model_role_type.go
index 986bc263..ddd2cefa 100644
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/model_role_type.go
+++ b/app-services-sdk-go/registryinstance/apiv1internal/client/model_role_type.go
@@ -1,11 +1,11 @@
 /*
-Service Registry API
-
-Service Registry Instance API  NOTE: This API cannot be called directly from the portal.
-
-API version: 2.2.5.Final
-Contact: apicurio@lists.jboss.org
-*/
+ * Apicurio Registry API [v2]
+ *
+ * Apicurio Registry is a datastore for standard event schemas and API designs. Apicurio Registry enables developers to manage and share the structure of their data using a REST interface. For example, client applications can dynamically push or pull the latest updates to or from the registry without needing to redeploy. Apicurio Registry also enables developers to create rules that govern how registry content can evolve over time. For example, this includes rules for content validation and version compatibility.  The Apicurio Registry REST API enables client applications to manage the artifacts in the registry. This API provides create, read, update, and delete operations for schema and API artifacts, rules, versions, and metadata.   The supported artifact types include: - Apache Avro schema - AsyncAPI specification - Google protocol buffers - GraphQL schema - JSON Schema - Kafka Connect schema - OpenAPI specification - Web Services Description Language - XML Schema Definition   **Important**: The Apicurio Registry REST API is available from `https://MY-REGISTRY-URL/apis/registry/v2` by default. Therefore you must prefix all API operation paths with `../apis/registry/v2` in this case. For example: `../apis/registry/v2/ids/globalIds/{globalId}`. 
+ *
+ * API version: 2.2.5.Final
+ * Contact: apicurio@lists.jboss.org
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -16,7 +16,7 @@ import (
 	"fmt"
 )
 
-// RoleType 
+// RoleType the model 'RoleType'
 type RoleType string
 
 // List of RoleType
@@ -26,8 +26,7 @@ const (
 	ROLETYPE_ADMIN RoleType = "ADMIN"
 )
 
-// All allowed values of RoleType enum
-var AllowedRoleTypeEnumValues = []RoleType{
+var allowedRoleTypeEnumValues = []RoleType{
 	"READ_ONLY",
 	"DEVELOPER",
 	"ADMIN",
@@ -40,7 +39,7 @@ func (v *RoleType) UnmarshalJSON(src []byte) error {
 		return err
 	}
 	enumTypeValue := RoleType(value)
-	for _, existing := range AllowedRoleTypeEnumValues {
+	for _, existing := range allowedRoleTypeEnumValues {
 		if existing == enumTypeValue {
 			*v = enumTypeValue
 			return nil
@@ -57,13 +56,13 @@ func NewRoleTypeFromValue(v string) (*RoleType, error) {
 	if ev.IsValid() {
 		return &ev, nil
 	} else {
-		return nil, fmt.Errorf("invalid value '%v' for RoleType: valid values are %v", v, AllowedRoleTypeEnumValues)
+		return nil, fmt.Errorf("invalid value '%v' for RoleType: valid values are %v", v, allowedRoleTypeEnumValues)
 	}
 }
 
 // IsValid return true if the value is valid for the enum, false otherwise
 func (v RoleType) IsValid() bool {
-	for _, existing := range AllowedRoleTypeEnumValues {
+	for _, existing := range allowedRoleTypeEnumValues {
 		if existing == v {
 			return true
 		}
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/model_rule.go b/app-services-sdk-go/registryinstance/apiv1internal/client/model_rule.go
index 336a29a7..4600f350 100644
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/model_rule.go
+++ b/app-services-sdk-go/registryinstance/apiv1internal/client/model_rule.go
@@ -1,11 +1,11 @@
 /*
-Service Registry API
-
-Service Registry Instance API  NOTE: This API cannot be called directly from the portal.
-
-API version: 2.2.5.Final
-Contact: apicurio@lists.jboss.org
-*/
+ * Apicurio Registry API [v2]
+ *
+ * Apicurio Registry is a datastore for standard event schemas and API designs. Apicurio Registry enables developers to manage and share the structure of their data using a REST interface. For example, client applications can dynamically push or pull the latest updates to or from the registry without needing to redeploy. Apicurio Registry also enables developers to create rules that govern how registry content can evolve over time. For example, this includes rules for content validation and version compatibility.  The Apicurio Registry REST API enables client applications to manage the artifacts in the registry. This API provides create, read, update, and delete operations for schema and API artifacts, rules, versions, and metadata.   The supported artifact types include: - Apache Avro schema - AsyncAPI specification - Google protocol buffers - GraphQL schema - JSON Schema - Kafka Connect schema - OpenAPI specification - Web Services Description Language - XML Schema Definition   **Important**: The Apicurio Registry REST API is available from `https://MY-REGISTRY-URL/apis/registry/v2` by default. Therefore you must prefix all API operation paths with `../apis/registry/v2` in this case. For example: `../apis/registry/v2/ids/globalIds/{globalId}`. 
+ *
+ * API version: 2.2.5.Final
+ * Contact: apicurio@lists.jboss.org
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -15,7 +15,7 @@ import (
 	"encoding/json"
 )
 
-// Rule 
+// Rule struct for Rule
 type Rule struct {
 	Config string `json:"config"`
 	Type *RuleType `json:"type,omitempty"`
@@ -52,8 +52,8 @@ func (o *Rule) GetConfig() string {
 // GetConfigOk returns a tuple with the Config field value
 // and a boolean to check if the value has been set.
 func (o *Rule) GetConfigOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Config, true
 }
@@ -65,7 +65,7 @@ func (o *Rule) SetConfig(v string) {
 
 // GetType returns the Type field value if set, zero value otherwise.
 func (o *Rule) GetType() RuleType {
-	if o == nil || isNil(o.Type) {
+	if o == nil || o.Type == nil {
 		var ret RuleType
 		return ret
 	}
@@ -75,15 +75,15 @@ func (o *Rule) GetType() RuleType {
 // GetTypeOk returns a tuple with the Type field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Rule) GetTypeOk() (*RuleType, bool) {
-	if o == nil || isNil(o.Type) {
-    return nil, false
+	if o == nil || o.Type == nil {
+		return nil, false
 	}
 	return o.Type, true
 }
 
 // HasType returns a boolean if a field has been set.
 func (o *Rule) HasType() bool {
-	if o != nil && !isNil(o.Type) {
+	if o != nil && o.Type != nil {
 		return true
 	}
 
@@ -100,7 +100,7 @@ func (o Rule) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["config"] = o.Config
 	}
-	if !isNil(o.Type) {
+	if o.Type != nil {
 		toSerialize["type"] = o.Type
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/model_rule_type.go b/app-services-sdk-go/registryinstance/apiv1internal/client/model_rule_type.go
index 83c02344..1caac138 100644
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/model_rule_type.go
+++ b/app-services-sdk-go/registryinstance/apiv1internal/client/model_rule_type.go
@@ -1,11 +1,11 @@
 /*
-Service Registry API
-
-Service Registry Instance API  NOTE: This API cannot be called directly from the portal.
-
-API version: 2.2.5.Final
-Contact: apicurio@lists.jboss.org
-*/
+ * Apicurio Registry API [v2]
+ *
+ * Apicurio Registry is a datastore for standard event schemas and API designs. Apicurio Registry enables developers to manage and share the structure of their data using a REST interface. For example, client applications can dynamically push or pull the latest updates to or from the registry without needing to redeploy. Apicurio Registry also enables developers to create rules that govern how registry content can evolve over time. For example, this includes rules for content validation and version compatibility.  The Apicurio Registry REST API enables client applications to manage the artifacts in the registry. This API provides create, read, update, and delete operations for schema and API artifacts, rules, versions, and metadata.   The supported artifact types include: - Apache Avro schema - AsyncAPI specification - Google protocol buffers - GraphQL schema - JSON Schema - Kafka Connect schema - OpenAPI specification - Web Services Description Language - XML Schema Definition   **Important**: The Apicurio Registry REST API is available from `https://MY-REGISTRY-URL/apis/registry/v2` by default. Therefore you must prefix all API operation paths with `../apis/registry/v2` in this case. For example: `../apis/registry/v2/ids/globalIds/{globalId}`. 
+ *
+ * API version: 2.2.5.Final
+ * Contact: apicurio@lists.jboss.org
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -16,7 +16,7 @@ import (
 	"fmt"
 )
 
-// RuleType 
+// RuleType the model 'RuleType'
 type RuleType string
 
 // List of RuleType
@@ -25,8 +25,7 @@ const (
 	RULETYPE_COMPATIBILITY RuleType = "COMPATIBILITY"
 )
 
-// All allowed values of RuleType enum
-var AllowedRuleTypeEnumValues = []RuleType{
+var allowedRuleTypeEnumValues = []RuleType{
 	"VALIDITY",
 	"COMPATIBILITY",
 }
@@ -38,7 +37,7 @@ func (v *RuleType) UnmarshalJSON(src []byte) error {
 		return err
 	}
 	enumTypeValue := RuleType(value)
-	for _, existing := range AllowedRuleTypeEnumValues {
+	for _, existing := range allowedRuleTypeEnumValues {
 		if existing == enumTypeValue {
 			*v = enumTypeValue
 			return nil
@@ -55,13 +54,13 @@ func NewRuleTypeFromValue(v string) (*RuleType, error) {
 	if ev.IsValid() {
 		return &ev, nil
 	} else {
-		return nil, fmt.Errorf("invalid value '%v' for RuleType: valid values are %v", v, AllowedRuleTypeEnumValues)
+		return nil, fmt.Errorf("invalid value '%v' for RuleType: valid values are %v", v, allowedRuleTypeEnumValues)
 	}
 }
 
 // IsValid return true if the value is valid for the enum, false otherwise
 func (v RuleType) IsValid() bool {
-	for _, existing := range AllowedRuleTypeEnumValues {
+	for _, existing := range allowedRuleTypeEnumValues {
 		if existing == v {
 			return true
 		}
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/model_rule_violation_cause.go b/app-services-sdk-go/registryinstance/apiv1internal/client/model_rule_violation_cause.go
index 9a9057b9..00269938 100644
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/model_rule_violation_cause.go
+++ b/app-services-sdk-go/registryinstance/apiv1internal/client/model_rule_violation_cause.go
@@ -1,11 +1,11 @@
 /*
-Service Registry API
-
-Service Registry Instance API  NOTE: This API cannot be called directly from the portal.
-
-API version: 2.2.5.Final
-Contact: apicurio@lists.jboss.org
-*/
+ * Apicurio Registry API [v2]
+ *
+ * Apicurio Registry is a datastore for standard event schemas and API designs. Apicurio Registry enables developers to manage and share the structure of their data using a REST interface. For example, client applications can dynamically push or pull the latest updates to or from the registry without needing to redeploy. Apicurio Registry also enables developers to create rules that govern how registry content can evolve over time. For example, this includes rules for content validation and version compatibility.  The Apicurio Registry REST API enables client applications to manage the artifacts in the registry. This API provides create, read, update, and delete operations for schema and API artifacts, rules, versions, and metadata.   The supported artifact types include: - Apache Avro schema - AsyncAPI specification - Google protocol buffers - GraphQL schema - JSON Schema - Kafka Connect schema - OpenAPI specification - Web Services Description Language - XML Schema Definition   **Important**: The Apicurio Registry REST API is available from `https://MY-REGISTRY-URL/apis/registry/v2` by default. Therefore you must prefix all API operation paths with `../apis/registry/v2` in this case. For example: `../apis/registry/v2/ids/globalIds/{globalId}`. 
+ *
+ * API version: 2.2.5.Final
+ * Contact: apicurio@lists.jboss.org
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -15,7 +15,7 @@ import (
 	"encoding/json"
 )
 
-// RuleViolationCause 
+// RuleViolationCause struct for RuleViolationCause
 type RuleViolationCause struct {
 	Description *string `json:"description,omitempty"`
 	Context *string `json:"context,omitempty"`
@@ -40,7 +40,7 @@ func NewRuleViolationCauseWithDefaults() *RuleViolationCause {
 
 // GetDescription returns the Description field value if set, zero value otherwise.
 func (o *RuleViolationCause) GetDescription() string {
-	if o == nil || isNil(o.Description) {
+	if o == nil || o.Description == nil {
 		var ret string
 		return ret
 	}
@@ -50,15 +50,15 @@ func (o *RuleViolationCause) GetDescription() string {
 // GetDescriptionOk returns a tuple with the Description field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RuleViolationCause) GetDescriptionOk() (*string, bool) {
-	if o == nil || isNil(o.Description) {
-    return nil, false
+	if o == nil || o.Description == nil {
+		return nil, false
 	}
 	return o.Description, true
 }
 
 // HasDescription returns a boolean if a field has been set.
 func (o *RuleViolationCause) HasDescription() bool {
-	if o != nil && !isNil(o.Description) {
+	if o != nil && o.Description != nil {
 		return true
 	}
 
@@ -72,7 +72,7 @@ func (o *RuleViolationCause) SetDescription(v string) {
 
 // GetContext returns the Context field value if set, zero value otherwise.
 func (o *RuleViolationCause) GetContext() string {
-	if o == nil || isNil(o.Context) {
+	if o == nil || o.Context == nil {
 		var ret string
 		return ret
 	}
@@ -82,15 +82,15 @@ func (o *RuleViolationCause) GetContext() string {
 // GetContextOk returns a tuple with the Context field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RuleViolationCause) GetContextOk() (*string, bool) {
-	if o == nil || isNil(o.Context) {
-    return nil, false
+	if o == nil || o.Context == nil {
+		return nil, false
 	}
 	return o.Context, true
 }
 
 // HasContext returns a boolean if a field has been set.
 func (o *RuleViolationCause) HasContext() bool {
-	if o != nil && !isNil(o.Context) {
+	if o != nil && o.Context != nil {
 		return true
 	}
 
@@ -104,10 +104,10 @@ func (o *RuleViolationCause) SetContext(v string) {
 
 func (o RuleViolationCause) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Description) {
+	if o.Description != nil {
 		toSerialize["description"] = o.Description
 	}
-	if !isNil(o.Context) {
+	if o.Context != nil {
 		toSerialize["context"] = o.Context
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/model_rule_violation_error.go b/app-services-sdk-go/registryinstance/apiv1internal/client/model_rule_violation_error.go
index 513bcbe4..401ef3f3 100644
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/model_rule_violation_error.go
+++ b/app-services-sdk-go/registryinstance/apiv1internal/client/model_rule_violation_error.go
@@ -1,11 +1,11 @@
 /*
-Service Registry API
-
-Service Registry Instance API  NOTE: This API cannot be called directly from the portal.
-
-API version: 2.2.5.Final
-Contact: apicurio@lists.jboss.org
-*/
+ * Apicurio Registry API [v2]
+ *
+ * Apicurio Registry is a datastore for standard event schemas and API designs. Apicurio Registry enables developers to manage and share the structure of their data using a REST interface. For example, client applications can dynamically push or pull the latest updates to or from the registry without needing to redeploy. Apicurio Registry also enables developers to create rules that govern how registry content can evolve over time. For example, this includes rules for content validation and version compatibility.  The Apicurio Registry REST API enables client applications to manage the artifacts in the registry. This API provides create, read, update, and delete operations for schema and API artifacts, rules, versions, and metadata.   The supported artifact types include: - Apache Avro schema - AsyncAPI specification - Google protocol buffers - GraphQL schema - JSON Schema - Kafka Connect schema - OpenAPI specification - Web Services Description Language - XML Schema Definition   **Important**: The Apicurio Registry REST API is available from `https://MY-REGISTRY-URL/apis/registry/v2` by default. Therefore you must prefix all API operation paths with `../apis/registry/v2` in this case. For example: `../apis/registry/v2/ids/globalIds/{globalId}`. 
+ *
+ * API version: 2.2.5.Final
+ * Contact: apicurio@lists.jboss.org
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -59,11 +59,11 @@ func (o *RuleViolationError) GetCauses() []RuleViolationCause {
 
 // GetCausesOk returns a tuple with the Causes field value
 // and a boolean to check if the value has been set.
-func (o *RuleViolationError) GetCausesOk() ([]RuleViolationCause, bool) {
-	if o == nil {
-    return nil, false
+func (o *RuleViolationError) GetCausesOk() (*[]RuleViolationCause, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Causes, true
+	return &o.Causes, true
 }
 
 // SetCauses sets field value
@@ -73,7 +73,7 @@ func (o *RuleViolationError) SetCauses(v []RuleViolationCause) {
 
 // GetMessage returns the Message field value if set, zero value otherwise.
 func (o *RuleViolationError) GetMessage() string {
-	if o == nil || isNil(o.Message) {
+	if o == nil || o.Message == nil {
 		var ret string
 		return ret
 	}
@@ -83,15 +83,15 @@ func (o *RuleViolationError) GetMessage() string {
 // GetMessageOk returns a tuple with the Message field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RuleViolationError) GetMessageOk() (*string, bool) {
-	if o == nil || isNil(o.Message) {
-    return nil, false
+	if o == nil || o.Message == nil {
+		return nil, false
 	}
 	return o.Message, true
 }
 
 // HasMessage returns a boolean if a field has been set.
 func (o *RuleViolationError) HasMessage() bool {
-	if o != nil && !isNil(o.Message) {
+	if o != nil && o.Message != nil {
 		return true
 	}
 
@@ -105,7 +105,7 @@ func (o *RuleViolationError) SetMessage(v string) {
 
 // GetErrorCode returns the ErrorCode field value if set, zero value otherwise.
 func (o *RuleViolationError) GetErrorCode() int32 {
-	if o == nil || isNil(o.ErrorCode) {
+	if o == nil || o.ErrorCode == nil {
 		var ret int32
 		return ret
 	}
@@ -115,15 +115,15 @@ func (o *RuleViolationError) GetErrorCode() int32 {
 // GetErrorCodeOk returns a tuple with the ErrorCode field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RuleViolationError) GetErrorCodeOk() (*int32, bool) {
-	if o == nil || isNil(o.ErrorCode) {
-    return nil, false
+	if o == nil || o.ErrorCode == nil {
+		return nil, false
 	}
 	return o.ErrorCode, true
 }
 
 // HasErrorCode returns a boolean if a field has been set.
 func (o *RuleViolationError) HasErrorCode() bool {
-	if o != nil && !isNil(o.ErrorCode) {
+	if o != nil && o.ErrorCode != nil {
 		return true
 	}
 
@@ -137,7 +137,7 @@ func (o *RuleViolationError) SetErrorCode(v int32) {
 
 // GetDetail returns the Detail field value if set, zero value otherwise.
 func (o *RuleViolationError) GetDetail() string {
-	if o == nil || isNil(o.Detail) {
+	if o == nil || o.Detail == nil {
 		var ret string
 		return ret
 	}
@@ -147,15 +147,15 @@ func (o *RuleViolationError) GetDetail() string {
 // GetDetailOk returns a tuple with the Detail field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RuleViolationError) GetDetailOk() (*string, bool) {
-	if o == nil || isNil(o.Detail) {
-    return nil, false
+	if o == nil || o.Detail == nil {
+		return nil, false
 	}
 	return o.Detail, true
 }
 
 // HasDetail returns a boolean if a field has been set.
 func (o *RuleViolationError) HasDetail() bool {
-	if o != nil && !isNil(o.Detail) {
+	if o != nil && o.Detail != nil {
 		return true
 	}
 
@@ -169,7 +169,7 @@ func (o *RuleViolationError) SetDetail(v string) {
 
 // GetName returns the Name field value if set, zero value otherwise.
 func (o *RuleViolationError) GetName() string {
-	if o == nil || isNil(o.Name) {
+	if o == nil || o.Name == nil {
 		var ret string
 		return ret
 	}
@@ -179,15 +179,15 @@ func (o *RuleViolationError) GetName() string {
 // GetNameOk returns a tuple with the Name field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RuleViolationError) GetNameOk() (*string, bool) {
-	if o == nil || isNil(o.Name) {
-    return nil, false
+	if o == nil || o.Name == nil {
+		return nil, false
 	}
 	return o.Name, true
 }
 
 // HasName returns a boolean if a field has been set.
 func (o *RuleViolationError) HasName() bool {
-	if o != nil && !isNil(o.Name) {
+	if o != nil && o.Name != nil {
 		return true
 	}
 
@@ -204,16 +204,16 @@ func (o RuleViolationError) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["causes"] = o.Causes
 	}
-	if !isNil(o.Message) {
+	if o.Message != nil {
 		toSerialize["message"] = o.Message
 	}
-	if !isNil(o.ErrorCode) {
+	if o.ErrorCode != nil {
 		toSerialize["error_code"] = o.ErrorCode
 	}
-	if !isNil(o.Detail) {
+	if o.Detail != nil {
 		toSerialize["detail"] = o.Detail
 	}
-	if !isNil(o.Name) {
+	if o.Name != nil {
 		toSerialize["name"] = o.Name
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/model_rule_violation_error_all_of.go b/app-services-sdk-go/registryinstance/apiv1internal/client/model_rule_violation_error_all_of.go
index 35c52fd3..cbd3388f 100644
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/model_rule_violation_error_all_of.go
+++ b/app-services-sdk-go/registryinstance/apiv1internal/client/model_rule_violation_error_all_of.go
@@ -1,11 +1,11 @@
 /*
-Service Registry API
-
-Service Registry Instance API  NOTE: This API cannot be called directly from the portal.
-
-API version: 2.2.5.Final
-Contact: apicurio@lists.jboss.org
-*/
+ * Apicurio Registry API [v2]
+ *
+ * Apicurio Registry is a datastore for standard event schemas and API designs. Apicurio Registry enables developers to manage and share the structure of their data using a REST interface. For example, client applications can dynamically push or pull the latest updates to or from the registry without needing to redeploy. Apicurio Registry also enables developers to create rules that govern how registry content can evolve over time. For example, this includes rules for content validation and version compatibility.  The Apicurio Registry REST API enables client applications to manage the artifacts in the registry. This API provides create, read, update, and delete operations for schema and API artifacts, rules, versions, and metadata.   The supported artifact types include: - Apache Avro schema - AsyncAPI specification - Google protocol buffers - GraphQL schema - JSON Schema - Kafka Connect schema - OpenAPI specification - Web Services Description Language - XML Schema Definition   **Important**: The Apicurio Registry REST API is available from `https://MY-REGISTRY-URL/apis/registry/v2` by default. Therefore you must prefix all API operation paths with `../apis/registry/v2` in this case. For example: `../apis/registry/v2/ids/globalIds/{globalId}`. 
+ *
+ * API version: 2.2.5.Final
+ * Contact: apicurio@lists.jboss.org
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -51,11 +51,11 @@ func (o *RuleViolationErrorAllOf) GetCauses() []RuleViolationCause {
 
 // GetCausesOk returns a tuple with the Causes field value
 // and a boolean to check if the value has been set.
-func (o *RuleViolationErrorAllOf) GetCausesOk() ([]RuleViolationCause, bool) {
-	if o == nil {
-    return nil, false
+func (o *RuleViolationErrorAllOf) GetCausesOk() (*[]RuleViolationCause, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Causes, true
+	return &o.Causes, true
 }
 
 // SetCauses sets field value
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/model_searched_artifact.go b/app-services-sdk-go/registryinstance/apiv1internal/client/model_searched_artifact.go
index c3b50970..7edc6d61 100644
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/model_searched_artifact.go
+++ b/app-services-sdk-go/registryinstance/apiv1internal/client/model_searched_artifact.go
@@ -1,11 +1,11 @@
 /*
-Service Registry API
-
-Service Registry Instance API  NOTE: This API cannot be called directly from the portal.
-
-API version: 2.2.5.Final
-Contact: apicurio@lists.jboss.org
-*/
+ * Apicurio Registry API [v2]
+ *
+ * Apicurio Registry is a datastore for standard event schemas and API designs. Apicurio Registry enables developers to manage and share the structure of their data using a REST interface. For example, client applications can dynamically push or pull the latest updates to or from the registry without needing to redeploy. Apicurio Registry also enables developers to create rules that govern how registry content can evolve over time. For example, this includes rules for content validation and version compatibility.  The Apicurio Registry REST API enables client applications to manage the artifacts in the registry. This API provides create, read, update, and delete operations for schema and API artifacts, rules, versions, and metadata.   The supported artifact types include: - Apache Avro schema - AsyncAPI specification - Google protocol buffers - GraphQL schema - JSON Schema - Kafka Connect schema - OpenAPI specification - Web Services Description Language - XML Schema Definition   **Important**: The Apicurio Registry REST API is available from `https://MY-REGISTRY-URL/apis/registry/v2` by default. Therefore you must prefix all API operation paths with `../apis/registry/v2` in this case. For example: `../apis/registry/v2/ids/globalIds/{globalId}`. 
+ *
+ * API version: 2.2.5.Final
+ * Contact: apicurio@lists.jboss.org
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -19,21 +19,14 @@ import (
 type SearchedArtifact struct {
 	// The ID of a single artifact.
 	Id string `json:"id"`
-	// 
 	Name *string `json:"name,omitempty"`
-	// 
 	Description *string `json:"description,omitempty"`
-	// 
 	CreatedOn string `json:"createdOn"`
-	// 
 	CreatedBy string `json:"createdBy"`
 	Type ArtifactType `json:"type"`
-	// 
-	Labels []string `json:"labels,omitempty"`
+	Labels *[]string `json:"labels,omitempty"`
 	State ArtifactState `json:"state"`
-	// 
 	ModifiedOn *string `json:"modifiedOn,omitempty"`
-	// 
 	ModifiedBy *string `json:"modifiedBy,omitempty"`
 	// An ID of a single artifact group.
 	GroupId *string `json:"groupId,omitempty"`
@@ -74,8 +67,8 @@ func (o *SearchedArtifact) GetId() string {
 // GetIdOk returns a tuple with the Id field value
 // and a boolean to check if the value has been set.
 func (o *SearchedArtifact) GetIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Id, true
 }
@@ -87,7 +80,7 @@ func (o *SearchedArtifact) SetId(v string) {
 
 // GetName returns the Name field value if set, zero value otherwise.
 func (o *SearchedArtifact) GetName() string {
-	if o == nil || isNil(o.Name) {
+	if o == nil || o.Name == nil {
 		var ret string
 		return ret
 	}
@@ -97,15 +90,15 @@ func (o *SearchedArtifact) GetName() string {
 // GetNameOk returns a tuple with the Name field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SearchedArtifact) GetNameOk() (*string, bool) {
-	if o == nil || isNil(o.Name) {
-    return nil, false
+	if o == nil || o.Name == nil {
+		return nil, false
 	}
 	return o.Name, true
 }
 
 // HasName returns a boolean if a field has been set.
 func (o *SearchedArtifact) HasName() bool {
-	if o != nil && !isNil(o.Name) {
+	if o != nil && o.Name != nil {
 		return true
 	}
 
@@ -119,7 +112,7 @@ func (o *SearchedArtifact) SetName(v string) {
 
 // GetDescription returns the Description field value if set, zero value otherwise.
 func (o *SearchedArtifact) GetDescription() string {
-	if o == nil || isNil(o.Description) {
+	if o == nil || o.Description == nil {
 		var ret string
 		return ret
 	}
@@ -129,15 +122,15 @@ func (o *SearchedArtifact) GetDescription() string {
 // GetDescriptionOk returns a tuple with the Description field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SearchedArtifact) GetDescriptionOk() (*string, bool) {
-	if o == nil || isNil(o.Description) {
-    return nil, false
+	if o == nil || o.Description == nil {
+		return nil, false
 	}
 	return o.Description, true
 }
 
 // HasDescription returns a boolean if a field has been set.
 func (o *SearchedArtifact) HasDescription() bool {
-	if o != nil && !isNil(o.Description) {
+	if o != nil && o.Description != nil {
 		return true
 	}
 
@@ -162,8 +155,8 @@ func (o *SearchedArtifact) GetCreatedOn() string {
 // GetCreatedOnOk returns a tuple with the CreatedOn field value
 // and a boolean to check if the value has been set.
 func (o *SearchedArtifact) GetCreatedOnOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.CreatedOn, true
 }
@@ -186,8 +179,8 @@ func (o *SearchedArtifact) GetCreatedBy() string {
 // GetCreatedByOk returns a tuple with the CreatedBy field value
 // and a boolean to check if the value has been set.
 func (o *SearchedArtifact) GetCreatedByOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.CreatedBy, true
 }
@@ -210,8 +203,8 @@ func (o *SearchedArtifact) GetType() ArtifactType {
 // GetTypeOk returns a tuple with the Type field value
 // and a boolean to check if the value has been set.
 func (o *SearchedArtifact) GetTypeOk() (*ArtifactType, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Type, true
 }
@@ -223,25 +216,25 @@ func (o *SearchedArtifact) SetType(v ArtifactType) {
 
 // GetLabels returns the Labels field value if set, zero value otherwise.
 func (o *SearchedArtifact) GetLabels() []string {
-	if o == nil || isNil(o.Labels) {
+	if o == nil || o.Labels == nil {
 		var ret []string
 		return ret
 	}
-	return o.Labels
+	return *o.Labels
 }
 
 // GetLabelsOk returns a tuple with the Labels field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *SearchedArtifact) GetLabelsOk() ([]string, bool) {
-	if o == nil || isNil(o.Labels) {
-    return nil, false
+func (o *SearchedArtifact) GetLabelsOk() (*[]string, bool) {
+	if o == nil || o.Labels == nil {
+		return nil, false
 	}
 	return o.Labels, true
 }
 
 // HasLabels returns a boolean if a field has been set.
 func (o *SearchedArtifact) HasLabels() bool {
-	if o != nil && !isNil(o.Labels) {
+	if o != nil && o.Labels != nil {
 		return true
 	}
 
@@ -250,7 +243,7 @@ func (o *SearchedArtifact) HasLabels() bool {
 
 // SetLabels gets a reference to the given []string and assigns it to the Labels field.
 func (o *SearchedArtifact) SetLabels(v []string) {
-	o.Labels = v
+	o.Labels = &v
 }
 
 // GetState returns the State field value
@@ -266,8 +259,8 @@ func (o *SearchedArtifact) GetState() ArtifactState {
 // GetStateOk returns a tuple with the State field value
 // and a boolean to check if the value has been set.
 func (o *SearchedArtifact) GetStateOk() (*ArtifactState, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.State, true
 }
@@ -279,7 +272,7 @@ func (o *SearchedArtifact) SetState(v ArtifactState) {
 
 // GetModifiedOn returns the ModifiedOn field value if set, zero value otherwise.
 func (o *SearchedArtifact) GetModifiedOn() string {
-	if o == nil || isNil(o.ModifiedOn) {
+	if o == nil || o.ModifiedOn == nil {
 		var ret string
 		return ret
 	}
@@ -289,15 +282,15 @@ func (o *SearchedArtifact) GetModifiedOn() string {
 // GetModifiedOnOk returns a tuple with the ModifiedOn field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SearchedArtifact) GetModifiedOnOk() (*string, bool) {
-	if o == nil || isNil(o.ModifiedOn) {
-    return nil, false
+	if o == nil || o.ModifiedOn == nil {
+		return nil, false
 	}
 	return o.ModifiedOn, true
 }
 
 // HasModifiedOn returns a boolean if a field has been set.
 func (o *SearchedArtifact) HasModifiedOn() bool {
-	if o != nil && !isNil(o.ModifiedOn) {
+	if o != nil && o.ModifiedOn != nil {
 		return true
 	}
 
@@ -311,7 +304,7 @@ func (o *SearchedArtifact) SetModifiedOn(v string) {
 
 // GetModifiedBy returns the ModifiedBy field value if set, zero value otherwise.
 func (o *SearchedArtifact) GetModifiedBy() string {
-	if o == nil || isNil(o.ModifiedBy) {
+	if o == nil || o.ModifiedBy == nil {
 		var ret string
 		return ret
 	}
@@ -321,15 +314,15 @@ func (o *SearchedArtifact) GetModifiedBy() string {
 // GetModifiedByOk returns a tuple with the ModifiedBy field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SearchedArtifact) GetModifiedByOk() (*string, bool) {
-	if o == nil || isNil(o.ModifiedBy) {
-    return nil, false
+	if o == nil || o.ModifiedBy == nil {
+		return nil, false
 	}
 	return o.ModifiedBy, true
 }
 
 // HasModifiedBy returns a boolean if a field has been set.
 func (o *SearchedArtifact) HasModifiedBy() bool {
-	if o != nil && !isNil(o.ModifiedBy) {
+	if o != nil && o.ModifiedBy != nil {
 		return true
 	}
 
@@ -343,7 +336,7 @@ func (o *SearchedArtifact) SetModifiedBy(v string) {
 
 // GetGroupId returns the GroupId field value if set, zero value otherwise.
 func (o *SearchedArtifact) GetGroupId() string {
-	if o == nil || isNil(o.GroupId) {
+	if o == nil || o.GroupId == nil {
 		var ret string
 		return ret
 	}
@@ -353,15 +346,15 @@ func (o *SearchedArtifact) GetGroupId() string {
 // GetGroupIdOk returns a tuple with the GroupId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SearchedArtifact) GetGroupIdOk() (*string, bool) {
-	if o == nil || isNil(o.GroupId) {
-    return nil, false
+	if o == nil || o.GroupId == nil {
+		return nil, false
 	}
 	return o.GroupId, true
 }
 
 // HasGroupId returns a boolean if a field has been set.
 func (o *SearchedArtifact) HasGroupId() bool {
-	if o != nil && !isNil(o.GroupId) {
+	if o != nil && o.GroupId != nil {
 		return true
 	}
 
@@ -378,10 +371,10 @@ func (o SearchedArtifact) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.Name) {
+	if o.Name != nil {
 		toSerialize["name"] = o.Name
 	}
-	if !isNil(o.Description) {
+	if o.Description != nil {
 		toSerialize["description"] = o.Description
 	}
 	if true {
@@ -393,19 +386,19 @@ func (o SearchedArtifact) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["type"] = o.Type
 	}
-	if !isNil(o.Labels) {
+	if o.Labels != nil {
 		toSerialize["labels"] = o.Labels
 	}
 	if true {
 		toSerialize["state"] = o.State
 	}
-	if !isNil(o.ModifiedOn) {
+	if o.ModifiedOn != nil {
 		toSerialize["modifiedOn"] = o.ModifiedOn
 	}
-	if !isNil(o.ModifiedBy) {
+	if o.ModifiedBy != nil {
 		toSerialize["modifiedBy"] = o.ModifiedBy
 	}
-	if !isNil(o.GroupId) {
+	if o.GroupId != nil {
 		toSerialize["groupId"] = o.GroupId
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/model_searched_version.go b/app-services-sdk-go/registryinstance/apiv1internal/client/model_searched_version.go
index 215d7a53..c7bd36a7 100644
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/model_searched_version.go
+++ b/app-services-sdk-go/registryinstance/apiv1internal/client/model_searched_version.go
@@ -1,11 +1,11 @@
 /*
-Service Registry API
-
-Service Registry Instance API  NOTE: This API cannot be called directly from the portal.
-
-API version: 2.2.5.Final
-Contact: apicurio@lists.jboss.org
-*/
+ * Apicurio Registry API [v2]
+ *
+ * Apicurio Registry is a datastore for standard event schemas and API designs. Apicurio Registry enables developers to manage and share the structure of their data using a REST interface. For example, client applications can dynamically push or pull the latest updates to or from the registry without needing to redeploy. Apicurio Registry also enables developers to create rules that govern how registry content can evolve over time. For example, this includes rules for content validation and version compatibility.  The Apicurio Registry REST API enables client applications to manage the artifacts in the registry. This API provides create, read, update, and delete operations for schema and API artifacts, rules, versions, and metadata.   The supported artifact types include: - Apache Avro schema - AsyncAPI specification - Google protocol buffers - GraphQL schema - JSON Schema - Kafka Connect schema - OpenAPI specification - Web Services Description Language - XML Schema Definition   **Important**: The Apicurio Registry REST API is available from `https://MY-REGISTRY-URL/apis/registry/v2` by default. Therefore you must prefix all API operation paths with `../apis/registry/v2` in this case. For example: `../apis/registry/v2/ids/globalIds/{globalId}`. 
+ *
+ * API version: 2.2.5.Final
+ * Contact: apicurio@lists.jboss.org
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -17,27 +17,18 @@ import (
 
 // SearchedVersion Models a single artifact from the result set returned when searching for artifacts.
 type SearchedVersion struct {
-	// 
 	Name *string `json:"name,omitempty"`
-	// 
 	Description *string `json:"description,omitempty"`
-	// 
 	CreatedOn string `json:"createdOn"`
-	// 
 	CreatedBy string `json:"createdBy"`
 	Type ArtifactType `json:"type"`
-	// 
-	Labels []string `json:"labels,omitempty"`
+	Labels *[]string `json:"labels,omitempty"`
 	State ArtifactState `json:"state"`
-	// 
 	GlobalId int64 `json:"globalId"`
-	// 
 	Version string `json:"version"`
 	// User-defined name-value pairs. Name and value must be strings.
 	Properties *map[string]string `json:"properties,omitempty"`
-	// 
 	ContentId int64 `json:"contentId"`
-	// 
 	References []ArtifactReference `json:"references"`
 }
 
@@ -68,7 +59,7 @@ func NewSearchedVersionWithDefaults() *SearchedVersion {
 
 // GetName returns the Name field value if set, zero value otherwise.
 func (o *SearchedVersion) GetName() string {
-	if o == nil || isNil(o.Name) {
+	if o == nil || o.Name == nil {
 		var ret string
 		return ret
 	}
@@ -78,15 +69,15 @@ func (o *SearchedVersion) GetName() string {
 // GetNameOk returns a tuple with the Name field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SearchedVersion) GetNameOk() (*string, bool) {
-	if o == nil || isNil(o.Name) {
-    return nil, false
+	if o == nil || o.Name == nil {
+		return nil, false
 	}
 	return o.Name, true
 }
 
 // HasName returns a boolean if a field has been set.
 func (o *SearchedVersion) HasName() bool {
-	if o != nil && !isNil(o.Name) {
+	if o != nil && o.Name != nil {
 		return true
 	}
 
@@ -100,7 +91,7 @@ func (o *SearchedVersion) SetName(v string) {
 
 // GetDescription returns the Description field value if set, zero value otherwise.
 func (o *SearchedVersion) GetDescription() string {
-	if o == nil || isNil(o.Description) {
+	if o == nil || o.Description == nil {
 		var ret string
 		return ret
 	}
@@ -110,15 +101,15 @@ func (o *SearchedVersion) GetDescription() string {
 // GetDescriptionOk returns a tuple with the Description field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SearchedVersion) GetDescriptionOk() (*string, bool) {
-	if o == nil || isNil(o.Description) {
-    return nil, false
+	if o == nil || o.Description == nil {
+		return nil, false
 	}
 	return o.Description, true
 }
 
 // HasDescription returns a boolean if a field has been set.
 func (o *SearchedVersion) HasDescription() bool {
-	if o != nil && !isNil(o.Description) {
+	if o != nil && o.Description != nil {
 		return true
 	}
 
@@ -143,8 +134,8 @@ func (o *SearchedVersion) GetCreatedOn() string {
 // GetCreatedOnOk returns a tuple with the CreatedOn field value
 // and a boolean to check if the value has been set.
 func (o *SearchedVersion) GetCreatedOnOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.CreatedOn, true
 }
@@ -167,8 +158,8 @@ func (o *SearchedVersion) GetCreatedBy() string {
 // GetCreatedByOk returns a tuple with the CreatedBy field value
 // and a boolean to check if the value has been set.
 func (o *SearchedVersion) GetCreatedByOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.CreatedBy, true
 }
@@ -191,8 +182,8 @@ func (o *SearchedVersion) GetType() ArtifactType {
 // GetTypeOk returns a tuple with the Type field value
 // and a boolean to check if the value has been set.
 func (o *SearchedVersion) GetTypeOk() (*ArtifactType, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Type, true
 }
@@ -204,25 +195,25 @@ func (o *SearchedVersion) SetType(v ArtifactType) {
 
 // GetLabels returns the Labels field value if set, zero value otherwise.
 func (o *SearchedVersion) GetLabels() []string {
-	if o == nil || isNil(o.Labels) {
+	if o == nil || o.Labels == nil {
 		var ret []string
 		return ret
 	}
-	return o.Labels
+	return *o.Labels
 }
 
 // GetLabelsOk returns a tuple with the Labels field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *SearchedVersion) GetLabelsOk() ([]string, bool) {
-	if o == nil || isNil(o.Labels) {
-    return nil, false
+func (o *SearchedVersion) GetLabelsOk() (*[]string, bool) {
+	if o == nil || o.Labels == nil {
+		return nil, false
 	}
 	return o.Labels, true
 }
 
 // HasLabels returns a boolean if a field has been set.
 func (o *SearchedVersion) HasLabels() bool {
-	if o != nil && !isNil(o.Labels) {
+	if o != nil && o.Labels != nil {
 		return true
 	}
 
@@ -231,7 +222,7 @@ func (o *SearchedVersion) HasLabels() bool {
 
 // SetLabels gets a reference to the given []string and assigns it to the Labels field.
 func (o *SearchedVersion) SetLabels(v []string) {
-	o.Labels = v
+	o.Labels = &v
 }
 
 // GetState returns the State field value
@@ -247,8 +238,8 @@ func (o *SearchedVersion) GetState() ArtifactState {
 // GetStateOk returns a tuple with the State field value
 // and a boolean to check if the value has been set.
 func (o *SearchedVersion) GetStateOk() (*ArtifactState, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.State, true
 }
@@ -271,8 +262,8 @@ func (o *SearchedVersion) GetGlobalId() int64 {
 // GetGlobalIdOk returns a tuple with the GlobalId field value
 // and a boolean to check if the value has been set.
 func (o *SearchedVersion) GetGlobalIdOk() (*int64, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.GlobalId, true
 }
@@ -295,8 +286,8 @@ func (o *SearchedVersion) GetVersion() string {
 // GetVersionOk returns a tuple with the Version field value
 // and a boolean to check if the value has been set.
 func (o *SearchedVersion) GetVersionOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Version, true
 }
@@ -308,7 +299,7 @@ func (o *SearchedVersion) SetVersion(v string) {
 
 // GetProperties returns the Properties field value if set, zero value otherwise.
 func (o *SearchedVersion) GetProperties() map[string]string {
-	if o == nil || isNil(o.Properties) {
+	if o == nil || o.Properties == nil {
 		var ret map[string]string
 		return ret
 	}
@@ -318,15 +309,15 @@ func (o *SearchedVersion) GetProperties() map[string]string {
 // GetPropertiesOk returns a tuple with the Properties field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SearchedVersion) GetPropertiesOk() (*map[string]string, bool) {
-	if o == nil || isNil(o.Properties) {
-    return nil, false
+	if o == nil || o.Properties == nil {
+		return nil, false
 	}
 	return o.Properties, true
 }
 
 // HasProperties returns a boolean if a field has been set.
 func (o *SearchedVersion) HasProperties() bool {
-	if o != nil && !isNil(o.Properties) {
+	if o != nil && o.Properties != nil {
 		return true
 	}
 
@@ -351,8 +342,8 @@ func (o *SearchedVersion) GetContentId() int64 {
 // GetContentIdOk returns a tuple with the ContentId field value
 // and a boolean to check if the value has been set.
 func (o *SearchedVersion) GetContentIdOk() (*int64, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.ContentId, true
 }
@@ -374,11 +365,11 @@ func (o *SearchedVersion) GetReferences() []ArtifactReference {
 
 // GetReferencesOk returns a tuple with the References field value
 // and a boolean to check if the value has been set.
-func (o *SearchedVersion) GetReferencesOk() ([]ArtifactReference, bool) {
-	if o == nil {
-    return nil, false
+func (o *SearchedVersion) GetReferencesOk() (*[]ArtifactReference, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.References, true
+	return &o.References, true
 }
 
 // SetReferences sets field value
@@ -388,10 +379,10 @@ func (o *SearchedVersion) SetReferences(v []ArtifactReference) {
 
 func (o SearchedVersion) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Name) {
+	if o.Name != nil {
 		toSerialize["name"] = o.Name
 	}
-	if !isNil(o.Description) {
+	if o.Description != nil {
 		toSerialize["description"] = o.Description
 	}
 	if true {
@@ -403,7 +394,7 @@ func (o SearchedVersion) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["type"] = o.Type
 	}
-	if !isNil(o.Labels) {
+	if o.Labels != nil {
 		toSerialize["labels"] = o.Labels
 	}
 	if true {
@@ -415,7 +406,7 @@ func (o SearchedVersion) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["version"] = o.Version
 	}
-	if !isNil(o.Properties) {
+	if o.Properties != nil {
 		toSerialize["properties"] = o.Properties
 	}
 	if true {
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/model_sort_by.go b/app-services-sdk-go/registryinstance/apiv1internal/client/model_sort_by.go
index 535a777e..98180964 100644
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/model_sort_by.go
+++ b/app-services-sdk-go/registryinstance/apiv1internal/client/model_sort_by.go
@@ -1,11 +1,11 @@
 /*
-Service Registry API
-
-Service Registry Instance API  NOTE: This API cannot be called directly from the portal.
-
-API version: 2.2.5.Final
-Contact: apicurio@lists.jboss.org
-*/
+ * Apicurio Registry API [v2]
+ *
+ * Apicurio Registry is a datastore for standard event schemas and API designs. Apicurio Registry enables developers to manage and share the structure of their data using a REST interface. For example, client applications can dynamically push or pull the latest updates to or from the registry without needing to redeploy. Apicurio Registry also enables developers to create rules that govern how registry content can evolve over time. For example, this includes rules for content validation and version compatibility.  The Apicurio Registry REST API enables client applications to manage the artifacts in the registry. This API provides create, read, update, and delete operations for schema and API artifacts, rules, versions, and metadata.   The supported artifact types include: - Apache Avro schema - AsyncAPI specification - Google protocol buffers - GraphQL schema - JSON Schema - Kafka Connect schema - OpenAPI specification - Web Services Description Language - XML Schema Definition   **Important**: The Apicurio Registry REST API is available from `https://MY-REGISTRY-URL/apis/registry/v2` by default. Therefore you must prefix all API operation paths with `../apis/registry/v2` in this case. For example: `../apis/registry/v2/ids/globalIds/{globalId}`. 
+ *
+ * API version: 2.2.5.Final
+ * Contact: apicurio@lists.jboss.org
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -16,7 +16,7 @@ import (
 	"fmt"
 )
 
-// SortBy 
+// SortBy the model 'SortBy'
 type SortBy string
 
 // List of SortBy
@@ -25,8 +25,7 @@ const (
 	SORTBY_CREATED_ON SortBy = "createdOn"
 )
 
-// All allowed values of SortBy enum
-var AllowedSortByEnumValues = []SortBy{
+var allowedSortByEnumValues = []SortBy{
 	"name",
 	"createdOn",
 }
@@ -38,7 +37,7 @@ func (v *SortBy) UnmarshalJSON(src []byte) error {
 		return err
 	}
 	enumTypeValue := SortBy(value)
-	for _, existing := range AllowedSortByEnumValues {
+	for _, existing := range allowedSortByEnumValues {
 		if existing == enumTypeValue {
 			*v = enumTypeValue
 			return nil
@@ -55,13 +54,13 @@ func NewSortByFromValue(v string) (*SortBy, error) {
 	if ev.IsValid() {
 		return &ev, nil
 	} else {
-		return nil, fmt.Errorf("invalid value '%v' for SortBy: valid values are %v", v, AllowedSortByEnumValues)
+		return nil, fmt.Errorf("invalid value '%v' for SortBy: valid values are %v", v, allowedSortByEnumValues)
 	}
 }
 
 // IsValid return true if the value is valid for the enum, false otherwise
 func (v SortBy) IsValid() bool {
-	for _, existing := range AllowedSortByEnumValues {
+	for _, existing := range allowedSortByEnumValues {
 		if existing == v {
 			return true
 		}
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/model_sort_order.go b/app-services-sdk-go/registryinstance/apiv1internal/client/model_sort_order.go
index f2e99f00..04dae527 100644
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/model_sort_order.go
+++ b/app-services-sdk-go/registryinstance/apiv1internal/client/model_sort_order.go
@@ -1,11 +1,11 @@
 /*
-Service Registry API
-
-Service Registry Instance API  NOTE: This API cannot be called directly from the portal.
-
-API version: 2.2.5.Final
-Contact: apicurio@lists.jboss.org
-*/
+ * Apicurio Registry API [v2]
+ *
+ * Apicurio Registry is a datastore for standard event schemas and API designs. Apicurio Registry enables developers to manage and share the structure of their data using a REST interface. For example, client applications can dynamically push or pull the latest updates to or from the registry without needing to redeploy. Apicurio Registry also enables developers to create rules that govern how registry content can evolve over time. For example, this includes rules for content validation and version compatibility.  The Apicurio Registry REST API enables client applications to manage the artifacts in the registry. This API provides create, read, update, and delete operations for schema and API artifacts, rules, versions, and metadata.   The supported artifact types include: - Apache Avro schema - AsyncAPI specification - Google protocol buffers - GraphQL schema - JSON Schema - Kafka Connect schema - OpenAPI specification - Web Services Description Language - XML Schema Definition   **Important**: The Apicurio Registry REST API is available from `https://MY-REGISTRY-URL/apis/registry/v2` by default. Therefore you must prefix all API operation paths with `../apis/registry/v2` in this case. For example: `../apis/registry/v2/ids/globalIds/{globalId}`. 
+ *
+ * API version: 2.2.5.Final
+ * Contact: apicurio@lists.jboss.org
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -16,7 +16,7 @@ import (
 	"fmt"
 )
 
-// SortOrder 
+// SortOrder the model 'SortOrder'
 type SortOrder string
 
 // List of SortOrder
@@ -25,8 +25,7 @@ const (
 	SORTORDER_DESC SortOrder = "desc"
 )
 
-// All allowed values of SortOrder enum
-var AllowedSortOrderEnumValues = []SortOrder{
+var allowedSortOrderEnumValues = []SortOrder{
 	"asc",
 	"desc",
 }
@@ -38,7 +37,7 @@ func (v *SortOrder) UnmarshalJSON(src []byte) error {
 		return err
 	}
 	enumTypeValue := SortOrder(value)
-	for _, existing := range AllowedSortOrderEnumValues {
+	for _, existing := range allowedSortOrderEnumValues {
 		if existing == enumTypeValue {
 			*v = enumTypeValue
 			return nil
@@ -55,13 +54,13 @@ func NewSortOrderFromValue(v string) (*SortOrder, error) {
 	if ev.IsValid() {
 		return &ev, nil
 	} else {
-		return nil, fmt.Errorf("invalid value '%v' for SortOrder: valid values are %v", v, AllowedSortOrderEnumValues)
+		return nil, fmt.Errorf("invalid value '%v' for SortOrder: valid values are %v", v, allowedSortOrderEnumValues)
 	}
 }
 
 // IsValid return true if the value is valid for the enum, false otherwise
 func (v SortOrder) IsValid() bool {
-	for _, existing := range AllowedSortOrderEnumValues {
+	for _, existing := range allowedSortOrderEnumValues {
 		if existing == v {
 			return true
 		}
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/model_system_info.go b/app-services-sdk-go/registryinstance/apiv1internal/client/model_system_info.go
index 48383a23..dc862627 100644
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/model_system_info.go
+++ b/app-services-sdk-go/registryinstance/apiv1internal/client/model_system_info.go
@@ -1,11 +1,11 @@
 /*
-Service Registry API
-
-Service Registry Instance API  NOTE: This API cannot be called directly from the portal.
-
-API version: 2.2.5.Final
-Contact: apicurio@lists.jboss.org
-*/
+ * Apicurio Registry API [v2]
+ *
+ * Apicurio Registry is a datastore for standard event schemas and API designs. Apicurio Registry enables developers to manage and share the structure of their data using a REST interface. For example, client applications can dynamically push or pull the latest updates to or from the registry without needing to redeploy. Apicurio Registry also enables developers to create rules that govern how registry content can evolve over time. For example, this includes rules for content validation and version compatibility.  The Apicurio Registry REST API enables client applications to manage the artifacts in the registry. This API provides create, read, update, and delete operations for schema and API artifacts, rules, versions, and metadata.   The supported artifact types include: - Apache Avro schema - AsyncAPI specification - Google protocol buffers - GraphQL schema - JSON Schema - Kafka Connect schema - OpenAPI specification - Web Services Description Language - XML Schema Definition   **Important**: The Apicurio Registry REST API is available from `https://MY-REGISTRY-URL/apis/registry/v2` by default. Therefore you must prefix all API operation paths with `../apis/registry/v2` in this case. For example: `../apis/registry/v2/ids/globalIds/{globalId}`. 
+ *
+ * API version: 2.2.5.Final
+ * Contact: apicurio@lists.jboss.org
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -15,7 +15,7 @@ import (
 	"encoding/json"
 )
 
-// SystemInfo 
+// SystemInfo struct for SystemInfo
 type SystemInfo struct {
 	Name *string `json:"name,omitempty"`
 	Description *string `json:"description,omitempty"`
@@ -42,7 +42,7 @@ func NewSystemInfoWithDefaults() *SystemInfo {
 
 // GetName returns the Name field value if set, zero value otherwise.
 func (o *SystemInfo) GetName() string {
-	if o == nil || isNil(o.Name) {
+	if o == nil || o.Name == nil {
 		var ret string
 		return ret
 	}
@@ -52,15 +52,15 @@ func (o *SystemInfo) GetName() string {
 // GetNameOk returns a tuple with the Name field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SystemInfo) GetNameOk() (*string, bool) {
-	if o == nil || isNil(o.Name) {
-    return nil, false
+	if o == nil || o.Name == nil {
+		return nil, false
 	}
 	return o.Name, true
 }
 
 // HasName returns a boolean if a field has been set.
 func (o *SystemInfo) HasName() bool {
-	if o != nil && !isNil(o.Name) {
+	if o != nil && o.Name != nil {
 		return true
 	}
 
@@ -74,7 +74,7 @@ func (o *SystemInfo) SetName(v string) {
 
 // GetDescription returns the Description field value if set, zero value otherwise.
 func (o *SystemInfo) GetDescription() string {
-	if o == nil || isNil(o.Description) {
+	if o == nil || o.Description == nil {
 		var ret string
 		return ret
 	}
@@ -84,15 +84,15 @@ func (o *SystemInfo) GetDescription() string {
 // GetDescriptionOk returns a tuple with the Description field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SystemInfo) GetDescriptionOk() (*string, bool) {
-	if o == nil || isNil(o.Description) {
-    return nil, false
+	if o == nil || o.Description == nil {
+		return nil, false
 	}
 	return o.Description, true
 }
 
 // HasDescription returns a boolean if a field has been set.
 func (o *SystemInfo) HasDescription() bool {
-	if o != nil && !isNil(o.Description) {
+	if o != nil && o.Description != nil {
 		return true
 	}
 
@@ -106,7 +106,7 @@ func (o *SystemInfo) SetDescription(v string) {
 
 // GetVersion returns the Version field value if set, zero value otherwise.
 func (o *SystemInfo) GetVersion() string {
-	if o == nil || isNil(o.Version) {
+	if o == nil || o.Version == nil {
 		var ret string
 		return ret
 	}
@@ -116,15 +116,15 @@ func (o *SystemInfo) GetVersion() string {
 // GetVersionOk returns a tuple with the Version field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SystemInfo) GetVersionOk() (*string, bool) {
-	if o == nil || isNil(o.Version) {
-    return nil, false
+	if o == nil || o.Version == nil {
+		return nil, false
 	}
 	return o.Version, true
 }
 
 // HasVersion returns a boolean if a field has been set.
 func (o *SystemInfo) HasVersion() bool {
-	if o != nil && !isNil(o.Version) {
+	if o != nil && o.Version != nil {
 		return true
 	}
 
@@ -138,7 +138,7 @@ func (o *SystemInfo) SetVersion(v string) {
 
 // GetBuiltOn returns the BuiltOn field value if set, zero value otherwise.
 func (o *SystemInfo) GetBuiltOn() string {
-	if o == nil || isNil(o.BuiltOn) {
+	if o == nil || o.BuiltOn == nil {
 		var ret string
 		return ret
 	}
@@ -148,15 +148,15 @@ func (o *SystemInfo) GetBuiltOn() string {
 // GetBuiltOnOk returns a tuple with the BuiltOn field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SystemInfo) GetBuiltOnOk() (*string, bool) {
-	if o == nil || isNil(o.BuiltOn) {
-    return nil, false
+	if o == nil || o.BuiltOn == nil {
+		return nil, false
 	}
 	return o.BuiltOn, true
 }
 
 // HasBuiltOn returns a boolean if a field has been set.
 func (o *SystemInfo) HasBuiltOn() bool {
-	if o != nil && !isNil(o.BuiltOn) {
+	if o != nil && o.BuiltOn != nil {
 		return true
 	}
 
@@ -170,16 +170,16 @@ func (o *SystemInfo) SetBuiltOn(v string) {
 
 func (o SystemInfo) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Name) {
+	if o.Name != nil {
 		toSerialize["name"] = o.Name
 	}
-	if !isNil(o.Description) {
+	if o.Description != nil {
 		toSerialize["description"] = o.Description
 	}
-	if !isNil(o.Version) {
+	if o.Version != nil {
 		toSerialize["version"] = o.Version
 	}
-	if !isNil(o.BuiltOn) {
+	if o.BuiltOn != nil {
 		toSerialize["builtOn"] = o.BuiltOn
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/model_update_configuration_property.go b/app-services-sdk-go/registryinstance/apiv1internal/client/model_update_configuration_property.go
index 239528fa..40c22e2e 100644
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/model_update_configuration_property.go
+++ b/app-services-sdk-go/registryinstance/apiv1internal/client/model_update_configuration_property.go
@@ -1,11 +1,11 @@
 /*
-Service Registry API
-
-Service Registry Instance API  NOTE: This API cannot be called directly from the portal.
-
-API version: 2.2.5.Final
-Contact: apicurio@lists.jboss.org
-*/
+ * Apicurio Registry API [v2]
+ *
+ * Apicurio Registry is a datastore for standard event schemas and API designs. Apicurio Registry enables developers to manage and share the structure of their data using a REST interface. For example, client applications can dynamically push or pull the latest updates to or from the registry without needing to redeploy. Apicurio Registry also enables developers to create rules that govern how registry content can evolve over time. For example, this includes rules for content validation and version compatibility.  The Apicurio Registry REST API enables client applications to manage the artifacts in the registry. This API provides create, read, update, and delete operations for schema and API artifacts, rules, versions, and metadata.   The supported artifact types include: - Apache Avro schema - AsyncAPI specification - Google protocol buffers - GraphQL schema - JSON Schema - Kafka Connect schema - OpenAPI specification - Web Services Description Language - XML Schema Definition   **Important**: The Apicurio Registry REST API is available from `https://MY-REGISTRY-URL/apis/registry/v2` by default. Therefore you must prefix all API operation paths with `../apis/registry/v2` in this case. For example: `../apis/registry/v2/ids/globalIds/{globalId}`. 
+ *
+ * API version: 2.2.5.Final
+ * Contact: apicurio@lists.jboss.org
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -15,7 +15,7 @@ import (
 	"encoding/json"
 )
 
-// UpdateConfigurationProperty 
+// UpdateConfigurationProperty struct for UpdateConfigurationProperty
 type UpdateConfigurationProperty struct {
 	Value string `json:"value"`
 }
@@ -51,8 +51,8 @@ func (o *UpdateConfigurationProperty) GetValue() string {
 // GetValueOk returns a tuple with the Value field value
 // and a boolean to check if the value has been set.
 func (o *UpdateConfigurationProperty) GetValueOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Value, true
 }
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/model_update_role.go b/app-services-sdk-go/registryinstance/apiv1internal/client/model_update_role.go
index 9047f6a1..94ddbb9b 100644
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/model_update_role.go
+++ b/app-services-sdk-go/registryinstance/apiv1internal/client/model_update_role.go
@@ -1,11 +1,11 @@
 /*
-Service Registry API
-
-Service Registry Instance API  NOTE: This API cannot be called directly from the portal.
-
-API version: 2.2.5.Final
-Contact: apicurio@lists.jboss.org
-*/
+ * Apicurio Registry API [v2]
+ *
+ * Apicurio Registry is a datastore for standard event schemas and API designs. Apicurio Registry enables developers to manage and share the structure of their data using a REST interface. For example, client applications can dynamically push or pull the latest updates to or from the registry without needing to redeploy. Apicurio Registry also enables developers to create rules that govern how registry content can evolve over time. For example, this includes rules for content validation and version compatibility.  The Apicurio Registry REST API enables client applications to manage the artifacts in the registry. This API provides create, read, update, and delete operations for schema and API artifacts, rules, versions, and metadata.   The supported artifact types include: - Apache Avro schema - AsyncAPI specification - Google protocol buffers - GraphQL schema - JSON Schema - Kafka Connect schema - OpenAPI specification - Web Services Description Language - XML Schema Definition   **Important**: The Apicurio Registry REST API is available from `https://MY-REGISTRY-URL/apis/registry/v2` by default. Therefore you must prefix all API operation paths with `../apis/registry/v2` in this case. For example: `../apis/registry/v2/ids/globalIds/{globalId}`. 
+ *
+ * API version: 2.2.5.Final
+ * Contact: apicurio@lists.jboss.org
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -15,7 +15,7 @@ import (
 	"encoding/json"
 )
 
-// UpdateRole 
+// UpdateRole struct for UpdateRole
 type UpdateRole struct {
 	Role RoleType `json:"role"`
 }
@@ -51,8 +51,8 @@ func (o *UpdateRole) GetRole() RoleType {
 // GetRoleOk returns a tuple with the Role field value
 // and a boolean to check if the value has been set.
 func (o *UpdateRole) GetRoleOk() (*RoleType, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Role, true
 }
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/model_update_state.go b/app-services-sdk-go/registryinstance/apiv1internal/client/model_update_state.go
index f954a4d1..b9da5af0 100644
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/model_update_state.go
+++ b/app-services-sdk-go/registryinstance/apiv1internal/client/model_update_state.go
@@ -1,11 +1,11 @@
 /*
-Service Registry API
-
-Service Registry Instance API  NOTE: This API cannot be called directly from the portal.
-
-API version: 2.2.5.Final
-Contact: apicurio@lists.jboss.org
-*/
+ * Apicurio Registry API [v2]
+ *
+ * Apicurio Registry is a datastore for standard event schemas and API designs. Apicurio Registry enables developers to manage and share the structure of their data using a REST interface. For example, client applications can dynamically push or pull the latest updates to or from the registry without needing to redeploy. Apicurio Registry also enables developers to create rules that govern how registry content can evolve over time. For example, this includes rules for content validation and version compatibility.  The Apicurio Registry REST API enables client applications to manage the artifacts in the registry. This API provides create, read, update, and delete operations for schema and API artifacts, rules, versions, and metadata.   The supported artifact types include: - Apache Avro schema - AsyncAPI specification - Google protocol buffers - GraphQL schema - JSON Schema - Kafka Connect schema - OpenAPI specification - Web Services Description Language - XML Schema Definition   **Important**: The Apicurio Registry REST API is available from `https://MY-REGISTRY-URL/apis/registry/v2` by default. Therefore you must prefix all API operation paths with `../apis/registry/v2` in this case. For example: `../apis/registry/v2/ids/globalIds/{globalId}`. 
+ *
+ * API version: 2.2.5.Final
+ * Contact: apicurio@lists.jboss.org
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -15,7 +15,7 @@ import (
 	"encoding/json"
 )
 
-// UpdateState 
+// UpdateState struct for UpdateState
 type UpdateState struct {
 	State ArtifactState `json:"state"`
 }
@@ -51,8 +51,8 @@ func (o *UpdateState) GetState() ArtifactState {
 // GetStateOk returns a tuple with the State field value
 // and a boolean to check if the value has been set.
 func (o *UpdateState) GetStateOk() (*ArtifactState, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.State, true
 }
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/model_user_info.go b/app-services-sdk-go/registryinstance/apiv1internal/client/model_user_info.go
index f80764bb..bbb216a8 100644
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/model_user_info.go
+++ b/app-services-sdk-go/registryinstance/apiv1internal/client/model_user_info.go
@@ -1,11 +1,11 @@
 /*
-Service Registry API
-
-Service Registry Instance API  NOTE: This API cannot be called directly from the portal.
-
-API version: 2.2.5.Final
-Contact: apicurio@lists.jboss.org
-*/
+ * Apicurio Registry API [v2]
+ *
+ * Apicurio Registry is a datastore for standard event schemas and API designs. Apicurio Registry enables developers to manage and share the structure of their data using a REST interface. For example, client applications can dynamically push or pull the latest updates to or from the registry without needing to redeploy. Apicurio Registry also enables developers to create rules that govern how registry content can evolve over time. For example, this includes rules for content validation and version compatibility.  The Apicurio Registry REST API enables client applications to manage the artifacts in the registry. This API provides create, read, update, and delete operations for schema and API artifacts, rules, versions, and metadata.   The supported artifact types include: - Apache Avro schema - AsyncAPI specification - Google protocol buffers - GraphQL schema - JSON Schema - Kafka Connect schema - OpenAPI specification - Web Services Description Language - XML Schema Definition   **Important**: The Apicurio Registry REST API is available from `https://MY-REGISTRY-URL/apis/registry/v2` by default. Therefore you must prefix all API operation paths with `../apis/registry/v2` in this case. For example: `../apis/registry/v2/ids/globalIds/{globalId}`. 
+ *
+ * API version: 2.2.5.Final
+ * Contact: apicurio@lists.jboss.org
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -43,7 +43,7 @@ func NewUserInfoWithDefaults() *UserInfo {
 
 // GetUsername returns the Username field value if set, zero value otherwise.
 func (o *UserInfo) GetUsername() string {
-	if o == nil || isNil(o.Username) {
+	if o == nil || o.Username == nil {
 		var ret string
 		return ret
 	}
@@ -53,15 +53,15 @@ func (o *UserInfo) GetUsername() string {
 // GetUsernameOk returns a tuple with the Username field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *UserInfo) GetUsernameOk() (*string, bool) {
-	if o == nil || isNil(o.Username) {
-    return nil, false
+	if o == nil || o.Username == nil {
+		return nil, false
 	}
 	return o.Username, true
 }
 
 // HasUsername returns a boolean if a field has been set.
 func (o *UserInfo) HasUsername() bool {
-	if o != nil && !isNil(o.Username) {
+	if o != nil && o.Username != nil {
 		return true
 	}
 
@@ -75,7 +75,7 @@ func (o *UserInfo) SetUsername(v string) {
 
 // GetDisplayName returns the DisplayName field value if set, zero value otherwise.
 func (o *UserInfo) GetDisplayName() string {
-	if o == nil || isNil(o.DisplayName) {
+	if o == nil || o.DisplayName == nil {
 		var ret string
 		return ret
 	}
@@ -85,15 +85,15 @@ func (o *UserInfo) GetDisplayName() string {
 // GetDisplayNameOk returns a tuple with the DisplayName field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *UserInfo) GetDisplayNameOk() (*string, bool) {
-	if o == nil || isNil(o.DisplayName) {
-    return nil, false
+	if o == nil || o.DisplayName == nil {
+		return nil, false
 	}
 	return o.DisplayName, true
 }
 
 // HasDisplayName returns a boolean if a field has been set.
 func (o *UserInfo) HasDisplayName() bool {
-	if o != nil && !isNil(o.DisplayName) {
+	if o != nil && o.DisplayName != nil {
 		return true
 	}
 
@@ -107,7 +107,7 @@ func (o *UserInfo) SetDisplayName(v string) {
 
 // GetAdmin returns the Admin field value if set, zero value otherwise.
 func (o *UserInfo) GetAdmin() bool {
-	if o == nil || isNil(o.Admin) {
+	if o == nil || o.Admin == nil {
 		var ret bool
 		return ret
 	}
@@ -117,15 +117,15 @@ func (o *UserInfo) GetAdmin() bool {
 // GetAdminOk returns a tuple with the Admin field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *UserInfo) GetAdminOk() (*bool, bool) {
-	if o == nil || isNil(o.Admin) {
-    return nil, false
+	if o == nil || o.Admin == nil {
+		return nil, false
 	}
 	return o.Admin, true
 }
 
 // HasAdmin returns a boolean if a field has been set.
 func (o *UserInfo) HasAdmin() bool {
-	if o != nil && !isNil(o.Admin) {
+	if o != nil && o.Admin != nil {
 		return true
 	}
 
@@ -139,7 +139,7 @@ func (o *UserInfo) SetAdmin(v bool) {
 
 // GetDeveloper returns the Developer field value if set, zero value otherwise.
 func (o *UserInfo) GetDeveloper() bool {
-	if o == nil || isNil(o.Developer) {
+	if o == nil || o.Developer == nil {
 		var ret bool
 		return ret
 	}
@@ -149,15 +149,15 @@ func (o *UserInfo) GetDeveloper() bool {
 // GetDeveloperOk returns a tuple with the Developer field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *UserInfo) GetDeveloperOk() (*bool, bool) {
-	if o == nil || isNil(o.Developer) {
-    return nil, false
+	if o == nil || o.Developer == nil {
+		return nil, false
 	}
 	return o.Developer, true
 }
 
 // HasDeveloper returns a boolean if a field has been set.
 func (o *UserInfo) HasDeveloper() bool {
-	if o != nil && !isNil(o.Developer) {
+	if o != nil && o.Developer != nil {
 		return true
 	}
 
@@ -171,7 +171,7 @@ func (o *UserInfo) SetDeveloper(v bool) {
 
 // GetViewer returns the Viewer field value if set, zero value otherwise.
 func (o *UserInfo) GetViewer() bool {
-	if o == nil || isNil(o.Viewer) {
+	if o == nil || o.Viewer == nil {
 		var ret bool
 		return ret
 	}
@@ -181,15 +181,15 @@ func (o *UserInfo) GetViewer() bool {
 // GetViewerOk returns a tuple with the Viewer field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *UserInfo) GetViewerOk() (*bool, bool) {
-	if o == nil || isNil(o.Viewer) {
-    return nil, false
+	if o == nil || o.Viewer == nil {
+		return nil, false
 	}
 	return o.Viewer, true
 }
 
 // HasViewer returns a boolean if a field has been set.
 func (o *UserInfo) HasViewer() bool {
-	if o != nil && !isNil(o.Viewer) {
+	if o != nil && o.Viewer != nil {
 		return true
 	}
 
@@ -203,19 +203,19 @@ func (o *UserInfo) SetViewer(v bool) {
 
 func (o UserInfo) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Username) {
+	if o.Username != nil {
 		toSerialize["username"] = o.Username
 	}
-	if !isNil(o.DisplayName) {
+	if o.DisplayName != nil {
 		toSerialize["displayName"] = o.DisplayName
 	}
-	if !isNil(o.Admin) {
+	if o.Admin != nil {
 		toSerialize["admin"] = o.Admin
 	}
-	if !isNil(o.Developer) {
+	if o.Developer != nil {
 		toSerialize["developer"] = o.Developer
 	}
-	if !isNil(o.Viewer) {
+	if o.Viewer != nil {
 		toSerialize["viewer"] = o.Viewer
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/model_version_meta_data.go b/app-services-sdk-go/registryinstance/apiv1internal/client/model_version_meta_data.go
index 476c1fcc..f24eb613 100644
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/model_version_meta_data.go
+++ b/app-services-sdk-go/registryinstance/apiv1internal/client/model_version_meta_data.go
@@ -1,11 +1,11 @@
 /*
-Service Registry API
-
-Service Registry Instance API  NOTE: This API cannot be called directly from the portal.
-
-API version: 2.2.5.Final
-Contact: apicurio@lists.jboss.org
-*/
+ * Apicurio Registry API [v2]
+ *
+ * Apicurio Registry is a datastore for standard event schemas and API designs. Apicurio Registry enables developers to manage and share the structure of their data using a REST interface. For example, client applications can dynamically push or pull the latest updates to or from the registry without needing to redeploy. Apicurio Registry also enables developers to create rules that govern how registry content can evolve over time. For example, this includes rules for content validation and version compatibility.  The Apicurio Registry REST API enables client applications to manage the artifacts in the registry. This API provides create, read, update, and delete operations for schema and API artifacts, rules, versions, and metadata.   The supported artifact types include: - Apache Avro schema - AsyncAPI specification - Google protocol buffers - GraphQL schema - JSON Schema - Kafka Connect schema - OpenAPI specification - Web Services Description Language - XML Schema Definition   **Important**: The Apicurio Registry REST API is available from `https://MY-REGISTRY-URL/apis/registry/v2` by default. Therefore you must prefix all API operation paths with `../apis/registry/v2` in this case. For example: `../apis/registry/v2/ids/globalIds/{globalId}`. 
+ *
+ * API version: 2.2.5.Final
+ * Contact: apicurio@lists.jboss.org
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -15,7 +15,7 @@ import (
 	"encoding/json"
 )
 
-// VersionMetaData 
+// VersionMetaData struct for VersionMetaData
 type VersionMetaData struct {
 	Version string `json:"version"`
 	Name *string `json:"name,omitempty"`
@@ -23,18 +23,15 @@ type VersionMetaData struct {
 	CreatedBy string `json:"createdBy"`
 	CreatedOn string `json:"createdOn"`
 	Type ArtifactType `json:"type"`
-	// 
 	GlobalId int64 `json:"globalId"`
 	State *ArtifactState `json:"state,omitempty"`
 	// The ID of a single artifact.
 	Id string `json:"id"`
-	// 
-	Labels []string `json:"labels,omitempty"`
+	Labels *[]string `json:"labels,omitempty"`
 	// User-defined name-value pairs. Name and value must be strings.
 	Properties *map[string]string `json:"properties,omitempty"`
 	// An ID of a single artifact group.
 	GroupId *string `json:"groupId,omitempty"`
-	// 
 	ContentId int64 `json:"contentId"`
 }
 
@@ -75,8 +72,8 @@ func (o *VersionMetaData) GetVersion() string {
 // GetVersionOk returns a tuple with the Version field value
 // and a boolean to check if the value has been set.
 func (o *VersionMetaData) GetVersionOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Version, true
 }
@@ -88,7 +85,7 @@ func (o *VersionMetaData) SetVersion(v string) {
 
 // GetName returns the Name field value if set, zero value otherwise.
 func (o *VersionMetaData) GetName() string {
-	if o == nil || isNil(o.Name) {
+	if o == nil || o.Name == nil {
 		var ret string
 		return ret
 	}
@@ -98,15 +95,15 @@ func (o *VersionMetaData) GetName() string {
 // GetNameOk returns a tuple with the Name field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *VersionMetaData) GetNameOk() (*string, bool) {
-	if o == nil || isNil(o.Name) {
-    return nil, false
+	if o == nil || o.Name == nil {
+		return nil, false
 	}
 	return o.Name, true
 }
 
 // HasName returns a boolean if a field has been set.
 func (o *VersionMetaData) HasName() bool {
-	if o != nil && !isNil(o.Name) {
+	if o != nil && o.Name != nil {
 		return true
 	}
 
@@ -120,7 +117,7 @@ func (o *VersionMetaData) SetName(v string) {
 
 // GetDescription returns the Description field value if set, zero value otherwise.
 func (o *VersionMetaData) GetDescription() string {
-	if o == nil || isNil(o.Description) {
+	if o == nil || o.Description == nil {
 		var ret string
 		return ret
 	}
@@ -130,15 +127,15 @@ func (o *VersionMetaData) GetDescription() string {
 // GetDescriptionOk returns a tuple with the Description field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *VersionMetaData) GetDescriptionOk() (*string, bool) {
-	if o == nil || isNil(o.Description) {
-    return nil, false
+	if o == nil || o.Description == nil {
+		return nil, false
 	}
 	return o.Description, true
 }
 
 // HasDescription returns a boolean if a field has been set.
 func (o *VersionMetaData) HasDescription() bool {
-	if o != nil && !isNil(o.Description) {
+	if o != nil && o.Description != nil {
 		return true
 	}
 
@@ -163,8 +160,8 @@ func (o *VersionMetaData) GetCreatedBy() string {
 // GetCreatedByOk returns a tuple with the CreatedBy field value
 // and a boolean to check if the value has been set.
 func (o *VersionMetaData) GetCreatedByOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.CreatedBy, true
 }
@@ -187,8 +184,8 @@ func (o *VersionMetaData) GetCreatedOn() string {
 // GetCreatedOnOk returns a tuple with the CreatedOn field value
 // and a boolean to check if the value has been set.
 func (o *VersionMetaData) GetCreatedOnOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.CreatedOn, true
 }
@@ -211,8 +208,8 @@ func (o *VersionMetaData) GetType() ArtifactType {
 // GetTypeOk returns a tuple with the Type field value
 // and a boolean to check if the value has been set.
 func (o *VersionMetaData) GetTypeOk() (*ArtifactType, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Type, true
 }
@@ -235,8 +232,8 @@ func (o *VersionMetaData) GetGlobalId() int64 {
 // GetGlobalIdOk returns a tuple with the GlobalId field value
 // and a boolean to check if the value has been set.
 func (o *VersionMetaData) GetGlobalIdOk() (*int64, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.GlobalId, true
 }
@@ -248,7 +245,7 @@ func (o *VersionMetaData) SetGlobalId(v int64) {
 
 // GetState returns the State field value if set, zero value otherwise.
 func (o *VersionMetaData) GetState() ArtifactState {
-	if o == nil || isNil(o.State) {
+	if o == nil || o.State == nil {
 		var ret ArtifactState
 		return ret
 	}
@@ -258,15 +255,15 @@ func (o *VersionMetaData) GetState() ArtifactState {
 // GetStateOk returns a tuple with the State field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *VersionMetaData) GetStateOk() (*ArtifactState, bool) {
-	if o == nil || isNil(o.State) {
-    return nil, false
+	if o == nil || o.State == nil {
+		return nil, false
 	}
 	return o.State, true
 }
 
 // HasState returns a boolean if a field has been set.
 func (o *VersionMetaData) HasState() bool {
-	if o != nil && !isNil(o.State) {
+	if o != nil && o.State != nil {
 		return true
 	}
 
@@ -291,8 +288,8 @@ func (o *VersionMetaData) GetId() string {
 // GetIdOk returns a tuple with the Id field value
 // and a boolean to check if the value has been set.
 func (o *VersionMetaData) GetIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Id, true
 }
@@ -304,25 +301,25 @@ func (o *VersionMetaData) SetId(v string) {
 
 // GetLabels returns the Labels field value if set, zero value otherwise.
 func (o *VersionMetaData) GetLabels() []string {
-	if o == nil || isNil(o.Labels) {
+	if o == nil || o.Labels == nil {
 		var ret []string
 		return ret
 	}
-	return o.Labels
+	return *o.Labels
 }
 
 // GetLabelsOk returns a tuple with the Labels field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *VersionMetaData) GetLabelsOk() ([]string, bool) {
-	if o == nil || isNil(o.Labels) {
-    return nil, false
+func (o *VersionMetaData) GetLabelsOk() (*[]string, bool) {
+	if o == nil || o.Labels == nil {
+		return nil, false
 	}
 	return o.Labels, true
 }
 
 // HasLabels returns a boolean if a field has been set.
 func (o *VersionMetaData) HasLabels() bool {
-	if o != nil && !isNil(o.Labels) {
+	if o != nil && o.Labels != nil {
 		return true
 	}
 
@@ -331,12 +328,12 @@ func (o *VersionMetaData) HasLabels() bool {
 
 // SetLabels gets a reference to the given []string and assigns it to the Labels field.
 func (o *VersionMetaData) SetLabels(v []string) {
-	o.Labels = v
+	o.Labels = &v
 }
 
 // GetProperties returns the Properties field value if set, zero value otherwise.
 func (o *VersionMetaData) GetProperties() map[string]string {
-	if o == nil || isNil(o.Properties) {
+	if o == nil || o.Properties == nil {
 		var ret map[string]string
 		return ret
 	}
@@ -346,15 +343,15 @@ func (o *VersionMetaData) GetProperties() map[string]string {
 // GetPropertiesOk returns a tuple with the Properties field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *VersionMetaData) GetPropertiesOk() (*map[string]string, bool) {
-	if o == nil || isNil(o.Properties) {
-    return nil, false
+	if o == nil || o.Properties == nil {
+		return nil, false
 	}
 	return o.Properties, true
 }
 
 // HasProperties returns a boolean if a field has been set.
 func (o *VersionMetaData) HasProperties() bool {
-	if o != nil && !isNil(o.Properties) {
+	if o != nil && o.Properties != nil {
 		return true
 	}
 
@@ -368,7 +365,7 @@ func (o *VersionMetaData) SetProperties(v map[string]string) {
 
 // GetGroupId returns the GroupId field value if set, zero value otherwise.
 func (o *VersionMetaData) GetGroupId() string {
-	if o == nil || isNil(o.GroupId) {
+	if o == nil || o.GroupId == nil {
 		var ret string
 		return ret
 	}
@@ -378,15 +375,15 @@ func (o *VersionMetaData) GetGroupId() string {
 // GetGroupIdOk returns a tuple with the GroupId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *VersionMetaData) GetGroupIdOk() (*string, bool) {
-	if o == nil || isNil(o.GroupId) {
-    return nil, false
+	if o == nil || o.GroupId == nil {
+		return nil, false
 	}
 	return o.GroupId, true
 }
 
 // HasGroupId returns a boolean if a field has been set.
 func (o *VersionMetaData) HasGroupId() bool {
-	if o != nil && !isNil(o.GroupId) {
+	if o != nil && o.GroupId != nil {
 		return true
 	}
 
@@ -411,8 +408,8 @@ func (o *VersionMetaData) GetContentId() int64 {
 // GetContentIdOk returns a tuple with the ContentId field value
 // and a boolean to check if the value has been set.
 func (o *VersionMetaData) GetContentIdOk() (*int64, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.ContentId, true
 }
@@ -427,10 +424,10 @@ func (o VersionMetaData) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["version"] = o.Version
 	}
-	if !isNil(o.Name) {
+	if o.Name != nil {
 		toSerialize["name"] = o.Name
 	}
-	if !isNil(o.Description) {
+	if o.Description != nil {
 		toSerialize["description"] = o.Description
 	}
 	if true {
@@ -445,19 +442,19 @@ func (o VersionMetaData) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["globalId"] = o.GlobalId
 	}
-	if !isNil(o.State) {
+	if o.State != nil {
 		toSerialize["state"] = o.State
 	}
 	if true {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.Labels) {
+	if o.Labels != nil {
 		toSerialize["labels"] = o.Labels
 	}
-	if !isNil(o.Properties) {
+	if o.Properties != nil {
 		toSerialize["properties"] = o.Properties
 	}
-	if !isNil(o.GroupId) {
+	if o.GroupId != nil {
 		toSerialize["groupId"] = o.GroupId
 	}
 	if true {
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/model_version_search_results.go b/app-services-sdk-go/registryinstance/apiv1internal/client/model_version_search_results.go
index f9d86d8a..25466733 100644
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/model_version_search_results.go
+++ b/app-services-sdk-go/registryinstance/apiv1internal/client/model_version_search_results.go
@@ -1,11 +1,11 @@
 /*
-Service Registry API
-
-Service Registry Instance API  NOTE: This API cannot be called directly from the portal.
-
-API version: 2.2.5.Final
-Contact: apicurio@lists.jboss.org
-*/
+ * Apicurio Registry API [v2]
+ *
+ * Apicurio Registry is a datastore for standard event schemas and API designs. Apicurio Registry enables developers to manage and share the structure of their data using a REST interface. For example, client applications can dynamically push or pull the latest updates to or from the registry without needing to redeploy. Apicurio Registry also enables developers to create rules that govern how registry content can evolve over time. For example, this includes rules for content validation and version compatibility.  The Apicurio Registry REST API enables client applications to manage the artifacts in the registry. This API provides create, read, update, and delete operations for schema and API artifacts, rules, versions, and metadata.   The supported artifact types include: - Apache Avro schema - AsyncAPI specification - Google protocol buffers - GraphQL schema - JSON Schema - Kafka Connect schema - OpenAPI specification - Web Services Description Language - XML Schema Definition   **Important**: The Apicurio Registry REST API is available from `https://MY-REGISTRY-URL/apis/registry/v2` by default. Therefore you must prefix all API operation paths with `../apis/registry/v2` in this case. For example: `../apis/registry/v2/ids/globalIds/{globalId}`. 
+ *
+ * API version: 2.2.5.Final
+ * Contact: apicurio@lists.jboss.org
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -55,8 +55,8 @@ func (o *VersionSearchResults) GetCount() int32 {
 // GetCountOk returns a tuple with the Count field value
 // and a boolean to check if the value has been set.
 func (o *VersionSearchResults) GetCountOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Count, true
 }
@@ -78,11 +78,11 @@ func (o *VersionSearchResults) GetVersions() []SearchedVersion {
 
 // GetVersionsOk returns a tuple with the Versions field value
 // and a boolean to check if the value has been set.
-func (o *VersionSearchResults) GetVersionsOk() ([]SearchedVersion, bool) {
-	if o == nil {
-    return nil, false
+func (o *VersionSearchResults) GetVersionsOk() (*[]SearchedVersion, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Versions, true
+	return &o.Versions, true
 }
 
 // SetVersions sets field value
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/response.go b/app-services-sdk-go/registryinstance/apiv1internal/client/response.go
index 5ecb7cce..356bd360 100644
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/response.go
+++ b/app-services-sdk-go/registryinstance/apiv1internal/client/response.go
@@ -1,11 +1,11 @@
 /*
-Service Registry API
-
-Service Registry Instance API  NOTE: This API cannot be called directly from the portal.
-
-API version: 2.2.5.Final
-Contact: apicurio@lists.jboss.org
-*/
+ * Apicurio Registry API [v2]
+ *
+ * Apicurio Registry is a datastore for standard event schemas and API designs. Apicurio Registry enables developers to manage and share the structure of their data using a REST interface. For example, client applications can dynamically push or pull the latest updates to or from the registry without needing to redeploy. Apicurio Registry also enables developers to create rules that govern how registry content can evolve over time. For example, this includes rules for content validation and version compatibility.  The Apicurio Registry REST API enables client applications to manage the artifacts in the registry. This API provides create, read, update, and delete operations for schema and API artifacts, rules, versions, and metadata.   The supported artifact types include: - Apache Avro schema - AsyncAPI specification - Google protocol buffers - GraphQL schema - JSON Schema - Kafka Connect schema - OpenAPI specification - Web Services Description Language - XML Schema Definition   **Important**: The Apicurio Registry REST API is available from `https://MY-REGISTRY-URL/apis/registry/v2` by default. Therefore you must prefix all API operation paths with `../apis/registry/v2` in this case. For example: `../apis/registry/v2/ids/globalIds/{globalId}`. 
+ *
+ * API version: 2.2.5.Final
+ * Contact: apicurio@lists.jboss.org
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/test/api_admin_test.go b/app-services-sdk-go/registryinstance/apiv1internal/client/test/api_admin_test.go
deleted file mode 100644
index 06563d79..00000000
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/test/api_admin_test.go
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
-Service Registry API
-
-Testing AdminApiService
-
-*/
-
-// Code generated by OpenAPI Generator (https://openapi-generator.tech);
-
-package registryinstanceclient
-
-import (
-    "context"
-    "github.com/stretchr/testify/assert"
-    "github.com/stretchr/testify/require"
-    "testing"
-    openapiclient "./openapi"
-)
-
-func Test_registryinstanceclient_AdminApiService(t *testing.T) {
-
-    configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-
-    t.Run("Test AdminApiService CreateRoleMapping", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.AdminApi.CreateRoleMapping(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test AdminApiService DeleteRoleMapping", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var principalId string
-
-        resp, httpRes, err := apiClient.AdminApi.DeleteRoleMapping(context.Background(), principalId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test AdminApiService ExportData", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.AdminApi.ExportData(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test AdminApiService GetConfigProperty", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var propertyName string
-
-        resp, httpRes, err := apiClient.AdminApi.GetConfigProperty(context.Background(), propertyName).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test AdminApiService GetLogConfiguration", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var logger string
-
-        resp, httpRes, err := apiClient.AdminApi.GetLogConfiguration(context.Background(), logger).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test AdminApiService GetRoleMapping", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var principalId string
-
-        resp, httpRes, err := apiClient.AdminApi.GetRoleMapping(context.Background(), principalId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test AdminApiService ImportData", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.AdminApi.ImportData(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test AdminApiService ListConfigProperties", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.AdminApi.ListConfigProperties(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test AdminApiService ListLogConfigurations", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.AdminApi.ListLogConfigurations(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test AdminApiService ListRoleMappings", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.AdminApi.ListRoleMappings(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test AdminApiService RemoveLogConfiguration", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var logger string
-
-        resp, httpRes, err := apiClient.AdminApi.RemoveLogConfiguration(context.Background(), logger).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test AdminApiService ResetConfigProperty", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var propertyName string
-
-        resp, httpRes, err := apiClient.AdminApi.ResetConfigProperty(context.Background(), propertyName).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test AdminApiService SetLogConfiguration", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var logger string
-
-        resp, httpRes, err := apiClient.AdminApi.SetLogConfiguration(context.Background(), logger).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test AdminApiService UpdateConfigProperty", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var propertyName string
-
-        resp, httpRes, err := apiClient.AdminApi.UpdateConfigProperty(context.Background(), propertyName).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test AdminApiService UpdateRoleMapping", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var principalId string
-
-        resp, httpRes, err := apiClient.AdminApi.UpdateRoleMapping(context.Background(), principalId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-}
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/test/api_artifact_rules_test.go b/app-services-sdk-go/registryinstance/apiv1internal/client/test/api_artifact_rules_test.go
deleted file mode 100644
index d24f440b..00000000
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/test/api_artifact_rules_test.go
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
-Service Registry API
-
-Testing ArtifactRulesApiService
-
-*/
-
-// Code generated by OpenAPI Generator (https://openapi-generator.tech);
-
-package registryinstanceclient
-
-import (
-    "context"
-    "github.com/stretchr/testify/assert"
-    "github.com/stretchr/testify/require"
-    "testing"
-    openapiclient "./openapi"
-)
-
-func Test_registryinstanceclient_ArtifactRulesApiService(t *testing.T) {
-
-    configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-
-    t.Run("Test ArtifactRulesApiService CreateArtifactRule", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var groupId string
-        var artifactId string
-
-        resp, httpRes, err := apiClient.ArtifactRulesApi.CreateArtifactRule(context.Background(), groupId, artifactId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test ArtifactRulesApiService DeleteArtifactRule", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var groupId string
-        var artifactId string
-        var rule string
-
-        resp, httpRes, err := apiClient.ArtifactRulesApi.DeleteArtifactRule(context.Background(), groupId, artifactId, rule).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test ArtifactRulesApiService DeleteArtifactRules", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var groupId string
-        var artifactId string
-
-        resp, httpRes, err := apiClient.ArtifactRulesApi.DeleteArtifactRules(context.Background(), groupId, artifactId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test ArtifactRulesApiService GetArtifactRuleConfig", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var groupId string
-        var artifactId string
-        var rule string
-
-        resp, httpRes, err := apiClient.ArtifactRulesApi.GetArtifactRuleConfig(context.Background(), groupId, artifactId, rule).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test ArtifactRulesApiService ListArtifactRules", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var groupId string
-        var artifactId string
-
-        resp, httpRes, err := apiClient.ArtifactRulesApi.ListArtifactRules(context.Background(), groupId, artifactId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test ArtifactRulesApiService TestUpdateArtifact", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var groupId string
-        var artifactId string
-
-        resp, httpRes, err := apiClient.ArtifactRulesApi.TestUpdateArtifact(context.Background(), groupId, artifactId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test ArtifactRulesApiService UpdateArtifactRuleConfig", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var groupId string
-        var artifactId string
-        var rule string
-
-        resp, httpRes, err := apiClient.ArtifactRulesApi.UpdateArtifactRuleConfig(context.Background(), groupId, artifactId, rule).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-}
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/test/api_artifacts_test.go b/app-services-sdk-go/registryinstance/apiv1internal/client/test/api_artifacts_test.go
deleted file mode 100644
index 7e0e0345..00000000
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/test/api_artifacts_test.go
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
-Service Registry API
-
-Testing ArtifactsApiService
-
-*/
-
-// Code generated by OpenAPI Generator (https://openapi-generator.tech);
-
-package registryinstanceclient
-
-import (
-    "context"
-    "github.com/stretchr/testify/assert"
-    "github.com/stretchr/testify/require"
-    "testing"
-    openapiclient "./openapi"
-)
-
-func Test_registryinstanceclient_ArtifactsApiService(t *testing.T) {
-
-    configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-
-    t.Run("Test ArtifactsApiService CreateArtifact", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var groupId string
-
-        resp, httpRes, err := apiClient.ArtifactsApi.CreateArtifact(context.Background(), groupId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test ArtifactsApiService DeleteArtifact", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var groupId string
-        var artifactId string
-
-        resp, httpRes, err := apiClient.ArtifactsApi.DeleteArtifact(context.Background(), groupId, artifactId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test ArtifactsApiService DeleteArtifactsInGroup", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var groupId string
-
-        resp, httpRes, err := apiClient.ArtifactsApi.DeleteArtifactsInGroup(context.Background(), groupId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test ArtifactsApiService GetContentByGlobalId", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var globalId int64
-
-        resp, httpRes, err := apiClient.ArtifactsApi.GetContentByGlobalId(context.Background(), globalId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test ArtifactsApiService GetContentByHash", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var contentHash string
-
-        resp, httpRes, err := apiClient.ArtifactsApi.GetContentByHash(context.Background(), contentHash).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test ArtifactsApiService GetContentById", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var contentId int64
-
-        resp, httpRes, err := apiClient.ArtifactsApi.GetContentById(context.Background(), contentId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test ArtifactsApiService GetLatestArtifact", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var groupId string
-        var artifactId string
-
-        resp, httpRes, err := apiClient.ArtifactsApi.GetLatestArtifact(context.Background(), groupId, artifactId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test ArtifactsApiService ListArtifactsInGroup", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var groupId string
-
-        resp, httpRes, err := apiClient.ArtifactsApi.ListArtifactsInGroup(context.Background(), groupId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test ArtifactsApiService ReferencesByContentHash", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var contentHash string
-
-        resp, httpRes, err := apiClient.ArtifactsApi.ReferencesByContentHash(context.Background(), contentHash).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test ArtifactsApiService ReferencesByContentId", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var contentId int64
-
-        resp, httpRes, err := apiClient.ArtifactsApi.ReferencesByContentId(context.Background(), contentId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test ArtifactsApiService ReferencesByGlobalId", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var globalId int64
-
-        resp, httpRes, err := apiClient.ArtifactsApi.ReferencesByGlobalId(context.Background(), globalId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test ArtifactsApiService UpdateArtifact", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var groupId string
-        var artifactId string
-
-        resp, httpRes, err := apiClient.ArtifactsApi.UpdateArtifact(context.Background(), groupId, artifactId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test ArtifactsApiService UpdateArtifactState", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var groupId string
-        var artifactId string
-
-        resp, httpRes, err := apiClient.ArtifactsApi.UpdateArtifactState(context.Background(), groupId, artifactId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-}
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/test/api_global_rules_test.go b/app-services-sdk-go/registryinstance/apiv1internal/client/test/api_global_rules_test.go
deleted file mode 100644
index ac74f527..00000000
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/test/api_global_rules_test.go
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-Service Registry API
-
-Testing GlobalRulesApiService
-
-*/
-
-// Code generated by OpenAPI Generator (https://openapi-generator.tech);
-
-package registryinstanceclient
-
-import (
-    "context"
-    "github.com/stretchr/testify/assert"
-    "github.com/stretchr/testify/require"
-    "testing"
-    openapiclient "./openapi"
-)
-
-func Test_registryinstanceclient_GlobalRulesApiService(t *testing.T) {
-
-    configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-
-    t.Run("Test GlobalRulesApiService CreateGlobalRule", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.GlobalRulesApi.CreateGlobalRule(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test GlobalRulesApiService DeleteAllGlobalRules", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.GlobalRulesApi.DeleteAllGlobalRules(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test GlobalRulesApiService DeleteGlobalRule", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var rule RuleType
-
-        resp, httpRes, err := apiClient.GlobalRulesApi.DeleteGlobalRule(context.Background(), rule).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test GlobalRulesApiService GetGlobalRuleConfig", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var rule RuleType
-
-        resp, httpRes, err := apiClient.GlobalRulesApi.GetGlobalRuleConfig(context.Background(), rule).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test GlobalRulesApiService ListGlobalRules", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.GlobalRulesApi.ListGlobalRules(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test GlobalRulesApiService UpdateGlobalRuleConfig", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var rule RuleType
-
-        resp, httpRes, err := apiClient.GlobalRulesApi.UpdateGlobalRuleConfig(context.Background(), rule).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-}
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/test/api_metadata_test.go b/app-services-sdk-go/registryinstance/apiv1internal/client/test/api_metadata_test.go
deleted file mode 100644
index 92295b58..00000000
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/test/api_metadata_test.go
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
-Service Registry API
-
-Testing MetadataApiService
-
-*/
-
-// Code generated by OpenAPI Generator (https://openapi-generator.tech);
-
-package registryinstanceclient
-
-import (
-    "context"
-    "github.com/stretchr/testify/assert"
-    "github.com/stretchr/testify/require"
-    "testing"
-    openapiclient "./openapi"
-)
-
-func Test_registryinstanceclient_MetadataApiService(t *testing.T) {
-
-    configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-
-    t.Run("Test MetadataApiService DeleteArtifactVersionMetaData", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var groupId string
-        var artifactId string
-        var version string
-
-        resp, httpRes, err := apiClient.MetadataApi.DeleteArtifactVersionMetaData(context.Background(), groupId, artifactId, version).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test MetadataApiService GetArtifactMetaData", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var groupId string
-        var artifactId string
-
-        resp, httpRes, err := apiClient.MetadataApi.GetArtifactMetaData(context.Background(), groupId, artifactId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test MetadataApiService GetArtifactOwner", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var groupId string
-        var artifactId string
-
-        resp, httpRes, err := apiClient.MetadataApi.GetArtifactOwner(context.Background(), groupId, artifactId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test MetadataApiService GetArtifactVersionMetaData", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var groupId string
-        var artifactId string
-        var version string
-
-        resp, httpRes, err := apiClient.MetadataApi.GetArtifactVersionMetaData(context.Background(), groupId, artifactId, version).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test MetadataApiService GetArtifactVersionMetaDataByContent", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var groupId string
-        var artifactId string
-
-        resp, httpRes, err := apiClient.MetadataApi.GetArtifactVersionMetaDataByContent(context.Background(), groupId, artifactId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test MetadataApiService UpdateArtifactMetaData", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var groupId string
-        var artifactId string
-
-        resp, httpRes, err := apiClient.MetadataApi.UpdateArtifactMetaData(context.Background(), groupId, artifactId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test MetadataApiService UpdateArtifactOwner", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var groupId string
-        var artifactId string
-
-        resp, httpRes, err := apiClient.MetadataApi.UpdateArtifactOwner(context.Background(), groupId, artifactId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test MetadataApiService UpdateArtifactVersionMetaData", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var groupId string
-        var artifactId string
-        var version string
-
-        resp, httpRes, err := apiClient.MetadataApi.UpdateArtifactVersionMetaData(context.Background(), groupId, artifactId, version).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-}
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/test/api_search_test.go b/app-services-sdk-go/registryinstance/apiv1internal/client/test/api_search_test.go
deleted file mode 100644
index 673c81dd..00000000
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/test/api_search_test.go
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-Service Registry API
-
-Testing SearchApiService
-
-*/
-
-// Code generated by OpenAPI Generator (https://openapi-generator.tech);
-
-package registryinstanceclient
-
-import (
-    "context"
-    "github.com/stretchr/testify/assert"
-    "github.com/stretchr/testify/require"
-    "testing"
-    openapiclient "./openapi"
-)
-
-func Test_registryinstanceclient_SearchApiService(t *testing.T) {
-
-    configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-
-    t.Run("Test SearchApiService SearchArtifacts", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.SearchApi.SearchArtifacts(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test SearchApiService SearchArtifactsByContent", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.SearchApi.SearchArtifactsByContent(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-}
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/test/api_system_test.go b/app-services-sdk-go/registryinstance/apiv1internal/client/test/api_system_test.go
deleted file mode 100644
index bd827e86..00000000
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/test/api_system_test.go
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-Service Registry API
-
-Testing SystemApiService
-
-*/
-
-// Code generated by OpenAPI Generator (https://openapi-generator.tech);
-
-package registryinstanceclient
-
-import (
-    "context"
-    "github.com/stretchr/testify/assert"
-    "github.com/stretchr/testify/require"
-    "testing"
-    openapiclient "./openapi"
-)
-
-func Test_registryinstanceclient_SystemApiService(t *testing.T) {
-
-    configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-
-    t.Run("Test SystemApiService GetResourceLimits", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.SystemApi.GetResourceLimits(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test SystemApiService GetSystemInfo", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.SystemApi.GetSystemInfo(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-}
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/test/api_users_test.go b/app-services-sdk-go/registryinstance/apiv1internal/client/test/api_users_test.go
deleted file mode 100644
index 8ce7887c..00000000
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/test/api_users_test.go
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-Service Registry API
-
-Testing UsersApiService
-
-*/
-
-// Code generated by OpenAPI Generator (https://openapi-generator.tech);
-
-package registryinstanceclient
-
-import (
-    "context"
-    "github.com/stretchr/testify/assert"
-    "github.com/stretchr/testify/require"
-    "testing"
-    openapiclient "./openapi"
-)
-
-func Test_registryinstanceclient_UsersApiService(t *testing.T) {
-
-    configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-
-    t.Run("Test UsersApiService GetCurrentUserInfo", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.UsersApi.GetCurrentUserInfo(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-}
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/test/api_versions_test.go b/app-services-sdk-go/registryinstance/apiv1internal/client/test/api_versions_test.go
deleted file mode 100644
index 28ccdfa6..00000000
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/test/api_versions_test.go
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-Service Registry API
-
-Testing VersionsApiService
-
-*/
-
-// Code generated by OpenAPI Generator (https://openapi-generator.tech);
-
-package registryinstanceclient
-
-import (
-    "context"
-    "github.com/stretchr/testify/assert"
-    "github.com/stretchr/testify/require"
-    "testing"
-    openapiclient "./openapi"
-)
-
-func Test_registryinstanceclient_VersionsApiService(t *testing.T) {
-
-    configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-
-    t.Run("Test VersionsApiService CreateArtifactVersion", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var groupId string
-        var artifactId string
-
-        resp, httpRes, err := apiClient.VersionsApi.CreateArtifactVersion(context.Background(), groupId, artifactId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test VersionsApiService GetArtifactVersion", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var groupId string
-        var artifactId string
-        var version string
-
-        resp, httpRes, err := apiClient.VersionsApi.GetArtifactVersion(context.Background(), groupId, artifactId, version).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test VersionsApiService GetArtifactVersionReferences", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var groupId string
-        var artifactId string
-        var version string
-
-        resp, httpRes, err := apiClient.VersionsApi.GetArtifactVersionReferences(context.Background(), groupId, artifactId, version).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test VersionsApiService ListArtifactVersions", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var groupId string
-        var artifactId string
-
-        resp, httpRes, err := apiClient.VersionsApi.ListArtifactVersions(context.Background(), groupId, artifactId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test VersionsApiService UpdateArtifactVersionState", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var groupId string
-        var artifactId string
-        var version string
-
-        resp, httpRes, err := apiClient.VersionsApi.UpdateArtifactVersionState(context.Background(), groupId, artifactId, version).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-}
diff --git a/app-services-sdk-go/registryinstance/apiv1internal/client/utils.go b/app-services-sdk-go/registryinstance/apiv1internal/client/utils.go
index c132df7a..e5b62b2e 100644
--- a/app-services-sdk-go/registryinstance/apiv1internal/client/utils.go
+++ b/app-services-sdk-go/registryinstance/apiv1internal/client/utils.go
@@ -1,11 +1,11 @@
 /*
-Service Registry API
-
-Service Registry Instance API  NOTE: This API cannot be called directly from the portal.
-
-API version: 2.2.5.Final
-Contact: apicurio@lists.jboss.org
-*/
+ * Apicurio Registry API [v2]
+ *
+ * Apicurio Registry is a datastore for standard event schemas and API designs. Apicurio Registry enables developers to manage and share the structure of their data using a REST interface. For example, client applications can dynamically push or pull the latest updates to or from the registry without needing to redeploy. Apicurio Registry also enables developers to create rules that govern how registry content can evolve over time. For example, this includes rules for content validation and version compatibility.  The Apicurio Registry REST API enables client applications to manage the artifacts in the registry. This API provides create, read, update, and delete operations for schema and API artifacts, rules, versions, and metadata.   The supported artifact types include: - Apache Avro schema - AsyncAPI specification - Google protocol buffers - GraphQL schema - JSON Schema - Kafka Connect schema - OpenAPI specification - Web Services Description Language - XML Schema Definition   **Important**: The Apicurio Registry REST API is available from `https://MY-REGISTRY-URL/apis/registry/v2` by default. Therefore you must prefix all API operation paths with `../apis/registry/v2` in this case. For example: `../apis/registry/v2/ids/globalIds/{globalId}`. 
+ *
+ * API version: 2.2.5.Final
+ * Contact: apicurio@lists.jboss.org
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -13,7 +13,6 @@ package registryinstanceclient
 
 import (
 	"encoding/json"
-    "reflect"
 	"time"
 )
 
@@ -328,17 +327,3 @@ func (v *NullableTime) UnmarshalJSON(src []byte) error {
 	v.isSet = true
 	return json.Unmarshal(src, &v.value)
 }
-
-// isNil checks if an input is nil
-func isNil(i interface{}) bool {
-    if i == nil {
-        return true
-    }
-    switch reflect.TypeOf(i).Kind() {
-    case reflect.Chan, reflect.Func, reflect.Map, reflect.Ptr, reflect.UnsafePointer, reflect.Interface, reflect.Slice:
-        return reflect.ValueOf(i).IsNil()
-    case reflect.Array:
-        return reflect.ValueOf(i).IsZero()
-    }
-    return false
-}
\ No newline at end of file
diff --git a/app-services-sdk-go/registryinstance/go.mod b/app-services-sdk-go/registryinstance/go.mod
index b5ba754d..7a4395e7 100644
--- a/app-services-sdk-go/registryinstance/go.mod
+++ b/app-services-sdk-go/registryinstance/go.mod
@@ -1,8 +1,8 @@
-module github.com/redhat-developer/app-services-sdk-go/registryinstance
+module github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go/registryinstance
 
 go 1.15
 
 require (
-	github.com/redhat-developer/app-services-sdk-go v0.10.0
+	github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go v0.1.0
 	golang.org/x/oauth2 v0.0.0-20220630143837-2104d58473e0
 )
diff --git a/app-services-sdk-go/registrymgmt/apiv1/api_client.go b/app-services-sdk-go/registrymgmt/apiv1/api_client.go
index 0c33850e..d14a6704 100644
--- a/app-services-sdk-go/registrymgmt/apiv1/api_client.go
+++ b/app-services-sdk-go/registrymgmt/apiv1/api_client.go
@@ -1,9 +1,9 @@
 package registrymgmt
 
 import (
-	"github.com/redhat-developer/app-services-sdk-go/core"
+	"github.com/jackdelahunt/app-services-sdk-core/app-services-sdk-go/core"
 
-	apiv1 "github.com/redhat-developer/app-services-sdk-go/registrymgmt/apiv1/client"
+	apiv1 "github.com/jackdelahunt/app-services-sdk-core/app-services-sdk-go/registrymgmt/apiv1/client"
 )
 
 // Config defines the available configuration options
diff --git a/app-services-sdk-go/registrymgmt/apiv1/client/.openapi-generator/FILES b/app-services-sdk-go/registrymgmt/apiv1/client/.openapi-generator/FILES
index 125172c9..63331e85 100644
--- a/app-services-sdk-go/registrymgmt/apiv1/client/.openapi-generator/FILES
+++ b/app-services-sdk-go/registrymgmt/apiv1/client/.openapi-generator/FILES
@@ -20,8 +20,6 @@ docs/RegistryListAllOf.md
 docs/RegistryStatusValue.md
 docs/RootTypeForRegistry.md
 docs/ServiceStatus.md
-go.mod
-go.sum
 model_error.go
 model_error_list.go
 model_error_list_all_of.go
@@ -36,7 +34,4 @@ model_registry_status_value.go
 model_root_type_for_registry.go
 model_service_status.go
 response.go
-test/api_default_test.go
-test/api_errors_test.go
-test/api_registries_test.go
 utils.go
diff --git a/app-services-sdk-go/registrymgmt/apiv1/client/.openapi-generator/VERSION b/app-services-sdk-go/registrymgmt/apiv1/client/.openapi-generator/VERSION
index 0df17dd0..7cbea073 100644
--- a/app-services-sdk-go/registrymgmt/apiv1/client/.openapi-generator/VERSION
+++ b/app-services-sdk-go/registrymgmt/apiv1/client/.openapi-generator/VERSION
@@ -1 +1 @@
-6.2.1
\ No newline at end of file
+5.2.0
\ No newline at end of file
diff --git a/app-services-sdk-go/registrymgmt/apiv1/client/api/openapi.yaml b/app-services-sdk-go/registrymgmt/apiv1/client/api/openapi.yaml
index fdae61be..8161fab0 100644
--- a/app-services-sdk-go/registrymgmt/apiv1/client/api/openapi.yaml
+++ b/app-services-sdk-go/registrymgmt/apiv1/client/api/openapi.yaml
@@ -4,9 +4,9 @@ info:
     email: rhosak-eval-support@redhat.com
     name: Red Hat Hybrid Cloud Console
     url: https://console.redhat.com/application-services/service-registry/
-  description: "Service Registry Management API is a REST API for managing Service\
-    \ Registry instances. Service Registry is a datastore for event schemas and API\
-    \ designs, which is based on the open source Apicurio Registry project."
+  description: Service Registry Management API is a REST API for managing Service
+    Registry instances. Service Registry is a datastore for event schemas and API
+    designs, which is based on the open source Apicurio Registry project.
   license:
     name: Apache 2.0
     url: https://www.apache.org/licenses/LICENSE-2.0
@@ -22,10 +22,8 @@ servers:
 - description: current domain
   url: /
 tags:
-- description: ""
-  name: Errors
-- description: ""
-  name: Registries
+- name: Errors
+- name: Registries
 paths:
   /api/serviceregistry_mgmt/v1/registries:
     description: Manage the list of all Registry instances
@@ -187,10 +185,10 @@ paths:
       - Registries
   /api/serviceregistry_mgmt/v1/registries/{id}:
     delete:
-      description: "Deletes an existing `Registry` instance and all of the data that\
-        \ it stores. Important: Users should export the registry data before deleting\
-        \ the instance, e.g., using the Service Registry web console, core REST API,\
-        \ or `rhoas` CLI."
+      description: 'Deletes an existing `Registry` instance and all of the data that
+        it stores. Important: Users should export the registry data before deleting
+        the instance, e.g., using the Service Registry web console, core REST API,
+        or `rhoas` CLI.'
       operationId: deleteRegistry
       parameters:
       - description: A unique identifier for a `Registry` instance.
@@ -382,8 +380,8 @@ paths:
       tags:
       - Errors
   /api/serviceregistry_mgmt/v1/status:
-    description: "Retrieves the status of resources e.g., whether we have reached\
-      \ maximum service capacity"
+    description: Retrieves the status of resources e.g., whether we have reached maximum
+      service capacity
     get:
       description: Get the service status
       operationId: getServiceStatus
@@ -417,7 +415,7 @@ components:
         kind: Error
         href: /api/serviceregistry_mgmt/v1/errors/11
         code: CLOUD-SERV-API-11
-        reason: "Unable to verify JWT token: Required authorization token not found."
+        reason: 'Unable to verify JWT token: Required authorization token not found.'
         operation_id: 1iY3UhEhwmXBpWPfI2lNekpd4ZD
     "403Example":
       value:
@@ -607,9 +605,9 @@ components:
         max_instances_reached: true
       properties:
         max_instances_reached:
-          description: "Boolean property indicating if the maximum number of total\
-            \ Registry instances have been reached, therefore creation of more instances\
-            \ should not be allowed."
+          description: Boolean property indicating if the maximum number of total
+            Registry instances have been reached, therefore creation of more instances
+            should not be allowed.
           type: boolean
       title: Root type for ServiceStatus
       type: object
@@ -625,7 +623,7 @@ components:
             within a given organization.
           maxLength: 32
           minLength: 1
-          pattern: "[a-z]([a-z0-9\\-]*[a-z0-9])?"
+          pattern: '[a-z]([a-z0-9\-]*[a-z0-9])?'
           type: string
         description:
           description: User-provided description of the new Service Registry instance.
@@ -660,15 +658,24 @@ components:
             $ref: '#/components/schemas/Error'
           type: array
       type: object
-      example: null
     RegistryList_allOf:
-      example: "{\"kind\":\"RegistryList\",\"page\":\"1\",\"size\":\"1\",\"total\"\
-        :\"1\",\"items\":[{\"id\":\"llmNteR4P7waRp5nJIReG\",\"kind\":\"serviceregistry\"\
-        ,\"href\":\"/api/serviceregistry_mgmt/v1/registries/llmNteR4P7waRp5nJIReG\"\
-        ,\"name\":\"sample-registry\",\"status\":\"ready\",\"owner\":\"some_id\",\"\
-        registryUrl\":\"https://somehost:433/t/12345\",\"browserUrl\":\"https://someuihost:443/registries/12345\"\
-        ,\"created_at\":\"2020-01-01T00:00:00Z\",\"updated_at\":\"2022-01-01T00:00:00Z\"\
-        ,\"instance_type\":\"standard\"}]}"
+      example:
+        kind: RegistryList
+        page: "1"
+        size: "1"
+        total: "1"
+        items:
+        - id: llmNteR4P7waRp5nJIReG
+          kind: serviceregistry
+          href: /api/serviceregistry_mgmt/v1/registries/llmNteR4P7waRp5nJIReG
+          name: sample-registry
+          status: ready
+          owner: some_id
+          registryUrl: https://somehost:433/t/12345
+          browserUrl: https://someuihost:443/registries/12345
+          created_at: 2020-01-01T00:00:00Z
+          updated_at: 2022-01-01T00:00:00Z
+          instance_type: standard
       properties:
         items:
           items:
@@ -679,11 +686,17 @@ components:
       type: object
     Root_type_for_Registry:
       description: Service Registry instance in a multi-tenant deployment.
-      example: "{\"id\":\"42\",\"name\":\"my-registry\",\"registryUrl\":\"https://registry.apps.example.com/t/5213600b-afc9-487e-8cc3-339f4248d706\"\
-        ,\"browserUrl\":\"https://registry-ui.apps.example.com/t/5213600b-afc9-487e-8cc3-339f4248d706\"\
-        ,\"status\":\"provisioning\",\"registryDeploymentId\":1,\"owner\":\"ownername\"\
-        ,\"updated_at\":\"2022-01-01T00:00:00Z\",\"created_at\":\"2020-01-01T00:00:00Z\"\
-        ,\"instance_type\":\"standard\"}"
+      example:
+        id: "42"
+        name: my-registry
+        registryUrl: https://registry.apps.example.com/t/5213600b-afc9-487e-8cc3-339f4248d706
+        browserUrl: https://registry-ui.apps.example.com/t/5213600b-afc9-487e-8cc3-339f4248d706
+        status: provisioning
+        registryDeploymentId: 1
+        owner: ownername
+        updated_at: 2022-01-01T00:00:00Z
+        created_at: 2020-01-01T00:00:00Z
+        instance_type: standard
       properties:
         id:
           type: string
@@ -697,8 +710,8 @@ components:
           description: User-defined Registry instance name. Does not have to be unique.
           type: string
         registryDeploymentId:
-          description: "Identifier of a multi-tenant deployment, where this Service\
-            \ Registry instance resides."
+          description: Identifier of a multi-tenant deployment, where this Service
+            Registry instance resides.
           type: integer
         owner:
           description: Registry instance owner.
diff --git a/app-services-sdk-go/registrymgmt/apiv1/client/api_default.go b/app-services-sdk-go/registrymgmt/apiv1/client/api_default.go
index 47daa765..e7d72428 100644
--- a/app-services-sdk-go/registrymgmt/apiv1/client/api_default.go
+++ b/app-services-sdk-go/registrymgmt/apiv1/client/api_default.go
@@ -1,11 +1,11 @@
 /*
-Service Registry Management API
-
-Service Registry Management API is a REST API for managing Service Registry instances. Service Registry is a datastore for event schemas and API designs, which is based on the open source Apicurio Registry project.
-
-API version: 0.0.6
-Contact: rhosak-eval-support@redhat.com
-*/
+ * Service Registry Management API
+ *
+ * Service Registry Management API is a REST API for managing Service Registry instances. Service Registry is a datastore for event schemas and API designs, which is based on the open source Apicurio Registry project.
+ *
+ * API version: 0.0.6
+ * Contact: rhosak-eval-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -13,77 +13,84 @@ package registrymgmtclient
 
 import (
 	"bytes"
-	"context"
-	"io/ioutil"
-	"net/http"
-	"net/url"
+	_context "context"
+	_ioutil "io/ioutil"
+	_nethttp "net/http"
+	_neturl "net/url"
 )
 
+// Linger please
+var (
+	_ _context.Context
+)
 
 type DefaultApi interface {
 
 	/*
-	GetServiceStatus Method for GetServiceStatus
-
-	Get the service status
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiGetServiceStatusRequest
-	*/
-	GetServiceStatus(ctx context.Context) ApiGetServiceStatusRequest
+	 * GetServiceStatus Method for GetServiceStatus
+	 * Get the service status
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiGetServiceStatusRequest
+	 */
+	GetServiceStatus(ctx _context.Context) ApiGetServiceStatusRequest
 
-	// GetServiceStatusExecute executes the request
-	//  @return ServiceStatus
-	GetServiceStatusExecute(r ApiGetServiceStatusRequest) (*ServiceStatus, *http.Response, error)
+	/*
+	 * GetServiceStatusExecute executes the request
+	 * @return ServiceStatus
+	 */
+	GetServiceStatusExecute(r ApiGetServiceStatusRequest) (ServiceStatus, *_nethttp.Response, error)
 }
 
 // DefaultApiService DefaultApi service
 type DefaultApiService service
 
 type ApiGetServiceStatusRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 }
 
-func (r ApiGetServiceStatusRequest) Execute() (*ServiceStatus, *http.Response, error) {
+
+func (r ApiGetServiceStatusRequest) Execute() (ServiceStatus, *_nethttp.Response, error) {
 	return r.ApiService.GetServiceStatusExecute(r)
 }
 
 /*
-GetServiceStatus Method for GetServiceStatus
-
-Get the service status
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiGetServiceStatusRequest
-*/
-func (a *DefaultApiService) GetServiceStatus(ctx context.Context) ApiGetServiceStatusRequest {
+ * GetServiceStatus Method for GetServiceStatus
+ * Get the service status
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiGetServiceStatusRequest
+ */
+func (a *DefaultApiService) GetServiceStatus(ctx _context.Context) ApiGetServiceStatusRequest {
 	return ApiGetServiceStatusRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return ServiceStatus
-func (a *DefaultApiService) GetServiceStatusExecute(r ApiGetServiceStatusRequest) (*ServiceStatus, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return ServiceStatus
+ */
+func (a *DefaultApiService) GetServiceStatusExecute(r ApiGetServiceStatusRequest) (ServiceStatus, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *ServiceStatus
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  ServiceStatus
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.GetServiceStatus")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/serviceregistry_mgmt/v1/status"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -102,7 +109,7 @@ func (a *DefaultApiService) GetServiceStatusExecute(r ApiGetServiceStatusRequest
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -112,15 +119,15 @@ func (a *DefaultApiService) GetServiceStatusExecute(r ApiGetServiceStatusRequest
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -131,15 +138,14 @@ func (a *DefaultApiService) GetServiceStatusExecute(r ApiGetServiceStatusRequest
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
diff --git a/app-services-sdk-go/registrymgmt/apiv1/client/api_errors.go b/app-services-sdk-go/registrymgmt/apiv1/client/api_errors.go
index e3c99060..37dda4c3 100644
--- a/app-services-sdk-go/registrymgmt/apiv1/client/api_errors.go
+++ b/app-services-sdk-go/registrymgmt/apiv1/client/api_errors.go
@@ -1,11 +1,11 @@
 /*
-Service Registry Management API
-
-Service Registry Management API is a REST API for managing Service Registry instances. Service Registry is a datastore for event schemas and API designs, which is based on the open source Apicurio Registry project.
-
-API version: 0.0.6
-Contact: rhosak-eval-support@redhat.com
-*/
+ * Service Registry Management API
+ *
+ * Service Registry Management API is a REST API for managing Service Registry instances. Service Registry is a datastore for event schemas and API designs, which is based on the open source Apicurio Registry project.
+ *
+ * API version: 0.0.6
+ * Contact: rhosak-eval-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -13,69 +13,72 @@ package registrymgmtclient
 
 import (
 	"bytes"
-	"context"
-	"io/ioutil"
-	"net/http"
-	"net/url"
+	_context "context"
+	_ioutil "io/ioutil"
+	_nethttp "net/http"
+	_neturl "net/url"
 	"strings"
 )
 
+// Linger please
+var (
+	_ _context.Context
+)
 
 type ErrorsApi interface {
 
 	/*
-	GetError Method for GetError
-
-	Get information about a specific error type
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id A unique identifier for an error type.
-	@return ApiGetErrorRequest
-	*/
-	GetError(ctx context.Context, id int32) ApiGetErrorRequest
-
-	// GetErrorExecute executes the request
-	//  @return Error
-	GetErrorExecute(r ApiGetErrorRequest) (*Error, *http.Response, error)
+	 * GetError Method for GetError
+	 * Get information about a specific error type
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id A unique identifier for an error type.
+	 * @return ApiGetErrorRequest
+	 */
+	GetError(ctx _context.Context, id int32) ApiGetErrorRequest
 
 	/*
-	GetErrors Method for GetErrors
-
-	Get the list of all errors
+	 * GetErrorExecute executes the request
+	 * @return Error
+	 */
+	GetErrorExecute(r ApiGetErrorRequest) (Error, *_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiGetErrorsRequest
-	*/
-	GetErrors(ctx context.Context) ApiGetErrorsRequest
+	/*
+	 * GetErrors Method for GetErrors
+	 * Get the list of all errors
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiGetErrorsRequest
+	 */
+	GetErrors(ctx _context.Context) ApiGetErrorsRequest
 
-	// GetErrorsExecute executes the request
-	//  @return ErrorList
-	GetErrorsExecute(r ApiGetErrorsRequest) (*ErrorList, *http.Response, error)
+	/*
+	 * GetErrorsExecute executes the request
+	 * @return ErrorList
+	 */
+	GetErrorsExecute(r ApiGetErrorsRequest) (ErrorList, *_nethttp.Response, error)
 }
 
 // ErrorsApiService ErrorsApi service
 type ErrorsApiService service
 
 type ApiGetErrorRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService ErrorsApi
 	id int32
 }
 
-func (r ApiGetErrorRequest) Execute() (*Error, *http.Response, error) {
+
+func (r ApiGetErrorRequest) Execute() (Error, *_nethttp.Response, error) {
 	return r.ApiService.GetErrorExecute(r)
 }
 
 /*
-GetError Method for GetError
-
-Get information about a specific error type
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id A unique identifier for an error type.
- @return ApiGetErrorRequest
-*/
-func (a *ErrorsApiService) GetError(ctx context.Context, id int32) ApiGetErrorRequest {
+ * GetError Method for GetError
+ * Get information about a specific error type
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id A unique identifier for an error type.
+ * @return ApiGetErrorRequest
+ */
+func (a *ErrorsApiService) GetError(ctx _context.Context, id int32) ApiGetErrorRequest {
 	return ApiGetErrorRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -83,27 +86,31 @@ func (a *ErrorsApiService) GetError(ctx context.Context, id int32) ApiGetErrorRe
 	}
 }
 
-// Execute executes the request
-//  @return Error
-func (a *ErrorsApiService) GetErrorExecute(r ApiGetErrorRequest) (*Error, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return Error
+ */
+func (a *ErrorsApiService) GetErrorExecute(r ApiGetErrorRequest) (Error, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *Error
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  Error
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "ErrorsApiService.GetError")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/serviceregistry_mgmt/v1/errors/{id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.id < 1 {
 		return localVarReturnValue, nil, reportError("id must be greater than 1")
 	}
@@ -125,7 +132,7 @@ func (a *ErrorsApiService) GetErrorExecute(r ApiGetErrorRequest) (*Error, *http.
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -135,15 +142,15 @@ func (a *ErrorsApiService) GetErrorExecute(r ApiGetErrorRequest) (*Error, *http.
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -154,8 +161,7 @@ func (a *ErrorsApiService) GetErrorExecute(r ApiGetErrorRequest) (*Error, *http.
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -165,15 +171,14 @@ func (a *ErrorsApiService) GetErrorExecute(r ApiGetErrorRequest) (*Error, *http.
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -184,63 +189,62 @@ func (a *ErrorsApiService) GetErrorExecute(r ApiGetErrorRequest) (*Error, *http.
 }
 
 type ApiGetErrorsRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService ErrorsApi
 	page *int32
 	size *int32
 }
 
-// Page index.
 func (r ApiGetErrorsRequest) Page(page int32) ApiGetErrorsRequest {
 	r.page = &page
 	return r
 }
-
-// Number of items in each page.
 func (r ApiGetErrorsRequest) Size(size int32) ApiGetErrorsRequest {
 	r.size = &size
 	return r
 }
 
-func (r ApiGetErrorsRequest) Execute() (*ErrorList, *http.Response, error) {
+func (r ApiGetErrorsRequest) Execute() (ErrorList, *_nethttp.Response, error) {
 	return r.ApiService.GetErrorsExecute(r)
 }
 
 /*
-GetErrors Method for GetErrors
-
-Get the list of all errors
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiGetErrorsRequest
-*/
-func (a *ErrorsApiService) GetErrors(ctx context.Context) ApiGetErrorsRequest {
+ * GetErrors Method for GetErrors
+ * Get the list of all errors
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiGetErrorsRequest
+ */
+func (a *ErrorsApiService) GetErrors(ctx _context.Context) ApiGetErrorsRequest {
 	return ApiGetErrorsRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return ErrorList
-func (a *ErrorsApiService) GetErrorsExecute(r ApiGetErrorsRequest) (*ErrorList, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return ErrorList
+ */
+func (a *ErrorsApiService) GetErrorsExecute(r ApiGetErrorsRequest) (ErrorList, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *ErrorList
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  ErrorList
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "ErrorsApiService.GetErrors")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/serviceregistry_mgmt/v1/errors"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.page != nil {
 		localVarQueryParams.Add("page", parameterToString(*r.page, ""))
@@ -265,7 +269,7 @@ func (a *ErrorsApiService) GetErrorsExecute(r ApiGetErrorsRequest) (*ErrorList,
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -275,15 +279,15 @@ func (a *ErrorsApiService) GetErrorsExecute(r ApiGetErrorsRequest) (*ErrorList,
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -294,15 +298,14 @@ func (a *ErrorsApiService) GetErrorsExecute(r ApiGetErrorsRequest) (*ErrorList,
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
diff --git a/app-services-sdk-go/registrymgmt/apiv1/client/api_registries.go b/app-services-sdk-go/registrymgmt/apiv1/client/api_registries.go
index 116e3d24..881cbfd4 100644
--- a/app-services-sdk-go/registrymgmt/apiv1/client/api_registries.go
+++ b/app-services-sdk-go/registrymgmt/apiv1/client/api_registries.go
@@ -1,11 +1,11 @@
 /*
-Service Registry Management API
-
-Service Registry Management API is a REST API for managing Service Registry instances. Service Registry is a datastore for event schemas and API designs, which is based on the open source Apicurio Registry project.
-
-API version: 0.0.6
-Contact: rhosak-eval-support@redhat.com
-*/
+ * Service Registry Management API
+ *
+ * Service Registry Management API is a REST API for managing Service Registry instances. Service Registry is a datastore for event schemas and API designs, which is based on the open source Apicurio Registry project.
+ *
+ * API version: 0.0.6
+ * Contact: rhosak-eval-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -13,128 +13,133 @@ package registrymgmtclient
 
 import (
 	"bytes"
-	"context"
-	"io/ioutil"
-	"net/http"
-	"net/url"
+	_context "context"
+	_ioutil "io/ioutil"
+	_nethttp "net/http"
+	_neturl "net/url"
 	"strings"
 )
 
+// Linger please
+var (
+	_ _context.Context
+)
 
 type RegistriesApi interface {
 
 	/*
-	CreateRegistry Method for CreateRegistry
-
-	Create a new Registry instance
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiCreateRegistryRequest
-	*/
-	CreateRegistry(ctx context.Context) ApiCreateRegistryRequest
-
-	// CreateRegistryExecute executes the request
-	//  @return Registry
-	CreateRegistryExecute(r ApiCreateRegistryRequest) (*Registry, *http.Response, error)
+	 * CreateRegistry Method for CreateRegistry
+	 * Create a new Registry instance
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiCreateRegistryRequest
+	 */
+	CreateRegistry(ctx _context.Context) ApiCreateRegistryRequest
 
 	/*
-	DeleteRegistry Delete a Registry instance
-
-	Deletes an existing `Registry` instance and all of the data that it stores. Important: Users should export the registry data before deleting the instance, e.g., using the Service Registry web console, core REST API, or `rhoas` CLI.
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id A unique identifier for a `Registry` instance.
-	@return ApiDeleteRegistryRequest
-	*/
-	DeleteRegistry(ctx context.Context, id string) ApiDeleteRegistryRequest
-
-	// DeleteRegistryExecute executes the request
-	DeleteRegistryExecute(r ApiDeleteRegistryRequest) (*http.Response, error)
+	 * CreateRegistryExecute executes the request
+	 * @return Registry
+	 */
+	CreateRegistryExecute(r ApiCreateRegistryRequest) (Registry, *_nethttp.Response, error)
 
 	/*
-	GetRegistries Method for GetRegistries
-
-	Get the list of all Registry instances
+	 * DeleteRegistry Delete a Registry instance
+	 * Deletes an existing `Registry` instance and all of the data that it stores. Important: Users should export the registry data before deleting the instance, e.g., using the Service Registry web console, core REST API, or `rhoas` CLI.
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id A unique identifier for a `Registry` instance.
+	 * @return ApiDeleteRegistryRequest
+	 */
+	DeleteRegistry(ctx _context.Context, id string) ApiDeleteRegistryRequest
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiGetRegistriesRequest
-	*/
-	GetRegistries(ctx context.Context) ApiGetRegistriesRequest
-
-	// GetRegistriesExecute executes the request
-	//  @return RegistryList
-	GetRegistriesExecute(r ApiGetRegistriesRequest) (*RegistryList, *http.Response, error)
+	/*
+	 * DeleteRegistryExecute executes the request
+	 */
+	DeleteRegistryExecute(r ApiDeleteRegistryRequest) (*_nethttp.Response, error)
 
 	/*
-	GetRegistry Get a Registry instance
+	 * GetRegistries Method for GetRegistries
+	 * Get the list of all Registry instances
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiGetRegistriesRequest
+	 */
+	GetRegistries(ctx _context.Context) ApiGetRegistriesRequest
 
-	Gets the details of a single instance of a `Registry`.
+	/*
+	 * GetRegistriesExecute executes the request
+	 * @return RegistryList
+	 */
+	GetRegistriesExecute(r ApiGetRegistriesRequest) (RegistryList, *_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id A unique identifier for a `Registry` instance.
-	@return ApiGetRegistryRequest
-	*/
-	GetRegistry(ctx context.Context, id string) ApiGetRegistryRequest
+	/*
+	 * GetRegistry Get a Registry instance
+	 * Gets the details of a single instance of a `Registry`.
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id A unique identifier for a `Registry` instance.
+	 * @return ApiGetRegistryRequest
+	 */
+	GetRegistry(ctx _context.Context, id string) ApiGetRegistryRequest
 
-	// GetRegistryExecute executes the request
-	//  @return Registry
-	GetRegistryExecute(r ApiGetRegistryRequest) (*Registry, *http.Response, error)
+	/*
+	 * GetRegistryExecute executes the request
+	 * @return Registry
+	 */
+	GetRegistryExecute(r ApiGetRegistryRequest) (Registry, *_nethttp.Response, error)
 }
 
 // RegistriesApiService RegistriesApi service
 type RegistriesApiService service
 
 type ApiCreateRegistryRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService RegistriesApi
 	registryCreate *RegistryCreate
 }
 
-// A new &#x60;Registry&#x60; instance to be created.
 func (r ApiCreateRegistryRequest) RegistryCreate(registryCreate RegistryCreate) ApiCreateRegistryRequest {
 	r.registryCreate = &registryCreate
 	return r
 }
 
-func (r ApiCreateRegistryRequest) Execute() (*Registry, *http.Response, error) {
+func (r ApiCreateRegistryRequest) Execute() (Registry, *_nethttp.Response, error) {
 	return r.ApiService.CreateRegistryExecute(r)
 }
 
 /*
-CreateRegistry Method for CreateRegistry
-
-Create a new Registry instance
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiCreateRegistryRequest
-*/
-func (a *RegistriesApiService) CreateRegistry(ctx context.Context) ApiCreateRegistryRequest {
+ * CreateRegistry Method for CreateRegistry
+ * Create a new Registry instance
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiCreateRegistryRequest
+ */
+func (a *RegistriesApiService) CreateRegistry(ctx _context.Context) ApiCreateRegistryRequest {
 	return ApiCreateRegistryRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return Registry
-func (a *RegistriesApiService) CreateRegistryExecute(r ApiCreateRegistryRequest) (*Registry, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return Registry
+ */
+func (a *RegistriesApiService) CreateRegistryExecute(r ApiCreateRegistryRequest) (Registry, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *Registry
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  Registry
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "RegistriesApiService.CreateRegistry")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/serviceregistry_mgmt/v1/registries"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.registryCreate == nil {
 		return localVarReturnValue, nil, reportError("registryCreate is required and must be specified")
 	}
@@ -158,7 +163,7 @@ func (a *RegistriesApiService) CreateRegistryExecute(r ApiCreateRegistryRequest)
 	}
 	// body params
 	localVarPostBody = r.registryCreate
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -168,15 +173,15 @@ func (a *RegistriesApiService) CreateRegistryExecute(r ApiCreateRegistryRequest)
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -187,8 +192,7 @@ func (a *RegistriesApiService) CreateRegistryExecute(r ApiCreateRegistryRequest)
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -198,8 +202,7 @@ func (a *RegistriesApiService) CreateRegistryExecute(r ApiCreateRegistryRequest)
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -209,15 +212,14 @@ func (a *RegistriesApiService) CreateRegistryExecute(r ApiCreateRegistryRequest)
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -228,25 +230,24 @@ func (a *RegistriesApiService) CreateRegistryExecute(r ApiCreateRegistryRequest)
 }
 
 type ApiDeleteRegistryRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService RegistriesApi
 	id string
 }
 
-func (r ApiDeleteRegistryRequest) Execute() (*http.Response, error) {
+
+func (r ApiDeleteRegistryRequest) Execute() (*_nethttp.Response, error) {
 	return r.ApiService.DeleteRegistryExecute(r)
 }
 
 /*
-DeleteRegistry Delete a Registry instance
-
-Deletes an existing `Registry` instance and all of the data that it stores. Important: Users should export the registry data before deleting the instance, e.g., using the Service Registry web console, core REST API, or `rhoas` CLI.
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id A unique identifier for a `Registry` instance.
- @return ApiDeleteRegistryRequest
-*/
-func (a *RegistriesApiService) DeleteRegistry(ctx context.Context, id string) ApiDeleteRegistryRequest {
+ * DeleteRegistry Delete a Registry instance
+ * Deletes an existing `Registry` instance and all of the data that it stores. Important: Users should export the registry data before deleting the instance, e.g., using the Service Registry web console, core REST API, or `rhoas` CLI.
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id A unique identifier for a `Registry` instance.
+ * @return ApiDeleteRegistryRequest
+ */
+func (a *RegistriesApiService) DeleteRegistry(ctx _context.Context, id string) ApiDeleteRegistryRequest {
 	return ApiDeleteRegistryRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -254,25 +255,29 @@ func (a *RegistriesApiService) DeleteRegistry(ctx context.Context, id string) Ap
 	}
 }
 
-// Execute executes the request
-func (a *RegistriesApiService) DeleteRegistryExecute(r ApiDeleteRegistryRequest) (*http.Response, error) {
+/*
+ * Execute executes the request
+ */
+func (a *RegistriesApiService) DeleteRegistryExecute(r ApiDeleteRegistryRequest) (*_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodDelete
+		localVarHTTPMethod   = _nethttp.MethodDelete
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "RegistriesApiService.DeleteRegistry")
 	if err != nil {
-		return nil, &GenericOpenAPIError{error: err.Error()}
+		return nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/serviceregistry_mgmt/v1/registries/{id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -291,7 +296,7 @@ func (a *RegistriesApiService) DeleteRegistryExecute(r ApiDeleteRegistryRequest)
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return nil, err
 	}
@@ -301,15 +306,15 @@ func (a *RegistriesApiService) DeleteRegistryExecute(r ApiDeleteRegistryRequest)
 		return localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -320,8 +325,7 @@ func (a *RegistriesApiService) DeleteRegistryExecute(r ApiDeleteRegistryRequest)
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -331,8 +335,7 @@ func (a *RegistriesApiService) DeleteRegistryExecute(r ApiDeleteRegistryRequest)
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -342,8 +345,7 @@ func (a *RegistriesApiService) DeleteRegistryExecute(r ApiDeleteRegistryRequest)
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarHTTPResponse, newErr
 	}
@@ -352,7 +354,7 @@ func (a *RegistriesApiService) DeleteRegistryExecute(r ApiDeleteRegistryRequest)
 }
 
 type ApiGetRegistriesRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService RegistriesApi
 	page *int32
 	size *int32
@@ -360,69 +362,64 @@ type ApiGetRegistriesRequest struct {
 	search *string
 }
 
-// Page index.
 func (r ApiGetRegistriesRequest) Page(page int32) ApiGetRegistriesRequest {
 	r.page = &page
 	return r
 }
-
-// Number of items in each page.
 func (r ApiGetRegistriesRequest) Size(size int32) ApiGetRegistriesRequest {
 	r.size = &size
 	return r
 }
-
-// Specifies the order by criteria. The syntax of this parameter is similar to the syntax of the _order by_ clause of an SQL statement. Each query can be ordered by any of the request fields. For example, to retrieve all Registry instances ordered by their name:  &#x60;&#x60;&#x60;sql name asc &#x60;&#x60;&#x60;  Or to retrieve all Registry instances ordered by their name _and_ created date:  &#x60;&#x60;&#x60;sql name asc, created_at asc &#x60;&#x60;&#x60;  If the parameter isn&#39;t provided, or if the value is empty,  the results are ordered by name.
 func (r ApiGetRegistriesRequest) OrderBy(orderBy string) ApiGetRegistriesRequest {
 	r.orderBy = &orderBy
 	return r
 }
-
-// Search criteria.  The syntax of this parameter is similar to the syntax of the _where_ clause of an SQL statement. Allowed fields in the search are: &#x60;name&#x60;, &#x60;status&#x60;. Allowed comparators are &#x60;&#x3D;&#x60; or &#x60;LIKE&#x60;. Allowed joins are &#x60;AND&#x60; and &#x60;OR&#x60;, however there is a limit of max 10 joins in the search query.  Examples:  To retrieve a request with name equal &#x60;my-registry&#x60;, the value should be:  &#x60;&#x60;&#x60; name &#x3D; my-registry  &#x60;&#x60;&#x60;  To retrieve a request with its name starting with &#x60;my&#x60;, the value should be:  &#x60;&#x60;&#x60; name like my%25 &#x60;&#x60;&#x60;  If the parameter isn&#39;t provided, or if the value is empty, all the Registry instances that the user has permission to see are returned.  Note: If the query is invalid, an error is returned. 
 func (r ApiGetRegistriesRequest) Search(search string) ApiGetRegistriesRequest {
 	r.search = &search
 	return r
 }
 
-func (r ApiGetRegistriesRequest) Execute() (*RegistryList, *http.Response, error) {
+func (r ApiGetRegistriesRequest) Execute() (RegistryList, *_nethttp.Response, error) {
 	return r.ApiService.GetRegistriesExecute(r)
 }
 
 /*
-GetRegistries Method for GetRegistries
-
-Get the list of all Registry instances
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiGetRegistriesRequest
-*/
-func (a *RegistriesApiService) GetRegistries(ctx context.Context) ApiGetRegistriesRequest {
+ * GetRegistries Method for GetRegistries
+ * Get the list of all Registry instances
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiGetRegistriesRequest
+ */
+func (a *RegistriesApiService) GetRegistries(ctx _context.Context) ApiGetRegistriesRequest {
 	return ApiGetRegistriesRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return RegistryList
-func (a *RegistriesApiService) GetRegistriesExecute(r ApiGetRegistriesRequest) (*RegistryList, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return RegistryList
+ */
+func (a *RegistriesApiService) GetRegistriesExecute(r ApiGetRegistriesRequest) (RegistryList, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *RegistryList
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  RegistryList
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "RegistriesApiService.GetRegistries")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/serviceregistry_mgmt/v1/registries"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.page != nil {
 		localVarQueryParams.Add("page", parameterToString(*r.page, ""))
@@ -453,7 +450,7 @@ func (a *RegistriesApiService) GetRegistriesExecute(r ApiGetRegistriesRequest) (
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -463,15 +460,15 @@ func (a *RegistriesApiService) GetRegistriesExecute(r ApiGetRegistriesRequest) (
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -482,8 +479,7 @@ func (a *RegistriesApiService) GetRegistriesExecute(r ApiGetRegistriesRequest) (
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -493,8 +489,7 @@ func (a *RegistriesApiService) GetRegistriesExecute(r ApiGetRegistriesRequest) (
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -504,15 +499,14 @@ func (a *RegistriesApiService) GetRegistriesExecute(r ApiGetRegistriesRequest) (
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -523,25 +517,24 @@ func (a *RegistriesApiService) GetRegistriesExecute(r ApiGetRegistriesRequest) (
 }
 
 type ApiGetRegistryRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService RegistriesApi
 	id string
 }
 
-func (r ApiGetRegistryRequest) Execute() (*Registry, *http.Response, error) {
+
+func (r ApiGetRegistryRequest) Execute() (Registry, *_nethttp.Response, error) {
 	return r.ApiService.GetRegistryExecute(r)
 }
 
 /*
-GetRegistry Get a Registry instance
-
-Gets the details of a single instance of a `Registry`.
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id A unique identifier for a `Registry` instance.
- @return ApiGetRegistryRequest
-*/
-func (a *RegistriesApiService) GetRegistry(ctx context.Context, id string) ApiGetRegistryRequest {
+ * GetRegistry Get a Registry instance
+ * Gets the details of a single instance of a `Registry`.
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id A unique identifier for a `Registry` instance.
+ * @return ApiGetRegistryRequest
+ */
+func (a *RegistriesApiService) GetRegistry(ctx _context.Context, id string) ApiGetRegistryRequest {
 	return ApiGetRegistryRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -549,27 +542,31 @@ func (a *RegistriesApiService) GetRegistry(ctx context.Context, id string) ApiGe
 	}
 }
 
-// Execute executes the request
-//  @return Registry
-func (a *RegistriesApiService) GetRegistryExecute(r ApiGetRegistryRequest) (*Registry, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return Registry
+ */
+func (a *RegistriesApiService) GetRegistryExecute(r ApiGetRegistryRequest) (Registry, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *Registry
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  Registry
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "RegistriesApiService.GetRegistry")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/serviceregistry_mgmt/v1/registries/{id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -588,7 +585,7 @@ func (a *RegistriesApiService) GetRegistryExecute(r ApiGetRegistryRequest) (*Reg
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -598,15 +595,15 @@ func (a *RegistriesApiService) GetRegistryExecute(r ApiGetRegistryRequest) (*Reg
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -617,8 +614,7 @@ func (a *RegistriesApiService) GetRegistryExecute(r ApiGetRegistryRequest) (*Reg
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -628,8 +624,7 @@ func (a *RegistriesApiService) GetRegistryExecute(r ApiGetRegistryRequest) (*Reg
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -639,15 +634,14 @@ func (a *RegistriesApiService) GetRegistryExecute(r ApiGetRegistryRequest) (*Reg
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
diff --git a/app-services-sdk-go/registrymgmt/apiv1/client/client.go b/app-services-sdk-go/registrymgmt/apiv1/client/client.go
index d26f6f42..0dd83f30 100644
--- a/app-services-sdk-go/registrymgmt/apiv1/client/client.go
+++ b/app-services-sdk-go/registrymgmt/apiv1/client/client.go
@@ -1,11 +1,11 @@
 /*
-Service Registry Management API
-
-Service Registry Management API is a REST API for managing Service Registry instances. Service Registry is a datastore for event schemas and API designs, which is based on the open source Apicurio Registry project.
-
-API version: 0.0.6
-Contact: rhosak-eval-support@redhat.com
-*/
+ * Service Registry Management API
+ *
+ * Service Registry Management API is a REST API for managing Service Registry instances. Service Registry is a datastore for event schemas and API designs, which is based on the open source Apicurio Registry project.
+ *
+ * API version: 0.0.6
+ * Contact: rhosak-eval-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -111,7 +111,7 @@ func selectHeaderAccept(accepts []string) string {
 // contains is a case insensitive match, finding needle in a haystack
 func contains(haystack []string, needle string) bool {
 	for _, a := range haystack {
-		if strings.EqualFold(a, needle) {
+		if strings.ToLower(a) == strings.ToLower(needle) {
 			return true
 		}
 	}
@@ -127,7 +127,7 @@ func typeCheckParameter(obj interface{}, expected string, name string) error {
 
 	// Check the type is as expected.
 	if reflect.TypeOf(obj).String() != expected {
-		return fmt.Errorf("expected %s to be of type %s but received %s", name, expected, reflect.TypeOf(obj).String())
+		return fmt.Errorf("Expected %s to be of type %s but received %s.", name, expected, reflect.TypeOf(obj).String())
 	}
 	return nil
 }
@@ -196,12 +196,6 @@ func (c *APIClient) GetConfig() *Configuration {
 	return c.cfg
 }
 
-type formFile struct {
-		fileBytes []byte
-		fileName string
-		formFileName string
-}
-
 // prepareRequest build the request
 func (c *APIClient) prepareRequest(
 	ctx context.Context,
@@ -210,7 +204,9 @@ func (c *APIClient) prepareRequest(
 	headerParams map[string]string,
 	queryParams url.Values,
 	formParams url.Values,
-	formFiles []formFile) (localVarRequest *http.Request, err error) {
+	formFileName string,
+	fileName string,
+	fileBytes []byte) (localVarRequest *http.Request, err error) {
 
 	var body *bytes.Buffer
 
@@ -229,7 +225,7 @@ func (c *APIClient) prepareRequest(
 	}
 
 	// add form parameters and file if available.
-	if strings.HasPrefix(headerParams["Content-Type"], "multipart/form-data") && len(formParams) > 0 || (len(formFiles) > 0) {
+	if strings.HasPrefix(headerParams["Content-Type"], "multipart/form-data") && len(formParams) > 0 || (len(fileBytes) > 0 && fileName != "") {
 		if body != nil {
 			return nil, errors.New("Cannot specify postBody and multipart form at the same time.")
 		}
@@ -248,17 +244,16 @@ func (c *APIClient) prepareRequest(
 				}
 			}
 		}
-		for _, formFile := range formFiles {
-			if len(formFile.fileBytes) > 0 && formFile.fileName != "" {
-				w.Boundary()
-				part, err := w.CreateFormFile(formFile.formFileName, filepath.Base(formFile.fileName))
-				if err != nil {
-						return nil, err
-				}
-				_, err = part.Write(formFile.fileBytes)
-				if err != nil {
-						return nil, err
-				}
+		if len(fileBytes) > 0 && fileName != "" {
+			w.Boundary()
+			//_, fileNm := filepath.Split(fileName)
+			part, err := w.CreateFormFile(formFileName, filepath.Base(fileName))
+			if err != nil {
+				return nil, err
+			}
+			_, err = part.Write(fileBytes)
+			if err != nil {
+				return nil, err
 			}
 		}
 
@@ -321,7 +316,7 @@ func (c *APIClient) prepareRequest(
 	if len(headerParams) > 0 {
 		headers := http.Header{}
 		for h, v := range headerParams {
-			headers[h] = []string{v}
+			headers.Set(h, v)
 		}
 		localVarRequest.Header = headers
 	}
@@ -378,9 +373,6 @@ func (c *APIClient) decode(v interface{}, b []byte, contentType string) (err err
 			return
 		}
 		_, err = (*f).Write(b)
-		if err != nil {
-			return
-		}
 		_, err = (*f).Seek(0, io.SeekStart)
 		return
 	}
@@ -409,14 +401,11 @@ func (c *APIClient) decode(v interface{}, b []byte, contentType string) (err err
 
 // Add a file to the multipart request
 func addFile(w *multipart.Writer, fieldName, path string) error {
-	file, err := os.Open(filepath.Clean(path))
-	if err != nil {
-		return err
-	}
-	err = file.Close()
+	file, err := os.Open(path)
 	if err != nil {
 		return err
 	}
+	defer file.Close()
 
 	part, err := w.CreateFormFile(fieldName, filepath.Base(path))
 	if err != nil {
@@ -432,13 +421,6 @@ func reportError(format string, a ...interface{}) error {
 	return fmt.Errorf(format, a...)
 }
 
-// A wrapper for strict JSON decoding
-func newStrictDecoder(data []byte) *json.Decoder {
-	dec := json.NewDecoder(bytes.NewBuffer(data))
-	dec.DisallowUnknownFields()
-	return dec
-}
-
 // Set request body from an interface{}
 func setBody(body interface{}, contentType string) (bodyBuf *bytes.Buffer, err error) {
 	if bodyBuf == nil {
@@ -466,7 +448,7 @@ func setBody(body interface{}, contentType string) (bodyBuf *bytes.Buffer, err e
 	}
 
 	if bodyBuf.Len() == 0 {
-		err = fmt.Errorf("invalid body type %s\n", contentType)
+		err = fmt.Errorf("Invalid body type %s\n", contentType)
 		return nil, err
 	}
 	return bodyBuf, nil
@@ -568,23 +550,3 @@ func (e GenericOpenAPIError) Body() []byte {
 func (e GenericOpenAPIError) Model() interface{} {
 	return e.model
 }
-
-// format error message using title and detail when model implements rfc7807
-func formatErrorMessage(status string, v interface{}) string {
-
-    str := ""
-    metaValue := reflect.ValueOf(v).Elem()
-
-    field := metaValue.FieldByName("Title")
-    if field != (reflect.Value{}) {
-        str = fmt.Sprintf("%s", field.Interface())
-    }
-
-    field = metaValue.FieldByName("Detail")
-    if field != (reflect.Value{}) {
-        str = fmt.Sprintf("%s (%s)", str, field.Interface())
-    }
-
-    // status title (detail)
-    return fmt.Sprintf("%s %s", status, str)
-}
diff --git a/app-services-sdk-go/registrymgmt/apiv1/client/configuration.go b/app-services-sdk-go/registrymgmt/apiv1/client/configuration.go
index fa8f751d..f975c184 100644
--- a/app-services-sdk-go/registrymgmt/apiv1/client/configuration.go
+++ b/app-services-sdk-go/registrymgmt/apiv1/client/configuration.go
@@ -1,11 +1,11 @@
 /*
-Service Registry Management API
-
-Service Registry Management API is a REST API for managing Service Registry instances. Service Registry is a datastore for event schemas and API designs, which is based on the open source Apicurio Registry project.
-
-API version: 0.0.6
-Contact: rhosak-eval-support@redhat.com
-*/
+ * Service Registry Management API
+ *
+ * Service Registry Management API is a REST API for managing Service Registry instances. Service Registry is a datastore for event schemas and API designs, which is based on the open source Apicurio Registry project.
+ *
+ * API version: 0.0.6
+ * Contact: rhosak-eval-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -136,7 +136,7 @@ func (c *Configuration) AddDefaultHeader(key string, value string) {
 // URL formats template on a index using given variables
 func (sc ServerConfigurations) URL(index int, variables map[string]string) (string, error) {
 	if index < 0 || len(sc) <= index {
-		return "", fmt.Errorf("index %v out of range %v", index, len(sc)-1)
+		return "", fmt.Errorf("Index %v out of range %v", index, len(sc)-1)
 	}
 	server := sc[index]
 	url := server.URL
@@ -151,7 +151,7 @@ func (sc ServerConfigurations) URL(index int, variables map[string]string) (stri
 				}
 			}
 			if !found {
-				return "", fmt.Errorf("the variable %s in the server URL has invalid value %v. Must be %v", name, value, variable.EnumValues)
+				return "", fmt.Errorf("The variable %s in the server URL has invalid value %v. Must be %v", name, value, variable.EnumValues)
 			}
 			url = strings.Replace(url, "{"+name+"}", value, -1)
 		} else {
diff --git a/app-services-sdk-go/registrymgmt/apiv1/client/docs/DefaultApi.md b/app-services-sdk-go/registrymgmt/apiv1/client/docs/DefaultApi.md
index d44bd57d..c575fa51 100644
--- a/app-services-sdk-go/registrymgmt/apiv1/client/docs/DefaultApi.md
+++ b/app-services-sdk-go/registrymgmt/apiv1/client/docs/DefaultApi.md
@@ -31,8 +31,8 @@ import (
 func main() {
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.GetServiceStatus(context.Background()).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.GetServiceStatus(context.Background()).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.GetServiceStatus``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
diff --git a/app-services-sdk-go/registrymgmt/apiv1/client/docs/ErrorsApi.md b/app-services-sdk-go/registrymgmt/apiv1/client/docs/ErrorsApi.md
index c1480f51..7280e050 100644
--- a/app-services-sdk-go/registrymgmt/apiv1/client/docs/ErrorsApi.md
+++ b/app-services-sdk-go/registrymgmt/apiv1/client/docs/ErrorsApi.md
@@ -33,8 +33,8 @@ func main() {
     id := int32(56) // int32 | A unique identifier for an error type.
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.ErrorsApi.GetError(context.Background(), id).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.ErrorsApi.GetError(context.Background(), id).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `ErrorsApi.GetError``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -104,8 +104,8 @@ func main() {
     size := int32(100) // int32 | Number of items in each page. (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.ErrorsApi.GetErrors(context.Background()).Page(page).Size(size).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.ErrorsApi.GetErrors(context.Background()).Page(page).Size(size).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `ErrorsApi.GetErrors``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
diff --git a/app-services-sdk-go/registrymgmt/apiv1/client/docs/RegistriesApi.md b/app-services-sdk-go/registrymgmt/apiv1/client/docs/RegistriesApi.md
index 621aef28..94f2de0f 100644
--- a/app-services-sdk-go/registrymgmt/apiv1/client/docs/RegistriesApi.md
+++ b/app-services-sdk-go/registrymgmt/apiv1/client/docs/RegistriesApi.md
@@ -35,8 +35,8 @@ func main() {
     registryCreate := *openapiclient.NewRegistryCreate("Name_example") // RegistryCreate | A new `Registry` instance to be created.
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.RegistriesApi.CreateRegistry(context.Background()).RegistryCreate(registryCreate).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.RegistriesApi.CreateRegistry(context.Background()).RegistryCreate(registryCreate).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `RegistriesApi.CreateRegistry``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -101,8 +101,8 @@ func main() {
     id := "id_example" // string | A unique identifier for a `Registry` instance.
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.RegistriesApi.DeleteRegistry(context.Background(), id).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.RegistriesApi.DeleteRegistry(context.Background(), id).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `RegistriesApi.DeleteRegistry``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -172,8 +172,8 @@ func main() {
     search := "name = my-registry and status = AVAILABLE" // string | Search criteria.  The syntax of this parameter is similar to the syntax of the _where_ clause of an SQL statement. Allowed fields in the search are: `name`, `status`. Allowed comparators are `=` or `LIKE`. Allowed joins are `AND` and `OR`, however there is a limit of max 10 joins in the search query.  Examples:  To retrieve a request with name equal `my-registry`, the value should be:  ``` name = my-registry  ```  To retrieve a request with its name starting with `my`, the value should be:  ``` name like my%25 ```  If the parameter isn't provided, or if the value is empty, all the Registry instances that the user has permission to see are returned.  Note: If the query is invalid, an error is returned.  (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.RegistriesApi.GetRegistries(context.Background()).Page(page).Size(size).OrderBy(orderBy).Search(search).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.RegistriesApi.GetRegistries(context.Background()).Page(page).Size(size).OrderBy(orderBy).Search(search).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `RegistriesApi.GetRegistries``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -241,8 +241,8 @@ func main() {
     id := "id_example" // string | A unique identifier for a `Registry` instance.
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.RegistriesApi.GetRegistry(context.Background(), id).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.RegistriesApi.GetRegistry(context.Background(), id).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `RegistriesApi.GetRegistry``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
diff --git a/app-services-sdk-go/registrymgmt/apiv1/client/go.mod b/app-services-sdk-go/registrymgmt/apiv1/client/go.mod
deleted file mode 100644
index ead32606..00000000
--- a/app-services-sdk-go/registrymgmt/apiv1/client/go.mod
+++ /dev/null
@@ -1,7 +0,0 @@
-module github.com/GIT_USER_ID/GIT_REPO_ID
-
-go 1.13
-
-require (
-	golang.org/x/oauth2 v0.0.0-20210323180902-22b0adad7558
-)
diff --git a/app-services-sdk-go/registrymgmt/apiv1/client/go.sum b/app-services-sdk-go/registrymgmt/apiv1/client/go.sum
deleted file mode 100644
index 734252e6..00000000
--- a/app-services-sdk-go/registrymgmt/apiv1/client/go.sum
+++ /dev/null
@@ -1,13 +0,0 @@
-cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
-github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e h1:bRhVy7zSSasaqNksaRZiA5EEI+Ei4I1nO5Jh72wfHlg=
-golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 h1:SVwTIAaPC2U/AvvLNZ2a7OVsmBpC8L5BlwK1whH3hm0=
-golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 h1:YUO/7uOKsKeq9UokNS62b8FYywz3ker1l1vDZRCRefw=
-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508=
-google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
diff --git a/app-services-sdk-go/registrymgmt/apiv1/client/model_error.go b/app-services-sdk-go/registrymgmt/apiv1/client/model_error.go
index 966719db..c557dfe6 100644
--- a/app-services-sdk-go/registrymgmt/apiv1/client/model_error.go
+++ b/app-services-sdk-go/registrymgmt/apiv1/client/model_error.go
@@ -1,11 +1,11 @@
 /*
-Service Registry Management API
-
-Service Registry Management API is a REST API for managing Service Registry instances. Service Registry is a datastore for event schemas and API designs, which is based on the open source Apicurio Registry project.
-
-API version: 0.0.6
-Contact: rhosak-eval-support@redhat.com
-*/
+ * Service Registry Management API
+ *
+ * Service Registry Management API is a REST API for managing Service Registry instances. Service Registry is a datastore for event schemas and API designs, which is based on the open source Apicurio Registry project.
+ *
+ * API version: 0.0.6
+ * Contact: rhosak-eval-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -60,8 +60,8 @@ func (o *Error) GetReason() string {
 // GetReasonOk returns a tuple with the Reason field value
 // and a boolean to check if the value has been set.
 func (o *Error) GetReasonOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Reason, true
 }
@@ -73,7 +73,7 @@ func (o *Error) SetReason(v string) {
 
 // GetOperationId returns the OperationId field value if set, zero value otherwise.
 func (o *Error) GetOperationId() string {
-	if o == nil || isNil(o.OperationId) {
+	if o == nil || o.OperationId == nil {
 		var ret string
 		return ret
 	}
@@ -83,15 +83,15 @@ func (o *Error) GetOperationId() string {
 // GetOperationIdOk returns a tuple with the OperationId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Error) GetOperationIdOk() (*string, bool) {
-	if o == nil || isNil(o.OperationId) {
-    return nil, false
+	if o == nil || o.OperationId == nil {
+		return nil, false
 	}
 	return o.OperationId, true
 }
 
 // HasOperationId returns a boolean if a field has been set.
 func (o *Error) HasOperationId() bool {
-	if o != nil && !isNil(o.OperationId) {
+	if o != nil && o.OperationId != nil {
 		return true
 	}
 
@@ -116,8 +116,8 @@ func (o *Error) GetId() string {
 // GetIdOk returns a tuple with the Id field value
 // and a boolean to check if the value has been set.
 func (o *Error) GetIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Id, true
 }
@@ -140,8 +140,8 @@ func (o *Error) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *Error) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -164,8 +164,8 @@ func (o *Error) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value
 // and a boolean to check if the value has been set.
 func (o *Error) GetHrefOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Href, true
 }
@@ -188,8 +188,8 @@ func (o *Error) GetCode() string {
 // GetCodeOk returns a tuple with the Code field value
 // and a boolean to check if the value has been set.
 func (o *Error) GetCodeOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Code, true
 }
@@ -204,7 +204,7 @@ func (o Error) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["reason"] = o.Reason
 	}
-	if !isNil(o.OperationId) {
+	if o.OperationId != nil {
 		toSerialize["operation_id"] = o.OperationId
 	}
 	if true {
diff --git a/app-services-sdk-go/registrymgmt/apiv1/client/model_error_list.go b/app-services-sdk-go/registrymgmt/apiv1/client/model_error_list.go
index ec13ec32..6787ed4f 100644
--- a/app-services-sdk-go/registrymgmt/apiv1/client/model_error_list.go
+++ b/app-services-sdk-go/registrymgmt/apiv1/client/model_error_list.go
@@ -1,11 +1,11 @@
 /*
-Service Registry Management API
-
-Service Registry Management API is a REST API for managing Service Registry instances. Service Registry is a datastore for event schemas and API designs, which is based on the open source Apicurio Registry project.
-
-API version: 0.0.6
-Contact: rhosak-eval-support@redhat.com
-*/
+ * Service Registry Management API
+ *
+ * Service Registry Management API is a REST API for managing Service Registry instances. Service Registry is a datastore for event schemas and API designs, which is based on the open source Apicurio Registry project.
+ *
+ * API version: 0.0.6
+ * Contact: rhosak-eval-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -59,8 +59,8 @@ func (o *ErrorList) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *ErrorList) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -83,8 +83,8 @@ func (o *ErrorList) GetPage() int32 {
 // GetPageOk returns a tuple with the Page field value
 // and a boolean to check if the value has been set.
 func (o *ErrorList) GetPageOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Page, true
 }
@@ -107,8 +107,8 @@ func (o *ErrorList) GetSize() int32 {
 // GetSizeOk returns a tuple with the Size field value
 // and a boolean to check if the value has been set.
 func (o *ErrorList) GetSizeOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Size, true
 }
@@ -131,8 +131,8 @@ func (o *ErrorList) GetTotal() int32 {
 // GetTotalOk returns a tuple with the Total field value
 // and a boolean to check if the value has been set.
 func (o *ErrorList) GetTotalOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Total, true
 }
@@ -154,11 +154,11 @@ func (o *ErrorList) GetItems() []Error {
 
 // GetItemsOk returns a tuple with the Items field value
 // and a boolean to check if the value has been set.
-func (o *ErrorList) GetItemsOk() ([]Error, bool) {
-	if o == nil {
-    return nil, false
+func (o *ErrorList) GetItemsOk() (*[]Error, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Items, true
+	return &o.Items, true
 }
 
 // SetItems sets field value
diff --git a/app-services-sdk-go/registrymgmt/apiv1/client/model_error_list_all_of.go b/app-services-sdk-go/registrymgmt/apiv1/client/model_error_list_all_of.go
index 5a3a5fa1..f8a1b257 100644
--- a/app-services-sdk-go/registrymgmt/apiv1/client/model_error_list_all_of.go
+++ b/app-services-sdk-go/registrymgmt/apiv1/client/model_error_list_all_of.go
@@ -1,11 +1,11 @@
 /*
-Service Registry Management API
-
-Service Registry Management API is a REST API for managing Service Registry instances. Service Registry is a datastore for event schemas and API designs, which is based on the open source Apicurio Registry project.
-
-API version: 0.0.6
-Contact: rhosak-eval-support@redhat.com
-*/
+ * Service Registry Management API
+ *
+ * Service Registry Management API is a REST API for managing Service Registry instances. Service Registry is a datastore for event schemas and API designs, which is based on the open source Apicurio Registry project.
+ *
+ * API version: 0.0.6
+ * Contact: rhosak-eval-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -17,7 +17,7 @@ import (
 
 // ErrorListAllOf struct for ErrorListAllOf
 type ErrorListAllOf struct {
-	Items []Error `json:"items,omitempty"`
+	Items *[]Error `json:"items,omitempty"`
 }
 
 // NewErrorListAllOf instantiates a new ErrorListAllOf object
@@ -39,25 +39,25 @@ func NewErrorListAllOfWithDefaults() *ErrorListAllOf {
 
 // GetItems returns the Items field value if set, zero value otherwise.
 func (o *ErrorListAllOf) GetItems() []Error {
-	if o == nil || isNil(o.Items) {
+	if o == nil || o.Items == nil {
 		var ret []Error
 		return ret
 	}
-	return o.Items
+	return *o.Items
 }
 
 // GetItemsOk returns a tuple with the Items field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *ErrorListAllOf) GetItemsOk() ([]Error, bool) {
-	if o == nil || isNil(o.Items) {
-    return nil, false
+func (o *ErrorListAllOf) GetItemsOk() (*[]Error, bool) {
+	if o == nil || o.Items == nil {
+		return nil, false
 	}
 	return o.Items, true
 }
 
 // HasItems returns a boolean if a field has been set.
 func (o *ErrorListAllOf) HasItems() bool {
-	if o != nil && !isNil(o.Items) {
+	if o != nil && o.Items != nil {
 		return true
 	}
 
@@ -66,12 +66,12 @@ func (o *ErrorListAllOf) HasItems() bool {
 
 // SetItems gets a reference to the given []Error and assigns it to the Items field.
 func (o *ErrorListAllOf) SetItems(v []Error) {
-	o.Items = v
+	o.Items = &v
 }
 
 func (o ErrorListAllOf) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Items) {
+	if o.Items != nil {
 		toSerialize["items"] = o.Items
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/registrymgmt/apiv1/client/model_list.go b/app-services-sdk-go/registrymgmt/apiv1/client/model_list.go
index 235a2cb7..a4aabc8a 100644
--- a/app-services-sdk-go/registrymgmt/apiv1/client/model_list.go
+++ b/app-services-sdk-go/registrymgmt/apiv1/client/model_list.go
@@ -1,11 +1,11 @@
 /*
-Service Registry Management API
-
-Service Registry Management API is a REST API for managing Service Registry instances. Service Registry is a datastore for event schemas and API designs, which is based on the open source Apicurio Registry project.
-
-API version: 0.0.6
-Contact: rhosak-eval-support@redhat.com
-*/
+ * Service Registry Management API
+ *
+ * Service Registry Management API is a REST API for managing Service Registry instances. Service Registry is a datastore for event schemas and API designs, which is based on the open source Apicurio Registry project.
+ *
+ * API version: 0.0.6
+ * Contact: rhosak-eval-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -59,8 +59,8 @@ func (o *List) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *List) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -83,8 +83,8 @@ func (o *List) GetPage() int32 {
 // GetPageOk returns a tuple with the Page field value
 // and a boolean to check if the value has been set.
 func (o *List) GetPageOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Page, true
 }
@@ -107,8 +107,8 @@ func (o *List) GetSize() int32 {
 // GetSizeOk returns a tuple with the Size field value
 // and a boolean to check if the value has been set.
 func (o *List) GetSizeOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Size, true
 }
@@ -131,8 +131,8 @@ func (o *List) GetTotal() int32 {
 // GetTotalOk returns a tuple with the Total field value
 // and a boolean to check if the value has been set.
 func (o *List) GetTotalOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Total, true
 }
@@ -154,11 +154,11 @@ func (o *List) GetItems() []ObjectReference {
 
 // GetItemsOk returns a tuple with the Items field value
 // and a boolean to check if the value has been set.
-func (o *List) GetItemsOk() ([]ObjectReference, bool) {
-	if o == nil {
-    return nil, false
+func (o *List) GetItemsOk() (*[]ObjectReference, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Items, true
+	return &o.Items, true
 }
 
 // SetItems sets field value
diff --git a/app-services-sdk-go/registrymgmt/apiv1/client/model_object_reference.go b/app-services-sdk-go/registrymgmt/apiv1/client/model_object_reference.go
index 78b9271a..8b20c55d 100644
--- a/app-services-sdk-go/registrymgmt/apiv1/client/model_object_reference.go
+++ b/app-services-sdk-go/registrymgmt/apiv1/client/model_object_reference.go
@@ -1,11 +1,11 @@
 /*
-Service Registry Management API
-
-Service Registry Management API is a REST API for managing Service Registry instances. Service Registry is a datastore for event schemas and API designs, which is based on the open source Apicurio Registry project.
-
-API version: 0.0.6
-Contact: rhosak-eval-support@redhat.com
-*/
+ * Service Registry Management API
+ *
+ * Service Registry Management API is a REST API for managing Service Registry instances. Service Registry is a datastore for event schemas and API designs, which is based on the open source Apicurio Registry project.
+ *
+ * API version: 0.0.6
+ * Contact: rhosak-eval-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -55,8 +55,8 @@ func (o *ObjectReference) GetId() string {
 // GetIdOk returns a tuple with the Id field value
 // and a boolean to check if the value has been set.
 func (o *ObjectReference) GetIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Id, true
 }
@@ -79,8 +79,8 @@ func (o *ObjectReference) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *ObjectReference) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -103,8 +103,8 @@ func (o *ObjectReference) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value
 // and a boolean to check if the value has been set.
 func (o *ObjectReference) GetHrefOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Href, true
 }
diff --git a/app-services-sdk-go/registrymgmt/apiv1/client/model_registry.go b/app-services-sdk-go/registrymgmt/apiv1/client/model_registry.go
index 8d9f58eb..698776c9 100644
--- a/app-services-sdk-go/registrymgmt/apiv1/client/model_registry.go
+++ b/app-services-sdk-go/registrymgmt/apiv1/client/model_registry.go
@@ -1,11 +1,11 @@
 /*
-Service Registry Management API
-
-Service Registry Management API is a REST API for managing Service Registry instances. Service Registry is a datastore for event schemas and API designs, which is based on the open source Apicurio Registry project.
-
-API version: 0.0.6
-Contact: rhosak-eval-support@redhat.com
-*/
+ * Service Registry Management API
+ *
+ * Service Registry Management API is a REST API for managing Service Registry instances. Service Registry is a datastore for event schemas and API designs, which is based on the open source Apicurio Registry project.
+ *
+ * API version: 0.0.6
+ * Contact: rhosak-eval-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -13,6 +13,7 @@ package registrymgmtclient
 
 import (
 	"encoding/json"
+	"time"
 )
 
 // Registry struct for Registry
@@ -77,8 +78,8 @@ func (o *Registry) GetId() string {
 // GetIdOk returns a tuple with the Id field value
 // and a boolean to check if the value has been set.
 func (o *Registry) GetIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Id, true
 }
@@ -101,8 +102,8 @@ func (o *Registry) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *Registry) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -125,8 +126,8 @@ func (o *Registry) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value
 // and a boolean to check if the value has been set.
 func (o *Registry) GetHrefOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Href, true
 }
@@ -149,8 +150,8 @@ func (o *Registry) GetStatus() RegistryStatusValue {
 // GetStatusOk returns a tuple with the Status field value
 // and a boolean to check if the value has been set.
 func (o *Registry) GetStatusOk() (*RegistryStatusValue, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Status, true
 }
@@ -162,7 +163,7 @@ func (o *Registry) SetStatus(v RegistryStatusValue) {
 
 // GetRegistryUrl returns the RegistryUrl field value if set, zero value otherwise.
 func (o *Registry) GetRegistryUrl() string {
-	if o == nil || isNil(o.RegistryUrl) {
+	if o == nil || o.RegistryUrl == nil {
 		var ret string
 		return ret
 	}
@@ -172,15 +173,15 @@ func (o *Registry) GetRegistryUrl() string {
 // GetRegistryUrlOk returns a tuple with the RegistryUrl field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Registry) GetRegistryUrlOk() (*string, bool) {
-	if o == nil || isNil(o.RegistryUrl) {
-    return nil, false
+	if o == nil || o.RegistryUrl == nil {
+		return nil, false
 	}
 	return o.RegistryUrl, true
 }
 
 // HasRegistryUrl returns a boolean if a field has been set.
 func (o *Registry) HasRegistryUrl() bool {
-	if o != nil && !isNil(o.RegistryUrl) {
+	if o != nil && o.RegistryUrl != nil {
 		return true
 	}
 
@@ -194,7 +195,7 @@ func (o *Registry) SetRegistryUrl(v string) {
 
 // GetBrowserUrl returns the BrowserUrl field value if set, zero value otherwise.
 func (o *Registry) GetBrowserUrl() string {
-	if o == nil || isNil(o.BrowserUrl) {
+	if o == nil || o.BrowserUrl == nil {
 		var ret string
 		return ret
 	}
@@ -204,15 +205,15 @@ func (o *Registry) GetBrowserUrl() string {
 // GetBrowserUrlOk returns a tuple with the BrowserUrl field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Registry) GetBrowserUrlOk() (*string, bool) {
-	if o == nil || isNil(o.BrowserUrl) {
-    return nil, false
+	if o == nil || o.BrowserUrl == nil {
+		return nil, false
 	}
 	return o.BrowserUrl, true
 }
 
 // HasBrowserUrl returns a boolean if a field has been set.
 func (o *Registry) HasBrowserUrl() bool {
-	if o != nil && !isNil(o.BrowserUrl) {
+	if o != nil && o.BrowserUrl != nil {
 		return true
 	}
 
@@ -237,8 +238,8 @@ func (o *Registry) GetName() string {
 // GetNameOk returns a tuple with the Name field value
 // and a boolean to check if the value has been set.
 func (o *Registry) GetNameOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Name, true
 }
@@ -250,7 +251,7 @@ func (o *Registry) SetName(v string) {
 
 // GetRegistryDeploymentId returns the RegistryDeploymentId field value if set, zero value otherwise.
 func (o *Registry) GetRegistryDeploymentId() int32 {
-	if o == nil || isNil(o.RegistryDeploymentId) {
+	if o == nil || o.RegistryDeploymentId == nil {
 		var ret int32
 		return ret
 	}
@@ -260,15 +261,15 @@ func (o *Registry) GetRegistryDeploymentId() int32 {
 // GetRegistryDeploymentIdOk returns a tuple with the RegistryDeploymentId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Registry) GetRegistryDeploymentIdOk() (*int32, bool) {
-	if o == nil || isNil(o.RegistryDeploymentId) {
-    return nil, false
+	if o == nil || o.RegistryDeploymentId == nil {
+		return nil, false
 	}
 	return o.RegistryDeploymentId, true
 }
 
 // HasRegistryDeploymentId returns a boolean if a field has been set.
 func (o *Registry) HasRegistryDeploymentId() bool {
-	if o != nil && !isNil(o.RegistryDeploymentId) {
+	if o != nil && o.RegistryDeploymentId != nil {
 		return true
 	}
 
@@ -293,8 +294,8 @@ func (o *Registry) GetOwner() string {
 // GetOwnerOk returns a tuple with the Owner field value
 // and a boolean to check if the value has been set.
 func (o *Registry) GetOwnerOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Owner, true
 }
@@ -306,7 +307,7 @@ func (o *Registry) SetOwner(v string) {
 
 // GetDescription returns the Description field value if set, zero value otherwise.
 func (o *Registry) GetDescription() string {
-	if o == nil || isNil(o.Description) {
+	if o == nil || o.Description == nil {
 		var ret string
 		return ret
 	}
@@ -316,15 +317,15 @@ func (o *Registry) GetDescription() string {
 // GetDescriptionOk returns a tuple with the Description field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Registry) GetDescriptionOk() (*string, bool) {
-	if o == nil || isNil(o.Description) {
-    return nil, false
+	if o == nil || o.Description == nil {
+		return nil, false
 	}
 	return o.Description, true
 }
 
 // HasDescription returns a boolean if a field has been set.
 func (o *Registry) HasDescription() bool {
-	if o != nil && !isNil(o.Description) {
+	if o != nil && o.Description != nil {
 		return true
 	}
 
@@ -349,8 +350,8 @@ func (o *Registry) GetCreatedAt() time.Time {
 // GetCreatedAtOk returns a tuple with the CreatedAt field value
 // and a boolean to check if the value has been set.
 func (o *Registry) GetCreatedAtOk() (*time.Time, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.CreatedAt, true
 }
@@ -373,8 +374,8 @@ func (o *Registry) GetUpdatedAt() time.Time {
 // GetUpdatedAtOk returns a tuple with the UpdatedAt field value
 // and a boolean to check if the value has been set.
 func (o *Registry) GetUpdatedAtOk() (*time.Time, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.UpdatedAt, true
 }
@@ -397,8 +398,8 @@ func (o *Registry) GetInstanceType() RegistryInstanceTypeValue {
 // GetInstanceTypeOk returns a tuple with the InstanceType field value
 // and a boolean to check if the value has been set.
 func (o *Registry) GetInstanceTypeOk() (*RegistryInstanceTypeValue, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.InstanceType, true
 }
@@ -422,22 +423,22 @@ func (o Registry) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["status"] = o.Status
 	}
-	if !isNil(o.RegistryUrl) {
+	if o.RegistryUrl != nil {
 		toSerialize["registryUrl"] = o.RegistryUrl
 	}
-	if !isNil(o.BrowserUrl) {
+	if o.BrowserUrl != nil {
 		toSerialize["browserUrl"] = o.BrowserUrl
 	}
 	if true {
 		toSerialize["name"] = o.Name
 	}
-	if !isNil(o.RegistryDeploymentId) {
+	if o.RegistryDeploymentId != nil {
 		toSerialize["registryDeploymentId"] = o.RegistryDeploymentId
 	}
 	if true {
 		toSerialize["owner"] = o.Owner
 	}
-	if !isNil(o.Description) {
+	if o.Description != nil {
 		toSerialize["description"] = o.Description
 	}
 	if true {
diff --git a/app-services-sdk-go/registrymgmt/apiv1/client/model_registry_create.go b/app-services-sdk-go/registrymgmt/apiv1/client/model_registry_create.go
index fec9d577..39b12f6f 100644
--- a/app-services-sdk-go/registrymgmt/apiv1/client/model_registry_create.go
+++ b/app-services-sdk-go/registrymgmt/apiv1/client/model_registry_create.go
@@ -1,11 +1,11 @@
 /*
-Service Registry Management API
-
-Service Registry Management API is a REST API for managing Service Registry instances. Service Registry is a datastore for event schemas and API designs, which is based on the open source Apicurio Registry project.
-
-API version: 0.0.6
-Contact: rhosak-eval-support@redhat.com
-*/
+ * Service Registry Management API
+ *
+ * Service Registry Management API is a REST API for managing Service Registry instances. Service Registry is a datastore for event schemas and API designs, which is based on the open source Apicurio Registry project.
+ *
+ * API version: 0.0.6
+ * Contact: rhosak-eval-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -54,8 +54,8 @@ func (o *RegistryCreate) GetName() string {
 // GetNameOk returns a tuple with the Name field value
 // and a boolean to check if the value has been set.
 func (o *RegistryCreate) GetNameOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Name, true
 }
@@ -67,7 +67,7 @@ func (o *RegistryCreate) SetName(v string) {
 
 // GetDescription returns the Description field value if set, zero value otherwise.
 func (o *RegistryCreate) GetDescription() string {
-	if o == nil || isNil(o.Description) {
+	if o == nil || o.Description == nil {
 		var ret string
 		return ret
 	}
@@ -77,15 +77,15 @@ func (o *RegistryCreate) GetDescription() string {
 // GetDescriptionOk returns a tuple with the Description field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RegistryCreate) GetDescriptionOk() (*string, bool) {
-	if o == nil || isNil(o.Description) {
-    return nil, false
+	if o == nil || o.Description == nil {
+		return nil, false
 	}
 	return o.Description, true
 }
 
 // HasDescription returns a boolean if a field has been set.
 func (o *RegistryCreate) HasDescription() bool {
-	if o != nil && !isNil(o.Description) {
+	if o != nil && o.Description != nil {
 		return true
 	}
 
@@ -102,7 +102,7 @@ func (o RegistryCreate) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["name"] = o.Name
 	}
-	if !isNil(o.Description) {
+	if o.Description != nil {
 		toSerialize["description"] = o.Description
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/registrymgmt/apiv1/client/model_registry_instance_type_value.go b/app-services-sdk-go/registrymgmt/apiv1/client/model_registry_instance_type_value.go
index 5b1aa482..b8936255 100644
--- a/app-services-sdk-go/registrymgmt/apiv1/client/model_registry_instance_type_value.go
+++ b/app-services-sdk-go/registrymgmt/apiv1/client/model_registry_instance_type_value.go
@@ -1,11 +1,11 @@
 /*
-Service Registry Management API
-
-Service Registry Management API is a REST API for managing Service Registry instances. Service Registry is a datastore for event schemas and API designs, which is based on the open source Apicurio Registry project.
-
-API version: 0.0.6
-Contact: rhosak-eval-support@redhat.com
-*/
+ * Service Registry Management API
+ *
+ * Service Registry Management API is a REST API for managing Service Registry instances. Service Registry is a datastore for event schemas and API designs, which is based on the open source Apicurio Registry project.
+ *
+ * API version: 0.0.6
+ * Contact: rhosak-eval-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -25,8 +25,7 @@ const (
 	REGISTRYINSTANCETYPEVALUE_EVAL RegistryInstanceTypeValue = "eval"
 )
 
-// All allowed values of RegistryInstanceTypeValue enum
-var AllowedRegistryInstanceTypeValueEnumValues = []RegistryInstanceTypeValue{
+var allowedRegistryInstanceTypeValueEnumValues = []RegistryInstanceTypeValue{
 	"standard",
 	"eval",
 }
@@ -38,7 +37,7 @@ func (v *RegistryInstanceTypeValue) UnmarshalJSON(src []byte) error {
 		return err
 	}
 	enumTypeValue := RegistryInstanceTypeValue(value)
-	for _, existing := range AllowedRegistryInstanceTypeValueEnumValues {
+	for _, existing := range allowedRegistryInstanceTypeValueEnumValues {
 		if existing == enumTypeValue {
 			*v = enumTypeValue
 			return nil
@@ -55,13 +54,13 @@ func NewRegistryInstanceTypeValueFromValue(v string) (*RegistryInstanceTypeValue
 	if ev.IsValid() {
 		return &ev, nil
 	} else {
-		return nil, fmt.Errorf("invalid value '%v' for RegistryInstanceTypeValue: valid values are %v", v, AllowedRegistryInstanceTypeValueEnumValues)
+		return nil, fmt.Errorf("invalid value '%v' for RegistryInstanceTypeValue: valid values are %v", v, allowedRegistryInstanceTypeValueEnumValues)
 	}
 }
 
 // IsValid return true if the value is valid for the enum, false otherwise
 func (v RegistryInstanceTypeValue) IsValid() bool {
-	for _, existing := range AllowedRegistryInstanceTypeValueEnumValues {
+	for _, existing := range allowedRegistryInstanceTypeValueEnumValues {
 		if existing == v {
 			return true
 		}
diff --git a/app-services-sdk-go/registrymgmt/apiv1/client/model_registry_list.go b/app-services-sdk-go/registrymgmt/apiv1/client/model_registry_list.go
index 7603d302..da921131 100644
--- a/app-services-sdk-go/registrymgmt/apiv1/client/model_registry_list.go
+++ b/app-services-sdk-go/registrymgmt/apiv1/client/model_registry_list.go
@@ -1,11 +1,11 @@
 /*
-Service Registry Management API
-
-Service Registry Management API is a REST API for managing Service Registry instances. Service Registry is a datastore for event schemas and API designs, which is based on the open source Apicurio Registry project.
-
-API version: 0.0.6
-Contact: rhosak-eval-support@redhat.com
-*/
+ * Service Registry Management API
+ *
+ * Service Registry Management API is a REST API for managing Service Registry instances. Service Registry is a datastore for event schemas and API designs, which is based on the open source Apicurio Registry project.
+ *
+ * API version: 0.0.6
+ * Contact: rhosak-eval-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -59,8 +59,8 @@ func (o *RegistryList) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *RegistryList) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -83,8 +83,8 @@ func (o *RegistryList) GetPage() int32 {
 // GetPageOk returns a tuple with the Page field value
 // and a boolean to check if the value has been set.
 func (o *RegistryList) GetPageOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Page, true
 }
@@ -107,8 +107,8 @@ func (o *RegistryList) GetSize() int32 {
 // GetSizeOk returns a tuple with the Size field value
 // and a boolean to check if the value has been set.
 func (o *RegistryList) GetSizeOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Size, true
 }
@@ -131,8 +131,8 @@ func (o *RegistryList) GetTotal() int32 {
 // GetTotalOk returns a tuple with the Total field value
 // and a boolean to check if the value has been set.
 func (o *RegistryList) GetTotalOk() (*int32, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Total, true
 }
@@ -154,11 +154,11 @@ func (o *RegistryList) GetItems() []Registry {
 
 // GetItemsOk returns a tuple with the Items field value
 // and a boolean to check if the value has been set.
-func (o *RegistryList) GetItemsOk() ([]Registry, bool) {
-	if o == nil {
-    return nil, false
+func (o *RegistryList) GetItemsOk() (*[]Registry, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Items, true
+	return &o.Items, true
 }
 
 // SetItems sets field value
diff --git a/app-services-sdk-go/registrymgmt/apiv1/client/model_registry_list_all_of.go b/app-services-sdk-go/registrymgmt/apiv1/client/model_registry_list_all_of.go
index f7920e37..71f52a88 100644
--- a/app-services-sdk-go/registrymgmt/apiv1/client/model_registry_list_all_of.go
+++ b/app-services-sdk-go/registrymgmt/apiv1/client/model_registry_list_all_of.go
@@ -1,11 +1,11 @@
 /*
-Service Registry Management API
-
-Service Registry Management API is a REST API for managing Service Registry instances. Service Registry is a datastore for event schemas and API designs, which is based on the open source Apicurio Registry project.
-
-API version: 0.0.6
-Contact: rhosak-eval-support@redhat.com
-*/
+ * Service Registry Management API
+ *
+ * Service Registry Management API is a REST API for managing Service Registry instances. Service Registry is a datastore for event schemas and API designs, which is based on the open source Apicurio Registry project.
+ *
+ * API version: 0.0.6
+ * Contact: rhosak-eval-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -50,11 +50,11 @@ func (o *RegistryListAllOf) GetItems() []Registry {
 
 // GetItemsOk returns a tuple with the Items field value
 // and a boolean to check if the value has been set.
-func (o *RegistryListAllOf) GetItemsOk() ([]Registry, bool) {
-	if o == nil {
-    return nil, false
+func (o *RegistryListAllOf) GetItemsOk() (*[]Registry, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Items, true
+	return &o.Items, true
 }
 
 // SetItems sets field value
diff --git a/app-services-sdk-go/registrymgmt/apiv1/client/model_registry_status_value.go b/app-services-sdk-go/registrymgmt/apiv1/client/model_registry_status_value.go
index 6290f6e0..a5394842 100644
--- a/app-services-sdk-go/registrymgmt/apiv1/client/model_registry_status_value.go
+++ b/app-services-sdk-go/registrymgmt/apiv1/client/model_registry_status_value.go
@@ -1,11 +1,11 @@
 /*
-Service Registry Management API
-
-Service Registry Management API is a REST API for managing Service Registry instances. Service Registry is a datastore for event schemas and API designs, which is based on the open source Apicurio Registry project.
-
-API version: 0.0.6
-Contact: rhosak-eval-support@redhat.com
-*/
+ * Service Registry Management API
+ *
+ * Service Registry Management API is a REST API for managing Service Registry instances. Service Registry is a datastore for event schemas and API designs, which is based on the open source Apicurio Registry project.
+ *
+ * API version: 0.0.6
+ * Contact: rhosak-eval-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -29,8 +29,7 @@ const (
 	REGISTRYSTATUSVALUE_DELETING RegistryStatusValue = "deleting"
 )
 
-// All allowed values of RegistryStatusValue enum
-var AllowedRegistryStatusValueEnumValues = []RegistryStatusValue{
+var allowedRegistryStatusValueEnumValues = []RegistryStatusValue{
 	"accepted",
 	"provisioning",
 	"ready",
@@ -46,7 +45,7 @@ func (v *RegistryStatusValue) UnmarshalJSON(src []byte) error {
 		return err
 	}
 	enumTypeValue := RegistryStatusValue(value)
-	for _, existing := range AllowedRegistryStatusValueEnumValues {
+	for _, existing := range allowedRegistryStatusValueEnumValues {
 		if existing == enumTypeValue {
 			*v = enumTypeValue
 			return nil
@@ -63,13 +62,13 @@ func NewRegistryStatusValueFromValue(v string) (*RegistryStatusValue, error) {
 	if ev.IsValid() {
 		return &ev, nil
 	} else {
-		return nil, fmt.Errorf("invalid value '%v' for RegistryStatusValue: valid values are %v", v, AllowedRegistryStatusValueEnumValues)
+		return nil, fmt.Errorf("invalid value '%v' for RegistryStatusValue: valid values are %v", v, allowedRegistryStatusValueEnumValues)
 	}
 }
 
 // IsValid return true if the value is valid for the enum, false otherwise
 func (v RegistryStatusValue) IsValid() bool {
-	for _, existing := range AllowedRegistryStatusValueEnumValues {
+	for _, existing := range allowedRegistryStatusValueEnumValues {
 		if existing == v {
 			return true
 		}
diff --git a/app-services-sdk-go/registrymgmt/apiv1/client/model_root_type_for_registry.go b/app-services-sdk-go/registrymgmt/apiv1/client/model_root_type_for_registry.go
index 43d7e953..278e861a 100644
--- a/app-services-sdk-go/registrymgmt/apiv1/client/model_root_type_for_registry.go
+++ b/app-services-sdk-go/registrymgmt/apiv1/client/model_root_type_for_registry.go
@@ -1,11 +1,11 @@
 /*
-Service Registry Management API
-
-Service Registry Management API is a REST API for managing Service Registry instances. Service Registry is a datastore for event schemas and API designs, which is based on the open source Apicurio Registry project.
-
-API version: 0.0.6
-Contact: rhosak-eval-support@redhat.com
-*/
+ * Service Registry Management API
+ *
+ * Service Registry Management API is a REST API for managing Service Registry instances. Service Registry is a datastore for event schemas and API designs, which is based on the open source Apicurio Registry project.
+ *
+ * API version: 0.0.6
+ * Contact: rhosak-eval-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -74,8 +74,8 @@ func (o *RootTypeForRegistry) GetId() string {
 // GetIdOk returns a tuple with the Id field value
 // and a boolean to check if the value has been set.
 func (o *RootTypeForRegistry) GetIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Id, true
 }
@@ -98,8 +98,8 @@ func (o *RootTypeForRegistry) GetStatus() RegistryStatusValue {
 // GetStatusOk returns a tuple with the Status field value
 // and a boolean to check if the value has been set.
 func (o *RootTypeForRegistry) GetStatusOk() (*RegistryStatusValue, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Status, true
 }
@@ -111,7 +111,7 @@ func (o *RootTypeForRegistry) SetStatus(v RegistryStatusValue) {
 
 // GetRegistryUrl returns the RegistryUrl field value if set, zero value otherwise.
 func (o *RootTypeForRegistry) GetRegistryUrl() string {
-	if o == nil || isNil(o.RegistryUrl) {
+	if o == nil || o.RegistryUrl == nil {
 		var ret string
 		return ret
 	}
@@ -121,15 +121,15 @@ func (o *RootTypeForRegistry) GetRegistryUrl() string {
 // GetRegistryUrlOk returns a tuple with the RegistryUrl field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RootTypeForRegistry) GetRegistryUrlOk() (*string, bool) {
-	if o == nil || isNil(o.RegistryUrl) {
-    return nil, false
+	if o == nil || o.RegistryUrl == nil {
+		return nil, false
 	}
 	return o.RegistryUrl, true
 }
 
 // HasRegistryUrl returns a boolean if a field has been set.
 func (o *RootTypeForRegistry) HasRegistryUrl() bool {
-	if o != nil && !isNil(o.RegistryUrl) {
+	if o != nil && o.RegistryUrl != nil {
 		return true
 	}
 
@@ -143,7 +143,7 @@ func (o *RootTypeForRegistry) SetRegistryUrl(v string) {
 
 // GetBrowserUrl returns the BrowserUrl field value if set, zero value otherwise.
 func (o *RootTypeForRegistry) GetBrowserUrl() string {
-	if o == nil || isNil(o.BrowserUrl) {
+	if o == nil || o.BrowserUrl == nil {
 		var ret string
 		return ret
 	}
@@ -153,15 +153,15 @@ func (o *RootTypeForRegistry) GetBrowserUrl() string {
 // GetBrowserUrlOk returns a tuple with the BrowserUrl field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RootTypeForRegistry) GetBrowserUrlOk() (*string, bool) {
-	if o == nil || isNil(o.BrowserUrl) {
-    return nil, false
+	if o == nil || o.BrowserUrl == nil {
+		return nil, false
 	}
 	return o.BrowserUrl, true
 }
 
 // HasBrowserUrl returns a boolean if a field has been set.
 func (o *RootTypeForRegistry) HasBrowserUrl() bool {
-	if o != nil && !isNil(o.BrowserUrl) {
+	if o != nil && o.BrowserUrl != nil {
 		return true
 	}
 
@@ -186,8 +186,8 @@ func (o *RootTypeForRegistry) GetName() string {
 // GetNameOk returns a tuple with the Name field value
 // and a boolean to check if the value has been set.
 func (o *RootTypeForRegistry) GetNameOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Name, true
 }
@@ -199,7 +199,7 @@ func (o *RootTypeForRegistry) SetName(v string) {
 
 // GetRegistryDeploymentId returns the RegistryDeploymentId field value if set, zero value otherwise.
 func (o *RootTypeForRegistry) GetRegistryDeploymentId() int32 {
-	if o == nil || isNil(o.RegistryDeploymentId) {
+	if o == nil || o.RegistryDeploymentId == nil {
 		var ret int32
 		return ret
 	}
@@ -209,15 +209,15 @@ func (o *RootTypeForRegistry) GetRegistryDeploymentId() int32 {
 // GetRegistryDeploymentIdOk returns a tuple with the RegistryDeploymentId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RootTypeForRegistry) GetRegistryDeploymentIdOk() (*int32, bool) {
-	if o == nil || isNil(o.RegistryDeploymentId) {
-    return nil, false
+	if o == nil || o.RegistryDeploymentId == nil {
+		return nil, false
 	}
 	return o.RegistryDeploymentId, true
 }
 
 // HasRegistryDeploymentId returns a boolean if a field has been set.
 func (o *RootTypeForRegistry) HasRegistryDeploymentId() bool {
-	if o != nil && !isNil(o.RegistryDeploymentId) {
+	if o != nil && o.RegistryDeploymentId != nil {
 		return true
 	}
 
@@ -242,8 +242,8 @@ func (o *RootTypeForRegistry) GetOwner() string {
 // GetOwnerOk returns a tuple with the Owner field value
 // and a boolean to check if the value has been set.
 func (o *RootTypeForRegistry) GetOwnerOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Owner, true
 }
@@ -255,7 +255,7 @@ func (o *RootTypeForRegistry) SetOwner(v string) {
 
 // GetDescription returns the Description field value if set, zero value otherwise.
 func (o *RootTypeForRegistry) GetDescription() string {
-	if o == nil || isNil(o.Description) {
+	if o == nil || o.Description == nil {
 		var ret string
 		return ret
 	}
@@ -265,15 +265,15 @@ func (o *RootTypeForRegistry) GetDescription() string {
 // GetDescriptionOk returns a tuple with the Description field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RootTypeForRegistry) GetDescriptionOk() (*string, bool) {
-	if o == nil || isNil(o.Description) {
-    return nil, false
+	if o == nil || o.Description == nil {
+		return nil, false
 	}
 	return o.Description, true
 }
 
 // HasDescription returns a boolean if a field has been set.
 func (o *RootTypeForRegistry) HasDescription() bool {
-	if o != nil && !isNil(o.Description) {
+	if o != nil && o.Description != nil {
 		return true
 	}
 
@@ -298,8 +298,8 @@ func (o *RootTypeForRegistry) GetCreatedAt() time.Time {
 // GetCreatedAtOk returns a tuple with the CreatedAt field value
 // and a boolean to check if the value has been set.
 func (o *RootTypeForRegistry) GetCreatedAtOk() (*time.Time, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.CreatedAt, true
 }
@@ -322,8 +322,8 @@ func (o *RootTypeForRegistry) GetUpdatedAt() time.Time {
 // GetUpdatedAtOk returns a tuple with the UpdatedAt field value
 // and a boolean to check if the value has been set.
 func (o *RootTypeForRegistry) GetUpdatedAtOk() (*time.Time, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.UpdatedAt, true
 }
@@ -346,8 +346,8 @@ func (o *RootTypeForRegistry) GetInstanceType() RegistryInstanceTypeValue {
 // GetInstanceTypeOk returns a tuple with the InstanceType field value
 // and a boolean to check if the value has been set.
 func (o *RootTypeForRegistry) GetInstanceTypeOk() (*RegistryInstanceTypeValue, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.InstanceType, true
 }
@@ -365,22 +365,22 @@ func (o RootTypeForRegistry) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["status"] = o.Status
 	}
-	if !isNil(o.RegistryUrl) {
+	if o.RegistryUrl != nil {
 		toSerialize["registryUrl"] = o.RegistryUrl
 	}
-	if !isNil(o.BrowserUrl) {
+	if o.BrowserUrl != nil {
 		toSerialize["browserUrl"] = o.BrowserUrl
 	}
 	if true {
 		toSerialize["name"] = o.Name
 	}
-	if !isNil(o.RegistryDeploymentId) {
+	if o.RegistryDeploymentId != nil {
 		toSerialize["registryDeploymentId"] = o.RegistryDeploymentId
 	}
 	if true {
 		toSerialize["owner"] = o.Owner
 	}
-	if !isNil(o.Description) {
+	if o.Description != nil {
 		toSerialize["description"] = o.Description
 	}
 	if true {
diff --git a/app-services-sdk-go/registrymgmt/apiv1/client/model_service_status.go b/app-services-sdk-go/registrymgmt/apiv1/client/model_service_status.go
index a98e92a1..c4108c22 100644
--- a/app-services-sdk-go/registrymgmt/apiv1/client/model_service_status.go
+++ b/app-services-sdk-go/registrymgmt/apiv1/client/model_service_status.go
@@ -1,11 +1,11 @@
 /*
-Service Registry Management API
-
-Service Registry Management API is a REST API for managing Service Registry instances. Service Registry is a datastore for event schemas and API designs, which is based on the open source Apicurio Registry project.
-
-API version: 0.0.6
-Contact: rhosak-eval-support@redhat.com
-*/
+ * Service Registry Management API
+ *
+ * Service Registry Management API is a REST API for managing Service Registry instances. Service Registry is a datastore for event schemas and API designs, which is based on the open source Apicurio Registry project.
+ *
+ * API version: 0.0.6
+ * Contact: rhosak-eval-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -40,7 +40,7 @@ func NewServiceStatusWithDefaults() *ServiceStatus {
 
 // GetMaxInstancesReached returns the MaxInstancesReached field value if set, zero value otherwise.
 func (o *ServiceStatus) GetMaxInstancesReached() bool {
-	if o == nil || isNil(o.MaxInstancesReached) {
+	if o == nil || o.MaxInstancesReached == nil {
 		var ret bool
 		return ret
 	}
@@ -50,15 +50,15 @@ func (o *ServiceStatus) GetMaxInstancesReached() bool {
 // GetMaxInstancesReachedOk returns a tuple with the MaxInstancesReached field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ServiceStatus) GetMaxInstancesReachedOk() (*bool, bool) {
-	if o == nil || isNil(o.MaxInstancesReached) {
-    return nil, false
+	if o == nil || o.MaxInstancesReached == nil {
+		return nil, false
 	}
 	return o.MaxInstancesReached, true
 }
 
 // HasMaxInstancesReached returns a boolean if a field has been set.
 func (o *ServiceStatus) HasMaxInstancesReached() bool {
-	if o != nil && !isNil(o.MaxInstancesReached) {
+	if o != nil && o.MaxInstancesReached != nil {
 		return true
 	}
 
@@ -72,7 +72,7 @@ func (o *ServiceStatus) SetMaxInstancesReached(v bool) {
 
 func (o ServiceStatus) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.MaxInstancesReached) {
+	if o.MaxInstancesReached != nil {
 		toSerialize["max_instances_reached"] = o.MaxInstancesReached
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/registrymgmt/apiv1/client/response.go b/app-services-sdk-go/registrymgmt/apiv1/client/response.go
index 0c448e2e..bb53c4b0 100644
--- a/app-services-sdk-go/registrymgmt/apiv1/client/response.go
+++ b/app-services-sdk-go/registrymgmt/apiv1/client/response.go
@@ -1,11 +1,11 @@
 /*
-Service Registry Management API
-
-Service Registry Management API is a REST API for managing Service Registry instances. Service Registry is a datastore for event schemas and API designs, which is based on the open source Apicurio Registry project.
-
-API version: 0.0.6
-Contact: rhosak-eval-support@redhat.com
-*/
+ * Service Registry Management API
+ *
+ * Service Registry Management API is a REST API for managing Service Registry instances. Service Registry is a datastore for event schemas and API designs, which is based on the open source Apicurio Registry project.
+ *
+ * API version: 0.0.6
+ * Contact: rhosak-eval-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
diff --git a/app-services-sdk-go/registrymgmt/apiv1/client/test/api_default_test.go b/app-services-sdk-go/registrymgmt/apiv1/client/test/api_default_test.go
deleted file mode 100644
index 890658d6..00000000
--- a/app-services-sdk-go/registrymgmt/apiv1/client/test/api_default_test.go
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-Service Registry Management API
-
-Testing DefaultApiService
-
-*/
-
-// Code generated by OpenAPI Generator (https://openapi-generator.tech);
-
-package registrymgmtclient
-
-import (
-    "context"
-    "github.com/stretchr/testify/assert"
-    "github.com/stretchr/testify/require"
-    "testing"
-    openapiclient "./openapi"
-)
-
-func Test_registrymgmtclient_DefaultApiService(t *testing.T) {
-
-    configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-
-    t.Run("Test DefaultApiService GetServiceStatus", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.DefaultApi.GetServiceStatus(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-}
diff --git a/app-services-sdk-go/registrymgmt/apiv1/client/test/api_errors_test.go b/app-services-sdk-go/registrymgmt/apiv1/client/test/api_errors_test.go
deleted file mode 100644
index 6705c834..00000000
--- a/app-services-sdk-go/registrymgmt/apiv1/client/test/api_errors_test.go
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-Service Registry Management API
-
-Testing ErrorsApiService
-
-*/
-
-// Code generated by OpenAPI Generator (https://openapi-generator.tech);
-
-package registrymgmtclient
-
-import (
-    "context"
-    "github.com/stretchr/testify/assert"
-    "github.com/stretchr/testify/require"
-    "testing"
-    openapiclient "./openapi"
-)
-
-func Test_registrymgmtclient_ErrorsApiService(t *testing.T) {
-
-    configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-
-    t.Run("Test ErrorsApiService GetError", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id int32
-
-        resp, httpRes, err := apiClient.ErrorsApi.GetError(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test ErrorsApiService GetErrors", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.ErrorsApi.GetErrors(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-}
diff --git a/app-services-sdk-go/registrymgmt/apiv1/client/test/api_registries_test.go b/app-services-sdk-go/registrymgmt/apiv1/client/test/api_registries_test.go
deleted file mode 100644
index 2a470279..00000000
--- a/app-services-sdk-go/registrymgmt/apiv1/client/test/api_registries_test.go
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
-Service Registry Management API
-
-Testing RegistriesApiService
-
-*/
-
-// Code generated by OpenAPI Generator (https://openapi-generator.tech);
-
-package registrymgmtclient
-
-import (
-    "context"
-    "github.com/stretchr/testify/assert"
-    "github.com/stretchr/testify/require"
-    "testing"
-    openapiclient "./openapi"
-)
-
-func Test_registrymgmtclient_RegistriesApiService(t *testing.T) {
-
-    configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-
-    t.Run("Test RegistriesApiService CreateRegistry", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.RegistriesApi.CreateRegistry(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test RegistriesApiService DeleteRegistry", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.RegistriesApi.DeleteRegistry(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test RegistriesApiService GetRegistries", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.RegistriesApi.GetRegistries(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test RegistriesApiService GetRegistry", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.RegistriesApi.GetRegistry(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-}
diff --git a/app-services-sdk-go/registrymgmt/apiv1/client/utils.go b/app-services-sdk-go/registrymgmt/apiv1/client/utils.go
index d400af58..eaf32c3a 100644
--- a/app-services-sdk-go/registrymgmt/apiv1/client/utils.go
+++ b/app-services-sdk-go/registrymgmt/apiv1/client/utils.go
@@ -1,11 +1,11 @@
 /*
-Service Registry Management API
-
-Service Registry Management API is a REST API for managing Service Registry instances. Service Registry is a datastore for event schemas and API designs, which is based on the open source Apicurio Registry project.
-
-API version: 0.0.6
-Contact: rhosak-eval-support@redhat.com
-*/
+ * Service Registry Management API
+ *
+ * Service Registry Management API is a REST API for managing Service Registry instances. Service Registry is a datastore for event schemas and API designs, which is based on the open source Apicurio Registry project.
+ *
+ * API version: 0.0.6
+ * Contact: rhosak-eval-support@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -13,7 +13,6 @@ package registrymgmtclient
 
 import (
 	"encoding/json"
-    "reflect"
 	"time"
 )
 
@@ -328,17 +327,3 @@ func (v *NullableTime) UnmarshalJSON(src []byte) error {
 	v.isSet = true
 	return json.Unmarshal(src, &v.value)
 }
-
-// isNil checks if an input is nil
-func isNil(i interface{}) bool {
-    if i == nil {
-        return true
-    }
-    switch reflect.TypeOf(i).Kind() {
-    case reflect.Chan, reflect.Func, reflect.Map, reflect.Ptr, reflect.UnsafePointer, reflect.Interface, reflect.Slice:
-        return reflect.ValueOf(i).IsNil()
-    case reflect.Array:
-        return reflect.ValueOf(i).IsZero()
-    }
-    return false
-}
\ No newline at end of file
diff --git a/app-services-sdk-go/registrymgmt/apiv1/error/error_sdk.go b/app-services-sdk-go/registrymgmt/apiv1/error/error_sdk.go
index aa4000d6..9c76e749 100644
--- a/app-services-sdk-go/registrymgmt/apiv1/error/error_sdk.go
+++ b/app-services-sdk-go/registrymgmt/apiv1/error/error_sdk.go
@@ -3,7 +3,7 @@ package error
 import (
 	"errors"
 
-	registrymgmtclient "github.com/redhat-developer/app-services-sdk-go/registrymgmt/apiv1/client"
+	registrymgmtclient "github.com/jackdelahunt/app-services-sdk-core/app-services-sdk-go/registrymgmt/apiv1/client"
 )
 
 // GetAPIError gets a strongly typed error from an error
diff --git a/app-services-sdk-go/registrymgmt/go.mod b/app-services-sdk-go/registrymgmt/go.mod
index cfed4a09..747bf0e0 100644
--- a/app-services-sdk-go/registrymgmt/go.mod
+++ b/app-services-sdk-go/registrymgmt/go.mod
@@ -1,8 +1,8 @@
-module github.com/redhat-developer/app-services-sdk-go/registrymgmt
+module github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go/registrymgmt
 
 go 1.15
 
 require (
-	github.com/redhat-developer/app-services-sdk-go v0.10.0
+	github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go v0.1.0
 	golang.org/x/oauth2 v0.0.0-20220630143837-2104d58473e0
 )
diff --git a/app-services-sdk-go/serviceaccountmgmt/apiv1/api_client.go b/app-services-sdk-go/serviceaccountmgmt/apiv1/api_client.go
index f4a23fb3..1aad7852 100644
--- a/app-services-sdk-go/serviceaccountmgmt/apiv1/api_client.go
+++ b/app-services-sdk-go/serviceaccountmgmt/apiv1/api_client.go
@@ -1,9 +1,9 @@
 package apiv1
 
 import (
-	"github.com/redhat-developer/app-services-sdk-go/core"
+	"github.com/jackdelahunt/app-services-sdk-core/app-services-sdk-go/core"
 
-	apiv1 "github.com/redhat-developer/app-services-sdk-go/serviceaccountmgmt/apiv1/client"
+	apiv1 "github.com/jackdelahunt/app-services-sdk-core/app-services-sdk-go/serviceaccountmgmt/apiv1/client"
 )
 
 // Config defines the available configuration options
diff --git a/app-services-sdk-go/serviceaccountmgmt/apiv1/client/.openapi-generator/FILES b/app-services-sdk-go/serviceaccountmgmt/apiv1/client/.openapi-generator/FILES
index 70e6db3f..5412f47f 100644
--- a/app-services-sdk-go/serviceaccountmgmt/apiv1/client/.openapi-generator/FILES
+++ b/app-services-sdk-go/serviceaccountmgmt/apiv1/client/.openapi-generator/FILES
@@ -18,8 +18,6 @@ docs/ServiceAccountData.md
 docs/ServiceAccountRequestData.md
 docs/ServiceAccountsApi.md
 docs/ValidationExceptionData.md
-go.mod
-go.sum
 model_acs_client_request_data.go
 model_acs_client_response_data.go
 model_authentication_factors.go
@@ -32,7 +30,4 @@ model_service_account_data.go
 model_service_account_request_data.go
 model_validation_exception_data.go
 response.go
-test/api_acs_tenants_test.go
-test/api_default_test.go
-test/api_service_accounts_test.go
 utils.go
diff --git a/app-services-sdk-go/serviceaccountmgmt/apiv1/client/.openapi-generator/VERSION b/app-services-sdk-go/serviceaccountmgmt/apiv1/client/.openapi-generator/VERSION
index 0df17dd0..7cbea073 100644
--- a/app-services-sdk-go/serviceaccountmgmt/apiv1/client/.openapi-generator/VERSION
+++ b/app-services-sdk-go/serviceaccountmgmt/apiv1/client/.openapi-generator/VERSION
@@ -1 +1 @@
-6.2.1
\ No newline at end of file
+5.2.0
\ No newline at end of file
diff --git a/app-services-sdk-go/serviceaccountmgmt/apiv1/client/api/openapi.yaml b/app-services-sdk-go/serviceaccountmgmt/apiv1/client/api/openapi.yaml
index 01e24312..14646bcd 100644
--- a/app-services-sdk-go/serviceaccountmgmt/apiv1/client/api/openapi.yaml
+++ b/app-services-sdk-go/serviceaccountmgmt/apiv1/client/api/openapi.yaml
@@ -32,8 +32,8 @@ paths:
           application/json:
             schema:
               $ref: '#/components/schemas/AcsClientRequestData'
-        description: "The name, redirect URIs and the organization id of the ACS managed\
-          \ central client"
+        description: The name, redirect URIs and the organization id of the ACS managed
+          central client
         required: true
       responses:
         "201":
@@ -75,7 +75,7 @@ paths:
                   $ref: '#/components/examples/405AcsApiDisabled'
               schema:
                 $ref: '#/components/schemas/RedHatErrorRepresentation'
-          description: "Not allowed, API Currently Disabled"
+          description: Not allowed, API Currently Disabled
       security:
       - serviceAccounts:
         - api.iam.clients
@@ -123,7 +123,7 @@ paths:
                   $ref: '#/components/examples/405AcsApiDisabled'
               schema:
                 $ref: '#/components/schemas/RedHatErrorRepresentation'
-          description: "Not allowed, API Currently Disabled"
+          description: Not allowed, API Currently Disabled
       security:
       - serviceAccounts:
         - api.iam.clients
@@ -621,7 +621,7 @@ components:
           type: array
           uniqueItems: true
         orgId:
-          pattern: "\\d{1,10}"
+          pattern: \d{1,10}
           type: string
       required:
       - orgId
diff --git a/app-services-sdk-go/serviceaccountmgmt/apiv1/client/api_acs_tenants.go b/app-services-sdk-go/serviceaccountmgmt/apiv1/client/api_acs_tenants.go
index 33e5dcef..e633fa2b 100644
--- a/app-services-sdk-go/serviceaccountmgmt/apiv1/client/api_acs_tenants.go
+++ b/app-services-sdk-go/serviceaccountmgmt/apiv1/client/api_acs_tenants.go
@@ -1,11 +1,11 @@
 /*
-sso.redhat.com API documentation
-
-This is the API documentation for sso.redhat.com
-
-API version: 5.0.19-SNAPSHOT
-Contact: it-user-team-list@redhat.com
-*/
+ * sso.redhat.com API documentation
+ *
+ * This is the API documentation for sso.redhat.com
+ *
+ * API version: 5.0.19-SNAPSHOT
+ * Contact: it-user-team-list@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -13,99 +13,104 @@ package serviceaccountsclient
 
 import (
 	"bytes"
-	"context"
-	"io/ioutil"
-	"net/http"
-	"net/url"
+	_context "context"
+	_ioutil "io/ioutil"
+	_nethttp "net/http"
+	_neturl "net/url"
 	"strings"
 )
 
+// Linger please
+var (
+	_ _context.Context
+)
 
 type AcsTenantsApi interface {
 
 	/*
-	CreateAcsClient Create ACS managed central client
-
-	Create an ACS managed central client. Created ACS managed central clients are associated with the supplied organization id.
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiCreateAcsClientRequest
-	*/
-	CreateAcsClient(ctx context.Context) ApiCreateAcsClientRequest
-
-	// CreateAcsClientExecute executes the request
-	//  @return AcsClientResponseData
-	CreateAcsClientExecute(r ApiCreateAcsClientRequest) (*AcsClientResponseData, *http.Response, error)
+	 * CreateAcsClient Create ACS managed central client
+	 * Create an ACS managed central client. Created ACS managed central clients are associated with the supplied organization id.
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiCreateAcsClientRequest
+	 */
+	CreateAcsClient(ctx _context.Context) ApiCreateAcsClientRequest
 
 	/*
-	DeleteAcsClient Delete ACS managed central client
+	 * CreateAcsClientExecute executes the request
+	 * @return AcsClientResponseData
+	 */
+	CreateAcsClientExecute(r ApiCreateAcsClientRequest) (AcsClientResponseData, *_nethttp.Response, error)
 
-	Delete ACS managed central client by clientId. Throws not found exception if the client is not found
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param clientId
-	@return ApiDeleteAcsClientRequest
-	*/
-	DeleteAcsClient(ctx context.Context, clientId string) ApiDeleteAcsClientRequest
+	/*
+	 * DeleteAcsClient Delete ACS managed central client
+	 * Delete ACS managed central client by clientId. Throws not found exception if the client is not found
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param clientId
+	 * @return ApiDeleteAcsClientRequest
+	 */
+	DeleteAcsClient(ctx _context.Context, clientId string) ApiDeleteAcsClientRequest
 
-	// DeleteAcsClientExecute executes the request
-	DeleteAcsClientExecute(r ApiDeleteAcsClientRequest) (*http.Response, error)
+	/*
+	 * DeleteAcsClientExecute executes the request
+	 */
+	DeleteAcsClientExecute(r ApiDeleteAcsClientRequest) (*_nethttp.Response, error)
 }
 
 // AcsTenantsApiService AcsTenantsApi service
 type AcsTenantsApiService service
 
 type ApiCreateAcsClientRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService AcsTenantsApi
 	acsClientRequestData *AcsClientRequestData
 }
 
-// The name, redirect URIs and the organization id of the ACS managed central client
 func (r ApiCreateAcsClientRequest) AcsClientRequestData(acsClientRequestData AcsClientRequestData) ApiCreateAcsClientRequest {
 	r.acsClientRequestData = &acsClientRequestData
 	return r
 }
 
-func (r ApiCreateAcsClientRequest) Execute() (*AcsClientResponseData, *http.Response, error) {
+func (r ApiCreateAcsClientRequest) Execute() (AcsClientResponseData, *_nethttp.Response, error) {
 	return r.ApiService.CreateAcsClientExecute(r)
 }
 
 /*
-CreateAcsClient Create ACS managed central client
-
-Create an ACS managed central client. Created ACS managed central clients are associated with the supplied organization id.
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiCreateAcsClientRequest
-*/
-func (a *AcsTenantsApiService) CreateAcsClient(ctx context.Context) ApiCreateAcsClientRequest {
+ * CreateAcsClient Create ACS managed central client
+ * Create an ACS managed central client. Created ACS managed central clients are associated with the supplied organization id.
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiCreateAcsClientRequest
+ */
+func (a *AcsTenantsApiService) CreateAcsClient(ctx _context.Context) ApiCreateAcsClientRequest {
 	return ApiCreateAcsClientRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return AcsClientResponseData
-func (a *AcsTenantsApiService) CreateAcsClientExecute(r ApiCreateAcsClientRequest) (*AcsClientResponseData, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return AcsClientResponseData
+ */
+func (a *AcsTenantsApiService) CreateAcsClientExecute(r ApiCreateAcsClientRequest) (AcsClientResponseData, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *AcsClientResponseData
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  AcsClientResponseData
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "AcsTenantsApiService.CreateAcsClient")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/apis/beta/acs/v1"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.acsClientRequestData == nil {
 		return localVarReturnValue, nil, reportError("acsClientRequestData is required and must be specified")
 	}
@@ -129,7 +134,7 @@ func (a *AcsTenantsApiService) CreateAcsClientExecute(r ApiCreateAcsClientReques
 	}
 	// body params
 	localVarPostBody = r.acsClientRequestData
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -139,15 +144,15 @@ func (a *AcsTenantsApiService) CreateAcsClientExecute(r ApiCreateAcsClientReques
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -158,8 +163,7 @@ func (a *AcsTenantsApiService) CreateAcsClientExecute(r ApiCreateAcsClientReques
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -169,8 +173,7 @@ func (a *AcsTenantsApiService) CreateAcsClientExecute(r ApiCreateAcsClientReques
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -180,8 +183,7 @@ func (a *AcsTenantsApiService) CreateAcsClientExecute(r ApiCreateAcsClientReques
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 405 {
@@ -191,15 +193,14 @@ func (a *AcsTenantsApiService) CreateAcsClientExecute(r ApiCreateAcsClientReques
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -210,25 +211,24 @@ func (a *AcsTenantsApiService) CreateAcsClientExecute(r ApiCreateAcsClientReques
 }
 
 type ApiDeleteAcsClientRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService AcsTenantsApi
 	clientId string
 }
 
-func (r ApiDeleteAcsClientRequest) Execute() (*http.Response, error) {
+
+func (r ApiDeleteAcsClientRequest) Execute() (*_nethttp.Response, error) {
 	return r.ApiService.DeleteAcsClientExecute(r)
 }
 
 /*
-DeleteAcsClient Delete ACS managed central client
-
-Delete ACS managed central client by clientId. Throws not found exception if the client is not found
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param clientId
- @return ApiDeleteAcsClientRequest
-*/
-func (a *AcsTenantsApiService) DeleteAcsClient(ctx context.Context, clientId string) ApiDeleteAcsClientRequest {
+ * DeleteAcsClient Delete ACS managed central client
+ * Delete ACS managed central client by clientId. Throws not found exception if the client is not found
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param clientId
+ * @return ApiDeleteAcsClientRequest
+ */
+func (a *AcsTenantsApiService) DeleteAcsClient(ctx _context.Context, clientId string) ApiDeleteAcsClientRequest {
 	return ApiDeleteAcsClientRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -236,25 +236,29 @@ func (a *AcsTenantsApiService) DeleteAcsClient(ctx context.Context, clientId str
 	}
 }
 
-// Execute executes the request
-func (a *AcsTenantsApiService) DeleteAcsClientExecute(r ApiDeleteAcsClientRequest) (*http.Response, error) {
+/*
+ * Execute executes the request
+ */
+func (a *AcsTenantsApiService) DeleteAcsClientExecute(r ApiDeleteAcsClientRequest) (*_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodDelete
+		localVarHTTPMethod   = _nethttp.MethodDelete
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "AcsTenantsApiService.DeleteAcsClient")
 	if err != nil {
-		return nil, &GenericOpenAPIError{error: err.Error()}
+		return nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/apis/beta/acs/v1/{clientId}"
-	localVarPath = strings.Replace(localVarPath, "{"+"clientId"+"}", url.PathEscape(parameterToString(r.clientId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"clientId"+"}", _neturl.PathEscape(parameterToString(r.clientId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -273,7 +277,7 @@ func (a *AcsTenantsApiService) DeleteAcsClientExecute(r ApiDeleteAcsClientReques
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return nil, err
 	}
@@ -283,15 +287,15 @@ func (a *AcsTenantsApiService) DeleteAcsClientExecute(r ApiDeleteAcsClientReques
 		return localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -302,8 +306,7 @@ func (a *AcsTenantsApiService) DeleteAcsClientExecute(r ApiDeleteAcsClientReques
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -313,8 +316,7 @@ func (a *AcsTenantsApiService) DeleteAcsClientExecute(r ApiDeleteAcsClientReques
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 405 {
@@ -324,8 +326,7 @@ func (a *AcsTenantsApiService) DeleteAcsClientExecute(r ApiDeleteAcsClientReques
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarHTTPResponse, newErr
 	}
diff --git a/app-services-sdk-go/serviceaccountmgmt/apiv1/client/api_default.go b/app-services-sdk-go/serviceaccountmgmt/apiv1/client/api_default.go
index 5672a897..2625a3f7 100644
--- a/app-services-sdk-go/serviceaccountmgmt/apiv1/client/api_default.go
+++ b/app-services-sdk-go/serviceaccountmgmt/apiv1/client/api_default.go
@@ -1,11 +1,11 @@
 /*
-sso.redhat.com API documentation
-
-This is the API documentation for sso.redhat.com
-
-API version: 5.0.19-SNAPSHOT
-Contact: it-user-team-list@redhat.com
-*/
+ * sso.redhat.com API documentation
+ *
+ * This is the API documentation for sso.redhat.com
+ *
+ * API version: 5.0.19-SNAPSHOT
+ * Contact: it-user-team-list@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -13,64 +13,70 @@ package serviceaccountsclient
 
 import (
 	"bytes"
-	"context"
-	"io/ioutil"
-	"net/http"
-	"net/url"
+	_context "context"
+	_ioutil "io/ioutil"
+	_nethttp "net/http"
+	_neturl "net/url"
 	"strings"
 )
 
+// Linger please
+var (
+	_ _context.Context
+)
 
 type DefaultApi interface {
 
 	/*
-	GetAuthenticationPolicy Get current authentication policy information
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id
-	@return ApiGetAuthenticationPolicyRequest
-	*/
-	GetAuthenticationPolicy(ctx context.Context, id string) ApiGetAuthenticationPolicyRequest
-
-	// GetAuthenticationPolicyExecute executes the request
-	//  @return AuthenticationPolicy
-	GetAuthenticationPolicyExecute(r ApiGetAuthenticationPolicyRequest) (*AuthenticationPolicy, *http.Response, error)
+	 * GetAuthenticationPolicy Get current authentication policy information
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id
+	 * @return ApiGetAuthenticationPolicyRequest
+	 */
+	GetAuthenticationPolicy(ctx _context.Context, id string) ApiGetAuthenticationPolicyRequest
 
 	/*
-	SetAuthenticationPolicy Update current authentication policy information
+	 * GetAuthenticationPolicyExecute executes the request
+	 * @return AuthenticationPolicy
+	 */
+	GetAuthenticationPolicyExecute(r ApiGetAuthenticationPolicyRequest) (AuthenticationPolicy, *_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id
-	@return ApiSetAuthenticationPolicyRequest
-	*/
-	SetAuthenticationPolicy(ctx context.Context, id string) ApiSetAuthenticationPolicyRequest
+	/*
+	 * SetAuthenticationPolicy Update current authentication policy information
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id
+	 * @return ApiSetAuthenticationPolicyRequest
+	 */
+	SetAuthenticationPolicy(ctx _context.Context, id string) ApiSetAuthenticationPolicyRequest
 
-	// SetAuthenticationPolicyExecute executes the request
-	//  @return AuthenticationPolicy
-	SetAuthenticationPolicyExecute(r ApiSetAuthenticationPolicyRequest) (*AuthenticationPolicy, *http.Response, error)
+	/*
+	 * SetAuthenticationPolicyExecute executes the request
+	 * @return AuthenticationPolicy
+	 */
+	SetAuthenticationPolicyExecute(r ApiSetAuthenticationPolicyRequest) (AuthenticationPolicy, *_nethttp.Response, error)
 }
 
 // DefaultApiService DefaultApi service
 type DefaultApiService service
 
 type ApiGetAuthenticationPolicyRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	id string
 }
 
-func (r ApiGetAuthenticationPolicyRequest) Execute() (*AuthenticationPolicy, *http.Response, error) {
+
+func (r ApiGetAuthenticationPolicyRequest) Execute() (AuthenticationPolicy, *_nethttp.Response, error) {
 	return r.ApiService.GetAuthenticationPolicyExecute(r)
 }
 
 /*
-GetAuthenticationPolicy Get current authentication policy information
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id
- @return ApiGetAuthenticationPolicyRequest
-*/
-func (a *DefaultApiService) GetAuthenticationPolicy(ctx context.Context, id string) ApiGetAuthenticationPolicyRequest {
+ * GetAuthenticationPolicy Get current authentication policy information
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id
+ * @return ApiGetAuthenticationPolicyRequest
+ */
+func (a *DefaultApiService) GetAuthenticationPolicy(ctx _context.Context, id string) ApiGetAuthenticationPolicyRequest {
 	return ApiGetAuthenticationPolicyRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -78,27 +84,31 @@ func (a *DefaultApiService) GetAuthenticationPolicy(ctx context.Context, id stri
 	}
 }
 
-// Execute executes the request
-//  @return AuthenticationPolicy
-func (a *DefaultApiService) GetAuthenticationPolicyExecute(r ApiGetAuthenticationPolicyRequest) (*AuthenticationPolicy, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return AuthenticationPolicy
+ */
+func (a *DefaultApiService) GetAuthenticationPolicyExecute(r ApiGetAuthenticationPolicyRequest) (AuthenticationPolicy, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *AuthenticationPolicy
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  AuthenticationPolicy
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.GetAuthenticationPolicy")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/apis/organizations/v1/{id}/authentication-policy"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -117,7 +127,7 @@ func (a *DefaultApiService) GetAuthenticationPolicyExecute(r ApiGetAuthenticatio
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -127,15 +137,15 @@ func (a *DefaultApiService) GetAuthenticationPolicyExecute(r ApiGetAuthenticatio
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -146,15 +156,14 @@ func (a *DefaultApiService) GetAuthenticationPolicyExecute(r ApiGetAuthenticatio
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -165,7 +174,7 @@ func (a *DefaultApiService) GetAuthenticationPolicyExecute(r ApiGetAuthenticatio
 }
 
 type ApiSetAuthenticationPolicyRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService DefaultApi
 	id string
 	authenticationPolicy *AuthenticationPolicy
@@ -176,18 +185,17 @@ func (r ApiSetAuthenticationPolicyRequest) AuthenticationPolicy(authenticationPo
 	return r
 }
 
-func (r ApiSetAuthenticationPolicyRequest) Execute() (*AuthenticationPolicy, *http.Response, error) {
+func (r ApiSetAuthenticationPolicyRequest) Execute() (AuthenticationPolicy, *_nethttp.Response, error) {
 	return r.ApiService.SetAuthenticationPolicyExecute(r)
 }
 
 /*
-SetAuthenticationPolicy Update current authentication policy information
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id
- @return ApiSetAuthenticationPolicyRequest
-*/
-func (a *DefaultApiService) SetAuthenticationPolicy(ctx context.Context, id string) ApiSetAuthenticationPolicyRequest {
+ * SetAuthenticationPolicy Update current authentication policy information
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id
+ * @return ApiSetAuthenticationPolicyRequest
+ */
+func (a *DefaultApiService) SetAuthenticationPolicy(ctx _context.Context, id string) ApiSetAuthenticationPolicyRequest {
 	return ApiSetAuthenticationPolicyRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -195,27 +203,31 @@ func (a *DefaultApiService) SetAuthenticationPolicy(ctx context.Context, id stri
 	}
 }
 
-// Execute executes the request
-//  @return AuthenticationPolicy
-func (a *DefaultApiService) SetAuthenticationPolicyExecute(r ApiSetAuthenticationPolicyRequest) (*AuthenticationPolicy, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return AuthenticationPolicy
+ */
+func (a *DefaultApiService) SetAuthenticationPolicyExecute(r ApiSetAuthenticationPolicyRequest) (AuthenticationPolicy, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *AuthenticationPolicy
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  AuthenticationPolicy
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.SetAuthenticationPolicy")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/apis/organizations/v1/{id}/authentication-policy"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{"application/json"}
@@ -236,7 +248,7 @@ func (a *DefaultApiService) SetAuthenticationPolicyExecute(r ApiSetAuthenticatio
 	}
 	// body params
 	localVarPostBody = r.authenticationPolicy
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -246,15 +258,15 @@ func (a *DefaultApiService) SetAuthenticationPolicyExecute(r ApiSetAuthenticatio
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -265,15 +277,14 @@ func (a *DefaultApiService) SetAuthenticationPolicyExecute(r ApiSetAuthenticatio
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
diff --git a/app-services-sdk-go/serviceaccountmgmt/apiv1/client/api_service_accounts.go b/app-services-sdk-go/serviceaccountmgmt/apiv1/client/api_service_accounts.go
index a590db58..c7533215 100644
--- a/app-services-sdk-go/serviceaccountmgmt/apiv1/client/api_service_accounts.go
+++ b/app-services-sdk-go/serviceaccountmgmt/apiv1/client/api_service_accounts.go
@@ -1,11 +1,11 @@
 /*
-sso.redhat.com API documentation
-
-This is the API documentation for sso.redhat.com
-
-API version: 5.0.19-SNAPSHOT
-Contact: it-user-team-list@redhat.com
-*/
+ * sso.redhat.com API documentation
+ *
+ * This is the API documentation for sso.redhat.com
+ *
+ * API version: 5.0.19-SNAPSHOT
+ * Contact: it-user-team-list@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -13,159 +13,164 @@ package serviceaccountsclient
 
 import (
 	"bytes"
-	"context"
-	"io/ioutil"
-	"net/http"
-	"net/url"
+	_context "context"
+	_ioutil "io/ioutil"
+	_nethttp "net/http"
+	_neturl "net/url"
 	"strings"
 	"reflect"
 )
 
+// Linger please
+var (
+	_ _context.Context
+)
 
 type ServiceAccountsApi interface {
 
 	/*
-	CreateServiceAccount Create service account
-
-	Create a service account. Created service account is associated with the user defined in the bearer token.
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiCreateServiceAccountRequest
-	*/
-	CreateServiceAccount(ctx context.Context) ApiCreateServiceAccountRequest
-
-	// CreateServiceAccountExecute executes the request
-	//  @return ServiceAccountData
-	CreateServiceAccountExecute(r ApiCreateServiceAccountRequest) (*ServiceAccountData, *http.Response, error)
+	 * CreateServiceAccount Create service account
+	 * Create a service account. Created service account is associated with the user defined in the bearer token.
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiCreateServiceAccountRequest
+	 */
+	CreateServiceAccount(ctx _context.Context) ApiCreateServiceAccountRequest
 
 	/*
-	DeleteServiceAccount Delete service account by id
-
-	Delete service account by id. Throws not found exception if the service account is not found or the user does not have access to this service account
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id
-	@return ApiDeleteServiceAccountRequest
-	*/
-	DeleteServiceAccount(ctx context.Context, id string) ApiDeleteServiceAccountRequest
-
-	// DeleteServiceAccountExecute executes the request
-	DeleteServiceAccountExecute(r ApiDeleteServiceAccountRequest) (*http.Response, error)
+	 * CreateServiceAccountExecute executes the request
+	 * @return ServiceAccountData
+	 */
+	CreateServiceAccountExecute(r ApiCreateServiceAccountRequest) (ServiceAccountData, *_nethttp.Response, error)
 
 	/*
-	GetServiceAccount Get service account by id
-
-	Returns service account by id. Throws not found exception if the service account is not found or the user does not have access to this service account
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id
-	@return ApiGetServiceAccountRequest
-	*/
-	GetServiceAccount(ctx context.Context, id string) ApiGetServiceAccountRequest
-
-	// GetServiceAccountExecute executes the request
-	//  @return ServiceAccountData
-	GetServiceAccountExecute(r ApiGetServiceAccountRequest) (*ServiceAccountData, *http.Response, error)
+	 * DeleteServiceAccount Delete service account by id
+	 * Delete service account by id. Throws not found exception if the service account is not found or the user does not have access to this service account
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id
+	 * @return ApiDeleteServiceAccountRequest
+	 */
+	DeleteServiceAccount(ctx _context.Context, id string) ApiDeleteServiceAccountRequest
 
 	/*
-	GetServiceAccounts List all service accounts
-
-	Returns a list of service accounts created by a user. User information is obtained from the bearer token. The list is paginated with starting index as 'first' and page size as 'max'.
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiGetServiceAccountsRequest
-	*/
-	GetServiceAccounts(ctx context.Context) ApiGetServiceAccountsRequest
-
-	// GetServiceAccountsExecute executes the request
-	//  @return []ServiceAccountData
-	GetServiceAccountsExecute(r ApiGetServiceAccountsRequest) ([]ServiceAccountData, *http.Response, error)
+	 * DeleteServiceAccountExecute executes the request
+	 */
+	DeleteServiceAccountExecute(r ApiDeleteServiceAccountRequest) (*_nethttp.Response, error)
 
 	/*
-	ResetServiceAccountSecret Reset service account secret by id
+	 * GetServiceAccount Get service account by id
+	 * Returns service account by id. Throws not found exception if the service account is not found or the user does not have access to this service account
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id
+	 * @return ApiGetServiceAccountRequest
+	 */
+	GetServiceAccount(ctx _context.Context, id string) ApiGetServiceAccountRequest
 
-	Reset service account secret by id . Throws not found exception if the service account is not found or the user does not have access to this service account
+	/*
+	 * GetServiceAccountExecute executes the request
+	 * @return ServiceAccountData
+	 */
+	GetServiceAccountExecute(r ApiGetServiceAccountRequest) (ServiceAccountData, *_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id
-	@return ApiResetServiceAccountSecretRequest
-	*/
-	ResetServiceAccountSecret(ctx context.Context, id string) ApiResetServiceAccountSecretRequest
+	/*
+	 * GetServiceAccounts List all service accounts
+	 * Returns a list of service accounts created by a user. User information is obtained from the bearer token. The list is paginated with starting index as 'first' and page size as 'max'.
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiGetServiceAccountsRequest
+	 */
+	GetServiceAccounts(ctx _context.Context) ApiGetServiceAccountsRequest
 
-	// ResetServiceAccountSecretExecute executes the request
-	//  @return ServiceAccountData
-	ResetServiceAccountSecretExecute(r ApiResetServiceAccountSecretRequest) (*ServiceAccountData, *http.Response, error)
+	/*
+	 * GetServiceAccountsExecute executes the request
+	 * @return []ServiceAccountData
+	 */
+	GetServiceAccountsExecute(r ApiGetServiceAccountsRequest) ([]ServiceAccountData, *_nethttp.Response, error)
 
 	/*
-	UpdateServiceAccount Update service account
+	 * ResetServiceAccountSecret Reset service account secret by id
+	 * Reset service account secret by id . Throws not found exception if the service account is not found or the user does not have access to this service account
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id
+	 * @return ApiResetServiceAccountSecretRequest
+	 */
+	ResetServiceAccountSecret(ctx _context.Context, id string) ApiResetServiceAccountSecretRequest
 
-	Update a service account by id.
+	/*
+	 * ResetServiceAccountSecretExecute executes the request
+	 * @return ServiceAccountData
+	 */
+	ResetServiceAccountSecretExecute(r ApiResetServiceAccountSecretRequest) (ServiceAccountData, *_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id
-	@return ApiUpdateServiceAccountRequest
-	*/
-	UpdateServiceAccount(ctx context.Context, id string) ApiUpdateServiceAccountRequest
+	/*
+	 * UpdateServiceAccount Update service account
+	 * Update a service account by id.
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id
+	 * @return ApiUpdateServiceAccountRequest
+	 */
+	UpdateServiceAccount(ctx _context.Context, id string) ApiUpdateServiceAccountRequest
 
-	// UpdateServiceAccountExecute executes the request
-	//  @return ServiceAccountData
-	UpdateServiceAccountExecute(r ApiUpdateServiceAccountRequest) (*ServiceAccountData, *http.Response, error)
+	/*
+	 * UpdateServiceAccountExecute executes the request
+	 * @return ServiceAccountData
+	 */
+	UpdateServiceAccountExecute(r ApiUpdateServiceAccountRequest) (ServiceAccountData, *_nethttp.Response, error)
 }
 
 // ServiceAccountsApiService ServiceAccountsApi service
 type ServiceAccountsApiService service
 
 type ApiCreateServiceAccountRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService ServiceAccountsApi
 	serviceAccountCreateRequestData *ServiceAccountCreateRequestData
 }
 
-// &#39;name&#39; and &#39;description&#39; of the service account
 func (r ApiCreateServiceAccountRequest) ServiceAccountCreateRequestData(serviceAccountCreateRequestData ServiceAccountCreateRequestData) ApiCreateServiceAccountRequest {
 	r.serviceAccountCreateRequestData = &serviceAccountCreateRequestData
 	return r
 }
 
-func (r ApiCreateServiceAccountRequest) Execute() (*ServiceAccountData, *http.Response, error) {
+func (r ApiCreateServiceAccountRequest) Execute() (ServiceAccountData, *_nethttp.Response, error) {
 	return r.ApiService.CreateServiceAccountExecute(r)
 }
 
 /*
-CreateServiceAccount Create service account
-
-Create a service account. Created service account is associated with the user defined in the bearer token.
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiCreateServiceAccountRequest
-*/
-func (a *ServiceAccountsApiService) CreateServiceAccount(ctx context.Context) ApiCreateServiceAccountRequest {
+ * CreateServiceAccount Create service account
+ * Create a service account. Created service account is associated with the user defined in the bearer token.
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiCreateServiceAccountRequest
+ */
+func (a *ServiceAccountsApiService) CreateServiceAccount(ctx _context.Context) ApiCreateServiceAccountRequest {
 	return ApiCreateServiceAccountRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return ServiceAccountData
-func (a *ServiceAccountsApiService) CreateServiceAccountExecute(r ApiCreateServiceAccountRequest) (*ServiceAccountData, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return ServiceAccountData
+ */
+func (a *ServiceAccountsApiService) CreateServiceAccountExecute(r ApiCreateServiceAccountRequest) (ServiceAccountData, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *ServiceAccountData
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  ServiceAccountData
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "ServiceAccountsApiService.CreateServiceAccount")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/apis/service_accounts/v1"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.serviceAccountCreateRequestData == nil {
 		return localVarReturnValue, nil, reportError("serviceAccountCreateRequestData is required and must be specified")
 	}
@@ -189,7 +194,7 @@ func (a *ServiceAccountsApiService) CreateServiceAccountExecute(r ApiCreateServi
 	}
 	// body params
 	localVarPostBody = r.serviceAccountCreateRequestData
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -199,15 +204,15 @@ func (a *ServiceAccountsApiService) CreateServiceAccountExecute(r ApiCreateServi
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -218,8 +223,7 @@ func (a *ServiceAccountsApiService) CreateServiceAccountExecute(r ApiCreateServi
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -229,8 +233,7 @@ func (a *ServiceAccountsApiService) CreateServiceAccountExecute(r ApiCreateServi
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -240,15 +243,14 @@ func (a *ServiceAccountsApiService) CreateServiceAccountExecute(r ApiCreateServi
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -259,25 +261,24 @@ func (a *ServiceAccountsApiService) CreateServiceAccountExecute(r ApiCreateServi
 }
 
 type ApiDeleteServiceAccountRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService ServiceAccountsApi
 	id string
 }
 
-func (r ApiDeleteServiceAccountRequest) Execute() (*http.Response, error) {
+
+func (r ApiDeleteServiceAccountRequest) Execute() (*_nethttp.Response, error) {
 	return r.ApiService.DeleteServiceAccountExecute(r)
 }
 
 /*
-DeleteServiceAccount Delete service account by id
-
-Delete service account by id. Throws not found exception if the service account is not found or the user does not have access to this service account
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id
- @return ApiDeleteServiceAccountRequest
-*/
-func (a *ServiceAccountsApiService) DeleteServiceAccount(ctx context.Context, id string) ApiDeleteServiceAccountRequest {
+ * DeleteServiceAccount Delete service account by id
+ * Delete service account by id. Throws not found exception if the service account is not found or the user does not have access to this service account
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id
+ * @return ApiDeleteServiceAccountRequest
+ */
+func (a *ServiceAccountsApiService) DeleteServiceAccount(ctx _context.Context, id string) ApiDeleteServiceAccountRequest {
 	return ApiDeleteServiceAccountRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -285,25 +286,29 @@ func (a *ServiceAccountsApiService) DeleteServiceAccount(ctx context.Context, id
 	}
 }
 
-// Execute executes the request
-func (a *ServiceAccountsApiService) DeleteServiceAccountExecute(r ApiDeleteServiceAccountRequest) (*http.Response, error) {
+/*
+ * Execute executes the request
+ */
+func (a *ServiceAccountsApiService) DeleteServiceAccountExecute(r ApiDeleteServiceAccountRequest) (*_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodDelete
+		localVarHTTPMethod   = _nethttp.MethodDelete
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "ServiceAccountsApiService.DeleteServiceAccount")
 	if err != nil {
-		return nil, &GenericOpenAPIError{error: err.Error()}
+		return nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/apis/service_accounts/v1/{id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -322,7 +327,7 @@ func (a *ServiceAccountsApiService) DeleteServiceAccountExecute(r ApiDeleteServi
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return nil, err
 	}
@@ -332,15 +337,15 @@ func (a *ServiceAccountsApiService) DeleteServiceAccountExecute(r ApiDeleteServi
 		return localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -351,8 +356,7 @@ func (a *ServiceAccountsApiService) DeleteServiceAccountExecute(r ApiDeleteServi
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -362,8 +366,7 @@ func (a *ServiceAccountsApiService) DeleteServiceAccountExecute(r ApiDeleteServi
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarHTTPResponse, newErr
 	}
@@ -372,25 +375,24 @@ func (a *ServiceAccountsApiService) DeleteServiceAccountExecute(r ApiDeleteServi
 }
 
 type ApiGetServiceAccountRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService ServiceAccountsApi
 	id string
 }
 
-func (r ApiGetServiceAccountRequest) Execute() (*ServiceAccountData, *http.Response, error) {
+
+func (r ApiGetServiceAccountRequest) Execute() (ServiceAccountData, *_nethttp.Response, error) {
 	return r.ApiService.GetServiceAccountExecute(r)
 }
 
 /*
-GetServiceAccount Get service account by id
-
-Returns service account by id. Throws not found exception if the service account is not found or the user does not have access to this service account
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id
- @return ApiGetServiceAccountRequest
-*/
-func (a *ServiceAccountsApiService) GetServiceAccount(ctx context.Context, id string) ApiGetServiceAccountRequest {
+ * GetServiceAccount Get service account by id
+ * Returns service account by id. Throws not found exception if the service account is not found or the user does not have access to this service account
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id
+ * @return ApiGetServiceAccountRequest
+ */
+func (a *ServiceAccountsApiService) GetServiceAccount(ctx _context.Context, id string) ApiGetServiceAccountRequest {
 	return ApiGetServiceAccountRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -398,27 +400,31 @@ func (a *ServiceAccountsApiService) GetServiceAccount(ctx context.Context, id st
 	}
 }
 
-// Execute executes the request
-//  @return ServiceAccountData
-func (a *ServiceAccountsApiService) GetServiceAccountExecute(r ApiGetServiceAccountRequest) (*ServiceAccountData, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return ServiceAccountData
+ */
+func (a *ServiceAccountsApiService) GetServiceAccountExecute(r ApiGetServiceAccountRequest) (ServiceAccountData, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *ServiceAccountData
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  ServiceAccountData
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "ServiceAccountsApiService.GetServiceAccount")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/apis/service_accounts/v1/{id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -437,7 +443,7 @@ func (a *ServiceAccountsApiService) GetServiceAccountExecute(r ApiGetServiceAcco
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -447,15 +453,15 @@ func (a *ServiceAccountsApiService) GetServiceAccountExecute(r ApiGetServiceAcco
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -466,8 +472,7 @@ func (a *ServiceAccountsApiService) GetServiceAccountExecute(r ApiGetServiceAcco
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -477,15 +482,14 @@ func (a *ServiceAccountsApiService) GetServiceAccountExecute(r ApiGetServiceAcco
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -496,7 +500,7 @@ func (a *ServiceAccountsApiService) GetServiceAccountExecute(r ApiGetServiceAcco
 }
 
 type ApiGetServiceAccountsRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService ServiceAccountsApi
 	first *int32
 	max *int32
@@ -507,56 +511,56 @@ func (r ApiGetServiceAccountsRequest) First(first int32) ApiGetServiceAccountsRe
 	r.first = &first
 	return r
 }
-
 func (r ApiGetServiceAccountsRequest) Max(max int32) ApiGetServiceAccountsRequest {
 	r.max = &max
 	return r
 }
-
 func (r ApiGetServiceAccountsRequest) ClientId(clientId []string) ApiGetServiceAccountsRequest {
 	r.clientId = &clientId
 	return r
 }
 
-func (r ApiGetServiceAccountsRequest) Execute() ([]ServiceAccountData, *http.Response, error) {
+func (r ApiGetServiceAccountsRequest) Execute() ([]ServiceAccountData, *_nethttp.Response, error) {
 	return r.ApiService.GetServiceAccountsExecute(r)
 }
 
 /*
-GetServiceAccounts List all service accounts
-
-Returns a list of service accounts created by a user. User information is obtained from the bearer token. The list is paginated with starting index as 'first' and page size as 'max'.
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiGetServiceAccountsRequest
-*/
-func (a *ServiceAccountsApiService) GetServiceAccounts(ctx context.Context) ApiGetServiceAccountsRequest {
+ * GetServiceAccounts List all service accounts
+ * Returns a list of service accounts created by a user. User information is obtained from the bearer token. The list is paginated with starting index as 'first' and page size as 'max'.
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiGetServiceAccountsRequest
+ */
+func (a *ServiceAccountsApiService) GetServiceAccounts(ctx _context.Context) ApiGetServiceAccountsRequest {
 	return ApiGetServiceAccountsRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return []ServiceAccountData
-func (a *ServiceAccountsApiService) GetServiceAccountsExecute(r ApiGetServiceAccountsRequest) ([]ServiceAccountData, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return []ServiceAccountData
+ */
+func (a *ServiceAccountsApiService) GetServiceAccountsExecute(r ApiGetServiceAccountsRequest) ([]ServiceAccountData, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 		localVarReturnValue  []ServiceAccountData
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "ServiceAccountsApiService.GetServiceAccounts")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/apis/service_accounts/v1"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.first != nil {
 		localVarQueryParams.Add("first", parameterToString(*r.first, ""))
@@ -592,7 +596,7 @@ func (a *ServiceAccountsApiService) GetServiceAccountsExecute(r ApiGetServiceAcc
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -602,15 +606,15 @@ func (a *ServiceAccountsApiService) GetServiceAccountsExecute(r ApiGetServiceAcc
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -621,8 +625,7 @@ func (a *ServiceAccountsApiService) GetServiceAccountsExecute(r ApiGetServiceAcc
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -632,15 +635,14 @@ func (a *ServiceAccountsApiService) GetServiceAccountsExecute(r ApiGetServiceAcc
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -651,25 +653,24 @@ func (a *ServiceAccountsApiService) GetServiceAccountsExecute(r ApiGetServiceAcc
 }
 
 type ApiResetServiceAccountSecretRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService ServiceAccountsApi
 	id string
 }
 
-func (r ApiResetServiceAccountSecretRequest) Execute() (*ServiceAccountData, *http.Response, error) {
+
+func (r ApiResetServiceAccountSecretRequest) Execute() (ServiceAccountData, *_nethttp.Response, error) {
 	return r.ApiService.ResetServiceAccountSecretExecute(r)
 }
 
 /*
-ResetServiceAccountSecret Reset service account secret by id
-
-Reset service account secret by id . Throws not found exception if the service account is not found or the user does not have access to this service account
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id
- @return ApiResetServiceAccountSecretRequest
-*/
-func (a *ServiceAccountsApiService) ResetServiceAccountSecret(ctx context.Context, id string) ApiResetServiceAccountSecretRequest {
+ * ResetServiceAccountSecret Reset service account secret by id
+ * Reset service account secret by id . Throws not found exception if the service account is not found or the user does not have access to this service account
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id
+ * @return ApiResetServiceAccountSecretRequest
+ */
+func (a *ServiceAccountsApiService) ResetServiceAccountSecret(ctx _context.Context, id string) ApiResetServiceAccountSecretRequest {
 	return ApiResetServiceAccountSecretRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -677,27 +678,31 @@ func (a *ServiceAccountsApiService) ResetServiceAccountSecret(ctx context.Contex
 	}
 }
 
-// Execute executes the request
-//  @return ServiceAccountData
-func (a *ServiceAccountsApiService) ResetServiceAccountSecretExecute(r ApiResetServiceAccountSecretRequest) (*ServiceAccountData, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return ServiceAccountData
+ */
+func (a *ServiceAccountsApiService) ResetServiceAccountSecretExecute(r ApiResetServiceAccountSecretRequest) (ServiceAccountData, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *ServiceAccountData
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  ServiceAccountData
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "ServiceAccountsApiService.ResetServiceAccountSecret")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/apis/service_accounts/v1/{id}/resetSecret"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -716,7 +721,7 @@ func (a *ServiceAccountsApiService) ResetServiceAccountSecretExecute(r ApiResetS
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -726,15 +731,15 @@ func (a *ServiceAccountsApiService) ResetServiceAccountSecretExecute(r ApiResetS
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -745,8 +750,7 @@ func (a *ServiceAccountsApiService) ResetServiceAccountSecretExecute(r ApiResetS
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -756,15 +760,14 @@ func (a *ServiceAccountsApiService) ResetServiceAccountSecretExecute(r ApiResetS
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -775,32 +778,29 @@ func (a *ServiceAccountsApiService) ResetServiceAccountSecretExecute(r ApiResetS
 }
 
 type ApiUpdateServiceAccountRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService ServiceAccountsApi
 	id string
 	serviceAccountRequestData *ServiceAccountRequestData
 }
 
-// &#39;name&#39; and &#39;description&#39; of the service account
 func (r ApiUpdateServiceAccountRequest) ServiceAccountRequestData(serviceAccountRequestData ServiceAccountRequestData) ApiUpdateServiceAccountRequest {
 	r.serviceAccountRequestData = &serviceAccountRequestData
 	return r
 }
 
-func (r ApiUpdateServiceAccountRequest) Execute() (*ServiceAccountData, *http.Response, error) {
+func (r ApiUpdateServiceAccountRequest) Execute() (ServiceAccountData, *_nethttp.Response, error) {
 	return r.ApiService.UpdateServiceAccountExecute(r)
 }
 
 /*
-UpdateServiceAccount Update service account
-
-Update a service account by id.
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id
- @return ApiUpdateServiceAccountRequest
-*/
-func (a *ServiceAccountsApiService) UpdateServiceAccount(ctx context.Context, id string) ApiUpdateServiceAccountRequest {
+ * UpdateServiceAccount Update service account
+ * Update a service account by id.
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id
+ * @return ApiUpdateServiceAccountRequest
+ */
+func (a *ServiceAccountsApiService) UpdateServiceAccount(ctx _context.Context, id string) ApiUpdateServiceAccountRequest {
 	return ApiUpdateServiceAccountRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -808,27 +808,31 @@ func (a *ServiceAccountsApiService) UpdateServiceAccount(ctx context.Context, id
 	}
 }
 
-// Execute executes the request
-//  @return ServiceAccountData
-func (a *ServiceAccountsApiService) UpdateServiceAccountExecute(r ApiUpdateServiceAccountRequest) (*ServiceAccountData, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return ServiceAccountData
+ */
+func (a *ServiceAccountsApiService) UpdateServiceAccountExecute(r ApiUpdateServiceAccountRequest) (ServiceAccountData, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPatch
+		localVarHTTPMethod   = _nethttp.MethodPatch
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *ServiceAccountData
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  ServiceAccountData
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "ServiceAccountsApiService.UpdateServiceAccount")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/apis/service_accounts/v1/{id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if r.serviceAccountRequestData == nil {
 		return localVarReturnValue, nil, reportError("serviceAccountRequestData is required and must be specified")
 	}
@@ -852,7 +856,7 @@ func (a *ServiceAccountsApiService) UpdateServiceAccountExecute(r ApiUpdateServi
 	}
 	// body params
 	localVarPostBody = r.serviceAccountRequestData
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -862,15 +866,15 @@ func (a *ServiceAccountsApiService) UpdateServiceAccountExecute(r ApiUpdateServi
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -881,8 +885,7 @@ func (a *ServiceAccountsApiService) UpdateServiceAccountExecute(r ApiUpdateServi
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -892,8 +895,7 @@ func (a *ServiceAccountsApiService) UpdateServiceAccountExecute(r ApiUpdateServi
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -903,15 +905,14 @@ func (a *ServiceAccountsApiService) UpdateServiceAccountExecute(r ApiUpdateServi
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
diff --git a/app-services-sdk-go/serviceaccountmgmt/apiv1/client/client.go b/app-services-sdk-go/serviceaccountmgmt/apiv1/client/client.go
index e89b3bbf..ec04500a 100644
--- a/app-services-sdk-go/serviceaccountmgmt/apiv1/client/client.go
+++ b/app-services-sdk-go/serviceaccountmgmt/apiv1/client/client.go
@@ -1,11 +1,11 @@
 /*
-sso.redhat.com API documentation
-
-This is the API documentation for sso.redhat.com
-
-API version: 5.0.19-SNAPSHOT
-Contact: it-user-team-list@redhat.com
-*/
+ * sso.redhat.com API documentation
+ *
+ * This is the API documentation for sso.redhat.com
+ *
+ * API version: 5.0.19-SNAPSHOT
+ * Contact: it-user-team-list@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -111,7 +111,7 @@ func selectHeaderAccept(accepts []string) string {
 // contains is a case insensitive match, finding needle in a haystack
 func contains(haystack []string, needle string) bool {
 	for _, a := range haystack {
-		if strings.EqualFold(a, needle) {
+		if strings.ToLower(a) == strings.ToLower(needle) {
 			return true
 		}
 	}
@@ -127,7 +127,7 @@ func typeCheckParameter(obj interface{}, expected string, name string) error {
 
 	// Check the type is as expected.
 	if reflect.TypeOf(obj).String() != expected {
-		return fmt.Errorf("expected %s to be of type %s but received %s", name, expected, reflect.TypeOf(obj).String())
+		return fmt.Errorf("Expected %s to be of type %s but received %s.", name, expected, reflect.TypeOf(obj).String())
 	}
 	return nil
 }
@@ -196,12 +196,6 @@ func (c *APIClient) GetConfig() *Configuration {
 	return c.cfg
 }
 
-type formFile struct {
-		fileBytes []byte
-		fileName string
-		formFileName string
-}
-
 // prepareRequest build the request
 func (c *APIClient) prepareRequest(
 	ctx context.Context,
@@ -210,7 +204,9 @@ func (c *APIClient) prepareRequest(
 	headerParams map[string]string,
 	queryParams url.Values,
 	formParams url.Values,
-	formFiles []formFile) (localVarRequest *http.Request, err error) {
+	formFileName string,
+	fileName string,
+	fileBytes []byte) (localVarRequest *http.Request, err error) {
 
 	var body *bytes.Buffer
 
@@ -229,7 +225,7 @@ func (c *APIClient) prepareRequest(
 	}
 
 	// add form parameters and file if available.
-	if strings.HasPrefix(headerParams["Content-Type"], "multipart/form-data") && len(formParams) > 0 || (len(formFiles) > 0) {
+	if strings.HasPrefix(headerParams["Content-Type"], "multipart/form-data") && len(formParams) > 0 || (len(fileBytes) > 0 && fileName != "") {
 		if body != nil {
 			return nil, errors.New("Cannot specify postBody and multipart form at the same time.")
 		}
@@ -248,17 +244,16 @@ func (c *APIClient) prepareRequest(
 				}
 			}
 		}
-		for _, formFile := range formFiles {
-			if len(formFile.fileBytes) > 0 && formFile.fileName != "" {
-				w.Boundary()
-				part, err := w.CreateFormFile(formFile.formFileName, filepath.Base(formFile.fileName))
-				if err != nil {
-						return nil, err
-				}
-				_, err = part.Write(formFile.fileBytes)
-				if err != nil {
-						return nil, err
-				}
+		if len(fileBytes) > 0 && fileName != "" {
+			w.Boundary()
+			//_, fileNm := filepath.Split(fileName)
+			part, err := w.CreateFormFile(formFileName, filepath.Base(fileName))
+			if err != nil {
+				return nil, err
+			}
+			_, err = part.Write(fileBytes)
+			if err != nil {
+				return nil, err
 			}
 		}
 
@@ -321,7 +316,7 @@ func (c *APIClient) prepareRequest(
 	if len(headerParams) > 0 {
 		headers := http.Header{}
 		for h, v := range headerParams {
-			headers[h] = []string{v}
+			headers.Set(h, v)
 		}
 		localVarRequest.Header = headers
 	}
@@ -378,9 +373,6 @@ func (c *APIClient) decode(v interface{}, b []byte, contentType string) (err err
 			return
 		}
 		_, err = (*f).Write(b)
-		if err != nil {
-			return
-		}
 		_, err = (*f).Seek(0, io.SeekStart)
 		return
 	}
@@ -409,14 +401,11 @@ func (c *APIClient) decode(v interface{}, b []byte, contentType string) (err err
 
 // Add a file to the multipart request
 func addFile(w *multipart.Writer, fieldName, path string) error {
-	file, err := os.Open(filepath.Clean(path))
-	if err != nil {
-		return err
-	}
-	err = file.Close()
+	file, err := os.Open(path)
 	if err != nil {
 		return err
 	}
+	defer file.Close()
 
 	part, err := w.CreateFormFile(fieldName, filepath.Base(path))
 	if err != nil {
@@ -432,13 +421,6 @@ func reportError(format string, a ...interface{}) error {
 	return fmt.Errorf(format, a...)
 }
 
-// A wrapper for strict JSON decoding
-func newStrictDecoder(data []byte) *json.Decoder {
-	dec := json.NewDecoder(bytes.NewBuffer(data))
-	dec.DisallowUnknownFields()
-	return dec
-}
-
 // Set request body from an interface{}
 func setBody(body interface{}, contentType string) (bodyBuf *bytes.Buffer, err error) {
 	if bodyBuf == nil {
@@ -466,7 +448,7 @@ func setBody(body interface{}, contentType string) (bodyBuf *bytes.Buffer, err e
 	}
 
 	if bodyBuf.Len() == 0 {
-		err = fmt.Errorf("invalid body type %s\n", contentType)
+		err = fmt.Errorf("Invalid body type %s\n", contentType)
 		return nil, err
 	}
 	return bodyBuf, nil
@@ -568,23 +550,3 @@ func (e GenericOpenAPIError) Body() []byte {
 func (e GenericOpenAPIError) Model() interface{} {
 	return e.model
 }
-
-// format error message using title and detail when model implements rfc7807
-func formatErrorMessage(status string, v interface{}) string {
-
-    str := ""
-    metaValue := reflect.ValueOf(v).Elem()
-
-    field := metaValue.FieldByName("Title")
-    if field != (reflect.Value{}) {
-        str = fmt.Sprintf("%s", field.Interface())
-    }
-
-    field = metaValue.FieldByName("Detail")
-    if field != (reflect.Value{}) {
-        str = fmt.Sprintf("%s (%s)", str, field.Interface())
-    }
-
-    // status title (detail)
-    return fmt.Sprintf("%s %s", status, str)
-}
diff --git a/app-services-sdk-go/serviceaccountmgmt/apiv1/client/configuration.go b/app-services-sdk-go/serviceaccountmgmt/apiv1/client/configuration.go
index edf03351..c7197502 100644
--- a/app-services-sdk-go/serviceaccountmgmt/apiv1/client/configuration.go
+++ b/app-services-sdk-go/serviceaccountmgmt/apiv1/client/configuration.go
@@ -1,11 +1,11 @@
 /*
-sso.redhat.com API documentation
-
-This is the API documentation for sso.redhat.com
-
-API version: 5.0.19-SNAPSHOT
-Contact: it-user-team-list@redhat.com
-*/
+ * sso.redhat.com API documentation
+ *
+ * This is the API documentation for sso.redhat.com
+ *
+ * API version: 5.0.19-SNAPSHOT
+ * Contact: it-user-team-list@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -132,7 +132,7 @@ func (c *Configuration) AddDefaultHeader(key string, value string) {
 // URL formats template on a index using given variables
 func (sc ServerConfigurations) URL(index int, variables map[string]string) (string, error) {
 	if index < 0 || len(sc) <= index {
-		return "", fmt.Errorf("index %v out of range %v", index, len(sc)-1)
+		return "", fmt.Errorf("Index %v out of range %v", index, len(sc)-1)
 	}
 	server := sc[index]
 	url := server.URL
@@ -147,7 +147,7 @@ func (sc ServerConfigurations) URL(index int, variables map[string]string) (stri
 				}
 			}
 			if !found {
-				return "", fmt.Errorf("the variable %s in the server URL has invalid value %v. Must be %v", name, value, variable.EnumValues)
+				return "", fmt.Errorf("The variable %s in the server URL has invalid value %v. Must be %v", name, value, variable.EnumValues)
 			}
 			url = strings.Replace(url, "{"+name+"}", value, -1)
 		} else {
diff --git a/app-services-sdk-go/serviceaccountmgmt/apiv1/client/docs/AcsTenantsApi.md b/app-services-sdk-go/serviceaccountmgmt/apiv1/client/docs/AcsTenantsApi.md
index 40067955..c9bf308d 100644
--- a/app-services-sdk-go/serviceaccountmgmt/apiv1/client/docs/AcsTenantsApi.md
+++ b/app-services-sdk-go/serviceaccountmgmt/apiv1/client/docs/AcsTenantsApi.md
@@ -33,8 +33,8 @@ func main() {
     acsClientRequestData := *openapiclient.NewAcsClientRequestData([]string{"RedirectUris_example"}, "OrgId_example") // AcsClientRequestData | The name, redirect URIs and the organization id of the ACS managed central client
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.AcsTenantsApi.CreateAcsClient(context.Background()).AcsClientRequestData(acsClientRequestData).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.AcsTenantsApi.CreateAcsClient(context.Background()).AcsClientRequestData(acsClientRequestData).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `AcsTenantsApi.CreateAcsClient``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -99,8 +99,8 @@ func main() {
     clientId := "clientId_example" // string | 
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.AcsTenantsApi.DeleteAcsClient(context.Background(), clientId).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.AcsTenantsApi.DeleteAcsClient(context.Background(), clientId).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `AcsTenantsApi.DeleteAcsClient``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
diff --git a/app-services-sdk-go/serviceaccountmgmt/apiv1/client/docs/DefaultApi.md b/app-services-sdk-go/serviceaccountmgmt/apiv1/client/docs/DefaultApi.md
index 70f3dcd4..acffc2ac 100644
--- a/app-services-sdk-go/serviceaccountmgmt/apiv1/client/docs/DefaultApi.md
+++ b/app-services-sdk-go/serviceaccountmgmt/apiv1/client/docs/DefaultApi.md
@@ -31,8 +31,8 @@ func main() {
     id := "id_example" // string | 
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.GetAuthenticationPolicy(context.Background(), id).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.GetAuthenticationPolicy(context.Background(), id).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.GetAuthenticationPolicy``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -100,8 +100,8 @@ func main() {
     authenticationPolicy := *openapiclient.NewAuthenticationPolicy() // AuthenticationPolicy |  (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.DefaultApi.SetAuthenticationPolicy(context.Background(), id).AuthenticationPolicy(authenticationPolicy).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.DefaultApi.SetAuthenticationPolicy(context.Background(), id).AuthenticationPolicy(authenticationPolicy).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.SetAuthenticationPolicy``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
diff --git a/app-services-sdk-go/serviceaccountmgmt/apiv1/client/docs/ServiceAccountsApi.md b/app-services-sdk-go/serviceaccountmgmt/apiv1/client/docs/ServiceAccountsApi.md
index a2f911ac..b046c75a 100644
--- a/app-services-sdk-go/serviceaccountmgmt/apiv1/client/docs/ServiceAccountsApi.md
+++ b/app-services-sdk-go/serviceaccountmgmt/apiv1/client/docs/ServiceAccountsApi.md
@@ -37,8 +37,8 @@ func main() {
     serviceAccountCreateRequestData := *openapiclient.NewServiceAccountCreateRequestData("Name_example") // ServiceAccountCreateRequestData | 'name' and 'description' of the service account
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.ServiceAccountsApi.CreateServiceAccount(context.Background()).ServiceAccountCreateRequestData(serviceAccountCreateRequestData).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.ServiceAccountsApi.CreateServiceAccount(context.Background()).ServiceAccountCreateRequestData(serviceAccountCreateRequestData).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `ServiceAccountsApi.CreateServiceAccount``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -103,8 +103,8 @@ func main() {
     id := "id_example" // string | 
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.ServiceAccountsApi.DeleteServiceAccount(context.Background(), id).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.ServiceAccountsApi.DeleteServiceAccount(context.Background(), id).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `ServiceAccountsApi.DeleteServiceAccount``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -171,8 +171,8 @@ func main() {
     id := "id_example" // string | 
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.ServiceAccountsApi.GetServiceAccount(context.Background(), id).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.ServiceAccountsApi.GetServiceAccount(context.Background(), id).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `ServiceAccountsApi.GetServiceAccount``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -243,8 +243,8 @@ func main() {
     clientId := []string{"Inner_example"} // []string |  (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.ServiceAccountsApi.GetServiceAccounts(context.Background()).First(first).Max(max).ClientId(clientId).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.ServiceAccountsApi.GetServiceAccounts(context.Background()).First(first).Max(max).ClientId(clientId).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `ServiceAccountsApi.GetServiceAccounts``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -311,8 +311,8 @@ func main() {
     id := "id_example" // string | 
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.ServiceAccountsApi.ResetServiceAccountSecret(context.Background(), id).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.ServiceAccountsApi.ResetServiceAccountSecret(context.Background(), id).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `ServiceAccountsApi.ResetServiceAccountSecret``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -382,8 +382,8 @@ func main() {
     serviceAccountRequestData := *openapiclient.NewServiceAccountRequestData() // ServiceAccountRequestData | 'name' and 'description' of the service account
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.ServiceAccountsApi.UpdateServiceAccount(context.Background(), id).ServiceAccountRequestData(serviceAccountRequestData).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.ServiceAccountsApi.UpdateServiceAccount(context.Background(), id).ServiceAccountRequestData(serviceAccountRequestData).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `ServiceAccountsApi.UpdateServiceAccount``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
diff --git a/app-services-sdk-go/serviceaccountmgmt/apiv1/client/go.mod b/app-services-sdk-go/serviceaccountmgmt/apiv1/client/go.mod
deleted file mode 100644
index ead32606..00000000
--- a/app-services-sdk-go/serviceaccountmgmt/apiv1/client/go.mod
+++ /dev/null
@@ -1,7 +0,0 @@
-module github.com/GIT_USER_ID/GIT_REPO_ID
-
-go 1.13
-
-require (
-	golang.org/x/oauth2 v0.0.0-20210323180902-22b0adad7558
-)
diff --git a/app-services-sdk-go/serviceaccountmgmt/apiv1/client/go.sum b/app-services-sdk-go/serviceaccountmgmt/apiv1/client/go.sum
deleted file mode 100644
index 734252e6..00000000
--- a/app-services-sdk-go/serviceaccountmgmt/apiv1/client/go.sum
+++ /dev/null
@@ -1,13 +0,0 @@
-cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
-github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e h1:bRhVy7zSSasaqNksaRZiA5EEI+Ei4I1nO5Jh72wfHlg=
-golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 h1:SVwTIAaPC2U/AvvLNZ2a7OVsmBpC8L5BlwK1whH3hm0=
-golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 h1:YUO/7uOKsKeq9UokNS62b8FYywz3ker1l1vDZRCRefw=
-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508=
-google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
diff --git a/app-services-sdk-go/serviceaccountmgmt/apiv1/client/model_acs_client_request_data.go b/app-services-sdk-go/serviceaccountmgmt/apiv1/client/model_acs_client_request_data.go
index 89c561a2..26a4c106 100644
--- a/app-services-sdk-go/serviceaccountmgmt/apiv1/client/model_acs_client_request_data.go
+++ b/app-services-sdk-go/serviceaccountmgmt/apiv1/client/model_acs_client_request_data.go
@@ -1,11 +1,11 @@
 /*
-sso.redhat.com API documentation
-
-This is the API documentation for sso.redhat.com
-
-API version: 5.0.19-SNAPSHOT
-Contact: it-user-team-list@redhat.com
-*/
+ * sso.redhat.com API documentation
+ *
+ * This is the API documentation for sso.redhat.com
+ *
+ * API version: 5.0.19-SNAPSHOT
+ * Contact: it-user-team-list@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -43,7 +43,7 @@ func NewAcsClientRequestDataWithDefaults() *AcsClientRequestData {
 
 // GetName returns the Name field value if set, zero value otherwise.
 func (o *AcsClientRequestData) GetName() string {
-	if o == nil || isNil(o.Name) {
+	if o == nil || o.Name == nil {
 		var ret string
 		return ret
 	}
@@ -53,15 +53,15 @@ func (o *AcsClientRequestData) GetName() string {
 // GetNameOk returns a tuple with the Name field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AcsClientRequestData) GetNameOk() (*string, bool) {
-	if o == nil || isNil(o.Name) {
-    return nil, false
+	if o == nil || o.Name == nil {
+		return nil, false
 	}
 	return o.Name, true
 }
 
 // HasName returns a boolean if a field has been set.
 func (o *AcsClientRequestData) HasName() bool {
-	if o != nil && !isNil(o.Name) {
+	if o != nil && o.Name != nil {
 		return true
 	}
 
@@ -85,11 +85,11 @@ func (o *AcsClientRequestData) GetRedirectUris() []string {
 
 // GetRedirectUrisOk returns a tuple with the RedirectUris field value
 // and a boolean to check if the value has been set.
-func (o *AcsClientRequestData) GetRedirectUrisOk() ([]string, bool) {
-	if o == nil {
-    return nil, false
+func (o *AcsClientRequestData) GetRedirectUrisOk() (*[]string, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.RedirectUris, true
+	return &o.RedirectUris, true
 }
 
 // SetRedirectUris sets field value
@@ -110,8 +110,8 @@ func (o *AcsClientRequestData) GetOrgId() string {
 // GetOrgIdOk returns a tuple with the OrgId field value
 // and a boolean to check if the value has been set.
 func (o *AcsClientRequestData) GetOrgIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.OrgId, true
 }
@@ -123,7 +123,7 @@ func (o *AcsClientRequestData) SetOrgId(v string) {
 
 func (o AcsClientRequestData) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Name) {
+	if o.Name != nil {
 		toSerialize["name"] = o.Name
 	}
 	if true {
diff --git a/app-services-sdk-go/serviceaccountmgmt/apiv1/client/model_acs_client_response_data.go b/app-services-sdk-go/serviceaccountmgmt/apiv1/client/model_acs_client_response_data.go
index c6bafb2e..adc21fad 100644
--- a/app-services-sdk-go/serviceaccountmgmt/apiv1/client/model_acs_client_response_data.go
+++ b/app-services-sdk-go/serviceaccountmgmt/apiv1/client/model_acs_client_response_data.go
@@ -1,11 +1,11 @@
 /*
-sso.redhat.com API documentation
-
-This is the API documentation for sso.redhat.com
-
-API version: 5.0.19-SNAPSHOT
-Contact: it-user-team-list@redhat.com
-*/
+ * sso.redhat.com API documentation
+ *
+ * This is the API documentation for sso.redhat.com
+ *
+ * API version: 5.0.19-SNAPSHOT
+ * Contact: it-user-team-list@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -42,7 +42,7 @@ func NewAcsClientResponseDataWithDefaults() *AcsClientResponseData {
 
 // GetClientId returns the ClientId field value if set, zero value otherwise.
 func (o *AcsClientResponseData) GetClientId() string {
-	if o == nil || isNil(o.ClientId) {
+	if o == nil || o.ClientId == nil {
 		var ret string
 		return ret
 	}
@@ -52,15 +52,15 @@ func (o *AcsClientResponseData) GetClientId() string {
 // GetClientIdOk returns a tuple with the ClientId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AcsClientResponseData) GetClientIdOk() (*string, bool) {
-	if o == nil || isNil(o.ClientId) {
-    return nil, false
+	if o == nil || o.ClientId == nil {
+		return nil, false
 	}
 	return o.ClientId, true
 }
 
 // HasClientId returns a boolean if a field has been set.
 func (o *AcsClientResponseData) HasClientId() bool {
-	if o != nil && !isNil(o.ClientId) {
+	if o != nil && o.ClientId != nil {
 		return true
 	}
 
@@ -74,7 +74,7 @@ func (o *AcsClientResponseData) SetClientId(v string) {
 
 // GetSecret returns the Secret field value if set, zero value otherwise.
 func (o *AcsClientResponseData) GetSecret() string {
-	if o == nil || isNil(o.Secret) {
+	if o == nil || o.Secret == nil {
 		var ret string
 		return ret
 	}
@@ -84,15 +84,15 @@ func (o *AcsClientResponseData) GetSecret() string {
 // GetSecretOk returns a tuple with the Secret field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AcsClientResponseData) GetSecretOk() (*string, bool) {
-	if o == nil || isNil(o.Secret) {
-    return nil, false
+	if o == nil || o.Secret == nil {
+		return nil, false
 	}
 	return o.Secret, true
 }
 
 // HasSecret returns a boolean if a field has been set.
 func (o *AcsClientResponseData) HasSecret() bool {
-	if o != nil && !isNil(o.Secret) {
+	if o != nil && o.Secret != nil {
 		return true
 	}
 
@@ -106,7 +106,7 @@ func (o *AcsClientResponseData) SetSecret(v string) {
 
 // GetName returns the Name field value if set, zero value otherwise.
 func (o *AcsClientResponseData) GetName() string {
-	if o == nil || isNil(o.Name) {
+	if o == nil || o.Name == nil {
 		var ret string
 		return ret
 	}
@@ -116,15 +116,15 @@ func (o *AcsClientResponseData) GetName() string {
 // GetNameOk returns a tuple with the Name field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AcsClientResponseData) GetNameOk() (*string, bool) {
-	if o == nil || isNil(o.Name) {
-    return nil, false
+	if o == nil || o.Name == nil {
+		return nil, false
 	}
 	return o.Name, true
 }
 
 // HasName returns a boolean if a field has been set.
 func (o *AcsClientResponseData) HasName() bool {
-	if o != nil && !isNil(o.Name) {
+	if o != nil && o.Name != nil {
 		return true
 	}
 
@@ -138,7 +138,7 @@ func (o *AcsClientResponseData) SetName(v string) {
 
 // GetCreatedAt returns the CreatedAt field value if set, zero value otherwise.
 func (o *AcsClientResponseData) GetCreatedAt() int64 {
-	if o == nil || isNil(o.CreatedAt) {
+	if o == nil || o.CreatedAt == nil {
 		var ret int64
 		return ret
 	}
@@ -148,15 +148,15 @@ func (o *AcsClientResponseData) GetCreatedAt() int64 {
 // GetCreatedAtOk returns a tuple with the CreatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AcsClientResponseData) GetCreatedAtOk() (*int64, bool) {
-	if o == nil || isNil(o.CreatedAt) {
-    return nil, false
+	if o == nil || o.CreatedAt == nil {
+		return nil, false
 	}
 	return o.CreatedAt, true
 }
 
 // HasCreatedAt returns a boolean if a field has been set.
 func (o *AcsClientResponseData) HasCreatedAt() bool {
-	if o != nil && !isNil(o.CreatedAt) {
+	if o != nil && o.CreatedAt != nil {
 		return true
 	}
 
@@ -170,16 +170,16 @@ func (o *AcsClientResponseData) SetCreatedAt(v int64) {
 
 func (o AcsClientResponseData) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.ClientId) {
+	if o.ClientId != nil {
 		toSerialize["clientId"] = o.ClientId
 	}
-	if !isNil(o.Secret) {
+	if o.Secret != nil {
 		toSerialize["secret"] = o.Secret
 	}
-	if !isNil(o.Name) {
+	if o.Name != nil {
 		toSerialize["name"] = o.Name
 	}
-	if !isNil(o.CreatedAt) {
+	if o.CreatedAt != nil {
 		toSerialize["createdAt"] = o.CreatedAt
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/serviceaccountmgmt/apiv1/client/model_authentication_factors.go b/app-services-sdk-go/serviceaccountmgmt/apiv1/client/model_authentication_factors.go
index fba73762..6ea44289 100644
--- a/app-services-sdk-go/serviceaccountmgmt/apiv1/client/model_authentication_factors.go
+++ b/app-services-sdk-go/serviceaccountmgmt/apiv1/client/model_authentication_factors.go
@@ -1,11 +1,11 @@
 /*
-sso.redhat.com API documentation
-
-This is the API documentation for sso.redhat.com
-
-API version: 5.0.19-SNAPSHOT
-Contact: it-user-team-list@redhat.com
-*/
+ * sso.redhat.com API documentation
+ *
+ * This is the API documentation for sso.redhat.com
+ *
+ * API version: 5.0.19-SNAPSHOT
+ * Contact: it-user-team-list@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -39,7 +39,7 @@ func NewAuthenticationFactorsWithDefaults() *AuthenticationFactors {
 
 // GetOtp returns the Otp field value if set, zero value otherwise.
 func (o *AuthenticationFactors) GetOtp() Otp {
-	if o == nil || isNil(o.Otp) {
+	if o == nil || o.Otp == nil {
 		var ret Otp
 		return ret
 	}
@@ -49,15 +49,15 @@ func (o *AuthenticationFactors) GetOtp() Otp {
 // GetOtpOk returns a tuple with the Otp field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AuthenticationFactors) GetOtpOk() (*Otp, bool) {
-	if o == nil || isNil(o.Otp) {
-    return nil, false
+	if o == nil || o.Otp == nil {
+		return nil, false
 	}
 	return o.Otp, true
 }
 
 // HasOtp returns a boolean if a field has been set.
 func (o *AuthenticationFactors) HasOtp() bool {
-	if o != nil && !isNil(o.Otp) {
+	if o != nil && o.Otp != nil {
 		return true
 	}
 
@@ -71,7 +71,7 @@ func (o *AuthenticationFactors) SetOtp(v Otp) {
 
 func (o AuthenticationFactors) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Otp) {
+	if o.Otp != nil {
 		toSerialize["otp"] = o.Otp
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/serviceaccountmgmt/apiv1/client/model_authentication_policy.go b/app-services-sdk-go/serviceaccountmgmt/apiv1/client/model_authentication_policy.go
index e87660b5..b03558c4 100644
--- a/app-services-sdk-go/serviceaccountmgmt/apiv1/client/model_authentication_policy.go
+++ b/app-services-sdk-go/serviceaccountmgmt/apiv1/client/model_authentication_policy.go
@@ -1,11 +1,11 @@
 /*
-sso.redhat.com API documentation
-
-This is the API documentation for sso.redhat.com
-
-API version: 5.0.19-SNAPSHOT
-Contact: it-user-team-list@redhat.com
-*/
+ * sso.redhat.com API documentation
+ *
+ * This is the API documentation for sso.redhat.com
+ *
+ * API version: 5.0.19-SNAPSHOT
+ * Contact: it-user-team-list@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -39,7 +39,7 @@ func NewAuthenticationPolicyWithDefaults() *AuthenticationPolicy {
 
 // GetAuthenticationFactors returns the AuthenticationFactors field value if set, zero value otherwise.
 func (o *AuthenticationPolicy) GetAuthenticationFactors() AuthenticationFactors {
-	if o == nil || isNil(o.AuthenticationFactors) {
+	if o == nil || o.AuthenticationFactors == nil {
 		var ret AuthenticationFactors
 		return ret
 	}
@@ -49,15 +49,15 @@ func (o *AuthenticationPolicy) GetAuthenticationFactors() AuthenticationFactors
 // GetAuthenticationFactorsOk returns a tuple with the AuthenticationFactors field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *AuthenticationPolicy) GetAuthenticationFactorsOk() (*AuthenticationFactors, bool) {
-	if o == nil || isNil(o.AuthenticationFactors) {
-    return nil, false
+	if o == nil || o.AuthenticationFactors == nil {
+		return nil, false
 	}
 	return o.AuthenticationFactors, true
 }
 
 // HasAuthenticationFactors returns a boolean if a field has been set.
 func (o *AuthenticationPolicy) HasAuthenticationFactors() bool {
-	if o != nil && !isNil(o.AuthenticationFactors) {
+	if o != nil && o.AuthenticationFactors != nil {
 		return true
 	}
 
@@ -71,7 +71,7 @@ func (o *AuthenticationPolicy) SetAuthenticationFactors(v AuthenticationFactors)
 
 func (o AuthenticationPolicy) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.AuthenticationFactors) {
+	if o.AuthenticationFactors != nil {
 		toSerialize["authenticationFactors"] = o.AuthenticationFactors
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/serviceaccountmgmt/apiv1/client/model_error.go b/app-services-sdk-go/serviceaccountmgmt/apiv1/client/model_error.go
index a89ff431..9f2a9a72 100644
--- a/app-services-sdk-go/serviceaccountmgmt/apiv1/client/model_error.go
+++ b/app-services-sdk-go/serviceaccountmgmt/apiv1/client/model_error.go
@@ -1,11 +1,11 @@
 /*
-sso.redhat.com API documentation
-
-This is the API documentation for sso.redhat.com
-
-API version: 5.0.19-SNAPSHOT
-Contact: it-user-team-list@redhat.com
-*/
+ * sso.redhat.com API documentation
+ *
+ * This is the API documentation for sso.redhat.com
+ *
+ * API version: 5.0.19-SNAPSHOT
+ * Contact: it-user-team-list@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -52,8 +52,8 @@ func (o *Error) GetError() string {
 // GetErrorOk returns a tuple with the Error field value
 // and a boolean to check if the value has been set.
 func (o *Error) GetErrorOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Error, true
 }
diff --git a/app-services-sdk-go/serviceaccountmgmt/apiv1/client/model_otp.go b/app-services-sdk-go/serviceaccountmgmt/apiv1/client/model_otp.go
index 457a5ef9..c618d67d 100644
--- a/app-services-sdk-go/serviceaccountmgmt/apiv1/client/model_otp.go
+++ b/app-services-sdk-go/serviceaccountmgmt/apiv1/client/model_otp.go
@@ -1,11 +1,11 @@
 /*
-sso.redhat.com API documentation
-
-This is the API documentation for sso.redhat.com
-
-API version: 5.0.19-SNAPSHOT
-Contact: it-user-team-list@redhat.com
-*/
+ * sso.redhat.com API documentation
+ *
+ * This is the API documentation for sso.redhat.com
+ *
+ * API version: 5.0.19-SNAPSHOT
+ * Contact: it-user-team-list@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -39,7 +39,7 @@ func NewOtpWithDefaults() *Otp {
 
 // GetRequired returns the Required field value if set, zero value otherwise.
 func (o *Otp) GetRequired() bool {
-	if o == nil || isNil(o.Required) {
+	if o == nil || o.Required == nil {
 		var ret bool
 		return ret
 	}
@@ -49,15 +49,15 @@ func (o *Otp) GetRequired() bool {
 // GetRequiredOk returns a tuple with the Required field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Otp) GetRequiredOk() (*bool, bool) {
-	if o == nil || isNil(o.Required) {
-    return nil, false
+	if o == nil || o.Required == nil {
+		return nil, false
 	}
 	return o.Required, true
 }
 
 // HasRequired returns a boolean if a field has been set.
 func (o *Otp) HasRequired() bool {
-	if o != nil && !isNil(o.Required) {
+	if o != nil && o.Required != nil {
 		return true
 	}
 
@@ -71,7 +71,7 @@ func (o *Otp) SetRequired(v bool) {
 
 func (o Otp) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Required) {
+	if o.Required != nil {
 		toSerialize["required"] = o.Required
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/serviceaccountmgmt/apiv1/client/model_red_hat_error_representation.go b/app-services-sdk-go/serviceaccountmgmt/apiv1/client/model_red_hat_error_representation.go
index b69c6755..6bd23106 100644
--- a/app-services-sdk-go/serviceaccountmgmt/apiv1/client/model_red_hat_error_representation.go
+++ b/app-services-sdk-go/serviceaccountmgmt/apiv1/client/model_red_hat_error_representation.go
@@ -1,11 +1,11 @@
 /*
-sso.redhat.com API documentation
-
-This is the API documentation for sso.redhat.com
-
-API version: 5.0.19-SNAPSHOT
-Contact: it-user-team-list@redhat.com
-*/
+ * sso.redhat.com API documentation
+ *
+ * This is the API documentation for sso.redhat.com
+ *
+ * API version: 5.0.19-SNAPSHOT
+ * Contact: it-user-team-list@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -40,7 +40,7 @@ func NewRedHatErrorRepresentationWithDefaults() *RedHatErrorRepresentation {
 
 // GetError returns the Error field value if set, zero value otherwise.
 func (o *RedHatErrorRepresentation) GetError() string {
-	if o == nil || isNil(o.Error) {
+	if o == nil || o.Error == nil {
 		var ret string
 		return ret
 	}
@@ -50,15 +50,15 @@ func (o *RedHatErrorRepresentation) GetError() string {
 // GetErrorOk returns a tuple with the Error field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RedHatErrorRepresentation) GetErrorOk() (*string, bool) {
-	if o == nil || isNil(o.Error) {
-    return nil, false
+	if o == nil || o.Error == nil {
+		return nil, false
 	}
 	return o.Error, true
 }
 
 // HasError returns a boolean if a field has been set.
 func (o *RedHatErrorRepresentation) HasError() bool {
-	if o != nil && !isNil(o.Error) {
+	if o != nil && o.Error != nil {
 		return true
 	}
 
@@ -72,7 +72,7 @@ func (o *RedHatErrorRepresentation) SetError(v string) {
 
 // GetErrorDescription returns the ErrorDescription field value if set, zero value otherwise.
 func (o *RedHatErrorRepresentation) GetErrorDescription() string {
-	if o == nil || isNil(o.ErrorDescription) {
+	if o == nil || o.ErrorDescription == nil {
 		var ret string
 		return ret
 	}
@@ -82,15 +82,15 @@ func (o *RedHatErrorRepresentation) GetErrorDescription() string {
 // GetErrorDescriptionOk returns a tuple with the ErrorDescription field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *RedHatErrorRepresentation) GetErrorDescriptionOk() (*string, bool) {
-	if o == nil || isNil(o.ErrorDescription) {
-    return nil, false
+	if o == nil || o.ErrorDescription == nil {
+		return nil, false
 	}
 	return o.ErrorDescription, true
 }
 
 // HasErrorDescription returns a boolean if a field has been set.
 func (o *RedHatErrorRepresentation) HasErrorDescription() bool {
-	if o != nil && !isNil(o.ErrorDescription) {
+	if o != nil && o.ErrorDescription != nil {
 		return true
 	}
 
@@ -104,10 +104,10 @@ func (o *RedHatErrorRepresentation) SetErrorDescription(v string) {
 
 func (o RedHatErrorRepresentation) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Error) {
+	if o.Error != nil {
 		toSerialize["error"] = o.Error
 	}
-	if !isNil(o.ErrorDescription) {
+	if o.ErrorDescription != nil {
 		toSerialize["error_description"] = o.ErrorDescription
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/serviceaccountmgmt/apiv1/client/model_service_account_create_request_data.go b/app-services-sdk-go/serviceaccountmgmt/apiv1/client/model_service_account_create_request_data.go
index a0d4de8b..cba6bee3 100644
--- a/app-services-sdk-go/serviceaccountmgmt/apiv1/client/model_service_account_create_request_data.go
+++ b/app-services-sdk-go/serviceaccountmgmt/apiv1/client/model_service_account_create_request_data.go
@@ -1,11 +1,11 @@
 /*
-sso.redhat.com API documentation
-
-This is the API documentation for sso.redhat.com
-
-API version: 5.0.19-SNAPSHOT
-Contact: it-user-team-list@redhat.com
-*/
+ * sso.redhat.com API documentation
+ *
+ * This is the API documentation for sso.redhat.com
+ *
+ * API version: 5.0.19-SNAPSHOT
+ * Contact: it-user-team-list@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -52,8 +52,8 @@ func (o *ServiceAccountCreateRequestData) GetName() string {
 // GetNameOk returns a tuple with the Name field value
 // and a boolean to check if the value has been set.
 func (o *ServiceAccountCreateRequestData) GetNameOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Name, true
 }
@@ -65,7 +65,7 @@ func (o *ServiceAccountCreateRequestData) SetName(v string) {
 
 // GetDescription returns the Description field value if set, zero value otherwise.
 func (o *ServiceAccountCreateRequestData) GetDescription() string {
-	if o == nil || isNil(o.Description) {
+	if o == nil || o.Description == nil {
 		var ret string
 		return ret
 	}
@@ -75,15 +75,15 @@ func (o *ServiceAccountCreateRequestData) GetDescription() string {
 // GetDescriptionOk returns a tuple with the Description field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ServiceAccountCreateRequestData) GetDescriptionOk() (*string, bool) {
-	if o == nil || isNil(o.Description) {
-    return nil, false
+	if o == nil || o.Description == nil {
+		return nil, false
 	}
 	return o.Description, true
 }
 
 // HasDescription returns a boolean if a field has been set.
 func (o *ServiceAccountCreateRequestData) HasDescription() bool {
-	if o != nil && !isNil(o.Description) {
+	if o != nil && o.Description != nil {
 		return true
 	}
 
@@ -100,7 +100,7 @@ func (o ServiceAccountCreateRequestData) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["name"] = o.Name
 	}
-	if !isNil(o.Description) {
+	if o.Description != nil {
 		toSerialize["description"] = o.Description
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/serviceaccountmgmt/apiv1/client/model_service_account_data.go b/app-services-sdk-go/serviceaccountmgmt/apiv1/client/model_service_account_data.go
index 98a1c5d5..97e3528a 100644
--- a/app-services-sdk-go/serviceaccountmgmt/apiv1/client/model_service_account_data.go
+++ b/app-services-sdk-go/serviceaccountmgmt/apiv1/client/model_service_account_data.go
@@ -1,11 +1,11 @@
 /*
-sso.redhat.com API documentation
-
-This is the API documentation for sso.redhat.com
-
-API version: 5.0.19-SNAPSHOT
-Contact: it-user-team-list@redhat.com
-*/
+ * sso.redhat.com API documentation
+ *
+ * This is the API documentation for sso.redhat.com
+ *
+ * API version: 5.0.19-SNAPSHOT
+ * Contact: it-user-team-list@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -46,7 +46,7 @@ func NewServiceAccountDataWithDefaults() *ServiceAccountData {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *ServiceAccountData) GetId() string {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret string
 		return ret
 	}
@@ -56,15 +56,15 @@ func (o *ServiceAccountData) GetId() string {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ServiceAccountData) GetIdOk() (*string, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *ServiceAccountData) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -78,7 +78,7 @@ func (o *ServiceAccountData) SetId(v string) {
 
 // GetClientId returns the ClientId field value if set, zero value otherwise.
 func (o *ServiceAccountData) GetClientId() string {
-	if o == nil || isNil(o.ClientId) {
+	if o == nil || o.ClientId == nil {
 		var ret string
 		return ret
 	}
@@ -88,15 +88,15 @@ func (o *ServiceAccountData) GetClientId() string {
 // GetClientIdOk returns a tuple with the ClientId field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ServiceAccountData) GetClientIdOk() (*string, bool) {
-	if o == nil || isNil(o.ClientId) {
-    return nil, false
+	if o == nil || o.ClientId == nil {
+		return nil, false
 	}
 	return o.ClientId, true
 }
 
 // HasClientId returns a boolean if a field has been set.
 func (o *ServiceAccountData) HasClientId() bool {
-	if o != nil && !isNil(o.ClientId) {
+	if o != nil && o.ClientId != nil {
 		return true
 	}
 
@@ -110,7 +110,7 @@ func (o *ServiceAccountData) SetClientId(v string) {
 
 // GetSecret returns the Secret field value if set, zero value otherwise.
 func (o *ServiceAccountData) GetSecret() string {
-	if o == nil || isNil(o.Secret) {
+	if o == nil || o.Secret == nil {
 		var ret string
 		return ret
 	}
@@ -120,15 +120,15 @@ func (o *ServiceAccountData) GetSecret() string {
 // GetSecretOk returns a tuple with the Secret field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ServiceAccountData) GetSecretOk() (*string, bool) {
-	if o == nil || isNil(o.Secret) {
-    return nil, false
+	if o == nil || o.Secret == nil {
+		return nil, false
 	}
 	return o.Secret, true
 }
 
 // HasSecret returns a boolean if a field has been set.
 func (o *ServiceAccountData) HasSecret() bool {
-	if o != nil && !isNil(o.Secret) {
+	if o != nil && o.Secret != nil {
 		return true
 	}
 
@@ -142,7 +142,7 @@ func (o *ServiceAccountData) SetSecret(v string) {
 
 // GetName returns the Name field value if set, zero value otherwise.
 func (o *ServiceAccountData) GetName() string {
-	if o == nil || isNil(o.Name) {
+	if o == nil || o.Name == nil {
 		var ret string
 		return ret
 	}
@@ -152,15 +152,15 @@ func (o *ServiceAccountData) GetName() string {
 // GetNameOk returns a tuple with the Name field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ServiceAccountData) GetNameOk() (*string, bool) {
-	if o == nil || isNil(o.Name) {
-    return nil, false
+	if o == nil || o.Name == nil {
+		return nil, false
 	}
 	return o.Name, true
 }
 
 // HasName returns a boolean if a field has been set.
 func (o *ServiceAccountData) HasName() bool {
-	if o != nil && !isNil(o.Name) {
+	if o != nil && o.Name != nil {
 		return true
 	}
 
@@ -174,7 +174,7 @@ func (o *ServiceAccountData) SetName(v string) {
 
 // GetDescription returns the Description field value if set, zero value otherwise.
 func (o *ServiceAccountData) GetDescription() string {
-	if o == nil || isNil(o.Description) {
+	if o == nil || o.Description == nil {
 		var ret string
 		return ret
 	}
@@ -184,15 +184,15 @@ func (o *ServiceAccountData) GetDescription() string {
 // GetDescriptionOk returns a tuple with the Description field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ServiceAccountData) GetDescriptionOk() (*string, bool) {
-	if o == nil || isNil(o.Description) {
-    return nil, false
+	if o == nil || o.Description == nil {
+		return nil, false
 	}
 	return o.Description, true
 }
 
 // HasDescription returns a boolean if a field has been set.
 func (o *ServiceAccountData) HasDescription() bool {
-	if o != nil && !isNil(o.Description) {
+	if o != nil && o.Description != nil {
 		return true
 	}
 
@@ -206,7 +206,7 @@ func (o *ServiceAccountData) SetDescription(v string) {
 
 // GetCreatedBy returns the CreatedBy field value if set, zero value otherwise.
 func (o *ServiceAccountData) GetCreatedBy() string {
-	if o == nil || isNil(o.CreatedBy) {
+	if o == nil || o.CreatedBy == nil {
 		var ret string
 		return ret
 	}
@@ -216,15 +216,15 @@ func (o *ServiceAccountData) GetCreatedBy() string {
 // GetCreatedByOk returns a tuple with the CreatedBy field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ServiceAccountData) GetCreatedByOk() (*string, bool) {
-	if o == nil || isNil(o.CreatedBy) {
-    return nil, false
+	if o == nil || o.CreatedBy == nil {
+		return nil, false
 	}
 	return o.CreatedBy, true
 }
 
 // HasCreatedBy returns a boolean if a field has been set.
 func (o *ServiceAccountData) HasCreatedBy() bool {
-	if o != nil && !isNil(o.CreatedBy) {
+	if o != nil && o.CreatedBy != nil {
 		return true
 	}
 
@@ -238,7 +238,7 @@ func (o *ServiceAccountData) SetCreatedBy(v string) {
 
 // GetCreatedAt returns the CreatedAt field value if set, zero value otherwise.
 func (o *ServiceAccountData) GetCreatedAt() int64 {
-	if o == nil || isNil(o.CreatedAt) {
+	if o == nil || o.CreatedAt == nil {
 		var ret int64
 		return ret
 	}
@@ -248,15 +248,15 @@ func (o *ServiceAccountData) GetCreatedAt() int64 {
 // GetCreatedAtOk returns a tuple with the CreatedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ServiceAccountData) GetCreatedAtOk() (*int64, bool) {
-	if o == nil || isNil(o.CreatedAt) {
-    return nil, false
+	if o == nil || o.CreatedAt == nil {
+		return nil, false
 	}
 	return o.CreatedAt, true
 }
 
 // HasCreatedAt returns a boolean if a field has been set.
 func (o *ServiceAccountData) HasCreatedAt() bool {
-	if o != nil && !isNil(o.CreatedAt) {
+	if o != nil && o.CreatedAt != nil {
 		return true
 	}
 
@@ -270,25 +270,25 @@ func (o *ServiceAccountData) SetCreatedAt(v int64) {
 
 func (o ServiceAccountData) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.ClientId) {
+	if o.ClientId != nil {
 		toSerialize["clientId"] = o.ClientId
 	}
-	if !isNil(o.Secret) {
+	if o.Secret != nil {
 		toSerialize["secret"] = o.Secret
 	}
-	if !isNil(o.Name) {
+	if o.Name != nil {
 		toSerialize["name"] = o.Name
 	}
-	if !isNil(o.Description) {
+	if o.Description != nil {
 		toSerialize["description"] = o.Description
 	}
-	if !isNil(o.CreatedBy) {
+	if o.CreatedBy != nil {
 		toSerialize["createdBy"] = o.CreatedBy
 	}
-	if !isNil(o.CreatedAt) {
+	if o.CreatedAt != nil {
 		toSerialize["createdAt"] = o.CreatedAt
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/serviceaccountmgmt/apiv1/client/model_service_account_request_data.go b/app-services-sdk-go/serviceaccountmgmt/apiv1/client/model_service_account_request_data.go
index 91b18197..c3458635 100644
--- a/app-services-sdk-go/serviceaccountmgmt/apiv1/client/model_service_account_request_data.go
+++ b/app-services-sdk-go/serviceaccountmgmt/apiv1/client/model_service_account_request_data.go
@@ -1,11 +1,11 @@
 /*
-sso.redhat.com API documentation
-
-This is the API documentation for sso.redhat.com
-
-API version: 5.0.19-SNAPSHOT
-Contact: it-user-team-list@redhat.com
-*/
+ * sso.redhat.com API documentation
+ *
+ * This is the API documentation for sso.redhat.com
+ *
+ * API version: 5.0.19-SNAPSHOT
+ * Contact: it-user-team-list@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -40,7 +40,7 @@ func NewServiceAccountRequestDataWithDefaults() *ServiceAccountRequestData {
 
 // GetName returns the Name field value if set, zero value otherwise.
 func (o *ServiceAccountRequestData) GetName() string {
-	if o == nil || isNil(o.Name) {
+	if o == nil || o.Name == nil {
 		var ret string
 		return ret
 	}
@@ -50,15 +50,15 @@ func (o *ServiceAccountRequestData) GetName() string {
 // GetNameOk returns a tuple with the Name field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ServiceAccountRequestData) GetNameOk() (*string, bool) {
-	if o == nil || isNil(o.Name) {
-    return nil, false
+	if o == nil || o.Name == nil {
+		return nil, false
 	}
 	return o.Name, true
 }
 
 // HasName returns a boolean if a field has been set.
 func (o *ServiceAccountRequestData) HasName() bool {
-	if o != nil && !isNil(o.Name) {
+	if o != nil && o.Name != nil {
 		return true
 	}
 
@@ -72,7 +72,7 @@ func (o *ServiceAccountRequestData) SetName(v string) {
 
 // GetDescription returns the Description field value if set, zero value otherwise.
 func (o *ServiceAccountRequestData) GetDescription() string {
-	if o == nil || isNil(o.Description) {
+	if o == nil || o.Description == nil {
 		var ret string
 		return ret
 	}
@@ -82,15 +82,15 @@ func (o *ServiceAccountRequestData) GetDescription() string {
 // GetDescriptionOk returns a tuple with the Description field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ServiceAccountRequestData) GetDescriptionOk() (*string, bool) {
-	if o == nil || isNil(o.Description) {
-    return nil, false
+	if o == nil || o.Description == nil {
+		return nil, false
 	}
 	return o.Description, true
 }
 
 // HasDescription returns a boolean if a field has been set.
 func (o *ServiceAccountRequestData) HasDescription() bool {
-	if o != nil && !isNil(o.Description) {
+	if o != nil && o.Description != nil {
 		return true
 	}
 
@@ -104,10 +104,10 @@ func (o *ServiceAccountRequestData) SetDescription(v string) {
 
 func (o ServiceAccountRequestData) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Name) {
+	if o.Name != nil {
 		toSerialize["name"] = o.Name
 	}
-	if !isNil(o.Description) {
+	if o.Description != nil {
 		toSerialize["description"] = o.Description
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/serviceaccountmgmt/apiv1/client/model_validation_exception_data.go b/app-services-sdk-go/serviceaccountmgmt/apiv1/client/model_validation_exception_data.go
index 79e07dca..56856b60 100644
--- a/app-services-sdk-go/serviceaccountmgmt/apiv1/client/model_validation_exception_data.go
+++ b/app-services-sdk-go/serviceaccountmgmt/apiv1/client/model_validation_exception_data.go
@@ -1,11 +1,11 @@
 /*
-sso.redhat.com API documentation
-
-This is the API documentation for sso.redhat.com
-
-API version: 5.0.19-SNAPSHOT
-Contact: it-user-team-list@redhat.com
-*/
+ * sso.redhat.com API documentation
+ *
+ * This is the API documentation for sso.redhat.com
+ *
+ * API version: 5.0.19-SNAPSHOT
+ * Contact: it-user-team-list@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -41,7 +41,7 @@ func NewValidationExceptionDataWithDefaults() *ValidationExceptionData {
 
 // GetFields returns the Fields field value if set, zero value otherwise.
 func (o *ValidationExceptionData) GetFields() map[string]string {
-	if o == nil || isNil(o.Fields) {
+	if o == nil || o.Fields == nil {
 		var ret map[string]string
 		return ret
 	}
@@ -51,15 +51,15 @@ func (o *ValidationExceptionData) GetFields() map[string]string {
 // GetFieldsOk returns a tuple with the Fields field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ValidationExceptionData) GetFieldsOk() (*map[string]string, bool) {
-	if o == nil || isNil(o.Fields) {
-    return nil, false
+	if o == nil || o.Fields == nil {
+		return nil, false
 	}
 	return o.Fields, true
 }
 
 // HasFields returns a boolean if a field has been set.
 func (o *ValidationExceptionData) HasFields() bool {
-	if o != nil && !isNil(o.Fields) {
+	if o != nil && o.Fields != nil {
 		return true
 	}
 
@@ -73,7 +73,7 @@ func (o *ValidationExceptionData) SetFields(v map[string]string) {
 
 // GetError returns the Error field value if set, zero value otherwise.
 func (o *ValidationExceptionData) GetError() string {
-	if o == nil || isNil(o.Error) {
+	if o == nil || o.Error == nil {
 		var ret string
 		return ret
 	}
@@ -83,15 +83,15 @@ func (o *ValidationExceptionData) GetError() string {
 // GetErrorOk returns a tuple with the Error field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ValidationExceptionData) GetErrorOk() (*string, bool) {
-	if o == nil || isNil(o.Error) {
-    return nil, false
+	if o == nil || o.Error == nil {
+		return nil, false
 	}
 	return o.Error, true
 }
 
 // HasError returns a boolean if a field has been set.
 func (o *ValidationExceptionData) HasError() bool {
-	if o != nil && !isNil(o.Error) {
+	if o != nil && o.Error != nil {
 		return true
 	}
 
@@ -105,7 +105,7 @@ func (o *ValidationExceptionData) SetError(v string) {
 
 // GetErrorDescription returns the ErrorDescription field value if set, zero value otherwise.
 func (o *ValidationExceptionData) GetErrorDescription() string {
-	if o == nil || isNil(o.ErrorDescription) {
+	if o == nil || o.ErrorDescription == nil {
 		var ret string
 		return ret
 	}
@@ -115,15 +115,15 @@ func (o *ValidationExceptionData) GetErrorDescription() string {
 // GetErrorDescriptionOk returns a tuple with the ErrorDescription field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ValidationExceptionData) GetErrorDescriptionOk() (*string, bool) {
-	if o == nil || isNil(o.ErrorDescription) {
-    return nil, false
+	if o == nil || o.ErrorDescription == nil {
+		return nil, false
 	}
 	return o.ErrorDescription, true
 }
 
 // HasErrorDescription returns a boolean if a field has been set.
 func (o *ValidationExceptionData) HasErrorDescription() bool {
-	if o != nil && !isNil(o.ErrorDescription) {
+	if o != nil && o.ErrorDescription != nil {
 		return true
 	}
 
@@ -137,13 +137,13 @@ func (o *ValidationExceptionData) SetErrorDescription(v string) {
 
 func (o ValidationExceptionData) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Fields) {
+	if o.Fields != nil {
 		toSerialize["fields"] = o.Fields
 	}
-	if !isNil(o.Error) {
+	if o.Error != nil {
 		toSerialize["error"] = o.Error
 	}
-	if !isNil(o.ErrorDescription) {
+	if o.ErrorDescription != nil {
 		toSerialize["error_description"] = o.ErrorDescription
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/serviceaccountmgmt/apiv1/client/response.go b/app-services-sdk-go/serviceaccountmgmt/apiv1/client/response.go
index f63d4a02..50302a30 100644
--- a/app-services-sdk-go/serviceaccountmgmt/apiv1/client/response.go
+++ b/app-services-sdk-go/serviceaccountmgmt/apiv1/client/response.go
@@ -1,11 +1,11 @@
 /*
-sso.redhat.com API documentation
-
-This is the API documentation for sso.redhat.com
-
-API version: 5.0.19-SNAPSHOT
-Contact: it-user-team-list@redhat.com
-*/
+ * sso.redhat.com API documentation
+ *
+ * This is the API documentation for sso.redhat.com
+ *
+ * API version: 5.0.19-SNAPSHOT
+ * Contact: it-user-team-list@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
diff --git a/app-services-sdk-go/serviceaccountmgmt/apiv1/client/test/api_acs_tenants_test.go b/app-services-sdk-go/serviceaccountmgmt/apiv1/client/test/api_acs_tenants_test.go
deleted file mode 100644
index 8706e17e..00000000
--- a/app-services-sdk-go/serviceaccountmgmt/apiv1/client/test/api_acs_tenants_test.go
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-sso.redhat.com API documentation
-
-Testing AcsTenantsApiService
-
-*/
-
-// Code generated by OpenAPI Generator (https://openapi-generator.tech);
-
-package serviceaccountsclient
-
-import (
-    "context"
-    "github.com/stretchr/testify/assert"
-    "github.com/stretchr/testify/require"
-    "testing"
-    openapiclient "./openapi"
-)
-
-func Test_serviceaccountsclient_AcsTenantsApiService(t *testing.T) {
-
-    configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-
-    t.Run("Test AcsTenantsApiService CreateAcsClient", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.AcsTenantsApi.CreateAcsClient(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test AcsTenantsApiService DeleteAcsClient", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var clientId string
-
-        resp, httpRes, err := apiClient.AcsTenantsApi.DeleteAcsClient(context.Background(), clientId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-}
diff --git a/app-services-sdk-go/serviceaccountmgmt/apiv1/client/test/api_default_test.go b/app-services-sdk-go/serviceaccountmgmt/apiv1/client/test/api_default_test.go
deleted file mode 100644
index ac695b05..00000000
--- a/app-services-sdk-go/serviceaccountmgmt/apiv1/client/test/api_default_test.go
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-sso.redhat.com API documentation
-
-Testing DefaultApiService
-
-*/
-
-// Code generated by OpenAPI Generator (https://openapi-generator.tech);
-
-package serviceaccountsclient
-
-import (
-    "context"
-    "github.com/stretchr/testify/assert"
-    "github.com/stretchr/testify/require"
-    "testing"
-    openapiclient "./openapi"
-)
-
-func Test_serviceaccountsclient_DefaultApiService(t *testing.T) {
-
-    configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-
-    t.Run("Test DefaultApiService GetAuthenticationPolicy", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.DefaultApi.GetAuthenticationPolicy(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test DefaultApiService SetAuthenticationPolicy", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.DefaultApi.SetAuthenticationPolicy(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-}
diff --git a/app-services-sdk-go/serviceaccountmgmt/apiv1/client/test/api_service_accounts_test.go b/app-services-sdk-go/serviceaccountmgmt/apiv1/client/test/api_service_accounts_test.go
deleted file mode 100644
index 64b0d1d7..00000000
--- a/app-services-sdk-go/serviceaccountmgmt/apiv1/client/test/api_service_accounts_test.go
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
-sso.redhat.com API documentation
-
-Testing ServiceAccountsApiService
-
-*/
-
-// Code generated by OpenAPI Generator (https://openapi-generator.tech);
-
-package serviceaccountsclient
-
-import (
-    "context"
-    "github.com/stretchr/testify/assert"
-    "github.com/stretchr/testify/require"
-    "testing"
-    openapiclient "./openapi"
-)
-
-func Test_serviceaccountsclient_ServiceAccountsApiService(t *testing.T) {
-
-    configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-
-    t.Run("Test ServiceAccountsApiService CreateServiceAccount", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.ServiceAccountsApi.CreateServiceAccount(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test ServiceAccountsApiService DeleteServiceAccount", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.ServiceAccountsApi.DeleteServiceAccount(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test ServiceAccountsApiService GetServiceAccount", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.ServiceAccountsApi.GetServiceAccount(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test ServiceAccountsApiService GetServiceAccounts", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.ServiceAccountsApi.GetServiceAccounts(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test ServiceAccountsApiService ResetServiceAccountSecret", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.ServiceAccountsApi.ResetServiceAccountSecret(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test ServiceAccountsApiService UpdateServiceAccount", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.ServiceAccountsApi.UpdateServiceAccount(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-}
diff --git a/app-services-sdk-go/serviceaccountmgmt/apiv1/client/utils.go b/app-services-sdk-go/serviceaccountmgmt/apiv1/client/utils.go
index f2c95a30..4a90b67f 100644
--- a/app-services-sdk-go/serviceaccountmgmt/apiv1/client/utils.go
+++ b/app-services-sdk-go/serviceaccountmgmt/apiv1/client/utils.go
@@ -1,11 +1,11 @@
 /*
-sso.redhat.com API documentation
-
-This is the API documentation for sso.redhat.com
-
-API version: 5.0.19-SNAPSHOT
-Contact: it-user-team-list@redhat.com
-*/
+ * sso.redhat.com API documentation
+ *
+ * This is the API documentation for sso.redhat.com
+ *
+ * API version: 5.0.19-SNAPSHOT
+ * Contact: it-user-team-list@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -13,7 +13,6 @@ package serviceaccountsclient
 
 import (
 	"encoding/json"
-    "reflect"
 	"time"
 )
 
@@ -328,17 +327,3 @@ func (v *NullableTime) UnmarshalJSON(src []byte) error {
 	v.isSet = true
 	return json.Unmarshal(src, &v.value)
 }
-
-// isNil checks if an input is nil
-func isNil(i interface{}) bool {
-    if i == nil {
-        return true
-    }
-    switch reflect.TypeOf(i).Kind() {
-    case reflect.Chan, reflect.Func, reflect.Map, reflect.Ptr, reflect.UnsafePointer, reflect.Interface, reflect.Slice:
-        return reflect.ValueOf(i).IsNil()
-    case reflect.Array:
-        return reflect.ValueOf(i).IsZero()
-    }
-    return false
-}
\ No newline at end of file
diff --git a/app-services-sdk-go/serviceaccountmgmt/apiv1/error/error_sdk.go b/app-services-sdk-go/serviceaccountmgmt/apiv1/error/error_sdk.go
index d1e7769e..32b22924 100644
--- a/app-services-sdk-go/serviceaccountmgmt/apiv1/error/error_sdk.go
+++ b/app-services-sdk-go/serviceaccountmgmt/apiv1/error/error_sdk.go
@@ -3,7 +3,7 @@ package error
 import (
 	"errors"
 
-	svcacctmgmtclient "github.com/redhat-developer/app-services-sdk-go/serviceaccountmgmt/apiv1/client"
+	svcacctmgmtclient "github.com/jackdelahunt/app-services-sdk-core/app-services-sdk-go/serviceaccountmgmt/apiv1/client"
 )
 
 // GetAPIError gets a strongly typed error from an error
diff --git a/app-services-sdk-go/serviceaccountmgmt/go.mod b/app-services-sdk-go/serviceaccountmgmt/go.mod
index 9e8ca2cd..38457584 100644
--- a/app-services-sdk-go/serviceaccountmgmt/go.mod
+++ b/app-services-sdk-go/serviceaccountmgmt/go.mod
@@ -1,8 +1,8 @@
-module github.com/redhat-developer/app-services-sdk-go/serviceaccountmgmt
+module github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go/serviceaccountmgmt
 
 go 1.15
 
 require (
-	github.com/redhat-developer/app-services-sdk-go v0.10.0
+	github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go v0.1.0
 	golang.org/x/oauth2 v0.0.0-20220630143837-2104d58473e0
 )
diff --git a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/api_client.go b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/api_client.go
index 6d7ed6c5..8e16d8f2 100644
--- a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/api_client.go
+++ b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/api_client.go
@@ -1,9 +1,9 @@
 package apiv1alpha
 
 import (
-	"github.com/redhat-developer/app-services-sdk-go/core"
+	"github.com/jackdelahunt/app-services-sdk-core/app-services-sdk-go/core"
 
-	apiv1 "github.com/redhat-developer/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client"
+	apiv1 "github.com/jackdelahunt/app-services-sdk-core/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client"
 )
 
 // Config defines the available configuration options
diff --git a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/.openapi-generator/FILES b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/.openapi-generator/FILES
index c6896b03..8d073950 100644
--- a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/.openapi-generator/FILES
+++ b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/.openapi-generator/FILES
@@ -41,8 +41,6 @@ docs/SinkConnectorsApi.md
 docs/SourceConnectorListResponse.md
 docs/SourceConnectorResponse.md
 docs/SourceConnectorsApi.md
-go.mod
-go.sum
 model_bridge_error.go
 model_bridge_error_instance.go
 model_bridge_error_type.go
@@ -72,10 +70,4 @@ model_sink_connector_response.go
 model_source_connector_list_response.go
 model_source_connector_response.go
 response.go
-test/api_bridges_test.go
-test/api_cloud_providers_test.go
-test/api_error_catalog_test.go
-test/api_processors_test.go
-test/api_sink_connectors_test.go
-test/api_source_connectors_test.go
 utils.go
diff --git a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/.openapi-generator/VERSION b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/.openapi-generator/VERSION
index 0df17dd0..7cbea073 100644
--- a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/.openapi-generator/VERSION
+++ b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/.openapi-generator/VERSION
@@ -1 +1 @@
-6.2.1
\ No newline at end of file
+5.2.0
\ No newline at end of file
diff --git a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/api/openapi.yaml b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/api/openapi.yaml
index cfd3733a..ecd7e020 100644
--- a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/api/openapi.yaml
+++ b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/api/openapi.yaml
@@ -15,20 +15,20 @@ servers:
 - url: https://api.openshift.com
 - url: /
 tags:
-- description: "The API that allow the user to retrieve, create or delete Bridge instances."
+- description: The API that allow the user to retrieve, create or delete Bridge instances.
   name: Bridges
 - description: List Supported Cloud Providers and Regions
   name: Cloud Providers
 - description: List and get the error definitions from the error catalog.
   name: Error Catalog
-- description: "The API that allow the user to retrieve, create or delete Processors\
-    \ of a Bridge instance."
+- description: The API that allow the user to retrieve, create or delete Processors
+    of a Bridge instance.
   name: Processors
-- description: "The API that allow the user to retrieve, create or delete Sink Connectors\
-    \ to be used with smart-events."
+- description: The API that allow the user to retrieve, create or delete Sink Connectors
+    to be used with smart-events.
   name: Sink Connectors
-- description: "The API that allow the user to retrieve, create or delete Source Connectors\
-    \ to be used with smart-events."
+- description: The API that allow the user to retrieve, create or delete Source Connectors
+    to be used with smart-events.
   name: Source Connectors
 paths:
   /api/smartevents_mgmt/v2/bridges:
@@ -1422,7 +1422,6 @@ components:
         reason: reason
         code: code
         id: 0
-        type: null
       properties:
         id:
           format: int32
@@ -1561,7 +1560,7 @@ components:
           example: resourceName1
           type: string
         href:
-          description: "The URL of this resource, without the protocol"
+          description: The URL of this resource, without the protocol
           example: example.com/resource
           type: string
         submitted_at:
@@ -1671,7 +1670,7 @@ components:
           example: resourceName1
           type: string
         href:
-          description: "The URL of this resource, without the protocol"
+          description: The URL of this resource, without the protocol
           example: example.com/resource
           type: string
         display_name:
@@ -1746,7 +1745,7 @@ components:
       type: object
     ConnectorRequest:
       example:
-        connector: "{}"
+        connector: '{}'
         name: my-connector
         connector_type_id: slack_sink_0.1
       properties:
@@ -1788,7 +1787,7 @@ components:
           example: resourceName1
           type: string
         href:
-          description: "The URL of this resource, without the protocol"
+          description: The URL of this resource, without the protocol
           example: example.com/resource
           type: string
         code:
@@ -1896,7 +1895,7 @@ components:
           example: resourceName1
           type: string
         href:
-          description: "The URL of this resource, without the protocol"
+          description: The URL of this resource, without the protocol
           example: example.com/resource
           type: string
       required:
@@ -1951,7 +1950,7 @@ components:
         - owner: userName
           status_message: status_message
           submitted_at: 2022-03-10T12:15:50-04:00
-          flows: "{}"
+          flows: '{}'
           kind: kind
           name: resourceName1
           id: id
@@ -1962,7 +1961,7 @@ components:
         - owner: userName
           status_message: status_message
           submitted_at: 2022-03-10T12:15:50-04:00
-          flows: "{}"
+          flows: '{}'
           kind: kind
           name: resourceName1
           id: id
@@ -1994,7 +1993,7 @@ components:
       type: object
     ProcessorRequest:
       example:
-        flows: "{}"
+        flows: '{}'
         name: processor1
       properties:
         name:
@@ -2003,8 +2002,8 @@ components:
           minLength: 1
           type: string
         flows:
-          description: "The Camel YAML DSL code, formatted as JSON, that defines the\
-            \ flows in the processor"
+          description: The Camel YAML DSL code, formatted as JSON, that defines the
+            flows in the processor
           type: object
       required:
       - flows
@@ -2015,7 +2014,7 @@ components:
         owner: userName
         status_message: status_message
         submitted_at: 2022-03-10T12:15:50-04:00
-        flows: "{}"
+        flows: '{}'
         kind: kind
         name: resourceName1
         id: id
@@ -2035,7 +2034,7 @@ components:
           example: resourceName1
           type: string
         href:
-          description: "The URL of this resource, without the protocol"
+          description: The URL of this resource, without the protocol
           example: example.com/resource
           type: string
         submitted_at:
@@ -2060,8 +2059,8 @@ components:
           example: userName
           type: string
         flows:
-          description: "The Camel YAML DSL code, formatted as JSON, that defines the\
-            \ flows in the processor"
+          description: The Camel YAML DSL code, formatted as JSON, that defines the
+            flows in the processor
           type: object
         status_message:
           type: string
@@ -2086,7 +2085,7 @@ components:
           status_message: status_message
           submitted_at: 2022-03-10T12:15:50-04:00
           kind: kind
-          connector: "{}"
+          connector: '{}'
           name: resourceName1
           id: id
           href: example.com/resource
@@ -2099,7 +2098,7 @@ components:
           status_message: status_message
           submitted_at: 2022-03-10T12:15:50-04:00
           kind: kind
-          connector: "{}"
+          connector: '{}'
           name: resourceName1
           id: id
           href: example.com/resource
@@ -2136,7 +2135,7 @@ components:
         status_message: status_message
         submitted_at: 2022-03-10T12:15:50-04:00
         kind: kind
-        connector: "{}"
+        connector: '{}'
         name: resourceName1
         id: id
         href: example.com/resource
@@ -2157,7 +2156,7 @@ components:
           example: resourceName1
           type: string
         href:
-          description: "The URL of this resource, without the protocol"
+          description: The URL of this resource, without the protocol
           example: example.com/resource
           type: string
         submitted_at:
@@ -2217,7 +2216,7 @@ components:
         items:
         - owner: userName
           status_message: status_message
-          connector: "{}"
+          connector: '{}'
           submitted_at: 2022-03-10T12:15:50-04:00
           kind: kind
           name: resourceName1
@@ -2229,7 +2228,7 @@ components:
           connector_type_id: slack_sink_0.1
         - owner: userName
           status_message: status_message
-          connector: "{}"
+          connector: '{}'
           submitted_at: 2022-03-10T12:15:50-04:00
           kind: kind
           name: resourceName1
@@ -2265,7 +2264,7 @@ components:
       example:
         owner: userName
         status_message: status_message
-        connector: "{}"
+        connector: '{}'
         submitted_at: 2022-03-10T12:15:50-04:00
         kind: kind
         name: resourceName1
@@ -2287,7 +2286,7 @@ components:
           example: resourceName1
           type: string
         href:
-          description: "The URL of this resource, without the protocol"
+          description: The URL of this resource, without the protocol
           example: example.com/resource
           type: string
         submitted_at:
@@ -2353,7 +2352,6 @@ components:
       - size
       - total
       type: object
-      example: null
   securitySchemes:
     bearer:
       scheme: Bearer
diff --git a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/api_bridges.go b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/api_bridges.go
index 574f12e2..b5d5902a 100644
--- a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/api_bridges.go
+++ b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/api_bridges.go
@@ -1,11 +1,11 @@
 /*
-Red Hat Openshift SmartEvents Fleet Manager V2
-
-The API exposed by the fleet manager of the SmartEvents service.
-
-API version: 0.0.1
-Contact: openbridge-dev@redhat.com
-*/
+ * Red Hat Openshift SmartEvents Fleet Manager V2
+ *
+ * The API exposed by the fleet manager of the SmartEvents service.
+ *
+ * API version: 0.0.1
+ * Contact: openbridge-dev@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -13,80 +13,84 @@ package smarteventsmgmtclient
 
 import (
 	"bytes"
-	"context"
-	"io/ioutil"
-	"net/http"
-	"net/url"
+	_context "context"
+	_ioutil "io/ioutil"
+	_nethttp "net/http"
+	_neturl "net/url"
 	"strings"
 	"reflect"
 )
 
+// Linger please
+var (
+	_ _context.Context
+)
 
 type BridgesApi interface {
 
 	/*
-	BridgesAPICreateBridge Create a Bridge instance
-
-	Create a Bridge instance for the authenticated user.
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiBridgesAPICreateBridgeRequest
-	*/
-	BridgesAPICreateBridge(ctx context.Context) ApiBridgesAPICreateBridgeRequest
-
-	// BridgesAPICreateBridgeExecute executes the request
-	//  @return BridgeResponse
-	BridgesAPICreateBridgeExecute(r ApiBridgesAPICreateBridgeRequest) (*BridgeResponse, *http.Response, error)
+	 * BridgesAPICreateBridge Create a Bridge instance
+	 * Create a Bridge instance for the authenticated user.
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiBridgesAPICreateBridgeRequest
+	 */
+	BridgesAPICreateBridge(ctx _context.Context) ApiBridgesAPICreateBridgeRequest
 
 	/*
-	BridgesAPIDeleteBridge Delete a Bridge instance
-
-	Delete a Bridge instance of the authenticated user by ID.
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param bridgeId
-	@return ApiBridgesAPIDeleteBridgeRequest
-	*/
-	BridgesAPIDeleteBridge(ctx context.Context, bridgeId string) ApiBridgesAPIDeleteBridgeRequest
-
-	// BridgesAPIDeleteBridgeExecute executes the request
-	BridgesAPIDeleteBridgeExecute(r ApiBridgesAPIDeleteBridgeRequest) (*http.Response, error)
+	 * BridgesAPICreateBridgeExecute executes the request
+	 * @return BridgeResponse
+	 */
+	BridgesAPICreateBridgeExecute(r ApiBridgesAPICreateBridgeRequest) (BridgeResponse, *_nethttp.Response, error)
 
 	/*
-	BridgesAPIGetBridge Get a Bridge instance
-
-	Get a Bridge instance of the authenticated user by ID.
+	 * BridgesAPIDeleteBridge Delete a Bridge instance
+	 * Delete a Bridge instance of the authenticated user by ID.
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param bridgeId
+	 * @return ApiBridgesAPIDeleteBridgeRequest
+	 */
+	BridgesAPIDeleteBridge(ctx _context.Context, bridgeId string) ApiBridgesAPIDeleteBridgeRequest
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param bridgeId
-	@return ApiBridgesAPIGetBridgeRequest
-	*/
-	BridgesAPIGetBridge(ctx context.Context, bridgeId string) ApiBridgesAPIGetBridgeRequest
-
-	// BridgesAPIGetBridgeExecute executes the request
-	//  @return BridgeResponse
-	BridgesAPIGetBridgeExecute(r ApiBridgesAPIGetBridgeRequest) (*BridgeResponse, *http.Response, error)
+	/*
+	 * BridgesAPIDeleteBridgeExecute executes the request
+	 */
+	BridgesAPIDeleteBridgeExecute(r ApiBridgesAPIDeleteBridgeRequest) (*_nethttp.Response, error)
 
 	/*
-	BridgesAPIGetBridges Get the list of Bridge instances
+	 * BridgesAPIGetBridge Get a Bridge instance
+	 * Get a Bridge instance of the authenticated user by ID.
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param bridgeId
+	 * @return ApiBridgesAPIGetBridgeRequest
+	 */
+	BridgesAPIGetBridge(ctx _context.Context, bridgeId string) ApiBridgesAPIGetBridgeRequest
 
-	Get the list of Bridge instances for the authenticated user.
+	/*
+	 * BridgesAPIGetBridgeExecute executes the request
+	 * @return BridgeResponse
+	 */
+	BridgesAPIGetBridgeExecute(r ApiBridgesAPIGetBridgeRequest) (BridgeResponse, *_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiBridgesAPIGetBridgesRequest
-	*/
-	BridgesAPIGetBridges(ctx context.Context) ApiBridgesAPIGetBridgesRequest
+	/*
+	 * BridgesAPIGetBridges Get the list of Bridge instances
+	 * Get the list of Bridge instances for the authenticated user.
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiBridgesAPIGetBridgesRequest
+	 */
+	BridgesAPIGetBridges(ctx _context.Context) ApiBridgesAPIGetBridgesRequest
 
-	// BridgesAPIGetBridgesExecute executes the request
-	//  @return BridgeListResponse
-	BridgesAPIGetBridgesExecute(r ApiBridgesAPIGetBridgesRequest) (*BridgeListResponse, *http.Response, error)
+	/*
+	 * BridgesAPIGetBridgesExecute executes the request
+	 * @return BridgeListResponse
+	 */
+	BridgesAPIGetBridgesExecute(r ApiBridgesAPIGetBridgesRequest) (BridgeListResponse, *_nethttp.Response, error)
 }
 
 // BridgesApiService BridgesApi service
 type BridgesApiService service
 
 type ApiBridgesAPICreateBridgeRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService BridgesApi
 	bridgeRequest *BridgeRequest
 }
@@ -96,45 +100,47 @@ func (r ApiBridgesAPICreateBridgeRequest) BridgeRequest(bridgeRequest BridgeRequ
 	return r
 }
 
-func (r ApiBridgesAPICreateBridgeRequest) Execute() (*BridgeResponse, *http.Response, error) {
+func (r ApiBridgesAPICreateBridgeRequest) Execute() (BridgeResponse, *_nethttp.Response, error) {
 	return r.ApiService.BridgesAPICreateBridgeExecute(r)
 }
 
 /*
-BridgesAPICreateBridge Create a Bridge instance
-
-Create a Bridge instance for the authenticated user.
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiBridgesAPICreateBridgeRequest
-*/
-func (a *BridgesApiService) BridgesAPICreateBridge(ctx context.Context) ApiBridgesAPICreateBridgeRequest {
+ * BridgesAPICreateBridge Create a Bridge instance
+ * Create a Bridge instance for the authenticated user.
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiBridgesAPICreateBridgeRequest
+ */
+func (a *BridgesApiService) BridgesAPICreateBridge(ctx _context.Context) ApiBridgesAPICreateBridgeRequest {
 	return ApiBridgesAPICreateBridgeRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return BridgeResponse
-func (a *BridgesApiService) BridgesAPICreateBridgeExecute(r ApiBridgesAPICreateBridgeRequest) (*BridgeResponse, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return BridgeResponse
+ */
+func (a *BridgesApiService) BridgesAPICreateBridgeExecute(r ApiBridgesAPICreateBridgeRequest) (BridgeResponse, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *BridgeResponse
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  BridgeResponse
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "BridgesApiService.BridgesAPICreateBridge")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/smartevents_mgmt/v2/bridges"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{"application/json"}
@@ -155,7 +161,7 @@ func (a *BridgesApiService) BridgesAPICreateBridgeExecute(r ApiBridgesAPICreateB
 	}
 	// body params
 	localVarPostBody = r.bridgeRequest
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -165,15 +171,15 @@ func (a *BridgesApiService) BridgesAPICreateBridgeExecute(r ApiBridgesAPICreateB
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -184,8 +190,7 @@ func (a *BridgesApiService) BridgesAPICreateBridgeExecute(r ApiBridgesAPICreateB
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 402 {
@@ -195,8 +200,7 @@ func (a *BridgesApiService) BridgesAPICreateBridgeExecute(r ApiBridgesAPICreateB
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -206,15 +210,14 @@ func (a *BridgesApiService) BridgesAPICreateBridgeExecute(r ApiBridgesAPICreateB
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -225,25 +228,24 @@ func (a *BridgesApiService) BridgesAPICreateBridgeExecute(r ApiBridgesAPICreateB
 }
 
 type ApiBridgesAPIDeleteBridgeRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService BridgesApi
 	bridgeId string
 }
 
-func (r ApiBridgesAPIDeleteBridgeRequest) Execute() (*http.Response, error) {
+
+func (r ApiBridgesAPIDeleteBridgeRequest) Execute() (*_nethttp.Response, error) {
 	return r.ApiService.BridgesAPIDeleteBridgeExecute(r)
 }
 
 /*
-BridgesAPIDeleteBridge Delete a Bridge instance
-
-Delete a Bridge instance of the authenticated user by ID.
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param bridgeId
- @return ApiBridgesAPIDeleteBridgeRequest
-*/
-func (a *BridgesApiService) BridgesAPIDeleteBridge(ctx context.Context, bridgeId string) ApiBridgesAPIDeleteBridgeRequest {
+ * BridgesAPIDeleteBridge Delete a Bridge instance
+ * Delete a Bridge instance of the authenticated user by ID.
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param bridgeId
+ * @return ApiBridgesAPIDeleteBridgeRequest
+ */
+func (a *BridgesApiService) BridgesAPIDeleteBridge(ctx _context.Context, bridgeId string) ApiBridgesAPIDeleteBridgeRequest {
 	return ApiBridgesAPIDeleteBridgeRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -251,25 +253,29 @@ func (a *BridgesApiService) BridgesAPIDeleteBridge(ctx context.Context, bridgeId
 	}
 }
 
-// Execute executes the request
-func (a *BridgesApiService) BridgesAPIDeleteBridgeExecute(r ApiBridgesAPIDeleteBridgeRequest) (*http.Response, error) {
+/*
+ * Execute executes the request
+ */
+func (a *BridgesApiService) BridgesAPIDeleteBridgeExecute(r ApiBridgesAPIDeleteBridgeRequest) (*_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodDelete
+		localVarHTTPMethod   = _nethttp.MethodDelete
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "BridgesApiService.BridgesAPIDeleteBridge")
 	if err != nil {
-		return nil, &GenericOpenAPIError{error: err.Error()}
+		return nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/smartevents_mgmt/v2/bridges/{bridgeId}"
-	localVarPath = strings.Replace(localVarPath, "{"+"bridgeId"+"}", url.PathEscape(parameterToString(r.bridgeId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"bridgeId"+"}", _neturl.PathEscape(parameterToString(r.bridgeId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -288,7 +294,7 @@ func (a *BridgesApiService) BridgesAPIDeleteBridgeExecute(r ApiBridgesAPIDeleteB
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return nil, err
 	}
@@ -298,15 +304,15 @@ func (a *BridgesApiService) BridgesAPIDeleteBridgeExecute(r ApiBridgesAPIDeleteB
 		return localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -317,8 +323,7 @@ func (a *BridgesApiService) BridgesAPIDeleteBridgeExecute(r ApiBridgesAPIDeleteB
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -328,8 +333,7 @@ func (a *BridgesApiService) BridgesAPIDeleteBridgeExecute(r ApiBridgesAPIDeleteB
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -339,8 +343,7 @@ func (a *BridgesApiService) BridgesAPIDeleteBridgeExecute(r ApiBridgesAPIDeleteB
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarHTTPResponse, newErr
 	}
@@ -349,25 +352,24 @@ func (a *BridgesApiService) BridgesAPIDeleteBridgeExecute(r ApiBridgesAPIDeleteB
 }
 
 type ApiBridgesAPIGetBridgeRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService BridgesApi
 	bridgeId string
 }
 
-func (r ApiBridgesAPIGetBridgeRequest) Execute() (*BridgeResponse, *http.Response, error) {
+
+func (r ApiBridgesAPIGetBridgeRequest) Execute() (BridgeResponse, *_nethttp.Response, error) {
 	return r.ApiService.BridgesAPIGetBridgeExecute(r)
 }
 
 /*
-BridgesAPIGetBridge Get a Bridge instance
-
-Get a Bridge instance of the authenticated user by ID.
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param bridgeId
- @return ApiBridgesAPIGetBridgeRequest
-*/
-func (a *BridgesApiService) BridgesAPIGetBridge(ctx context.Context, bridgeId string) ApiBridgesAPIGetBridgeRequest {
+ * BridgesAPIGetBridge Get a Bridge instance
+ * Get a Bridge instance of the authenticated user by ID.
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param bridgeId
+ * @return ApiBridgesAPIGetBridgeRequest
+ */
+func (a *BridgesApiService) BridgesAPIGetBridge(ctx _context.Context, bridgeId string) ApiBridgesAPIGetBridgeRequest {
 	return ApiBridgesAPIGetBridgeRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -375,27 +377,31 @@ func (a *BridgesApiService) BridgesAPIGetBridge(ctx context.Context, bridgeId st
 	}
 }
 
-// Execute executes the request
-//  @return BridgeResponse
-func (a *BridgesApiService) BridgesAPIGetBridgeExecute(r ApiBridgesAPIGetBridgeRequest) (*BridgeResponse, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return BridgeResponse
+ */
+func (a *BridgesApiService) BridgesAPIGetBridgeExecute(r ApiBridgesAPIGetBridgeRequest) (BridgeResponse, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *BridgeResponse
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  BridgeResponse
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "BridgesApiService.BridgesAPIGetBridge")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/smartevents_mgmt/v2/bridges/{bridgeId}"
-	localVarPath = strings.Replace(localVarPath, "{"+"bridgeId"+"}", url.PathEscape(parameterToString(r.bridgeId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"bridgeId"+"}", _neturl.PathEscape(parameterToString(r.bridgeId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if strlen(r.bridgeId) < 1 {
 		return localVarReturnValue, nil, reportError("bridgeId must have at least 1 elements")
 	}
@@ -417,7 +423,7 @@ func (a *BridgesApiService) BridgesAPIGetBridgeExecute(r ApiBridgesAPIGetBridgeR
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -427,15 +433,15 @@ func (a *BridgesApiService) BridgesAPIGetBridgeExecute(r ApiBridgesAPIGetBridgeR
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -446,8 +452,7 @@ func (a *BridgesApiService) BridgesAPIGetBridgeExecute(r ApiBridgesAPIGetBridgeR
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -457,8 +462,7 @@ func (a *BridgesApiService) BridgesAPIGetBridgeExecute(r ApiBridgesAPIGetBridgeR
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -468,15 +472,14 @@ func (a *BridgesApiService) BridgesAPIGetBridgeExecute(r ApiBridgesAPIGetBridgeR
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -487,7 +490,7 @@ func (a *BridgesApiService) BridgesAPIGetBridgeExecute(r ApiBridgesAPIGetBridgeR
 }
 
 type ApiBridgesAPIGetBridgesRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService BridgesApi
 	name *string
 	page *int32
@@ -499,61 +502,60 @@ func (r ApiBridgesAPIGetBridgesRequest) Name(name string) ApiBridgesAPIGetBridge
 	r.name = &name
 	return r
 }
-
 func (r ApiBridgesAPIGetBridgesRequest) Page(page int32) ApiBridgesAPIGetBridgesRequest {
 	r.page = &page
 	return r
 }
-
 func (r ApiBridgesAPIGetBridgesRequest) Size(size int32) ApiBridgesAPIGetBridgesRequest {
 	r.size = &size
 	return r
 }
-
 func (r ApiBridgesAPIGetBridgesRequest) Status(status []ManagedResourceStatus) ApiBridgesAPIGetBridgesRequest {
 	r.status = &status
 	return r
 }
 
-func (r ApiBridgesAPIGetBridgesRequest) Execute() (*BridgeListResponse, *http.Response, error) {
+func (r ApiBridgesAPIGetBridgesRequest) Execute() (BridgeListResponse, *_nethttp.Response, error) {
 	return r.ApiService.BridgesAPIGetBridgesExecute(r)
 }
 
 /*
-BridgesAPIGetBridges Get the list of Bridge instances
-
-Get the list of Bridge instances for the authenticated user.
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiBridgesAPIGetBridgesRequest
-*/
-func (a *BridgesApiService) BridgesAPIGetBridges(ctx context.Context) ApiBridgesAPIGetBridgesRequest {
+ * BridgesAPIGetBridges Get the list of Bridge instances
+ * Get the list of Bridge instances for the authenticated user.
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiBridgesAPIGetBridgesRequest
+ */
+func (a *BridgesApiService) BridgesAPIGetBridges(ctx _context.Context) ApiBridgesAPIGetBridgesRequest {
 	return ApiBridgesAPIGetBridgesRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return BridgeListResponse
-func (a *BridgesApiService) BridgesAPIGetBridgesExecute(r ApiBridgesAPIGetBridgesRequest) (*BridgeListResponse, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return BridgeListResponse
+ */
+func (a *BridgesApiService) BridgesAPIGetBridgesExecute(r ApiBridgesAPIGetBridgesRequest) (BridgeListResponse, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *BridgeListResponse
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  BridgeListResponse
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "BridgesApiService.BridgesAPIGetBridges")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/smartevents_mgmt/v2/bridges"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.name != nil {
 		localVarQueryParams.Add("name", parameterToString(*r.name, ""))
@@ -592,7 +594,7 @@ func (a *BridgesApiService) BridgesAPIGetBridgesExecute(r ApiBridgesAPIGetBridge
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -602,15 +604,15 @@ func (a *BridgesApiService) BridgesAPIGetBridgesExecute(r ApiBridgesAPIGetBridge
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -621,8 +623,7 @@ func (a *BridgesApiService) BridgesAPIGetBridgesExecute(r ApiBridgesAPIGetBridge
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -632,8 +633,7 @@ func (a *BridgesApiService) BridgesAPIGetBridgesExecute(r ApiBridgesAPIGetBridge
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -643,8 +643,7 @@ func (a *BridgesApiService) BridgesAPIGetBridgesExecute(r ApiBridgesAPIGetBridge
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -654,8 +653,7 @@ func (a *BridgesApiService) BridgesAPIGetBridgesExecute(r ApiBridgesAPIGetBridge
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -665,15 +663,14 @@ func (a *BridgesApiService) BridgesAPIGetBridgesExecute(r ApiBridgesAPIGetBridge
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
diff --git a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/api_cloud_providers.go b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/api_cloud_providers.go
index 812e049b..85abd6ea 100644
--- a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/api_cloud_providers.go
+++ b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/api_cloud_providers.go
@@ -1,11 +1,11 @@
 /*
-Red Hat Openshift SmartEvents Fleet Manager V2
-
-The API exposed by the fleet manager of the SmartEvents service.
-
-API version: 0.0.1
-Contact: openbridge-dev@redhat.com
-*/
+ * Red Hat Openshift SmartEvents Fleet Manager V2
+ *
+ * The API exposed by the fleet manager of the SmartEvents service.
+ *
+ * API version: 0.0.1
+ * Contact: openbridge-dev@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -13,84 +13,87 @@ package smarteventsmgmtclient
 
 import (
 	"bytes"
-	"context"
-	"io/ioutil"
-	"net/http"
-	"net/url"
+	_context "context"
+	_ioutil "io/ioutil"
+	_nethttp "net/http"
+	_neturl "net/url"
 	"strings"
 )
 
+// Linger please
+var (
+	_ _context.Context
+)
 
 type CloudProvidersApi interface {
 
 	/*
-	CloudProviderAPIGetCloudProvider Get Cloud Provider.
-
-	Get details of the Cloud Provider specified by id.
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id
-	@return ApiCloudProviderAPIGetCloudProviderRequest
-	*/
-	CloudProviderAPIGetCloudProvider(ctx context.Context, id string) ApiCloudProviderAPIGetCloudProviderRequest
-
-	// CloudProviderAPIGetCloudProviderExecute executes the request
-	//  @return CloudProviderListResponse
-	CloudProviderAPIGetCloudProviderExecute(r ApiCloudProviderAPIGetCloudProviderRequest) (*CloudProviderListResponse, *http.Response, error)
+	 * CloudProviderAPIGetCloudProvider Get Cloud Provider.
+	 * Get details of the Cloud Provider specified by id.
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id
+	 * @return ApiCloudProviderAPIGetCloudProviderRequest
+	 */
+	CloudProviderAPIGetCloudProvider(ctx _context.Context, id string) ApiCloudProviderAPIGetCloudProviderRequest
 
 	/*
-	CloudProviderAPIListCloudProviderRegions List Supported Cloud Regions.
-
-	Returns the list of supported Regions of the specified Cloud Provider.
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id
-	@return ApiCloudProviderAPIListCloudProviderRegionsRequest
-	*/
-	CloudProviderAPIListCloudProviderRegions(ctx context.Context, id string) ApiCloudProviderAPIListCloudProviderRegionsRequest
-
-	// CloudProviderAPIListCloudProviderRegionsExecute executes the request
-	//  @return CloudRegionListResponse
-	CloudProviderAPIListCloudProviderRegionsExecute(r ApiCloudProviderAPIListCloudProviderRegionsRequest) (*CloudRegionListResponse, *http.Response, error)
+	 * CloudProviderAPIGetCloudProviderExecute executes the request
+	 * @return CloudProviderListResponse
+	 */
+	CloudProviderAPIGetCloudProviderExecute(r ApiCloudProviderAPIGetCloudProviderRequest) (CloudProviderListResponse, *_nethttp.Response, error)
 
 	/*
-	CloudProviderAPIListCloudProviders List Supported Cloud Providers.
+	 * CloudProviderAPIListCloudProviderRegions List Supported Cloud Regions.
+	 * Returns the list of supported Regions of the specified Cloud Provider.
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id
+	 * @return ApiCloudProviderAPIListCloudProviderRegionsRequest
+	 */
+	CloudProviderAPIListCloudProviderRegions(ctx _context.Context, id string) ApiCloudProviderAPIListCloudProviderRegionsRequest
 
-	Returns the list of supported Cloud Providers.
+	/*
+	 * CloudProviderAPIListCloudProviderRegionsExecute executes the request
+	 * @return CloudRegionListResponse
+	 */
+	CloudProviderAPIListCloudProviderRegionsExecute(r ApiCloudProviderAPIListCloudProviderRegionsRequest) (CloudRegionListResponse, *_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiCloudProviderAPIListCloudProvidersRequest
-	*/
-	CloudProviderAPIListCloudProviders(ctx context.Context) ApiCloudProviderAPIListCloudProvidersRequest
+	/*
+	 * CloudProviderAPIListCloudProviders List Supported Cloud Providers.
+	 * Returns the list of supported Cloud Providers.
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiCloudProviderAPIListCloudProvidersRequest
+	 */
+	CloudProviderAPIListCloudProviders(ctx _context.Context) ApiCloudProviderAPIListCloudProvidersRequest
 
-	// CloudProviderAPIListCloudProvidersExecute executes the request
-	//  @return CloudProviderListResponse
-	CloudProviderAPIListCloudProvidersExecute(r ApiCloudProviderAPIListCloudProvidersRequest) (*CloudProviderListResponse, *http.Response, error)
+	/*
+	 * CloudProviderAPIListCloudProvidersExecute executes the request
+	 * @return CloudProviderListResponse
+	 */
+	CloudProviderAPIListCloudProvidersExecute(r ApiCloudProviderAPIListCloudProvidersRequest) (CloudProviderListResponse, *_nethttp.Response, error)
 }
 
 // CloudProvidersApiService CloudProvidersApi service
 type CloudProvidersApiService service
 
 type ApiCloudProviderAPIGetCloudProviderRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService CloudProvidersApi
 	id string
 }
 
-func (r ApiCloudProviderAPIGetCloudProviderRequest) Execute() (*CloudProviderListResponse, *http.Response, error) {
+
+func (r ApiCloudProviderAPIGetCloudProviderRequest) Execute() (CloudProviderListResponse, *_nethttp.Response, error) {
 	return r.ApiService.CloudProviderAPIGetCloudProviderExecute(r)
 }
 
 /*
-CloudProviderAPIGetCloudProvider Get Cloud Provider.
-
-Get details of the Cloud Provider specified by id.
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id
- @return ApiCloudProviderAPIGetCloudProviderRequest
-*/
-func (a *CloudProvidersApiService) CloudProviderAPIGetCloudProvider(ctx context.Context, id string) ApiCloudProviderAPIGetCloudProviderRequest {
+ * CloudProviderAPIGetCloudProvider Get Cloud Provider.
+ * Get details of the Cloud Provider specified by id.
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id
+ * @return ApiCloudProviderAPIGetCloudProviderRequest
+ */
+func (a *CloudProvidersApiService) CloudProviderAPIGetCloudProvider(ctx _context.Context, id string) ApiCloudProviderAPIGetCloudProviderRequest {
 	return ApiCloudProviderAPIGetCloudProviderRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -98,27 +101,31 @@ func (a *CloudProvidersApiService) CloudProviderAPIGetCloudProvider(ctx context.
 	}
 }
 
-// Execute executes the request
-//  @return CloudProviderListResponse
-func (a *CloudProvidersApiService) CloudProviderAPIGetCloudProviderExecute(r ApiCloudProviderAPIGetCloudProviderRequest) (*CloudProviderListResponse, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return CloudProviderListResponse
+ */
+func (a *CloudProvidersApiService) CloudProviderAPIGetCloudProviderExecute(r ApiCloudProviderAPIGetCloudProviderRequest) (CloudProviderListResponse, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *CloudProviderListResponse
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  CloudProviderListResponse
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "CloudProvidersApiService.CloudProviderAPIGetCloudProvider")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/smartevents_mgmt/v2/cloud_providers/{id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if strlen(r.id) < 1 {
 		return localVarReturnValue, nil, reportError("id must have at least 1 elements")
 	}
@@ -140,7 +147,7 @@ func (a *CloudProvidersApiService) CloudProviderAPIGetCloudProviderExecute(r Api
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -150,15 +157,15 @@ func (a *CloudProvidersApiService) CloudProviderAPIGetCloudProviderExecute(r Api
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -169,8 +176,7 @@ func (a *CloudProvidersApiService) CloudProviderAPIGetCloudProviderExecute(r Api
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -180,8 +186,7 @@ func (a *CloudProvidersApiService) CloudProviderAPIGetCloudProviderExecute(r Api
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -191,15 +196,14 @@ func (a *CloudProvidersApiService) CloudProviderAPIGetCloudProviderExecute(r Api
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -210,7 +214,7 @@ func (a *CloudProvidersApiService) CloudProviderAPIGetCloudProviderExecute(r Api
 }
 
 type ApiCloudProviderAPIListCloudProviderRegionsRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService CloudProvidersApi
 	id string
 	page *int32
@@ -221,26 +225,23 @@ func (r ApiCloudProviderAPIListCloudProviderRegionsRequest) Page(page int32) Api
 	r.page = &page
 	return r
 }
-
 func (r ApiCloudProviderAPIListCloudProviderRegionsRequest) Size(size int32) ApiCloudProviderAPIListCloudProviderRegionsRequest {
 	r.size = &size
 	return r
 }
 
-func (r ApiCloudProviderAPIListCloudProviderRegionsRequest) Execute() (*CloudRegionListResponse, *http.Response, error) {
+func (r ApiCloudProviderAPIListCloudProviderRegionsRequest) Execute() (CloudRegionListResponse, *_nethttp.Response, error) {
 	return r.ApiService.CloudProviderAPIListCloudProviderRegionsExecute(r)
 }
 
 /*
-CloudProviderAPIListCloudProviderRegions List Supported Cloud Regions.
-
-Returns the list of supported Regions of the specified Cloud Provider.
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id
- @return ApiCloudProviderAPIListCloudProviderRegionsRequest
-*/
-func (a *CloudProvidersApiService) CloudProviderAPIListCloudProviderRegions(ctx context.Context, id string) ApiCloudProviderAPIListCloudProviderRegionsRequest {
+ * CloudProviderAPIListCloudProviderRegions List Supported Cloud Regions.
+ * Returns the list of supported Regions of the specified Cloud Provider.
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id
+ * @return ApiCloudProviderAPIListCloudProviderRegionsRequest
+ */
+func (a *CloudProvidersApiService) CloudProviderAPIListCloudProviderRegions(ctx _context.Context, id string) ApiCloudProviderAPIListCloudProviderRegionsRequest {
 	return ApiCloudProviderAPIListCloudProviderRegionsRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -248,27 +249,31 @@ func (a *CloudProvidersApiService) CloudProviderAPIListCloudProviderRegions(ctx
 	}
 }
 
-// Execute executes the request
-//  @return CloudRegionListResponse
-func (a *CloudProvidersApiService) CloudProviderAPIListCloudProviderRegionsExecute(r ApiCloudProviderAPIListCloudProviderRegionsRequest) (*CloudRegionListResponse, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return CloudRegionListResponse
+ */
+func (a *CloudProvidersApiService) CloudProviderAPIListCloudProviderRegionsExecute(r ApiCloudProviderAPIListCloudProviderRegionsRequest) (CloudRegionListResponse, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *CloudRegionListResponse
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  CloudRegionListResponse
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "CloudProvidersApiService.CloudProviderAPIListCloudProviderRegions")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/smartevents_mgmt/v2/cloud_providers/{id}/regions"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if strlen(r.id) < 1 {
 		return localVarReturnValue, nil, reportError("id must have at least 1 elements")
 	}
@@ -296,7 +301,7 @@ func (a *CloudProvidersApiService) CloudProviderAPIListCloudProviderRegionsExecu
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -306,15 +311,15 @@ func (a *CloudProvidersApiService) CloudProviderAPIListCloudProviderRegionsExecu
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -325,8 +330,7 @@ func (a *CloudProvidersApiService) CloudProviderAPIListCloudProviderRegionsExecu
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -336,15 +340,14 @@ func (a *CloudProvidersApiService) CloudProviderAPIListCloudProviderRegionsExecu
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -355,7 +358,7 @@ func (a *CloudProvidersApiService) CloudProviderAPIListCloudProviderRegionsExecu
 }
 
 type ApiCloudProviderAPIListCloudProvidersRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService CloudProvidersApi
 	page *int32
 	size *int32
@@ -365,51 +368,52 @@ func (r ApiCloudProviderAPIListCloudProvidersRequest) Page(page int32) ApiCloudP
 	r.page = &page
 	return r
 }
-
 func (r ApiCloudProviderAPIListCloudProvidersRequest) Size(size int32) ApiCloudProviderAPIListCloudProvidersRequest {
 	r.size = &size
 	return r
 }
 
-func (r ApiCloudProviderAPIListCloudProvidersRequest) Execute() (*CloudProviderListResponse, *http.Response, error) {
+func (r ApiCloudProviderAPIListCloudProvidersRequest) Execute() (CloudProviderListResponse, *_nethttp.Response, error) {
 	return r.ApiService.CloudProviderAPIListCloudProvidersExecute(r)
 }
 
 /*
-CloudProviderAPIListCloudProviders List Supported Cloud Providers.
-
-Returns the list of supported Cloud Providers.
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiCloudProviderAPIListCloudProvidersRequest
-*/
-func (a *CloudProvidersApiService) CloudProviderAPIListCloudProviders(ctx context.Context) ApiCloudProviderAPIListCloudProvidersRequest {
+ * CloudProviderAPIListCloudProviders List Supported Cloud Providers.
+ * Returns the list of supported Cloud Providers.
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiCloudProviderAPIListCloudProvidersRequest
+ */
+func (a *CloudProvidersApiService) CloudProviderAPIListCloudProviders(ctx _context.Context) ApiCloudProviderAPIListCloudProvidersRequest {
 	return ApiCloudProviderAPIListCloudProvidersRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return CloudProviderListResponse
-func (a *CloudProvidersApiService) CloudProviderAPIListCloudProvidersExecute(r ApiCloudProviderAPIListCloudProvidersRequest) (*CloudProviderListResponse, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return CloudProviderListResponse
+ */
+func (a *CloudProvidersApiService) CloudProviderAPIListCloudProvidersExecute(r ApiCloudProviderAPIListCloudProvidersRequest) (CloudProviderListResponse, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *CloudProviderListResponse
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  CloudProviderListResponse
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "CloudProvidersApiService.CloudProviderAPIListCloudProviders")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/smartevents_mgmt/v2/cloud_providers"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.page != nil {
 		localVarQueryParams.Add("page", parameterToString(*r.page, ""))
@@ -434,7 +438,7 @@ func (a *CloudProvidersApiService) CloudProviderAPIListCloudProvidersExecute(r A
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -444,15 +448,15 @@ func (a *CloudProvidersApiService) CloudProviderAPIListCloudProvidersExecute(r A
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -463,8 +467,7 @@ func (a *CloudProvidersApiService) CloudProviderAPIListCloudProvidersExecute(r A
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -474,15 +477,14 @@ func (a *CloudProvidersApiService) CloudProviderAPIListCloudProvidersExecute(r A
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
diff --git a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/api_error_catalog.go b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/api_error_catalog.go
index c469b994..b7347c14 100644
--- a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/api_error_catalog.go
+++ b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/api_error_catalog.go
@@ -1,11 +1,11 @@
 /*
-Red Hat Openshift SmartEvents Fleet Manager V2
-
-The API exposed by the fleet manager of the SmartEvents service.
-
-API version: 0.0.1
-Contact: openbridge-dev@redhat.com
-*/
+ * Red Hat Openshift SmartEvents Fleet Manager V2
+ *
+ * The API exposed by the fleet manager of the SmartEvents service.
+ *
+ * API version: 0.0.1
+ * Contact: openbridge-dev@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -13,69 +13,72 @@ package smarteventsmgmtclient
 
 import (
 	"bytes"
-	"context"
-	"io/ioutil"
-	"net/http"
-	"net/url"
+	_context "context"
+	_ioutil "io/ioutil"
+	_nethttp "net/http"
+	_neturl "net/url"
 	"strings"
 )
 
+// Linger please
+var (
+	_ _context.Context
+)
 
 type ErrorCatalogApi interface {
 
 	/*
-	ErrorsAPIGetError Get an error from the error catalog.
-
-	Get an error from the error catalog.
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param id
-	@return ApiErrorsAPIGetErrorRequest
-	*/
-	ErrorsAPIGetError(ctx context.Context, id int32) ApiErrorsAPIGetErrorRequest
-
-	// ErrorsAPIGetErrorExecute executes the request
-	//  @return BridgeError
-	ErrorsAPIGetErrorExecute(r ApiErrorsAPIGetErrorRequest) (*BridgeError, *http.Response, error)
+	 * ErrorsAPIGetError Get an error from the error catalog.
+	 * Get an error from the error catalog.
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param id
+	 * @return ApiErrorsAPIGetErrorRequest
+	 */
+	ErrorsAPIGetError(ctx _context.Context, id int32) ApiErrorsAPIGetErrorRequest
 
 	/*
-	ErrorsAPIGetErrors Get the list of errors.
-
-	Get the list of errors from the error catalog.
+	 * ErrorsAPIGetErrorExecute executes the request
+	 * @return BridgeError
+	 */
+	ErrorsAPIGetErrorExecute(r ApiErrorsAPIGetErrorRequest) (BridgeError, *_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@return ApiErrorsAPIGetErrorsRequest
-	*/
-	ErrorsAPIGetErrors(ctx context.Context) ApiErrorsAPIGetErrorsRequest
+	/*
+	 * ErrorsAPIGetErrors Get the list of errors.
+	 * Get the list of errors from the error catalog.
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @return ApiErrorsAPIGetErrorsRequest
+	 */
+	ErrorsAPIGetErrors(ctx _context.Context) ApiErrorsAPIGetErrorsRequest
 
-	// ErrorsAPIGetErrorsExecute executes the request
-	//  @return ErrorListResponse
-	ErrorsAPIGetErrorsExecute(r ApiErrorsAPIGetErrorsRequest) (*ErrorListResponse, *http.Response, error)
+	/*
+	 * ErrorsAPIGetErrorsExecute executes the request
+	 * @return ErrorListResponse
+	 */
+	ErrorsAPIGetErrorsExecute(r ApiErrorsAPIGetErrorsRequest) (ErrorListResponse, *_nethttp.Response, error)
 }
 
 // ErrorCatalogApiService ErrorCatalogApi service
 type ErrorCatalogApiService service
 
 type ApiErrorsAPIGetErrorRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService ErrorCatalogApi
 	id int32
 }
 
-func (r ApiErrorsAPIGetErrorRequest) Execute() (*BridgeError, *http.Response, error) {
+
+func (r ApiErrorsAPIGetErrorRequest) Execute() (BridgeError, *_nethttp.Response, error) {
 	return r.ApiService.ErrorsAPIGetErrorExecute(r)
 }
 
 /*
-ErrorsAPIGetError Get an error from the error catalog.
-
-Get an error from the error catalog.
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param id
- @return ApiErrorsAPIGetErrorRequest
-*/
-func (a *ErrorCatalogApiService) ErrorsAPIGetError(ctx context.Context, id int32) ApiErrorsAPIGetErrorRequest {
+ * ErrorsAPIGetError Get an error from the error catalog.
+ * Get an error from the error catalog.
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param id
+ * @return ApiErrorsAPIGetErrorRequest
+ */
+func (a *ErrorCatalogApiService) ErrorsAPIGetError(ctx _context.Context, id int32) ApiErrorsAPIGetErrorRequest {
 	return ApiErrorsAPIGetErrorRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -83,27 +86,31 @@ func (a *ErrorCatalogApiService) ErrorsAPIGetError(ctx context.Context, id int32
 	}
 }
 
-// Execute executes the request
-//  @return BridgeError
-func (a *ErrorCatalogApiService) ErrorsAPIGetErrorExecute(r ApiErrorsAPIGetErrorRequest) (*BridgeError, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return BridgeError
+ */
+func (a *ErrorCatalogApiService) ErrorsAPIGetErrorExecute(r ApiErrorsAPIGetErrorRequest) (BridgeError, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *BridgeError
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  BridgeError
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "ErrorCatalogApiService.ErrorsAPIGetError")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/smartevents_mgmt/v2/errors/{id}"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", url.PathEscape(parameterToString(r.id, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -122,7 +129,7 @@ func (a *ErrorCatalogApiService) ErrorsAPIGetErrorExecute(r ApiErrorsAPIGetError
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -132,15 +139,15 @@ func (a *ErrorCatalogApiService) ErrorsAPIGetErrorExecute(r ApiErrorsAPIGetError
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -151,8 +158,7 @@ func (a *ErrorCatalogApiService) ErrorsAPIGetErrorExecute(r ApiErrorsAPIGetError
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -162,15 +168,14 @@ func (a *ErrorCatalogApiService) ErrorsAPIGetErrorExecute(r ApiErrorsAPIGetError
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -181,7 +186,7 @@ func (a *ErrorCatalogApiService) ErrorsAPIGetErrorExecute(r ApiErrorsAPIGetError
 }
 
 type ApiErrorsAPIGetErrorsRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService ErrorCatalogApi
 	page *int32
 	size *int32
@@ -191,51 +196,52 @@ func (r ApiErrorsAPIGetErrorsRequest) Page(page int32) ApiErrorsAPIGetErrorsRequ
 	r.page = &page
 	return r
 }
-
 func (r ApiErrorsAPIGetErrorsRequest) Size(size int32) ApiErrorsAPIGetErrorsRequest {
 	r.size = &size
 	return r
 }
 
-func (r ApiErrorsAPIGetErrorsRequest) Execute() (*ErrorListResponse, *http.Response, error) {
+func (r ApiErrorsAPIGetErrorsRequest) Execute() (ErrorListResponse, *_nethttp.Response, error) {
 	return r.ApiService.ErrorsAPIGetErrorsExecute(r)
 }
 
 /*
-ErrorsAPIGetErrors Get the list of errors.
-
-Get the list of errors from the error catalog.
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @return ApiErrorsAPIGetErrorsRequest
-*/
-func (a *ErrorCatalogApiService) ErrorsAPIGetErrors(ctx context.Context) ApiErrorsAPIGetErrorsRequest {
+ * ErrorsAPIGetErrors Get the list of errors.
+ * Get the list of errors from the error catalog.
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @return ApiErrorsAPIGetErrorsRequest
+ */
+func (a *ErrorCatalogApiService) ErrorsAPIGetErrors(ctx _context.Context) ApiErrorsAPIGetErrorsRequest {
 	return ApiErrorsAPIGetErrorsRequest{
 		ApiService: a,
 		ctx: ctx,
 	}
 }
 
-// Execute executes the request
-//  @return ErrorListResponse
-func (a *ErrorCatalogApiService) ErrorsAPIGetErrorsExecute(r ApiErrorsAPIGetErrorsRequest) (*ErrorListResponse, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return ErrorListResponse
+ */
+func (a *ErrorCatalogApiService) ErrorsAPIGetErrorsExecute(r ApiErrorsAPIGetErrorsRequest) (ErrorListResponse, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *ErrorListResponse
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  ErrorListResponse
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "ErrorCatalogApiService.ErrorsAPIGetErrors")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/smartevents_mgmt/v2/errors"
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	if r.page != nil {
 		localVarQueryParams.Add("page", parameterToString(*r.page, ""))
@@ -260,7 +266,7 @@ func (a *ErrorCatalogApiService) ErrorsAPIGetErrorsExecute(r ApiErrorsAPIGetErro
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -270,15 +276,15 @@ func (a *ErrorCatalogApiService) ErrorsAPIGetErrorsExecute(r ApiErrorsAPIGetErro
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -289,8 +295,7 @@ func (a *ErrorCatalogApiService) ErrorsAPIGetErrorsExecute(r ApiErrorsAPIGetErro
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -300,15 +305,14 @@ func (a *ErrorCatalogApiService) ErrorsAPIGetErrorsExecute(r ApiErrorsAPIGetErro
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
diff --git a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/api_processors.go b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/api_processors.go
index 55ce2fa7..fa6607f4 100644
--- a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/api_processors.go
+++ b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/api_processors.go
@@ -1,11 +1,11 @@
 /*
-Red Hat Openshift SmartEvents Fleet Manager V2
-
-The API exposed by the fleet manager of the SmartEvents service.
-
-API version: 0.0.1
-Contact: openbridge-dev@redhat.com
-*/
+ * Red Hat Openshift SmartEvents Fleet Manager V2
+ *
+ * The API exposed by the fleet manager of the SmartEvents service.
+ *
+ * API version: 0.0.1
+ * Contact: openbridge-dev@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -13,100 +13,104 @@ package smarteventsmgmtclient
 
 import (
 	"bytes"
-	"context"
-	"io/ioutil"
-	"net/http"
-	"net/url"
+	_context "context"
+	_ioutil "io/ioutil"
+	_nethttp "net/http"
+	_neturl "net/url"
 	"strings"
 	"reflect"
 )
 
+// Linger please
+var (
+	_ _context.Context
+)
 
 type ProcessorsApi interface {
 
 	/*
-	ProcessorsAPICreateProcessor Create a Processor of a Bridge instance
-
-	Create a Processor of a Bridge instance for the authenticated user.
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param bridgeId
-	@return ApiProcessorsAPICreateProcessorRequest
-	*/
-	ProcessorsAPICreateProcessor(ctx context.Context, bridgeId string) ApiProcessorsAPICreateProcessorRequest
-
-	// ProcessorsAPICreateProcessorExecute executes the request
-	//  @return ProcessorResponse
-	ProcessorsAPICreateProcessorExecute(r ApiProcessorsAPICreateProcessorRequest) (*ProcessorResponse, *http.Response, error)
+	 * ProcessorsAPICreateProcessor Create a Processor of a Bridge instance
+	 * Create a Processor of a Bridge instance for the authenticated user.
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param bridgeId
+	 * @return ApiProcessorsAPICreateProcessorRequest
+	 */
+	ProcessorsAPICreateProcessor(ctx _context.Context, bridgeId string) ApiProcessorsAPICreateProcessorRequest
 
 	/*
-	ProcessorsAPIDeleteProcessor Delete a Processor of a Bridge instance
-
-	Delete a Processor of a Bridge instance for the authenticated user.
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param bridgeId
-	@param processorId
-	@return ApiProcessorsAPIDeleteProcessorRequest
-	*/
-	ProcessorsAPIDeleteProcessor(ctx context.Context, bridgeId string, processorId string) ApiProcessorsAPIDeleteProcessorRequest
-
-	// ProcessorsAPIDeleteProcessorExecute executes the request
-	ProcessorsAPIDeleteProcessorExecute(r ApiProcessorsAPIDeleteProcessorRequest) (*http.Response, error)
+	 * ProcessorsAPICreateProcessorExecute executes the request
+	 * @return ProcessorResponse
+	 */
+	ProcessorsAPICreateProcessorExecute(r ApiProcessorsAPICreateProcessorRequest) (ProcessorResponse, *_nethttp.Response, error)
 
 	/*
-	ProcessorsAPIGetProcessor Get a Processor of a Bridge instance
-
-	Get a Processor of a Bridge instance for the authenticated user.
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param bridgeId
-	@param processorId
-	@return ApiProcessorsAPIGetProcessorRequest
-	*/
-	ProcessorsAPIGetProcessor(ctx context.Context, bridgeId string, processorId string) ApiProcessorsAPIGetProcessorRequest
-
-	// ProcessorsAPIGetProcessorExecute executes the request
-	//  @return ProcessorResponse
-	ProcessorsAPIGetProcessorExecute(r ApiProcessorsAPIGetProcessorRequest) (*ProcessorResponse, *http.Response, error)
+	 * ProcessorsAPIDeleteProcessor Delete a Processor of a Bridge instance
+	 * Delete a Processor of a Bridge instance for the authenticated user.
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param bridgeId
+	 * @param processorId
+	 * @return ApiProcessorsAPIDeleteProcessorRequest
+	 */
+	ProcessorsAPIDeleteProcessor(ctx _context.Context, bridgeId string, processorId string) ApiProcessorsAPIDeleteProcessorRequest
 
 	/*
-	ProcessorsAPIGetProcessors Get the list of Processors of a Bridge instance
-
-	Get the list of Processors of a Bridge instance for the authenticated user.
+	 * ProcessorsAPIDeleteProcessorExecute executes the request
+	 */
+	ProcessorsAPIDeleteProcessorExecute(r ApiProcessorsAPIDeleteProcessorRequest) (*_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param bridgeId
-	@return ApiProcessorsAPIGetProcessorsRequest
-	*/
-	ProcessorsAPIGetProcessors(ctx context.Context, bridgeId string) ApiProcessorsAPIGetProcessorsRequest
+	/*
+	 * ProcessorsAPIGetProcessor Get a Processor of a Bridge instance
+	 * Get a Processor of a Bridge instance for the authenticated user.
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param bridgeId
+	 * @param processorId
+	 * @return ApiProcessorsAPIGetProcessorRequest
+	 */
+	ProcessorsAPIGetProcessor(ctx _context.Context, bridgeId string, processorId string) ApiProcessorsAPIGetProcessorRequest
 
-	// ProcessorsAPIGetProcessorsExecute executes the request
-	//  @return ProcessorListResponse
-	ProcessorsAPIGetProcessorsExecute(r ApiProcessorsAPIGetProcessorsRequest) (*ProcessorListResponse, *http.Response, error)
+	/*
+	 * ProcessorsAPIGetProcessorExecute executes the request
+	 * @return ProcessorResponse
+	 */
+	ProcessorsAPIGetProcessorExecute(r ApiProcessorsAPIGetProcessorRequest) (ProcessorResponse, *_nethttp.Response, error)
 
 	/*
-	ProcessorsAPIUpdateProcessor Update a Processor instance.
+	 * ProcessorsAPIGetProcessors Get the list of Processors of a Bridge instance
+	 * Get the list of Processors of a Bridge instance for the authenticated user.
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param bridgeId
+	 * @return ApiProcessorsAPIGetProcessorsRequest
+	 */
+	ProcessorsAPIGetProcessors(ctx _context.Context, bridgeId string) ApiProcessorsAPIGetProcessorsRequest
 
-	Update a Processor instance for the authenticated user.
+	/*
+	 * ProcessorsAPIGetProcessorsExecute executes the request
+	 * @return ProcessorListResponse
+	 */
+	ProcessorsAPIGetProcessorsExecute(r ApiProcessorsAPIGetProcessorsRequest) (ProcessorListResponse, *_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param bridgeId
-	@param processorId
-	@return ApiProcessorsAPIUpdateProcessorRequest
-	*/
-	ProcessorsAPIUpdateProcessor(ctx context.Context, bridgeId string, processorId string) ApiProcessorsAPIUpdateProcessorRequest
+	/*
+	 * ProcessorsAPIUpdateProcessor Update a Processor instance.
+	 * Update a Processor instance for the authenticated user.
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param bridgeId
+	 * @param processorId
+	 * @return ApiProcessorsAPIUpdateProcessorRequest
+	 */
+	ProcessorsAPIUpdateProcessor(ctx _context.Context, bridgeId string, processorId string) ApiProcessorsAPIUpdateProcessorRequest
 
-	// ProcessorsAPIUpdateProcessorExecute executes the request
-	//  @return ProcessorResponse
-	ProcessorsAPIUpdateProcessorExecute(r ApiProcessorsAPIUpdateProcessorRequest) (*ProcessorResponse, *http.Response, error)
+	/*
+	 * ProcessorsAPIUpdateProcessorExecute executes the request
+	 * @return ProcessorResponse
+	 */
+	ProcessorsAPIUpdateProcessorExecute(r ApiProcessorsAPIUpdateProcessorRequest) (ProcessorResponse, *_nethttp.Response, error)
 }
 
 // ProcessorsApiService ProcessorsApi service
 type ProcessorsApiService service
 
 type ApiProcessorsAPICreateProcessorRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService ProcessorsApi
 	bridgeId string
 	processorRequest *ProcessorRequest
@@ -117,20 +121,18 @@ func (r ApiProcessorsAPICreateProcessorRequest) ProcessorRequest(processorReques
 	return r
 }
 
-func (r ApiProcessorsAPICreateProcessorRequest) Execute() (*ProcessorResponse, *http.Response, error) {
+func (r ApiProcessorsAPICreateProcessorRequest) Execute() (ProcessorResponse, *_nethttp.Response, error) {
 	return r.ApiService.ProcessorsAPICreateProcessorExecute(r)
 }
 
 /*
-ProcessorsAPICreateProcessor Create a Processor of a Bridge instance
-
-Create a Processor of a Bridge instance for the authenticated user.
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param bridgeId
- @return ApiProcessorsAPICreateProcessorRequest
-*/
-func (a *ProcessorsApiService) ProcessorsAPICreateProcessor(ctx context.Context, bridgeId string) ApiProcessorsAPICreateProcessorRequest {
+ * ProcessorsAPICreateProcessor Create a Processor of a Bridge instance
+ * Create a Processor of a Bridge instance for the authenticated user.
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param bridgeId
+ * @return ApiProcessorsAPICreateProcessorRequest
+ */
+func (a *ProcessorsApiService) ProcessorsAPICreateProcessor(ctx _context.Context, bridgeId string) ApiProcessorsAPICreateProcessorRequest {
 	return ApiProcessorsAPICreateProcessorRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -138,27 +140,31 @@ func (a *ProcessorsApiService) ProcessorsAPICreateProcessor(ctx context.Context,
 	}
 }
 
-// Execute executes the request
-//  @return ProcessorResponse
-func (a *ProcessorsApiService) ProcessorsAPICreateProcessorExecute(r ApiProcessorsAPICreateProcessorRequest) (*ProcessorResponse, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return ProcessorResponse
+ */
+func (a *ProcessorsApiService) ProcessorsAPICreateProcessorExecute(r ApiProcessorsAPICreateProcessorRequest) (ProcessorResponse, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *ProcessorResponse
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  ProcessorResponse
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "ProcessorsApiService.ProcessorsAPICreateProcessor")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/smartevents_mgmt/v2/bridges/{bridgeId}/processors"
-	localVarPath = strings.Replace(localVarPath, "{"+"bridgeId"+"}", url.PathEscape(parameterToString(r.bridgeId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"bridgeId"+"}", _neturl.PathEscape(parameterToString(r.bridgeId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if strlen(r.bridgeId) < 1 {
 		return localVarReturnValue, nil, reportError("bridgeId must have at least 1 elements")
 	}
@@ -182,7 +188,7 @@ func (a *ProcessorsApiService) ProcessorsAPICreateProcessorExecute(r ApiProcesso
 	}
 	// body params
 	localVarPostBody = r.processorRequest
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -192,15 +198,15 @@ func (a *ProcessorsApiService) ProcessorsAPICreateProcessorExecute(r ApiProcesso
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -211,8 +217,7 @@ func (a *ProcessorsApiService) ProcessorsAPICreateProcessorExecute(r ApiProcesso
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 402 {
@@ -222,8 +227,7 @@ func (a *ProcessorsApiService) ProcessorsAPICreateProcessorExecute(r ApiProcesso
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -233,8 +237,7 @@ func (a *ProcessorsApiService) ProcessorsAPICreateProcessorExecute(r ApiProcesso
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -244,15 +247,14 @@ func (a *ProcessorsApiService) ProcessorsAPICreateProcessorExecute(r ApiProcesso
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -263,27 +265,26 @@ func (a *ProcessorsApiService) ProcessorsAPICreateProcessorExecute(r ApiProcesso
 }
 
 type ApiProcessorsAPIDeleteProcessorRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService ProcessorsApi
 	bridgeId string
 	processorId string
 }
 
-func (r ApiProcessorsAPIDeleteProcessorRequest) Execute() (*http.Response, error) {
+
+func (r ApiProcessorsAPIDeleteProcessorRequest) Execute() (*_nethttp.Response, error) {
 	return r.ApiService.ProcessorsAPIDeleteProcessorExecute(r)
 }
 
 /*
-ProcessorsAPIDeleteProcessor Delete a Processor of a Bridge instance
-
-Delete a Processor of a Bridge instance for the authenticated user.
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param bridgeId
- @param processorId
- @return ApiProcessorsAPIDeleteProcessorRequest
-*/
-func (a *ProcessorsApiService) ProcessorsAPIDeleteProcessor(ctx context.Context, bridgeId string, processorId string) ApiProcessorsAPIDeleteProcessorRequest {
+ * ProcessorsAPIDeleteProcessor Delete a Processor of a Bridge instance
+ * Delete a Processor of a Bridge instance for the authenticated user.
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param bridgeId
+ * @param processorId
+ * @return ApiProcessorsAPIDeleteProcessorRequest
+ */
+func (a *ProcessorsApiService) ProcessorsAPIDeleteProcessor(ctx _context.Context, bridgeId string, processorId string) ApiProcessorsAPIDeleteProcessorRequest {
 	return ApiProcessorsAPIDeleteProcessorRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -292,26 +293,30 @@ func (a *ProcessorsApiService) ProcessorsAPIDeleteProcessor(ctx context.Context,
 	}
 }
 
-// Execute executes the request
-func (a *ProcessorsApiService) ProcessorsAPIDeleteProcessorExecute(r ApiProcessorsAPIDeleteProcessorRequest) (*http.Response, error) {
+/*
+ * Execute executes the request
+ */
+func (a *ProcessorsApiService) ProcessorsAPIDeleteProcessorExecute(r ApiProcessorsAPIDeleteProcessorRequest) (*_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodDelete
+		localVarHTTPMethod   = _nethttp.MethodDelete
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "ProcessorsApiService.ProcessorsAPIDeleteProcessor")
 	if err != nil {
-		return nil, &GenericOpenAPIError{error: err.Error()}
+		return nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/smartevents_mgmt/v2/bridges/{bridgeId}/processors/{processorId}"
-	localVarPath = strings.Replace(localVarPath, "{"+"bridgeId"+"}", url.PathEscape(parameterToString(r.bridgeId, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"processorId"+"}", url.PathEscape(parameterToString(r.processorId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"bridgeId"+"}", _neturl.PathEscape(parameterToString(r.bridgeId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"processorId"+"}", _neturl.PathEscape(parameterToString(r.processorId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -330,7 +335,7 @@ func (a *ProcessorsApiService) ProcessorsAPIDeleteProcessorExecute(r ApiProcesso
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return nil, err
 	}
@@ -340,15 +345,15 @@ func (a *ProcessorsApiService) ProcessorsAPIDeleteProcessorExecute(r ApiProcesso
 		return localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -359,8 +364,7 @@ func (a *ProcessorsApiService) ProcessorsAPIDeleteProcessorExecute(r ApiProcesso
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -370,8 +374,7 @@ func (a *ProcessorsApiService) ProcessorsAPIDeleteProcessorExecute(r ApiProcesso
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -381,8 +384,7 @@ func (a *ProcessorsApiService) ProcessorsAPIDeleteProcessorExecute(r ApiProcesso
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarHTTPResponse, newErr
 	}
@@ -391,27 +393,26 @@ func (a *ProcessorsApiService) ProcessorsAPIDeleteProcessorExecute(r ApiProcesso
 }
 
 type ApiProcessorsAPIGetProcessorRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService ProcessorsApi
 	bridgeId string
 	processorId string
 }
 
-func (r ApiProcessorsAPIGetProcessorRequest) Execute() (*ProcessorResponse, *http.Response, error) {
+
+func (r ApiProcessorsAPIGetProcessorRequest) Execute() (ProcessorResponse, *_nethttp.Response, error) {
 	return r.ApiService.ProcessorsAPIGetProcessorExecute(r)
 }
 
 /*
-ProcessorsAPIGetProcessor Get a Processor of a Bridge instance
-
-Get a Processor of a Bridge instance for the authenticated user.
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param bridgeId
- @param processorId
- @return ApiProcessorsAPIGetProcessorRequest
-*/
-func (a *ProcessorsApiService) ProcessorsAPIGetProcessor(ctx context.Context, bridgeId string, processorId string) ApiProcessorsAPIGetProcessorRequest {
+ * ProcessorsAPIGetProcessor Get a Processor of a Bridge instance
+ * Get a Processor of a Bridge instance for the authenticated user.
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param bridgeId
+ * @param processorId
+ * @return ApiProcessorsAPIGetProcessorRequest
+ */
+func (a *ProcessorsApiService) ProcessorsAPIGetProcessor(ctx _context.Context, bridgeId string, processorId string) ApiProcessorsAPIGetProcessorRequest {
 	return ApiProcessorsAPIGetProcessorRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -420,28 +421,32 @@ func (a *ProcessorsApiService) ProcessorsAPIGetProcessor(ctx context.Context, br
 	}
 }
 
-// Execute executes the request
-//  @return ProcessorResponse
-func (a *ProcessorsApiService) ProcessorsAPIGetProcessorExecute(r ApiProcessorsAPIGetProcessorRequest) (*ProcessorResponse, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return ProcessorResponse
+ */
+func (a *ProcessorsApiService) ProcessorsAPIGetProcessorExecute(r ApiProcessorsAPIGetProcessorRequest) (ProcessorResponse, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *ProcessorResponse
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  ProcessorResponse
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "ProcessorsApiService.ProcessorsAPIGetProcessor")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/smartevents_mgmt/v2/bridges/{bridgeId}/processors/{processorId}"
-	localVarPath = strings.Replace(localVarPath, "{"+"bridgeId"+"}", url.PathEscape(parameterToString(r.bridgeId, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"processorId"+"}", url.PathEscape(parameterToString(r.processorId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"bridgeId"+"}", _neturl.PathEscape(parameterToString(r.bridgeId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"processorId"+"}", _neturl.PathEscape(parameterToString(r.processorId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if strlen(r.bridgeId) < 1 {
 		return localVarReturnValue, nil, reportError("bridgeId must have at least 1 elements")
 	}
@@ -466,7 +471,7 @@ func (a *ProcessorsApiService) ProcessorsAPIGetProcessorExecute(r ApiProcessorsA
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -476,15 +481,15 @@ func (a *ProcessorsApiService) ProcessorsAPIGetProcessorExecute(r ApiProcessorsA
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -495,8 +500,7 @@ func (a *ProcessorsApiService) ProcessorsAPIGetProcessorExecute(r ApiProcessorsA
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -506,8 +510,7 @@ func (a *ProcessorsApiService) ProcessorsAPIGetProcessorExecute(r ApiProcessorsA
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -517,15 +520,14 @@ func (a *ProcessorsApiService) ProcessorsAPIGetProcessorExecute(r ApiProcessorsA
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -536,7 +538,7 @@ func (a *ProcessorsApiService) ProcessorsAPIGetProcessorExecute(r ApiProcessorsA
 }
 
 type ApiProcessorsAPIGetProcessorsRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService ProcessorsApi
 	bridgeId string
 	name *string
@@ -549,36 +551,31 @@ func (r ApiProcessorsAPIGetProcessorsRequest) Name(name string) ApiProcessorsAPI
 	r.name = &name
 	return r
 }
-
 func (r ApiProcessorsAPIGetProcessorsRequest) Page(page int32) ApiProcessorsAPIGetProcessorsRequest {
 	r.page = &page
 	return r
 }
-
 func (r ApiProcessorsAPIGetProcessorsRequest) Size(size int32) ApiProcessorsAPIGetProcessorsRequest {
 	r.size = &size
 	return r
 }
-
 func (r ApiProcessorsAPIGetProcessorsRequest) Status(status []ManagedResourceStatus) ApiProcessorsAPIGetProcessorsRequest {
 	r.status = &status
 	return r
 }
 
-func (r ApiProcessorsAPIGetProcessorsRequest) Execute() (*ProcessorListResponse, *http.Response, error) {
+func (r ApiProcessorsAPIGetProcessorsRequest) Execute() (ProcessorListResponse, *_nethttp.Response, error) {
 	return r.ApiService.ProcessorsAPIGetProcessorsExecute(r)
 }
 
 /*
-ProcessorsAPIGetProcessors Get the list of Processors of a Bridge instance
-
-Get the list of Processors of a Bridge instance for the authenticated user.
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param bridgeId
- @return ApiProcessorsAPIGetProcessorsRequest
-*/
-func (a *ProcessorsApiService) ProcessorsAPIGetProcessors(ctx context.Context, bridgeId string) ApiProcessorsAPIGetProcessorsRequest {
+ * ProcessorsAPIGetProcessors Get the list of Processors of a Bridge instance
+ * Get the list of Processors of a Bridge instance for the authenticated user.
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param bridgeId
+ * @return ApiProcessorsAPIGetProcessorsRequest
+ */
+func (a *ProcessorsApiService) ProcessorsAPIGetProcessors(ctx _context.Context, bridgeId string) ApiProcessorsAPIGetProcessorsRequest {
 	return ApiProcessorsAPIGetProcessorsRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -586,27 +583,31 @@ func (a *ProcessorsApiService) ProcessorsAPIGetProcessors(ctx context.Context, b
 	}
 }
 
-// Execute executes the request
-//  @return ProcessorListResponse
-func (a *ProcessorsApiService) ProcessorsAPIGetProcessorsExecute(r ApiProcessorsAPIGetProcessorsRequest) (*ProcessorListResponse, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return ProcessorListResponse
+ */
+func (a *ProcessorsApiService) ProcessorsAPIGetProcessorsExecute(r ApiProcessorsAPIGetProcessorsRequest) (ProcessorListResponse, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *ProcessorListResponse
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  ProcessorListResponse
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "ProcessorsApiService.ProcessorsAPIGetProcessors")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/smartevents_mgmt/v2/bridges/{bridgeId}/processors"
-	localVarPath = strings.Replace(localVarPath, "{"+"bridgeId"+"}", url.PathEscape(parameterToString(r.bridgeId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"bridgeId"+"}", _neturl.PathEscape(parameterToString(r.bridgeId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if strlen(r.bridgeId) < 1 {
 		return localVarReturnValue, nil, reportError("bridgeId must have at least 1 elements")
 	}
@@ -648,7 +649,7 @@ func (a *ProcessorsApiService) ProcessorsAPIGetProcessorsExecute(r ApiProcessors
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -658,15 +659,15 @@ func (a *ProcessorsApiService) ProcessorsAPIGetProcessorsExecute(r ApiProcessors
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -677,8 +678,7 @@ func (a *ProcessorsApiService) ProcessorsAPIGetProcessorsExecute(r ApiProcessors
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -688,8 +688,7 @@ func (a *ProcessorsApiService) ProcessorsAPIGetProcessorsExecute(r ApiProcessors
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -699,15 +698,14 @@ func (a *ProcessorsApiService) ProcessorsAPIGetProcessorsExecute(r ApiProcessors
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -718,7 +716,7 @@ func (a *ProcessorsApiService) ProcessorsAPIGetProcessorsExecute(r ApiProcessors
 }
 
 type ApiProcessorsAPIUpdateProcessorRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService ProcessorsApi
 	bridgeId string
 	processorId string
@@ -730,21 +728,19 @@ func (r ApiProcessorsAPIUpdateProcessorRequest) ProcessorRequest(processorReques
 	return r
 }
 
-func (r ApiProcessorsAPIUpdateProcessorRequest) Execute() (*ProcessorResponse, *http.Response, error) {
+func (r ApiProcessorsAPIUpdateProcessorRequest) Execute() (ProcessorResponse, *_nethttp.Response, error) {
 	return r.ApiService.ProcessorsAPIUpdateProcessorExecute(r)
 }
 
 /*
-ProcessorsAPIUpdateProcessor Update a Processor instance.
-
-Update a Processor instance for the authenticated user.
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param bridgeId
- @param processorId
- @return ApiProcessorsAPIUpdateProcessorRequest
-*/
-func (a *ProcessorsApiService) ProcessorsAPIUpdateProcessor(ctx context.Context, bridgeId string, processorId string) ApiProcessorsAPIUpdateProcessorRequest {
+ * ProcessorsAPIUpdateProcessor Update a Processor instance.
+ * Update a Processor instance for the authenticated user.
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param bridgeId
+ * @param processorId
+ * @return ApiProcessorsAPIUpdateProcessorRequest
+ */
+func (a *ProcessorsApiService) ProcessorsAPIUpdateProcessor(ctx _context.Context, bridgeId string, processorId string) ApiProcessorsAPIUpdateProcessorRequest {
 	return ApiProcessorsAPIUpdateProcessorRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -753,28 +749,32 @@ func (a *ProcessorsApiService) ProcessorsAPIUpdateProcessor(ctx context.Context,
 	}
 }
 
-// Execute executes the request
-//  @return ProcessorResponse
-func (a *ProcessorsApiService) ProcessorsAPIUpdateProcessorExecute(r ApiProcessorsAPIUpdateProcessorRequest) (*ProcessorResponse, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return ProcessorResponse
+ */
+func (a *ProcessorsApiService) ProcessorsAPIUpdateProcessorExecute(r ApiProcessorsAPIUpdateProcessorRequest) (ProcessorResponse, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPut
+		localVarHTTPMethod   = _nethttp.MethodPut
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *ProcessorResponse
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  ProcessorResponse
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "ProcessorsApiService.ProcessorsAPIUpdateProcessor")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/smartevents_mgmt/v2/bridges/{bridgeId}/processors/{processorId}"
-	localVarPath = strings.Replace(localVarPath, "{"+"bridgeId"+"}", url.PathEscape(parameterToString(r.bridgeId, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"processorId"+"}", url.PathEscape(parameterToString(r.processorId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"bridgeId"+"}", _neturl.PathEscape(parameterToString(r.bridgeId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"processorId"+"}", _neturl.PathEscape(parameterToString(r.processorId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if strlen(r.bridgeId) < 1 {
 		return localVarReturnValue, nil, reportError("bridgeId must have at least 1 elements")
 	}
@@ -801,7 +801,7 @@ func (a *ProcessorsApiService) ProcessorsAPIUpdateProcessorExecute(r ApiProcesso
 	}
 	// body params
 	localVarPostBody = r.processorRequest
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -811,15 +811,15 @@ func (a *ProcessorsApiService) ProcessorsAPIUpdateProcessorExecute(r ApiProcesso
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -830,8 +830,7 @@ func (a *ProcessorsApiService) ProcessorsAPIUpdateProcessorExecute(r ApiProcesso
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -841,8 +840,7 @@ func (a *ProcessorsApiService) ProcessorsAPIUpdateProcessorExecute(r ApiProcesso
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -852,15 +850,14 @@ func (a *ProcessorsApiService) ProcessorsAPIUpdateProcessorExecute(r ApiProcesso
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
diff --git a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/api_sink_connectors.go b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/api_sink_connectors.go
index 5bd010d0..b4327de9 100644
--- a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/api_sink_connectors.go
+++ b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/api_sink_connectors.go
@@ -1,11 +1,11 @@
 /*
-Red Hat Openshift SmartEvents Fleet Manager V2
-
-The API exposed by the fleet manager of the SmartEvents service.
-
-API version: 0.0.1
-Contact: openbridge-dev@redhat.com
-*/
+ * Red Hat Openshift SmartEvents Fleet Manager V2
+ *
+ * The API exposed by the fleet manager of the SmartEvents service.
+ *
+ * API version: 0.0.1
+ * Contact: openbridge-dev@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -13,100 +13,104 @@ package smarteventsmgmtclient
 
 import (
 	"bytes"
-	"context"
-	"io/ioutil"
-	"net/http"
-	"net/url"
+	_context "context"
+	_ioutil "io/ioutil"
+	_nethttp "net/http"
+	_neturl "net/url"
 	"strings"
 	"reflect"
 )
 
+// Linger please
+var (
+	_ _context.Context
+)
 
 type SinkConnectorsApi interface {
 
 	/*
-	SinkConnectorsAPICreateSinkConnector Create a Sink Connector for a Bridge instance
-
-	Create a Sink Connector of a Bridge instance for the authenticated user.
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param bridgeId
-	@return ApiSinkConnectorsAPICreateSinkConnectorRequest
-	*/
-	SinkConnectorsAPICreateSinkConnector(ctx context.Context, bridgeId string) ApiSinkConnectorsAPICreateSinkConnectorRequest
-
-	// SinkConnectorsAPICreateSinkConnectorExecute executes the request
-	//  @return SinkConnectorResponse
-	SinkConnectorsAPICreateSinkConnectorExecute(r ApiSinkConnectorsAPICreateSinkConnectorRequest) (*SinkConnectorResponse, *http.Response, error)
+	 * SinkConnectorsAPICreateSinkConnector Create a Sink Connector for a Bridge instance
+	 * Create a Sink Connector of a Bridge instance for the authenticated user.
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param bridgeId
+	 * @return ApiSinkConnectorsAPICreateSinkConnectorRequest
+	 */
+	SinkConnectorsAPICreateSinkConnector(ctx _context.Context, bridgeId string) ApiSinkConnectorsAPICreateSinkConnectorRequest
 
 	/*
-	SinkConnectorsAPIDeleteSinkConnector Delete a Sink Connector of a Bridge instance
-
-	Delete a Sink Connector of a Bridge instance for the authenticated user.
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param bridgeId
-	@param sinkId
-	@return ApiSinkConnectorsAPIDeleteSinkConnectorRequest
-	*/
-	SinkConnectorsAPIDeleteSinkConnector(ctx context.Context, bridgeId string, sinkId string) ApiSinkConnectorsAPIDeleteSinkConnectorRequest
-
-	// SinkConnectorsAPIDeleteSinkConnectorExecute executes the request
-	SinkConnectorsAPIDeleteSinkConnectorExecute(r ApiSinkConnectorsAPIDeleteSinkConnectorRequest) (*http.Response, error)
+	 * SinkConnectorsAPICreateSinkConnectorExecute executes the request
+	 * @return SinkConnectorResponse
+	 */
+	SinkConnectorsAPICreateSinkConnectorExecute(r ApiSinkConnectorsAPICreateSinkConnectorRequest) (SinkConnectorResponse, *_nethttp.Response, error)
 
 	/*
-	SinkConnectorsAPIGetSinkConnector Get a Sink Connector of a Bridge instance
-
-	Get a Sink Connector of a Bridge instance for the authenticated user.
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param bridgeId
-	@param sinkId
-	@return ApiSinkConnectorsAPIGetSinkConnectorRequest
-	*/
-	SinkConnectorsAPIGetSinkConnector(ctx context.Context, bridgeId string, sinkId string) ApiSinkConnectorsAPIGetSinkConnectorRequest
-
-	// SinkConnectorsAPIGetSinkConnectorExecute executes the request
-	//  @return SinkConnectorResponse
-	SinkConnectorsAPIGetSinkConnectorExecute(r ApiSinkConnectorsAPIGetSinkConnectorRequest) (*SinkConnectorResponse, *http.Response, error)
+	 * SinkConnectorsAPIDeleteSinkConnector Delete a Sink Connector of a Bridge instance
+	 * Delete a Sink Connector of a Bridge instance for the authenticated user.
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param bridgeId
+	 * @param sinkId
+	 * @return ApiSinkConnectorsAPIDeleteSinkConnectorRequest
+	 */
+	SinkConnectorsAPIDeleteSinkConnector(ctx _context.Context, bridgeId string, sinkId string) ApiSinkConnectorsAPIDeleteSinkConnectorRequest
 
 	/*
-	SinkConnectorsAPIGetSinkConnectors Get the list of Sink Connectors for a Bridge
-
-	Get the list of Sink Connector instances of a Bridge instance for the authenticated user.
+	 * SinkConnectorsAPIDeleteSinkConnectorExecute executes the request
+	 */
+	SinkConnectorsAPIDeleteSinkConnectorExecute(r ApiSinkConnectorsAPIDeleteSinkConnectorRequest) (*_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param bridgeId
-	@return ApiSinkConnectorsAPIGetSinkConnectorsRequest
-	*/
-	SinkConnectorsAPIGetSinkConnectors(ctx context.Context, bridgeId string) ApiSinkConnectorsAPIGetSinkConnectorsRequest
+	/*
+	 * SinkConnectorsAPIGetSinkConnector Get a Sink Connector of a Bridge instance
+	 * Get a Sink Connector of a Bridge instance for the authenticated user.
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param bridgeId
+	 * @param sinkId
+	 * @return ApiSinkConnectorsAPIGetSinkConnectorRequest
+	 */
+	SinkConnectorsAPIGetSinkConnector(ctx _context.Context, bridgeId string, sinkId string) ApiSinkConnectorsAPIGetSinkConnectorRequest
 
-	// SinkConnectorsAPIGetSinkConnectorsExecute executes the request
-	//  @return SinkConnectorListResponse
-	SinkConnectorsAPIGetSinkConnectorsExecute(r ApiSinkConnectorsAPIGetSinkConnectorsRequest) (*SinkConnectorListResponse, *http.Response, error)
+	/*
+	 * SinkConnectorsAPIGetSinkConnectorExecute executes the request
+	 * @return SinkConnectorResponse
+	 */
+	SinkConnectorsAPIGetSinkConnectorExecute(r ApiSinkConnectorsAPIGetSinkConnectorRequest) (SinkConnectorResponse, *_nethttp.Response, error)
 
 	/*
-	SinkConnectorsAPIUpdateSinkConnector Update a Sink Connector instance.
+	 * SinkConnectorsAPIGetSinkConnectors Get the list of Sink Connectors for a Bridge
+	 * Get the list of Sink Connector instances of a Bridge instance for the authenticated user.
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param bridgeId
+	 * @return ApiSinkConnectorsAPIGetSinkConnectorsRequest
+	 */
+	SinkConnectorsAPIGetSinkConnectors(ctx _context.Context, bridgeId string) ApiSinkConnectorsAPIGetSinkConnectorsRequest
 
-	Update a Sink Connector instance for the authenticated user.
+	/*
+	 * SinkConnectorsAPIGetSinkConnectorsExecute executes the request
+	 * @return SinkConnectorListResponse
+	 */
+	SinkConnectorsAPIGetSinkConnectorsExecute(r ApiSinkConnectorsAPIGetSinkConnectorsRequest) (SinkConnectorListResponse, *_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param bridgeId
-	@param sinkId
-	@return ApiSinkConnectorsAPIUpdateSinkConnectorRequest
-	*/
-	SinkConnectorsAPIUpdateSinkConnector(ctx context.Context, bridgeId string, sinkId string) ApiSinkConnectorsAPIUpdateSinkConnectorRequest
+	/*
+	 * SinkConnectorsAPIUpdateSinkConnector Update a Sink Connector instance.
+	 * Update a Sink Connector instance for the authenticated user.
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param bridgeId
+	 * @param sinkId
+	 * @return ApiSinkConnectorsAPIUpdateSinkConnectorRequest
+	 */
+	SinkConnectorsAPIUpdateSinkConnector(ctx _context.Context, bridgeId string, sinkId string) ApiSinkConnectorsAPIUpdateSinkConnectorRequest
 
-	// SinkConnectorsAPIUpdateSinkConnectorExecute executes the request
-	//  @return SinkConnectorResponse
-	SinkConnectorsAPIUpdateSinkConnectorExecute(r ApiSinkConnectorsAPIUpdateSinkConnectorRequest) (*SinkConnectorResponse, *http.Response, error)
+	/*
+	 * SinkConnectorsAPIUpdateSinkConnectorExecute executes the request
+	 * @return SinkConnectorResponse
+	 */
+	SinkConnectorsAPIUpdateSinkConnectorExecute(r ApiSinkConnectorsAPIUpdateSinkConnectorRequest) (SinkConnectorResponse, *_nethttp.Response, error)
 }
 
 // SinkConnectorsApiService SinkConnectorsApi service
 type SinkConnectorsApiService service
 
 type ApiSinkConnectorsAPICreateSinkConnectorRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService SinkConnectorsApi
 	bridgeId string
 	connectorRequest *ConnectorRequest
@@ -117,20 +121,18 @@ func (r ApiSinkConnectorsAPICreateSinkConnectorRequest) ConnectorRequest(connect
 	return r
 }
 
-func (r ApiSinkConnectorsAPICreateSinkConnectorRequest) Execute() (*SinkConnectorResponse, *http.Response, error) {
+func (r ApiSinkConnectorsAPICreateSinkConnectorRequest) Execute() (SinkConnectorResponse, *_nethttp.Response, error) {
 	return r.ApiService.SinkConnectorsAPICreateSinkConnectorExecute(r)
 }
 
 /*
-SinkConnectorsAPICreateSinkConnector Create a Sink Connector for a Bridge instance
-
-Create a Sink Connector of a Bridge instance for the authenticated user.
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param bridgeId
- @return ApiSinkConnectorsAPICreateSinkConnectorRequest
-*/
-func (a *SinkConnectorsApiService) SinkConnectorsAPICreateSinkConnector(ctx context.Context, bridgeId string) ApiSinkConnectorsAPICreateSinkConnectorRequest {
+ * SinkConnectorsAPICreateSinkConnector Create a Sink Connector for a Bridge instance
+ * Create a Sink Connector of a Bridge instance for the authenticated user.
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param bridgeId
+ * @return ApiSinkConnectorsAPICreateSinkConnectorRequest
+ */
+func (a *SinkConnectorsApiService) SinkConnectorsAPICreateSinkConnector(ctx _context.Context, bridgeId string) ApiSinkConnectorsAPICreateSinkConnectorRequest {
 	return ApiSinkConnectorsAPICreateSinkConnectorRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -138,27 +140,31 @@ func (a *SinkConnectorsApiService) SinkConnectorsAPICreateSinkConnector(ctx cont
 	}
 }
 
-// Execute executes the request
-//  @return SinkConnectorResponse
-func (a *SinkConnectorsApiService) SinkConnectorsAPICreateSinkConnectorExecute(r ApiSinkConnectorsAPICreateSinkConnectorRequest) (*SinkConnectorResponse, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return SinkConnectorResponse
+ */
+func (a *SinkConnectorsApiService) SinkConnectorsAPICreateSinkConnectorExecute(r ApiSinkConnectorsAPICreateSinkConnectorRequest) (SinkConnectorResponse, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *SinkConnectorResponse
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  SinkConnectorResponse
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "SinkConnectorsApiService.SinkConnectorsAPICreateSinkConnector")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/smartevents_mgmt/v2/bridges/{bridgeId}/sinks"
-	localVarPath = strings.Replace(localVarPath, "{"+"bridgeId"+"}", url.PathEscape(parameterToString(r.bridgeId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"bridgeId"+"}", _neturl.PathEscape(parameterToString(r.bridgeId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if strlen(r.bridgeId) < 1 {
 		return localVarReturnValue, nil, reportError("bridgeId must have at least 1 elements")
 	}
@@ -182,7 +188,7 @@ func (a *SinkConnectorsApiService) SinkConnectorsAPICreateSinkConnectorExecute(r
 	}
 	// body params
 	localVarPostBody = r.connectorRequest
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -192,15 +198,15 @@ func (a *SinkConnectorsApiService) SinkConnectorsAPICreateSinkConnectorExecute(r
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -211,8 +217,7 @@ func (a *SinkConnectorsApiService) SinkConnectorsAPICreateSinkConnectorExecute(r
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 402 {
@@ -222,8 +227,7 @@ func (a *SinkConnectorsApiService) SinkConnectorsAPICreateSinkConnectorExecute(r
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -233,8 +237,7 @@ func (a *SinkConnectorsApiService) SinkConnectorsAPICreateSinkConnectorExecute(r
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -244,15 +247,14 @@ func (a *SinkConnectorsApiService) SinkConnectorsAPICreateSinkConnectorExecute(r
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -263,27 +265,26 @@ func (a *SinkConnectorsApiService) SinkConnectorsAPICreateSinkConnectorExecute(r
 }
 
 type ApiSinkConnectorsAPIDeleteSinkConnectorRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService SinkConnectorsApi
 	bridgeId string
 	sinkId string
 }
 
-func (r ApiSinkConnectorsAPIDeleteSinkConnectorRequest) Execute() (*http.Response, error) {
+
+func (r ApiSinkConnectorsAPIDeleteSinkConnectorRequest) Execute() (*_nethttp.Response, error) {
 	return r.ApiService.SinkConnectorsAPIDeleteSinkConnectorExecute(r)
 }
 
 /*
-SinkConnectorsAPIDeleteSinkConnector Delete a Sink Connector of a Bridge instance
-
-Delete a Sink Connector of a Bridge instance for the authenticated user.
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param bridgeId
- @param sinkId
- @return ApiSinkConnectorsAPIDeleteSinkConnectorRequest
-*/
-func (a *SinkConnectorsApiService) SinkConnectorsAPIDeleteSinkConnector(ctx context.Context, bridgeId string, sinkId string) ApiSinkConnectorsAPIDeleteSinkConnectorRequest {
+ * SinkConnectorsAPIDeleteSinkConnector Delete a Sink Connector of a Bridge instance
+ * Delete a Sink Connector of a Bridge instance for the authenticated user.
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param bridgeId
+ * @param sinkId
+ * @return ApiSinkConnectorsAPIDeleteSinkConnectorRequest
+ */
+func (a *SinkConnectorsApiService) SinkConnectorsAPIDeleteSinkConnector(ctx _context.Context, bridgeId string, sinkId string) ApiSinkConnectorsAPIDeleteSinkConnectorRequest {
 	return ApiSinkConnectorsAPIDeleteSinkConnectorRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -292,26 +293,30 @@ func (a *SinkConnectorsApiService) SinkConnectorsAPIDeleteSinkConnector(ctx cont
 	}
 }
 
-// Execute executes the request
-func (a *SinkConnectorsApiService) SinkConnectorsAPIDeleteSinkConnectorExecute(r ApiSinkConnectorsAPIDeleteSinkConnectorRequest) (*http.Response, error) {
+/*
+ * Execute executes the request
+ */
+func (a *SinkConnectorsApiService) SinkConnectorsAPIDeleteSinkConnectorExecute(r ApiSinkConnectorsAPIDeleteSinkConnectorRequest) (*_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodDelete
+		localVarHTTPMethod   = _nethttp.MethodDelete
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "SinkConnectorsApiService.SinkConnectorsAPIDeleteSinkConnector")
 	if err != nil {
-		return nil, &GenericOpenAPIError{error: err.Error()}
+		return nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/smartevents_mgmt/v2/bridges/{bridgeId}/sinks/{sinkId}"
-	localVarPath = strings.Replace(localVarPath, "{"+"bridgeId"+"}", url.PathEscape(parameterToString(r.bridgeId, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"sinkId"+"}", url.PathEscape(parameterToString(r.sinkId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"bridgeId"+"}", _neturl.PathEscape(parameterToString(r.bridgeId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"sinkId"+"}", _neturl.PathEscape(parameterToString(r.sinkId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -330,7 +335,7 @@ func (a *SinkConnectorsApiService) SinkConnectorsAPIDeleteSinkConnectorExecute(r
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return nil, err
 	}
@@ -340,15 +345,15 @@ func (a *SinkConnectorsApiService) SinkConnectorsAPIDeleteSinkConnectorExecute(r
 		return localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -359,8 +364,7 @@ func (a *SinkConnectorsApiService) SinkConnectorsAPIDeleteSinkConnectorExecute(r
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -370,8 +374,7 @@ func (a *SinkConnectorsApiService) SinkConnectorsAPIDeleteSinkConnectorExecute(r
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -381,8 +384,7 @@ func (a *SinkConnectorsApiService) SinkConnectorsAPIDeleteSinkConnectorExecute(r
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarHTTPResponse, newErr
 	}
@@ -391,27 +393,26 @@ func (a *SinkConnectorsApiService) SinkConnectorsAPIDeleteSinkConnectorExecute(r
 }
 
 type ApiSinkConnectorsAPIGetSinkConnectorRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService SinkConnectorsApi
 	bridgeId string
 	sinkId string
 }
 
-func (r ApiSinkConnectorsAPIGetSinkConnectorRequest) Execute() (*SinkConnectorResponse, *http.Response, error) {
+
+func (r ApiSinkConnectorsAPIGetSinkConnectorRequest) Execute() (SinkConnectorResponse, *_nethttp.Response, error) {
 	return r.ApiService.SinkConnectorsAPIGetSinkConnectorExecute(r)
 }
 
 /*
-SinkConnectorsAPIGetSinkConnector Get a Sink Connector of a Bridge instance
-
-Get a Sink Connector of a Bridge instance for the authenticated user.
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param bridgeId
- @param sinkId
- @return ApiSinkConnectorsAPIGetSinkConnectorRequest
-*/
-func (a *SinkConnectorsApiService) SinkConnectorsAPIGetSinkConnector(ctx context.Context, bridgeId string, sinkId string) ApiSinkConnectorsAPIGetSinkConnectorRequest {
+ * SinkConnectorsAPIGetSinkConnector Get a Sink Connector of a Bridge instance
+ * Get a Sink Connector of a Bridge instance for the authenticated user.
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param bridgeId
+ * @param sinkId
+ * @return ApiSinkConnectorsAPIGetSinkConnectorRequest
+ */
+func (a *SinkConnectorsApiService) SinkConnectorsAPIGetSinkConnector(ctx _context.Context, bridgeId string, sinkId string) ApiSinkConnectorsAPIGetSinkConnectorRequest {
 	return ApiSinkConnectorsAPIGetSinkConnectorRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -420,28 +421,32 @@ func (a *SinkConnectorsApiService) SinkConnectorsAPIGetSinkConnector(ctx context
 	}
 }
 
-// Execute executes the request
-//  @return SinkConnectorResponse
-func (a *SinkConnectorsApiService) SinkConnectorsAPIGetSinkConnectorExecute(r ApiSinkConnectorsAPIGetSinkConnectorRequest) (*SinkConnectorResponse, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return SinkConnectorResponse
+ */
+func (a *SinkConnectorsApiService) SinkConnectorsAPIGetSinkConnectorExecute(r ApiSinkConnectorsAPIGetSinkConnectorRequest) (SinkConnectorResponse, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *SinkConnectorResponse
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  SinkConnectorResponse
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "SinkConnectorsApiService.SinkConnectorsAPIGetSinkConnector")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/smartevents_mgmt/v2/bridges/{bridgeId}/sinks/{sinkId}"
-	localVarPath = strings.Replace(localVarPath, "{"+"bridgeId"+"}", url.PathEscape(parameterToString(r.bridgeId, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"sinkId"+"}", url.PathEscape(parameterToString(r.sinkId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"bridgeId"+"}", _neturl.PathEscape(parameterToString(r.bridgeId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"sinkId"+"}", _neturl.PathEscape(parameterToString(r.sinkId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if strlen(r.bridgeId) < 1 {
 		return localVarReturnValue, nil, reportError("bridgeId must have at least 1 elements")
 	}
@@ -466,7 +471,7 @@ func (a *SinkConnectorsApiService) SinkConnectorsAPIGetSinkConnectorExecute(r Ap
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -476,15 +481,15 @@ func (a *SinkConnectorsApiService) SinkConnectorsAPIGetSinkConnectorExecute(r Ap
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -495,8 +500,7 @@ func (a *SinkConnectorsApiService) SinkConnectorsAPIGetSinkConnectorExecute(r Ap
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -506,8 +510,7 @@ func (a *SinkConnectorsApiService) SinkConnectorsAPIGetSinkConnectorExecute(r Ap
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -517,15 +520,14 @@ func (a *SinkConnectorsApiService) SinkConnectorsAPIGetSinkConnectorExecute(r Ap
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -536,7 +538,7 @@ func (a *SinkConnectorsApiService) SinkConnectorsAPIGetSinkConnectorExecute(r Ap
 }
 
 type ApiSinkConnectorsAPIGetSinkConnectorsRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService SinkConnectorsApi
 	bridgeId string
 	name *string
@@ -549,36 +551,31 @@ func (r ApiSinkConnectorsAPIGetSinkConnectorsRequest) Name(name string) ApiSinkC
 	r.name = &name
 	return r
 }
-
 func (r ApiSinkConnectorsAPIGetSinkConnectorsRequest) Page(page int32) ApiSinkConnectorsAPIGetSinkConnectorsRequest {
 	r.page = &page
 	return r
 }
-
 func (r ApiSinkConnectorsAPIGetSinkConnectorsRequest) Size(size int32) ApiSinkConnectorsAPIGetSinkConnectorsRequest {
 	r.size = &size
 	return r
 }
-
 func (r ApiSinkConnectorsAPIGetSinkConnectorsRequest) Status(status []ManagedResourceStatus) ApiSinkConnectorsAPIGetSinkConnectorsRequest {
 	r.status = &status
 	return r
 }
 
-func (r ApiSinkConnectorsAPIGetSinkConnectorsRequest) Execute() (*SinkConnectorListResponse, *http.Response, error) {
+func (r ApiSinkConnectorsAPIGetSinkConnectorsRequest) Execute() (SinkConnectorListResponse, *_nethttp.Response, error) {
 	return r.ApiService.SinkConnectorsAPIGetSinkConnectorsExecute(r)
 }
 
 /*
-SinkConnectorsAPIGetSinkConnectors Get the list of Sink Connectors for a Bridge
-
-Get the list of Sink Connector instances of a Bridge instance for the authenticated user.
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param bridgeId
- @return ApiSinkConnectorsAPIGetSinkConnectorsRequest
-*/
-func (a *SinkConnectorsApiService) SinkConnectorsAPIGetSinkConnectors(ctx context.Context, bridgeId string) ApiSinkConnectorsAPIGetSinkConnectorsRequest {
+ * SinkConnectorsAPIGetSinkConnectors Get the list of Sink Connectors for a Bridge
+ * Get the list of Sink Connector instances of a Bridge instance for the authenticated user.
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param bridgeId
+ * @return ApiSinkConnectorsAPIGetSinkConnectorsRequest
+ */
+func (a *SinkConnectorsApiService) SinkConnectorsAPIGetSinkConnectors(ctx _context.Context, bridgeId string) ApiSinkConnectorsAPIGetSinkConnectorsRequest {
 	return ApiSinkConnectorsAPIGetSinkConnectorsRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -586,27 +583,31 @@ func (a *SinkConnectorsApiService) SinkConnectorsAPIGetSinkConnectors(ctx contex
 	}
 }
 
-// Execute executes the request
-//  @return SinkConnectorListResponse
-func (a *SinkConnectorsApiService) SinkConnectorsAPIGetSinkConnectorsExecute(r ApiSinkConnectorsAPIGetSinkConnectorsRequest) (*SinkConnectorListResponse, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return SinkConnectorListResponse
+ */
+func (a *SinkConnectorsApiService) SinkConnectorsAPIGetSinkConnectorsExecute(r ApiSinkConnectorsAPIGetSinkConnectorsRequest) (SinkConnectorListResponse, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *SinkConnectorListResponse
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  SinkConnectorListResponse
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "SinkConnectorsApiService.SinkConnectorsAPIGetSinkConnectors")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/smartevents_mgmt/v2/bridges/{bridgeId}/sinks"
-	localVarPath = strings.Replace(localVarPath, "{"+"bridgeId"+"}", url.PathEscape(parameterToString(r.bridgeId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"bridgeId"+"}", _neturl.PathEscape(parameterToString(r.bridgeId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if strlen(r.bridgeId) < 1 {
 		return localVarReturnValue, nil, reportError("bridgeId must have at least 1 elements")
 	}
@@ -648,7 +649,7 @@ func (a *SinkConnectorsApiService) SinkConnectorsAPIGetSinkConnectorsExecute(r A
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -658,15 +659,15 @@ func (a *SinkConnectorsApiService) SinkConnectorsAPIGetSinkConnectorsExecute(r A
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -677,8 +678,7 @@ func (a *SinkConnectorsApiService) SinkConnectorsAPIGetSinkConnectorsExecute(r A
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -688,8 +688,7 @@ func (a *SinkConnectorsApiService) SinkConnectorsAPIGetSinkConnectorsExecute(r A
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -699,8 +698,7 @@ func (a *SinkConnectorsApiService) SinkConnectorsAPIGetSinkConnectorsExecute(r A
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -710,8 +708,7 @@ func (a *SinkConnectorsApiService) SinkConnectorsAPIGetSinkConnectorsExecute(r A
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -721,15 +718,14 @@ func (a *SinkConnectorsApiService) SinkConnectorsAPIGetSinkConnectorsExecute(r A
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -740,7 +736,7 @@ func (a *SinkConnectorsApiService) SinkConnectorsAPIGetSinkConnectorsExecute(r A
 }
 
 type ApiSinkConnectorsAPIUpdateSinkConnectorRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService SinkConnectorsApi
 	bridgeId string
 	sinkId string
@@ -752,21 +748,19 @@ func (r ApiSinkConnectorsAPIUpdateSinkConnectorRequest) ConnectorRequest(connect
 	return r
 }
 
-func (r ApiSinkConnectorsAPIUpdateSinkConnectorRequest) Execute() (*SinkConnectorResponse, *http.Response, error) {
+func (r ApiSinkConnectorsAPIUpdateSinkConnectorRequest) Execute() (SinkConnectorResponse, *_nethttp.Response, error) {
 	return r.ApiService.SinkConnectorsAPIUpdateSinkConnectorExecute(r)
 }
 
 /*
-SinkConnectorsAPIUpdateSinkConnector Update a Sink Connector instance.
-
-Update a Sink Connector instance for the authenticated user.
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param bridgeId
- @param sinkId
- @return ApiSinkConnectorsAPIUpdateSinkConnectorRequest
-*/
-func (a *SinkConnectorsApiService) SinkConnectorsAPIUpdateSinkConnector(ctx context.Context, bridgeId string, sinkId string) ApiSinkConnectorsAPIUpdateSinkConnectorRequest {
+ * SinkConnectorsAPIUpdateSinkConnector Update a Sink Connector instance.
+ * Update a Sink Connector instance for the authenticated user.
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param bridgeId
+ * @param sinkId
+ * @return ApiSinkConnectorsAPIUpdateSinkConnectorRequest
+ */
+func (a *SinkConnectorsApiService) SinkConnectorsAPIUpdateSinkConnector(ctx _context.Context, bridgeId string, sinkId string) ApiSinkConnectorsAPIUpdateSinkConnectorRequest {
 	return ApiSinkConnectorsAPIUpdateSinkConnectorRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -775,28 +769,32 @@ func (a *SinkConnectorsApiService) SinkConnectorsAPIUpdateSinkConnector(ctx cont
 	}
 }
 
-// Execute executes the request
-//  @return SinkConnectorResponse
-func (a *SinkConnectorsApiService) SinkConnectorsAPIUpdateSinkConnectorExecute(r ApiSinkConnectorsAPIUpdateSinkConnectorRequest) (*SinkConnectorResponse, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return SinkConnectorResponse
+ */
+func (a *SinkConnectorsApiService) SinkConnectorsAPIUpdateSinkConnectorExecute(r ApiSinkConnectorsAPIUpdateSinkConnectorRequest) (SinkConnectorResponse, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPut
+		localVarHTTPMethod   = _nethttp.MethodPut
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *SinkConnectorResponse
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  SinkConnectorResponse
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "SinkConnectorsApiService.SinkConnectorsAPIUpdateSinkConnector")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/smartevents_mgmt/v2/bridges/{bridgeId}/sinks/{sinkId}"
-	localVarPath = strings.Replace(localVarPath, "{"+"bridgeId"+"}", url.PathEscape(parameterToString(r.bridgeId, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"sinkId"+"}", url.PathEscape(parameterToString(r.sinkId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"bridgeId"+"}", _neturl.PathEscape(parameterToString(r.bridgeId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"sinkId"+"}", _neturl.PathEscape(parameterToString(r.sinkId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if strlen(r.bridgeId) < 1 {
 		return localVarReturnValue, nil, reportError("bridgeId must have at least 1 elements")
 	}
@@ -823,7 +821,7 @@ func (a *SinkConnectorsApiService) SinkConnectorsAPIUpdateSinkConnectorExecute(r
 	}
 	// body params
 	localVarPostBody = r.connectorRequest
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -833,15 +831,15 @@ func (a *SinkConnectorsApiService) SinkConnectorsAPIUpdateSinkConnectorExecute(r
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -852,8 +850,7 @@ func (a *SinkConnectorsApiService) SinkConnectorsAPIUpdateSinkConnectorExecute(r
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -863,8 +860,7 @@ func (a *SinkConnectorsApiService) SinkConnectorsAPIUpdateSinkConnectorExecute(r
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -874,15 +870,14 @@ func (a *SinkConnectorsApiService) SinkConnectorsAPIUpdateSinkConnectorExecute(r
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
diff --git a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/api_source_connectors.go b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/api_source_connectors.go
index 53ff9500..81b8c9db 100644
--- a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/api_source_connectors.go
+++ b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/api_source_connectors.go
@@ -1,11 +1,11 @@
 /*
-Red Hat Openshift SmartEvents Fleet Manager V2
-
-The API exposed by the fleet manager of the SmartEvents service.
-
-API version: 0.0.1
-Contact: openbridge-dev@redhat.com
-*/
+ * Red Hat Openshift SmartEvents Fleet Manager V2
+ *
+ * The API exposed by the fleet manager of the SmartEvents service.
+ *
+ * API version: 0.0.1
+ * Contact: openbridge-dev@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -13,100 +13,104 @@ package smarteventsmgmtclient
 
 import (
 	"bytes"
-	"context"
-	"io/ioutil"
-	"net/http"
-	"net/url"
+	_context "context"
+	_ioutil "io/ioutil"
+	_nethttp "net/http"
+	_neturl "net/url"
 	"strings"
 	"reflect"
 )
 
+// Linger please
+var (
+	_ _context.Context
+)
 
 type SourceConnectorsApi interface {
 
 	/*
-	SourceConnectorsAPICreateSourceConnector Create a Source Connector for a Bridge instance
-
-	Create a Source Connector of a Bridge instance for the authenticated user.
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param bridgeId
-	@return ApiSourceConnectorsAPICreateSourceConnectorRequest
-	*/
-	SourceConnectorsAPICreateSourceConnector(ctx context.Context, bridgeId string) ApiSourceConnectorsAPICreateSourceConnectorRequest
-
-	// SourceConnectorsAPICreateSourceConnectorExecute executes the request
-	//  @return SourceConnectorResponse
-	SourceConnectorsAPICreateSourceConnectorExecute(r ApiSourceConnectorsAPICreateSourceConnectorRequest) (*SourceConnectorResponse, *http.Response, error)
+	 * SourceConnectorsAPICreateSourceConnector Create a Source Connector for a Bridge instance
+	 * Create a Source Connector of a Bridge instance for the authenticated user.
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param bridgeId
+	 * @return ApiSourceConnectorsAPICreateSourceConnectorRequest
+	 */
+	SourceConnectorsAPICreateSourceConnector(ctx _context.Context, bridgeId string) ApiSourceConnectorsAPICreateSourceConnectorRequest
 
 	/*
-	SourceConnectorsAPIDeleteSourceConnector Delete a Source Connector of a Bridge instance
-
-	Delete a Source Connector of a Bridge instance for the authenticated user.
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param bridgeId
-	@param sourceId
-	@return ApiSourceConnectorsAPIDeleteSourceConnectorRequest
-	*/
-	SourceConnectorsAPIDeleteSourceConnector(ctx context.Context, bridgeId string, sourceId string) ApiSourceConnectorsAPIDeleteSourceConnectorRequest
-
-	// SourceConnectorsAPIDeleteSourceConnectorExecute executes the request
-	SourceConnectorsAPIDeleteSourceConnectorExecute(r ApiSourceConnectorsAPIDeleteSourceConnectorRequest) (*http.Response, error)
+	 * SourceConnectorsAPICreateSourceConnectorExecute executes the request
+	 * @return SourceConnectorResponse
+	 */
+	SourceConnectorsAPICreateSourceConnectorExecute(r ApiSourceConnectorsAPICreateSourceConnectorRequest) (SourceConnectorResponse, *_nethttp.Response, error)
 
 	/*
-	SourceConnectorsAPIGetSourceConnector Get a Source Connector of a Bridge instance
-
-	Get a Source Connector of a Bridge instance for the authenticated user.
-
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param bridgeId
-	@param sourceId
-	@return ApiSourceConnectorsAPIGetSourceConnectorRequest
-	*/
-	SourceConnectorsAPIGetSourceConnector(ctx context.Context, bridgeId string, sourceId string) ApiSourceConnectorsAPIGetSourceConnectorRequest
-
-	// SourceConnectorsAPIGetSourceConnectorExecute executes the request
-	//  @return SourceConnectorResponse
-	SourceConnectorsAPIGetSourceConnectorExecute(r ApiSourceConnectorsAPIGetSourceConnectorRequest) (*SourceConnectorResponse, *http.Response, error)
+	 * SourceConnectorsAPIDeleteSourceConnector Delete a Source Connector of a Bridge instance
+	 * Delete a Source Connector of a Bridge instance for the authenticated user.
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param bridgeId
+	 * @param sourceId
+	 * @return ApiSourceConnectorsAPIDeleteSourceConnectorRequest
+	 */
+	SourceConnectorsAPIDeleteSourceConnector(ctx _context.Context, bridgeId string, sourceId string) ApiSourceConnectorsAPIDeleteSourceConnectorRequest
 
 	/*
-	SourceConnectorsAPIGetSourceConnectors Get the list of Sink Connectors for a Bridge
-
-	Get the list of Source Connector instances of a Bridge instance instance for the authenticated user.
+	 * SourceConnectorsAPIDeleteSourceConnectorExecute executes the request
+	 */
+	SourceConnectorsAPIDeleteSourceConnectorExecute(r ApiSourceConnectorsAPIDeleteSourceConnectorRequest) (*_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param bridgeId
-	@return ApiSourceConnectorsAPIGetSourceConnectorsRequest
-	*/
-	SourceConnectorsAPIGetSourceConnectors(ctx context.Context, bridgeId string) ApiSourceConnectorsAPIGetSourceConnectorsRequest
+	/*
+	 * SourceConnectorsAPIGetSourceConnector Get a Source Connector of a Bridge instance
+	 * Get a Source Connector of a Bridge instance for the authenticated user.
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param bridgeId
+	 * @param sourceId
+	 * @return ApiSourceConnectorsAPIGetSourceConnectorRequest
+	 */
+	SourceConnectorsAPIGetSourceConnector(ctx _context.Context, bridgeId string, sourceId string) ApiSourceConnectorsAPIGetSourceConnectorRequest
 
-	// SourceConnectorsAPIGetSourceConnectorsExecute executes the request
-	//  @return SourceConnectorListResponse
-	SourceConnectorsAPIGetSourceConnectorsExecute(r ApiSourceConnectorsAPIGetSourceConnectorsRequest) (*SourceConnectorListResponse, *http.Response, error)
+	/*
+	 * SourceConnectorsAPIGetSourceConnectorExecute executes the request
+	 * @return SourceConnectorResponse
+	 */
+	SourceConnectorsAPIGetSourceConnectorExecute(r ApiSourceConnectorsAPIGetSourceConnectorRequest) (SourceConnectorResponse, *_nethttp.Response, error)
 
 	/*
-	SourceConnectorsAPIUpdateSourceConnector Update a Source Connector instance.
+	 * SourceConnectorsAPIGetSourceConnectors Get the list of Sink Connectors for a Bridge
+	 * Get the list of Source Connector instances of a Bridge instance instance for the authenticated user.
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param bridgeId
+	 * @return ApiSourceConnectorsAPIGetSourceConnectorsRequest
+	 */
+	SourceConnectorsAPIGetSourceConnectors(ctx _context.Context, bridgeId string) ApiSourceConnectorsAPIGetSourceConnectorsRequest
 
-	Update a Source Connector instance for the authenticated user.
+	/*
+	 * SourceConnectorsAPIGetSourceConnectorsExecute executes the request
+	 * @return SourceConnectorListResponse
+	 */
+	SourceConnectorsAPIGetSourceConnectorsExecute(r ApiSourceConnectorsAPIGetSourceConnectorsRequest) (SourceConnectorListResponse, *_nethttp.Response, error)
 
-	@param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
-	@param bridgeId
-	@param sourceId
-	@return ApiSourceConnectorsAPIUpdateSourceConnectorRequest
-	*/
-	SourceConnectorsAPIUpdateSourceConnector(ctx context.Context, bridgeId string, sourceId string) ApiSourceConnectorsAPIUpdateSourceConnectorRequest
+	/*
+	 * SourceConnectorsAPIUpdateSourceConnector Update a Source Connector instance.
+	 * Update a Source Connector instance for the authenticated user.
+	 * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+	 * @param bridgeId
+	 * @param sourceId
+	 * @return ApiSourceConnectorsAPIUpdateSourceConnectorRequest
+	 */
+	SourceConnectorsAPIUpdateSourceConnector(ctx _context.Context, bridgeId string, sourceId string) ApiSourceConnectorsAPIUpdateSourceConnectorRequest
 
-	// SourceConnectorsAPIUpdateSourceConnectorExecute executes the request
-	//  @return SourceConnectorResponse
-	SourceConnectorsAPIUpdateSourceConnectorExecute(r ApiSourceConnectorsAPIUpdateSourceConnectorRequest) (*SourceConnectorResponse, *http.Response, error)
+	/*
+	 * SourceConnectorsAPIUpdateSourceConnectorExecute executes the request
+	 * @return SourceConnectorResponse
+	 */
+	SourceConnectorsAPIUpdateSourceConnectorExecute(r ApiSourceConnectorsAPIUpdateSourceConnectorRequest) (SourceConnectorResponse, *_nethttp.Response, error)
 }
 
 // SourceConnectorsApiService SourceConnectorsApi service
 type SourceConnectorsApiService service
 
 type ApiSourceConnectorsAPICreateSourceConnectorRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService SourceConnectorsApi
 	bridgeId string
 	connectorRequest *ConnectorRequest
@@ -117,20 +121,18 @@ func (r ApiSourceConnectorsAPICreateSourceConnectorRequest) ConnectorRequest(con
 	return r
 }
 
-func (r ApiSourceConnectorsAPICreateSourceConnectorRequest) Execute() (*SourceConnectorResponse, *http.Response, error) {
+func (r ApiSourceConnectorsAPICreateSourceConnectorRequest) Execute() (SourceConnectorResponse, *_nethttp.Response, error) {
 	return r.ApiService.SourceConnectorsAPICreateSourceConnectorExecute(r)
 }
 
 /*
-SourceConnectorsAPICreateSourceConnector Create a Source Connector for a Bridge instance
-
-Create a Source Connector of a Bridge instance for the authenticated user.
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param bridgeId
- @return ApiSourceConnectorsAPICreateSourceConnectorRequest
-*/
-func (a *SourceConnectorsApiService) SourceConnectorsAPICreateSourceConnector(ctx context.Context, bridgeId string) ApiSourceConnectorsAPICreateSourceConnectorRequest {
+ * SourceConnectorsAPICreateSourceConnector Create a Source Connector for a Bridge instance
+ * Create a Source Connector of a Bridge instance for the authenticated user.
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param bridgeId
+ * @return ApiSourceConnectorsAPICreateSourceConnectorRequest
+ */
+func (a *SourceConnectorsApiService) SourceConnectorsAPICreateSourceConnector(ctx _context.Context, bridgeId string) ApiSourceConnectorsAPICreateSourceConnectorRequest {
 	return ApiSourceConnectorsAPICreateSourceConnectorRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -138,27 +140,31 @@ func (a *SourceConnectorsApiService) SourceConnectorsAPICreateSourceConnector(ct
 	}
 }
 
-// Execute executes the request
-//  @return SourceConnectorResponse
-func (a *SourceConnectorsApiService) SourceConnectorsAPICreateSourceConnectorExecute(r ApiSourceConnectorsAPICreateSourceConnectorRequest) (*SourceConnectorResponse, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return SourceConnectorResponse
+ */
+func (a *SourceConnectorsApiService) SourceConnectorsAPICreateSourceConnectorExecute(r ApiSourceConnectorsAPICreateSourceConnectorRequest) (SourceConnectorResponse, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPost
+		localVarHTTPMethod   = _nethttp.MethodPost
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *SourceConnectorResponse
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  SourceConnectorResponse
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "SourceConnectorsApiService.SourceConnectorsAPICreateSourceConnector")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/smartevents_mgmt/v2/bridges/{bridgeId}/sources"
-	localVarPath = strings.Replace(localVarPath, "{"+"bridgeId"+"}", url.PathEscape(parameterToString(r.bridgeId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"bridgeId"+"}", _neturl.PathEscape(parameterToString(r.bridgeId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if strlen(r.bridgeId) < 1 {
 		return localVarReturnValue, nil, reportError("bridgeId must have at least 1 elements")
 	}
@@ -182,7 +188,7 @@ func (a *SourceConnectorsApiService) SourceConnectorsAPICreateSourceConnectorExe
 	}
 	// body params
 	localVarPostBody = r.connectorRequest
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -192,15 +198,15 @@ func (a *SourceConnectorsApiService) SourceConnectorsAPICreateSourceConnectorExe
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -211,8 +217,7 @@ func (a *SourceConnectorsApiService) SourceConnectorsAPICreateSourceConnectorExe
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 402 {
@@ -222,8 +227,7 @@ func (a *SourceConnectorsApiService) SourceConnectorsAPICreateSourceConnectorExe
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -233,8 +237,7 @@ func (a *SourceConnectorsApiService) SourceConnectorsAPICreateSourceConnectorExe
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -244,15 +247,14 @@ func (a *SourceConnectorsApiService) SourceConnectorsAPICreateSourceConnectorExe
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -263,27 +265,26 @@ func (a *SourceConnectorsApiService) SourceConnectorsAPICreateSourceConnectorExe
 }
 
 type ApiSourceConnectorsAPIDeleteSourceConnectorRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService SourceConnectorsApi
 	bridgeId string
 	sourceId string
 }
 
-func (r ApiSourceConnectorsAPIDeleteSourceConnectorRequest) Execute() (*http.Response, error) {
+
+func (r ApiSourceConnectorsAPIDeleteSourceConnectorRequest) Execute() (*_nethttp.Response, error) {
 	return r.ApiService.SourceConnectorsAPIDeleteSourceConnectorExecute(r)
 }
 
 /*
-SourceConnectorsAPIDeleteSourceConnector Delete a Source Connector of a Bridge instance
-
-Delete a Source Connector of a Bridge instance for the authenticated user.
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param bridgeId
- @param sourceId
- @return ApiSourceConnectorsAPIDeleteSourceConnectorRequest
-*/
-func (a *SourceConnectorsApiService) SourceConnectorsAPIDeleteSourceConnector(ctx context.Context, bridgeId string, sourceId string) ApiSourceConnectorsAPIDeleteSourceConnectorRequest {
+ * SourceConnectorsAPIDeleteSourceConnector Delete a Source Connector of a Bridge instance
+ * Delete a Source Connector of a Bridge instance for the authenticated user.
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param bridgeId
+ * @param sourceId
+ * @return ApiSourceConnectorsAPIDeleteSourceConnectorRequest
+ */
+func (a *SourceConnectorsApiService) SourceConnectorsAPIDeleteSourceConnector(ctx _context.Context, bridgeId string, sourceId string) ApiSourceConnectorsAPIDeleteSourceConnectorRequest {
 	return ApiSourceConnectorsAPIDeleteSourceConnectorRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -292,26 +293,30 @@ func (a *SourceConnectorsApiService) SourceConnectorsAPIDeleteSourceConnector(ct
 	}
 }
 
-// Execute executes the request
-func (a *SourceConnectorsApiService) SourceConnectorsAPIDeleteSourceConnectorExecute(r ApiSourceConnectorsAPIDeleteSourceConnectorRequest) (*http.Response, error) {
+/*
+ * Execute executes the request
+ */
+func (a *SourceConnectorsApiService) SourceConnectorsAPIDeleteSourceConnectorExecute(r ApiSourceConnectorsAPIDeleteSourceConnectorRequest) (*_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodDelete
+		localVarHTTPMethod   = _nethttp.MethodDelete
 		localVarPostBody     interface{}
-		formFiles            []formFile
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "SourceConnectorsApiService.SourceConnectorsAPIDeleteSourceConnector")
 	if err != nil {
-		return nil, &GenericOpenAPIError{error: err.Error()}
+		return nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/smartevents_mgmt/v2/bridges/{bridgeId}/sources/{sourceId}"
-	localVarPath = strings.Replace(localVarPath, "{"+"bridgeId"+"}", url.PathEscape(parameterToString(r.bridgeId, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"sourceId"+"}", url.PathEscape(parameterToString(r.sourceId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"bridgeId"+"}", _neturl.PathEscape(parameterToString(r.bridgeId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"sourceId"+"}", _neturl.PathEscape(parameterToString(r.sourceId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -330,7 +335,7 @@ func (a *SourceConnectorsApiService) SourceConnectorsAPIDeleteSourceConnectorExe
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return nil, err
 	}
@@ -340,15 +345,15 @@ func (a *SourceConnectorsApiService) SourceConnectorsAPIDeleteSourceConnectorExe
 		return localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -359,8 +364,7 @@ func (a *SourceConnectorsApiService) SourceConnectorsAPIDeleteSourceConnectorExe
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -370,8 +374,7 @@ func (a *SourceConnectorsApiService) SourceConnectorsAPIDeleteSourceConnectorExe
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -381,8 +384,7 @@ func (a *SourceConnectorsApiService) SourceConnectorsAPIDeleteSourceConnectorExe
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarHTTPResponse, newErr
 	}
@@ -391,27 +393,26 @@ func (a *SourceConnectorsApiService) SourceConnectorsAPIDeleteSourceConnectorExe
 }
 
 type ApiSourceConnectorsAPIGetSourceConnectorRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService SourceConnectorsApi
 	bridgeId string
 	sourceId string
 }
 
-func (r ApiSourceConnectorsAPIGetSourceConnectorRequest) Execute() (*SourceConnectorResponse, *http.Response, error) {
+
+func (r ApiSourceConnectorsAPIGetSourceConnectorRequest) Execute() (SourceConnectorResponse, *_nethttp.Response, error) {
 	return r.ApiService.SourceConnectorsAPIGetSourceConnectorExecute(r)
 }
 
 /*
-SourceConnectorsAPIGetSourceConnector Get a Source Connector of a Bridge instance
-
-Get a Source Connector of a Bridge instance for the authenticated user.
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param bridgeId
- @param sourceId
- @return ApiSourceConnectorsAPIGetSourceConnectorRequest
-*/
-func (a *SourceConnectorsApiService) SourceConnectorsAPIGetSourceConnector(ctx context.Context, bridgeId string, sourceId string) ApiSourceConnectorsAPIGetSourceConnectorRequest {
+ * SourceConnectorsAPIGetSourceConnector Get a Source Connector of a Bridge instance
+ * Get a Source Connector of a Bridge instance for the authenticated user.
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param bridgeId
+ * @param sourceId
+ * @return ApiSourceConnectorsAPIGetSourceConnectorRequest
+ */
+func (a *SourceConnectorsApiService) SourceConnectorsAPIGetSourceConnector(ctx _context.Context, bridgeId string, sourceId string) ApiSourceConnectorsAPIGetSourceConnectorRequest {
 	return ApiSourceConnectorsAPIGetSourceConnectorRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -420,28 +421,32 @@ func (a *SourceConnectorsApiService) SourceConnectorsAPIGetSourceConnector(ctx c
 	}
 }
 
-// Execute executes the request
-//  @return SourceConnectorResponse
-func (a *SourceConnectorsApiService) SourceConnectorsAPIGetSourceConnectorExecute(r ApiSourceConnectorsAPIGetSourceConnectorRequest) (*SourceConnectorResponse, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return SourceConnectorResponse
+ */
+func (a *SourceConnectorsApiService) SourceConnectorsAPIGetSourceConnectorExecute(r ApiSourceConnectorsAPIGetSourceConnectorRequest) (SourceConnectorResponse, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *SourceConnectorResponse
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  SourceConnectorResponse
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "SourceConnectorsApiService.SourceConnectorsAPIGetSourceConnector")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/smartevents_mgmt/v2/bridges/{bridgeId}/sources/{sourceId}"
-	localVarPath = strings.Replace(localVarPath, "{"+"bridgeId"+"}", url.PathEscape(parameterToString(r.bridgeId, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"sourceId"+"}", url.PathEscape(parameterToString(r.sourceId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"bridgeId"+"}", _neturl.PathEscape(parameterToString(r.bridgeId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"sourceId"+"}", _neturl.PathEscape(parameterToString(r.sourceId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if strlen(r.bridgeId) < 1 {
 		return localVarReturnValue, nil, reportError("bridgeId must have at least 1 elements")
 	}
@@ -466,7 +471,7 @@ func (a *SourceConnectorsApiService) SourceConnectorsAPIGetSourceConnectorExecut
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -476,15 +481,15 @@ func (a *SourceConnectorsApiService) SourceConnectorsAPIGetSourceConnectorExecut
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -495,8 +500,7 @@ func (a *SourceConnectorsApiService) SourceConnectorsAPIGetSourceConnectorExecut
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -506,8 +510,7 @@ func (a *SourceConnectorsApiService) SourceConnectorsAPIGetSourceConnectorExecut
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -517,15 +520,14 @@ func (a *SourceConnectorsApiService) SourceConnectorsAPIGetSourceConnectorExecut
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -536,7 +538,7 @@ func (a *SourceConnectorsApiService) SourceConnectorsAPIGetSourceConnectorExecut
 }
 
 type ApiSourceConnectorsAPIGetSourceConnectorsRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService SourceConnectorsApi
 	bridgeId string
 	name *string
@@ -549,36 +551,31 @@ func (r ApiSourceConnectorsAPIGetSourceConnectorsRequest) Name(name string) ApiS
 	r.name = &name
 	return r
 }
-
 func (r ApiSourceConnectorsAPIGetSourceConnectorsRequest) Page(page int32) ApiSourceConnectorsAPIGetSourceConnectorsRequest {
 	r.page = &page
 	return r
 }
-
 func (r ApiSourceConnectorsAPIGetSourceConnectorsRequest) Size(size int32) ApiSourceConnectorsAPIGetSourceConnectorsRequest {
 	r.size = &size
 	return r
 }
-
 func (r ApiSourceConnectorsAPIGetSourceConnectorsRequest) Status(status []ManagedResourceStatus) ApiSourceConnectorsAPIGetSourceConnectorsRequest {
 	r.status = &status
 	return r
 }
 
-func (r ApiSourceConnectorsAPIGetSourceConnectorsRequest) Execute() (*SourceConnectorListResponse, *http.Response, error) {
+func (r ApiSourceConnectorsAPIGetSourceConnectorsRequest) Execute() (SourceConnectorListResponse, *_nethttp.Response, error) {
 	return r.ApiService.SourceConnectorsAPIGetSourceConnectorsExecute(r)
 }
 
 /*
-SourceConnectorsAPIGetSourceConnectors Get the list of Sink Connectors for a Bridge
-
-Get the list of Source Connector instances of a Bridge instance instance for the authenticated user.
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param bridgeId
- @return ApiSourceConnectorsAPIGetSourceConnectorsRequest
-*/
-func (a *SourceConnectorsApiService) SourceConnectorsAPIGetSourceConnectors(ctx context.Context, bridgeId string) ApiSourceConnectorsAPIGetSourceConnectorsRequest {
+ * SourceConnectorsAPIGetSourceConnectors Get the list of Sink Connectors for a Bridge
+ * Get the list of Source Connector instances of a Bridge instance instance for the authenticated user.
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param bridgeId
+ * @return ApiSourceConnectorsAPIGetSourceConnectorsRequest
+ */
+func (a *SourceConnectorsApiService) SourceConnectorsAPIGetSourceConnectors(ctx _context.Context, bridgeId string) ApiSourceConnectorsAPIGetSourceConnectorsRequest {
 	return ApiSourceConnectorsAPIGetSourceConnectorsRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -586,27 +583,31 @@ func (a *SourceConnectorsApiService) SourceConnectorsAPIGetSourceConnectors(ctx
 	}
 }
 
-// Execute executes the request
-//  @return SourceConnectorListResponse
-func (a *SourceConnectorsApiService) SourceConnectorsAPIGetSourceConnectorsExecute(r ApiSourceConnectorsAPIGetSourceConnectorsRequest) (*SourceConnectorListResponse, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return SourceConnectorListResponse
+ */
+func (a *SourceConnectorsApiService) SourceConnectorsAPIGetSourceConnectorsExecute(r ApiSourceConnectorsAPIGetSourceConnectorsRequest) (SourceConnectorListResponse, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodGet
+		localVarHTTPMethod   = _nethttp.MethodGet
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *SourceConnectorListResponse
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  SourceConnectorListResponse
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "SourceConnectorsApiService.SourceConnectorsAPIGetSourceConnectors")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/smartevents_mgmt/v2/bridges/{bridgeId}/sources"
-	localVarPath = strings.Replace(localVarPath, "{"+"bridgeId"+"}", url.PathEscape(parameterToString(r.bridgeId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"bridgeId"+"}", _neturl.PathEscape(parameterToString(r.bridgeId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if strlen(r.bridgeId) < 1 {
 		return localVarReturnValue, nil, reportError("bridgeId must have at least 1 elements")
 	}
@@ -648,7 +649,7 @@ func (a *SourceConnectorsApiService) SourceConnectorsAPIGetSourceConnectorsExecu
 	if localVarHTTPHeaderAccept != "" {
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -658,15 +659,15 @@ func (a *SourceConnectorsApiService) SourceConnectorsAPIGetSourceConnectorsExecu
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -677,8 +678,7 @@ func (a *SourceConnectorsApiService) SourceConnectorsAPIGetSourceConnectorsExecu
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 401 {
@@ -688,8 +688,7 @@ func (a *SourceConnectorsApiService) SourceConnectorsAPIGetSourceConnectorsExecu
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 403 {
@@ -699,8 +698,7 @@ func (a *SourceConnectorsApiService) SourceConnectorsAPIGetSourceConnectorsExecu
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -710,8 +708,7 @@ func (a *SourceConnectorsApiService) SourceConnectorsAPIGetSourceConnectorsExecu
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -721,15 +718,14 @@ func (a *SourceConnectorsApiService) SourceConnectorsAPIGetSourceConnectorsExecu
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
@@ -740,7 +736,7 @@ func (a *SourceConnectorsApiService) SourceConnectorsAPIGetSourceConnectorsExecu
 }
 
 type ApiSourceConnectorsAPIUpdateSourceConnectorRequest struct {
-	ctx context.Context
+	ctx _context.Context
 	ApiService SourceConnectorsApi
 	bridgeId string
 	sourceId string
@@ -752,21 +748,19 @@ func (r ApiSourceConnectorsAPIUpdateSourceConnectorRequest) ConnectorRequest(con
 	return r
 }
 
-func (r ApiSourceConnectorsAPIUpdateSourceConnectorRequest) Execute() (*SourceConnectorResponse, *http.Response, error) {
+func (r ApiSourceConnectorsAPIUpdateSourceConnectorRequest) Execute() (SourceConnectorResponse, *_nethttp.Response, error) {
 	return r.ApiService.SourceConnectorsAPIUpdateSourceConnectorExecute(r)
 }
 
 /*
-SourceConnectorsAPIUpdateSourceConnector Update a Source Connector instance.
-
-Update a Source Connector instance for the authenticated user.
-
- @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
- @param bridgeId
- @param sourceId
- @return ApiSourceConnectorsAPIUpdateSourceConnectorRequest
-*/
-func (a *SourceConnectorsApiService) SourceConnectorsAPIUpdateSourceConnector(ctx context.Context, bridgeId string, sourceId string) ApiSourceConnectorsAPIUpdateSourceConnectorRequest {
+ * SourceConnectorsAPIUpdateSourceConnector Update a Source Connector instance.
+ * Update a Source Connector instance for the authenticated user.
+ * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param bridgeId
+ * @param sourceId
+ * @return ApiSourceConnectorsAPIUpdateSourceConnectorRequest
+ */
+func (a *SourceConnectorsApiService) SourceConnectorsAPIUpdateSourceConnector(ctx _context.Context, bridgeId string, sourceId string) ApiSourceConnectorsAPIUpdateSourceConnectorRequest {
 	return ApiSourceConnectorsAPIUpdateSourceConnectorRequest{
 		ApiService: a,
 		ctx: ctx,
@@ -775,28 +769,32 @@ func (a *SourceConnectorsApiService) SourceConnectorsAPIUpdateSourceConnector(ct
 	}
 }
 
-// Execute executes the request
-//  @return SourceConnectorResponse
-func (a *SourceConnectorsApiService) SourceConnectorsAPIUpdateSourceConnectorExecute(r ApiSourceConnectorsAPIUpdateSourceConnectorRequest) (*SourceConnectorResponse, *http.Response, error) {
+/*
+ * Execute executes the request
+ * @return SourceConnectorResponse
+ */
+func (a *SourceConnectorsApiService) SourceConnectorsAPIUpdateSourceConnectorExecute(r ApiSourceConnectorsAPIUpdateSourceConnectorRequest) (SourceConnectorResponse, *_nethttp.Response, error) {
 	var (
-		localVarHTTPMethod   = http.MethodPut
+		localVarHTTPMethod   = _nethttp.MethodPut
 		localVarPostBody     interface{}
-		formFiles            []formFile
-		localVarReturnValue  *SourceConnectorResponse
+		localVarFormFileName string
+		localVarFileName     string
+		localVarFileBytes    []byte
+		localVarReturnValue  SourceConnectorResponse
 	)
 
 	localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "SourceConnectorsApiService.SourceConnectorsAPIUpdateSourceConnector")
 	if err != nil {
-		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
+		return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()}
 	}
 
 	localVarPath := localBasePath + "/api/smartevents_mgmt/v2/bridges/{bridgeId}/sources/{sourceId}"
-	localVarPath = strings.Replace(localVarPath, "{"+"bridgeId"+"}", url.PathEscape(parameterToString(r.bridgeId, "")), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"sourceId"+"}", url.PathEscape(parameterToString(r.sourceId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"bridgeId"+"}", _neturl.PathEscape(parameterToString(r.bridgeId, "")), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"sourceId"+"}", _neturl.PathEscape(parameterToString(r.sourceId, "")), -1)
 
 	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := url.Values{}
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
 	if strlen(r.bridgeId) < 1 {
 		return localVarReturnValue, nil, reportError("bridgeId must have at least 1 elements")
 	}
@@ -823,7 +821,7 @@ func (a *SourceConnectorsApiService) SourceConnectorsAPIUpdateSourceConnectorExe
 	}
 	// body params
 	localVarPostBody = r.connectorRequest
-	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
+	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes)
 	if err != nil {
 		return localVarReturnValue, nil, err
 	}
@@ -833,15 +831,15 @@ func (a *SourceConnectorsApiService) SourceConnectorsAPIUpdateSourceConnectorExe
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
-	localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body)
+	localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body)
 	localVarHTTPResponse.Body.Close()
-	localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody))
+	localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody))
 	if err != nil {
 		return localVarReturnValue, localVarHTTPResponse, err
 	}
 
 	if localVarHTTPResponse.StatusCode >= 300 {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: localVarHTTPResponse.Status,
 		}
@@ -852,8 +850,7 @@ func (a *SourceConnectorsApiService) SourceConnectorsAPIUpdateSourceConnectorExe
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 404 {
@@ -863,8 +860,7 @@ func (a *SourceConnectorsApiService) SourceConnectorsAPIUpdateSourceConnectorExe
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode == 500 {
@@ -874,15 +870,14 @@ func (a *SourceConnectorsApiService) SourceConnectorsAPIUpdateSourceConnectorExe
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+			newErr.model = v
 		}
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
 	err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 	if err != nil {
-		newErr := &GenericOpenAPIError{
+		newErr := GenericOpenAPIError{
 			body:  localVarBody,
 			error: err.Error(),
 		}
diff --git a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/client.go b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/client.go
index a3c98ba4..a90e7609 100644
--- a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/client.go
+++ b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/client.go
@@ -1,11 +1,11 @@
 /*
-Red Hat Openshift SmartEvents Fleet Manager V2
-
-The API exposed by the fleet manager of the SmartEvents service.
-
-API version: 0.0.1
-Contact: openbridge-dev@redhat.com
-*/
+ * Red Hat Openshift SmartEvents Fleet Manager V2
+ *
+ * The API exposed by the fleet manager of the SmartEvents service.
+ *
+ * API version: 0.0.1
+ * Contact: openbridge-dev@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -120,7 +120,7 @@ func selectHeaderAccept(accepts []string) string {
 // contains is a case insensitive match, finding needle in a haystack
 func contains(haystack []string, needle string) bool {
 	for _, a := range haystack {
-		if strings.EqualFold(a, needle) {
+		if strings.ToLower(a) == strings.ToLower(needle) {
 			return true
 		}
 	}
@@ -136,7 +136,7 @@ func typeCheckParameter(obj interface{}, expected string, name string) error {
 
 	// Check the type is as expected.
 	if reflect.TypeOf(obj).String() != expected {
-		return fmt.Errorf("expected %s to be of type %s but received %s", name, expected, reflect.TypeOf(obj).String())
+		return fmt.Errorf("Expected %s to be of type %s but received %s.", name, expected, reflect.TypeOf(obj).String())
 	}
 	return nil
 }
@@ -205,12 +205,6 @@ func (c *APIClient) GetConfig() *Configuration {
 	return c.cfg
 }
 
-type formFile struct {
-		fileBytes []byte
-		fileName string
-		formFileName string
-}
-
 // prepareRequest build the request
 func (c *APIClient) prepareRequest(
 	ctx context.Context,
@@ -219,7 +213,9 @@ func (c *APIClient) prepareRequest(
 	headerParams map[string]string,
 	queryParams url.Values,
 	formParams url.Values,
-	formFiles []formFile) (localVarRequest *http.Request, err error) {
+	formFileName string,
+	fileName string,
+	fileBytes []byte) (localVarRequest *http.Request, err error) {
 
 	var body *bytes.Buffer
 
@@ -238,7 +234,7 @@ func (c *APIClient) prepareRequest(
 	}
 
 	// add form parameters and file if available.
-	if strings.HasPrefix(headerParams["Content-Type"], "multipart/form-data") && len(formParams) > 0 || (len(formFiles) > 0) {
+	if strings.HasPrefix(headerParams["Content-Type"], "multipart/form-data") && len(formParams) > 0 || (len(fileBytes) > 0 && fileName != "") {
 		if body != nil {
 			return nil, errors.New("Cannot specify postBody and multipart form at the same time.")
 		}
@@ -257,17 +253,16 @@ func (c *APIClient) prepareRequest(
 				}
 			}
 		}
-		for _, formFile := range formFiles {
-			if len(formFile.fileBytes) > 0 && formFile.fileName != "" {
-				w.Boundary()
-				part, err := w.CreateFormFile(formFile.formFileName, filepath.Base(formFile.fileName))
-				if err != nil {
-						return nil, err
-				}
-				_, err = part.Write(formFile.fileBytes)
-				if err != nil {
-						return nil, err
-				}
+		if len(fileBytes) > 0 && fileName != "" {
+			w.Boundary()
+			//_, fileNm := filepath.Split(fileName)
+			part, err := w.CreateFormFile(formFileName, filepath.Base(fileName))
+			if err != nil {
+				return nil, err
+			}
+			_, err = part.Write(fileBytes)
+			if err != nil {
+				return nil, err
 			}
 		}
 
@@ -330,7 +325,7 @@ func (c *APIClient) prepareRequest(
 	if len(headerParams) > 0 {
 		headers := http.Header{}
 		for h, v := range headerParams {
-			headers[h] = []string{v}
+			headers.Set(h, v)
 		}
 		localVarRequest.Header = headers
 	}
@@ -387,9 +382,6 @@ func (c *APIClient) decode(v interface{}, b []byte, contentType string) (err err
 			return
 		}
 		_, err = (*f).Write(b)
-		if err != nil {
-			return
-		}
 		_, err = (*f).Seek(0, io.SeekStart)
 		return
 	}
@@ -418,14 +410,11 @@ func (c *APIClient) decode(v interface{}, b []byte, contentType string) (err err
 
 // Add a file to the multipart request
 func addFile(w *multipart.Writer, fieldName, path string) error {
-	file, err := os.Open(filepath.Clean(path))
-	if err != nil {
-		return err
-	}
-	err = file.Close()
+	file, err := os.Open(path)
 	if err != nil {
 		return err
 	}
+	defer file.Close()
 
 	part, err := w.CreateFormFile(fieldName, filepath.Base(path))
 	if err != nil {
@@ -441,13 +430,6 @@ func reportError(format string, a ...interface{}) error {
 	return fmt.Errorf(format, a...)
 }
 
-// A wrapper for strict JSON decoding
-func newStrictDecoder(data []byte) *json.Decoder {
-	dec := json.NewDecoder(bytes.NewBuffer(data))
-	dec.DisallowUnknownFields()
-	return dec
-}
-
 // Set request body from an interface{}
 func setBody(body interface{}, contentType string) (bodyBuf *bytes.Buffer, err error) {
 	if bodyBuf == nil {
@@ -475,7 +457,7 @@ func setBody(body interface{}, contentType string) (bodyBuf *bytes.Buffer, err e
 	}
 
 	if bodyBuf.Len() == 0 {
-		err = fmt.Errorf("invalid body type %s\n", contentType)
+		err = fmt.Errorf("Invalid body type %s\n", contentType)
 		return nil, err
 	}
 	return bodyBuf, nil
@@ -577,23 +559,3 @@ func (e GenericOpenAPIError) Body() []byte {
 func (e GenericOpenAPIError) Model() interface{} {
 	return e.model
 }
-
-// format error message using title and detail when model implements rfc7807
-func formatErrorMessage(status string, v interface{}) string {
-
-    str := ""
-    metaValue := reflect.ValueOf(v).Elem()
-
-    field := metaValue.FieldByName("Title")
-    if field != (reflect.Value{}) {
-        str = fmt.Sprintf("%s", field.Interface())
-    }
-
-    field = metaValue.FieldByName("Detail")
-    if field != (reflect.Value{}) {
-        str = fmt.Sprintf("%s (%s)", str, field.Interface())
-    }
-
-    // status title (detail)
-    return fmt.Sprintf("%s %s", status, str)
-}
diff --git a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/configuration.go b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/configuration.go
index 0207ad69..7f9951ee 100644
--- a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/configuration.go
+++ b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/configuration.go
@@ -1,11 +1,11 @@
 /*
-Red Hat Openshift SmartEvents Fleet Manager V2
-
-The API exposed by the fleet manager of the SmartEvents service.
-
-API version: 0.0.1
-Contact: openbridge-dev@redhat.com
-*/
+ * Red Hat Openshift SmartEvents Fleet Manager V2
+ *
+ * The API exposed by the fleet manager of the SmartEvents service.
+ *
+ * API version: 0.0.1
+ * Contact: openbridge-dev@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -136,7 +136,7 @@ func (c *Configuration) AddDefaultHeader(key string, value string) {
 // URL formats template on a index using given variables
 func (sc ServerConfigurations) URL(index int, variables map[string]string) (string, error) {
 	if index < 0 || len(sc) <= index {
-		return "", fmt.Errorf("index %v out of range %v", index, len(sc)-1)
+		return "", fmt.Errorf("Index %v out of range %v", index, len(sc)-1)
 	}
 	server := sc[index]
 	url := server.URL
@@ -151,7 +151,7 @@ func (sc ServerConfigurations) URL(index int, variables map[string]string) (stri
 				}
 			}
 			if !found {
-				return "", fmt.Errorf("the variable %s in the server URL has invalid value %v. Must be %v", name, value, variable.EnumValues)
+				return "", fmt.Errorf("The variable %s in the server URL has invalid value %v. Must be %v", name, value, variable.EnumValues)
 			}
 			url = strings.Replace(url, "{"+name+"}", value, -1)
 		} else {
diff --git a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/docs/BridgesApi.md b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/docs/BridgesApi.md
index 081cb128..3b263cde 100644
--- a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/docs/BridgesApi.md
+++ b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/docs/BridgesApi.md
@@ -35,8 +35,8 @@ func main() {
     bridgeRequest := *openapiclient.NewBridgeRequest("bridge1", "aws", "us-east-1") // BridgeRequest |  (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.BridgesApi.BridgesAPICreateBridge(context.Background()).BridgeRequest(bridgeRequest).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.BridgesApi.BridgesAPICreateBridge(context.Background()).BridgeRequest(bridgeRequest).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `BridgesApi.BridgesAPICreateBridge``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -101,8 +101,8 @@ func main() {
     bridgeId := "bridgeId_example" // string | 
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.BridgesApi.BridgesAPIDeleteBridge(context.Background(), bridgeId).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.BridgesApi.BridgesAPIDeleteBridge(context.Background(), bridgeId).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `BridgesApi.BridgesAPIDeleteBridge``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -169,8 +169,8 @@ func main() {
     bridgeId := "bridgeId_example" // string | 
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.BridgesApi.BridgesAPIGetBridge(context.Background(), bridgeId).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.BridgesApi.BridgesAPIGetBridge(context.Background(), bridgeId).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `BridgesApi.BridgesAPIGetBridge``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -242,8 +242,8 @@ func main() {
     status := []openapiclient.ManagedResourceStatus{openapiclient.ManagedResourceStatus("accepted")} // []ManagedResourceStatus |  (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.BridgesApi.BridgesAPIGetBridges(context.Background()).Name(name).Page(page).Size(size).Status(status).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.BridgesApi.BridgesAPIGetBridges(context.Background()).Name(name).Page(page).Size(size).Status(status).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `BridgesApi.BridgesAPIGetBridges``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
diff --git a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/docs/CloudProvidersApi.md b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/docs/CloudProvidersApi.md
index 0ca1a23d..18d1d4b4 100644
--- a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/docs/CloudProvidersApi.md
+++ b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/docs/CloudProvidersApi.md
@@ -34,8 +34,8 @@ func main() {
     id := "id_example" // string | 
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.CloudProvidersApi.CloudProviderAPIGetCloudProvider(context.Background(), id).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.CloudProvidersApi.CloudProviderAPIGetCloudProvider(context.Background(), id).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `CloudProvidersApi.CloudProviderAPIGetCloudProvider``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -106,8 +106,8 @@ func main() {
     size := int32(56) // int32 |  (optional) (default to 100)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.CloudProvidersApi.CloudProviderAPIListCloudProviderRegions(context.Background(), id).Page(page).Size(size).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.CloudProvidersApi.CloudProviderAPIListCloudProviderRegions(context.Background(), id).Page(page).Size(size).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `CloudProvidersApi.CloudProviderAPIListCloudProviderRegions``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -179,8 +179,8 @@ func main() {
     size := int32(56) // int32 |  (optional) (default to 100)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.CloudProvidersApi.CloudProviderAPIListCloudProviders(context.Background()).Page(page).Size(size).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.CloudProvidersApi.CloudProviderAPIListCloudProviders(context.Background()).Page(page).Size(size).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `CloudProvidersApi.CloudProviderAPIListCloudProviders``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
diff --git a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/docs/ErrorCatalogApi.md b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/docs/ErrorCatalogApi.md
index 5beb4a3b..fedf051d 100644
--- a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/docs/ErrorCatalogApi.md
+++ b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/docs/ErrorCatalogApi.md
@@ -33,8 +33,8 @@ func main() {
     id := int32(56) // int32 | 
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.ErrorCatalogApi.ErrorsAPIGetError(context.Background(), id).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.ErrorCatalogApi.ErrorsAPIGetError(context.Background(), id).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `ErrorCatalogApi.ErrorsAPIGetError``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -104,8 +104,8 @@ func main() {
     size := int32(56) // int32 |  (optional) (default to 100)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.ErrorCatalogApi.ErrorsAPIGetErrors(context.Background()).Page(page).Size(size).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.ErrorCatalogApi.ErrorsAPIGetErrors(context.Background()).Page(page).Size(size).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `ErrorCatalogApi.ErrorsAPIGetErrors``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
diff --git a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/docs/ProcessorsApi.md b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/docs/ProcessorsApi.md
index 805dc749..2410ad8c 100644
--- a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/docs/ProcessorsApi.md
+++ b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/docs/ProcessorsApi.md
@@ -37,8 +37,8 @@ func main() {
     processorRequest := *openapiclient.NewProcessorRequest("processor1", map[string]interface{}(123)) // ProcessorRequest |  (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.ProcessorsApi.ProcessorsAPICreateProcessor(context.Background(), bridgeId).ProcessorRequest(processorRequest).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.ProcessorsApi.ProcessorsAPICreateProcessor(context.Background(), bridgeId).ProcessorRequest(processorRequest).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `ProcessorsApi.ProcessorsAPICreateProcessor``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -109,8 +109,8 @@ func main() {
     processorId := "processorId_example" // string | 
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.ProcessorsApi.ProcessorsAPIDeleteProcessor(context.Background(), bridgeId, processorId).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.ProcessorsApi.ProcessorsAPIDeleteProcessor(context.Background(), bridgeId, processorId).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `ProcessorsApi.ProcessorsAPIDeleteProcessor``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -180,8 +180,8 @@ func main() {
     processorId := "processorId_example" // string | 
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.ProcessorsApi.ProcessorsAPIGetProcessor(context.Background(), bridgeId, processorId).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.ProcessorsApi.ProcessorsAPIGetProcessor(context.Background(), bridgeId, processorId).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `ProcessorsApi.ProcessorsAPIGetProcessor``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -256,8 +256,8 @@ func main() {
     status := []openapiclient.ManagedResourceStatus{openapiclient.ManagedResourceStatus("accepted")} // []ManagedResourceStatus |  (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.ProcessorsApi.ProcessorsAPIGetProcessors(context.Background(), bridgeId).Name(name).Page(page).Size(size).Status(status).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.ProcessorsApi.ProcessorsAPIGetProcessors(context.Background(), bridgeId).Name(name).Page(page).Size(size).Status(status).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `ProcessorsApi.ProcessorsAPIGetProcessors``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -332,8 +332,8 @@ func main() {
     processorRequest := *openapiclient.NewProcessorRequest("processor1", map[string]interface{}(123)) // ProcessorRequest |  (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.ProcessorsApi.ProcessorsAPIUpdateProcessor(context.Background(), bridgeId, processorId).ProcessorRequest(processorRequest).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.ProcessorsApi.ProcessorsAPIUpdateProcessor(context.Background(), bridgeId, processorId).ProcessorRequest(processorRequest).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `ProcessorsApi.ProcessorsAPIUpdateProcessor``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
diff --git a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/docs/SinkConnectorsApi.md b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/docs/SinkConnectorsApi.md
index 16c986c0..796fa22f 100644
--- a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/docs/SinkConnectorsApi.md
+++ b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/docs/SinkConnectorsApi.md
@@ -37,8 +37,8 @@ func main() {
     connectorRequest := *openapiclient.NewConnectorRequest("my-connector", "slack_sink_0.1", map[string]interface{}(123)) // ConnectorRequest |  (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.SinkConnectorsApi.SinkConnectorsAPICreateSinkConnector(context.Background(), bridgeId).ConnectorRequest(connectorRequest).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.SinkConnectorsApi.SinkConnectorsAPICreateSinkConnector(context.Background(), bridgeId).ConnectorRequest(connectorRequest).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `SinkConnectorsApi.SinkConnectorsAPICreateSinkConnector``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -109,8 +109,8 @@ func main() {
     sinkId := "sinkId_example" // string | 
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.SinkConnectorsApi.SinkConnectorsAPIDeleteSinkConnector(context.Background(), bridgeId, sinkId).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.SinkConnectorsApi.SinkConnectorsAPIDeleteSinkConnector(context.Background(), bridgeId, sinkId).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `SinkConnectorsApi.SinkConnectorsAPIDeleteSinkConnector``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -180,8 +180,8 @@ func main() {
     sinkId := "sinkId_example" // string | 
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.SinkConnectorsApi.SinkConnectorsAPIGetSinkConnector(context.Background(), bridgeId, sinkId).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.SinkConnectorsApi.SinkConnectorsAPIGetSinkConnector(context.Background(), bridgeId, sinkId).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `SinkConnectorsApi.SinkConnectorsAPIGetSinkConnector``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -256,8 +256,8 @@ func main() {
     status := []openapiclient.ManagedResourceStatus{openapiclient.ManagedResourceStatus("accepted")} // []ManagedResourceStatus |  (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.SinkConnectorsApi.SinkConnectorsAPIGetSinkConnectors(context.Background(), bridgeId).Name(name).Page(page).Size(size).Status(status).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.SinkConnectorsApi.SinkConnectorsAPIGetSinkConnectors(context.Background(), bridgeId).Name(name).Page(page).Size(size).Status(status).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `SinkConnectorsApi.SinkConnectorsAPIGetSinkConnectors``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -332,8 +332,8 @@ func main() {
     connectorRequest := *openapiclient.NewConnectorRequest("my-connector", "slack_sink_0.1", map[string]interface{}(123)) // ConnectorRequest |  (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.SinkConnectorsApi.SinkConnectorsAPIUpdateSinkConnector(context.Background(), bridgeId, sinkId).ConnectorRequest(connectorRequest).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.SinkConnectorsApi.SinkConnectorsAPIUpdateSinkConnector(context.Background(), bridgeId, sinkId).ConnectorRequest(connectorRequest).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `SinkConnectorsApi.SinkConnectorsAPIUpdateSinkConnector``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
diff --git a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/docs/SourceConnectorsApi.md b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/docs/SourceConnectorsApi.md
index 00ab0293..2107f6b0 100644
--- a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/docs/SourceConnectorsApi.md
+++ b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/docs/SourceConnectorsApi.md
@@ -37,8 +37,8 @@ func main() {
     connectorRequest := *openapiclient.NewConnectorRequest("my-connector", "slack_sink_0.1", map[string]interface{}(123)) // ConnectorRequest |  (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.SourceConnectorsApi.SourceConnectorsAPICreateSourceConnector(context.Background(), bridgeId).ConnectorRequest(connectorRequest).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.SourceConnectorsApi.SourceConnectorsAPICreateSourceConnector(context.Background(), bridgeId).ConnectorRequest(connectorRequest).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `SourceConnectorsApi.SourceConnectorsAPICreateSourceConnector``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -109,8 +109,8 @@ func main() {
     sourceId := "sourceId_example" // string | 
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.SourceConnectorsApi.SourceConnectorsAPIDeleteSourceConnector(context.Background(), bridgeId, sourceId).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.SourceConnectorsApi.SourceConnectorsAPIDeleteSourceConnector(context.Background(), bridgeId, sourceId).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `SourceConnectorsApi.SourceConnectorsAPIDeleteSourceConnector``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -180,8 +180,8 @@ func main() {
     sourceId := "sourceId_example" // string | 
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.SourceConnectorsApi.SourceConnectorsAPIGetSourceConnector(context.Background(), bridgeId, sourceId).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.SourceConnectorsApi.SourceConnectorsAPIGetSourceConnector(context.Background(), bridgeId, sourceId).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `SourceConnectorsApi.SourceConnectorsAPIGetSourceConnector``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -256,8 +256,8 @@ func main() {
     status := []openapiclient.ManagedResourceStatus{openapiclient.ManagedResourceStatus("accepted")} // []ManagedResourceStatus |  (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.SourceConnectorsApi.SourceConnectorsAPIGetSourceConnectors(context.Background(), bridgeId).Name(name).Page(page).Size(size).Status(status).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.SourceConnectorsApi.SourceConnectorsAPIGetSourceConnectors(context.Background(), bridgeId).Name(name).Page(page).Size(size).Status(status).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `SourceConnectorsApi.SourceConnectorsAPIGetSourceConnectors``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
@@ -332,8 +332,8 @@ func main() {
     connectorRequest := *openapiclient.NewConnectorRequest("my-connector", "slack_sink_0.1", map[string]interface{}(123)) // ConnectorRequest |  (optional)
 
     configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-    resp, r, err := apiClient.SourceConnectorsApi.SourceConnectorsAPIUpdateSourceConnector(context.Background(), bridgeId, sourceId).ConnectorRequest(connectorRequest).Execute()
+    api_client := openapiclient.NewAPIClient(configuration)
+    resp, r, err := api_client.SourceConnectorsApi.SourceConnectorsAPIUpdateSourceConnector(context.Background(), bridgeId, sourceId).ConnectorRequest(connectorRequest).Execute()
     if err != nil {
         fmt.Fprintf(os.Stderr, "Error when calling `SourceConnectorsApi.SourceConnectorsAPIUpdateSourceConnector``: %v\n", err)
         fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
diff --git a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/go.mod b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/go.mod
deleted file mode 100644
index ead32606..00000000
--- a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/go.mod
+++ /dev/null
@@ -1,7 +0,0 @@
-module github.com/GIT_USER_ID/GIT_REPO_ID
-
-go 1.13
-
-require (
-	golang.org/x/oauth2 v0.0.0-20210323180902-22b0adad7558
-)
diff --git a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/go.sum b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/go.sum
deleted file mode 100644
index 734252e6..00000000
--- a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/go.sum
+++ /dev/null
@@ -1,13 +0,0 @@
-cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
-github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e h1:bRhVy7zSSasaqNksaRZiA5EEI+Ei4I1nO5Jh72wfHlg=
-golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 h1:SVwTIAaPC2U/AvvLNZ2a7OVsmBpC8L5BlwK1whH3hm0=
-golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 h1:YUO/7uOKsKeq9UokNS62b8FYywz3ker1l1vDZRCRefw=
-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508=
-google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
diff --git a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_bridge_error.go b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_bridge_error.go
index 418a3451..a58f1a90 100644
--- a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_bridge_error.go
+++ b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_bridge_error.go
@@ -1,11 +1,11 @@
 /*
-Red Hat Openshift SmartEvents Fleet Manager V2
-
-The API exposed by the fleet manager of the SmartEvents service.
-
-API version: 0.0.1
-Contact: openbridge-dev@redhat.com
-*/
+ * Red Hat Openshift SmartEvents Fleet Manager V2
+ *
+ * The API exposed by the fleet manager of the SmartEvents service.
+ *
+ * API version: 0.0.1
+ * Contact: openbridge-dev@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -42,7 +42,7 @@ func NewBridgeErrorWithDefaults() *BridgeError {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *BridgeError) GetId() int32 {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret int32
 		return ret
 	}
@@ -52,15 +52,15 @@ func (o *BridgeError) GetId() int32 {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *BridgeError) GetIdOk() (*int32, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *BridgeError) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -74,7 +74,7 @@ func (o *BridgeError) SetId(v int32) {
 
 // GetCode returns the Code field value if set, zero value otherwise.
 func (o *BridgeError) GetCode() string {
-	if o == nil || isNil(o.Code) {
+	if o == nil || o.Code == nil {
 		var ret string
 		return ret
 	}
@@ -84,15 +84,15 @@ func (o *BridgeError) GetCode() string {
 // GetCodeOk returns a tuple with the Code field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *BridgeError) GetCodeOk() (*string, bool) {
-	if o == nil || isNil(o.Code) {
-    return nil, false
+	if o == nil || o.Code == nil {
+		return nil, false
 	}
 	return o.Code, true
 }
 
 // HasCode returns a boolean if a field has been set.
 func (o *BridgeError) HasCode() bool {
-	if o != nil && !isNil(o.Code) {
+	if o != nil && o.Code != nil {
 		return true
 	}
 
@@ -106,7 +106,7 @@ func (o *BridgeError) SetCode(v string) {
 
 // GetReason returns the Reason field value if set, zero value otherwise.
 func (o *BridgeError) GetReason() string {
-	if o == nil || isNil(o.Reason) {
+	if o == nil || o.Reason == nil {
 		var ret string
 		return ret
 	}
@@ -116,15 +116,15 @@ func (o *BridgeError) GetReason() string {
 // GetReasonOk returns a tuple with the Reason field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *BridgeError) GetReasonOk() (*string, bool) {
-	if o == nil || isNil(o.Reason) {
-    return nil, false
+	if o == nil || o.Reason == nil {
+		return nil, false
 	}
 	return o.Reason, true
 }
 
 // HasReason returns a boolean if a field has been set.
 func (o *BridgeError) HasReason() bool {
-	if o != nil && !isNil(o.Reason) {
+	if o != nil && o.Reason != nil {
 		return true
 	}
 
@@ -138,7 +138,7 @@ func (o *BridgeError) SetReason(v string) {
 
 // GetType returns the Type field value if set, zero value otherwise.
 func (o *BridgeError) GetType() BridgeErrorType {
-	if o == nil || isNil(o.Type) {
+	if o == nil || o.Type == nil {
 		var ret BridgeErrorType
 		return ret
 	}
@@ -148,15 +148,15 @@ func (o *BridgeError) GetType() BridgeErrorType {
 // GetTypeOk returns a tuple with the Type field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *BridgeError) GetTypeOk() (*BridgeErrorType, bool) {
-	if o == nil || isNil(o.Type) {
-    return nil, false
+	if o == nil || o.Type == nil {
+		return nil, false
 	}
 	return o.Type, true
 }
 
 // HasType returns a boolean if a field has been set.
 func (o *BridgeError) HasType() bool {
-	if o != nil && !isNil(o.Type) {
+	if o != nil && o.Type != nil {
 		return true
 	}
 
@@ -170,16 +170,16 @@ func (o *BridgeError) SetType(v BridgeErrorType) {
 
 func (o BridgeError) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.Code) {
+	if o.Code != nil {
 		toSerialize["code"] = o.Code
 	}
-	if !isNil(o.Reason) {
+	if o.Reason != nil {
 		toSerialize["reason"] = o.Reason
 	}
-	if !isNil(o.Type) {
+	if o.Type != nil {
 		toSerialize["type"] = o.Type
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_bridge_error_instance.go b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_bridge_error_instance.go
index 5df2c616..70f4a764 100644
--- a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_bridge_error_instance.go
+++ b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_bridge_error_instance.go
@@ -1,11 +1,11 @@
 /*
-Red Hat Openshift SmartEvents Fleet Manager V2
-
-The API exposed by the fleet manager of the SmartEvents service.
-
-API version: 0.0.1
-Contact: openbridge-dev@redhat.com
-*/
+ * Red Hat Openshift SmartEvents Fleet Manager V2
+ *
+ * The API exposed by the fleet manager of the SmartEvents service.
+ *
+ * API version: 0.0.1
+ * Contact: openbridge-dev@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -43,7 +43,7 @@ func NewBridgeErrorInstanceWithDefaults() *BridgeErrorInstance {
 
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *BridgeErrorInstance) GetId() int32 {
-	if o == nil || isNil(o.Id) {
+	if o == nil || o.Id == nil {
 		var ret int32
 		return ret
 	}
@@ -53,15 +53,15 @@ func (o *BridgeErrorInstance) GetId() int32 {
 // GetIdOk returns a tuple with the Id field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *BridgeErrorInstance) GetIdOk() (*int32, bool) {
-	if o == nil || isNil(o.Id) {
-    return nil, false
+	if o == nil || o.Id == nil {
+		return nil, false
 	}
 	return o.Id, true
 }
 
 // HasId returns a boolean if a field has been set.
 func (o *BridgeErrorInstance) HasId() bool {
-	if o != nil && !isNil(o.Id) {
+	if o != nil && o.Id != nil {
 		return true
 	}
 
@@ -75,7 +75,7 @@ func (o *BridgeErrorInstance) SetId(v int32) {
 
 // GetCode returns the Code field value if set, zero value otherwise.
 func (o *BridgeErrorInstance) GetCode() string {
-	if o == nil || isNil(o.Code) {
+	if o == nil || o.Code == nil {
 		var ret string
 		return ret
 	}
@@ -85,15 +85,15 @@ func (o *BridgeErrorInstance) GetCode() string {
 // GetCodeOk returns a tuple with the Code field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *BridgeErrorInstance) GetCodeOk() (*string, bool) {
-	if o == nil || isNil(o.Code) {
-    return nil, false
+	if o == nil || o.Code == nil {
+		return nil, false
 	}
 	return o.Code, true
 }
 
 // HasCode returns a boolean if a field has been set.
 func (o *BridgeErrorInstance) HasCode() bool {
-	if o != nil && !isNil(o.Code) {
+	if o != nil && o.Code != nil {
 		return true
 	}
 
@@ -107,7 +107,7 @@ func (o *BridgeErrorInstance) SetCode(v string) {
 
 // GetReason returns the Reason field value if set, zero value otherwise.
 func (o *BridgeErrorInstance) GetReason() string {
-	if o == nil || isNil(o.Reason) {
+	if o == nil || o.Reason == nil {
 		var ret string
 		return ret
 	}
@@ -117,15 +117,15 @@ func (o *BridgeErrorInstance) GetReason() string {
 // GetReasonOk returns a tuple with the Reason field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *BridgeErrorInstance) GetReasonOk() (*string, bool) {
-	if o == nil || isNil(o.Reason) {
-    return nil, false
+	if o == nil || o.Reason == nil {
+		return nil, false
 	}
 	return o.Reason, true
 }
 
 // HasReason returns a boolean if a field has been set.
 func (o *BridgeErrorInstance) HasReason() bool {
-	if o != nil && !isNil(o.Reason) {
+	if o != nil && o.Reason != nil {
 		return true
 	}
 
@@ -139,7 +139,7 @@ func (o *BridgeErrorInstance) SetReason(v string) {
 
 // GetType returns the Type field value if set, zero value otherwise.
 func (o *BridgeErrorInstance) GetType() BridgeErrorType {
-	if o == nil || isNil(o.Type) {
+	if o == nil || o.Type == nil {
 		var ret BridgeErrorType
 		return ret
 	}
@@ -149,15 +149,15 @@ func (o *BridgeErrorInstance) GetType() BridgeErrorType {
 // GetTypeOk returns a tuple with the Type field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *BridgeErrorInstance) GetTypeOk() (*BridgeErrorType, bool) {
-	if o == nil || isNil(o.Type) {
-    return nil, false
+	if o == nil || o.Type == nil {
+		return nil, false
 	}
 	return o.Type, true
 }
 
 // HasType returns a boolean if a field has been set.
 func (o *BridgeErrorInstance) HasType() bool {
-	if o != nil && !isNil(o.Type) {
+	if o != nil && o.Type != nil {
 		return true
 	}
 
@@ -171,7 +171,7 @@ func (o *BridgeErrorInstance) SetType(v BridgeErrorType) {
 
 // GetUuid returns the Uuid field value if set, zero value otherwise.
 func (o *BridgeErrorInstance) GetUuid() string {
-	if o == nil || isNil(o.Uuid) {
+	if o == nil || o.Uuid == nil {
 		var ret string
 		return ret
 	}
@@ -181,15 +181,15 @@ func (o *BridgeErrorInstance) GetUuid() string {
 // GetUuidOk returns a tuple with the Uuid field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *BridgeErrorInstance) GetUuidOk() (*string, bool) {
-	if o == nil || isNil(o.Uuid) {
-    return nil, false
+	if o == nil || o.Uuid == nil {
+		return nil, false
 	}
 	return o.Uuid, true
 }
 
 // HasUuid returns a boolean if a field has been set.
 func (o *BridgeErrorInstance) HasUuid() bool {
-	if o != nil && !isNil(o.Uuid) {
+	if o != nil && o.Uuid != nil {
 		return true
 	}
 
@@ -203,19 +203,19 @@ func (o *BridgeErrorInstance) SetUuid(v string) {
 
 func (o BridgeErrorInstance) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.Id) {
+	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
-	if !isNil(o.Code) {
+	if o.Code != nil {
 		toSerialize["code"] = o.Code
 	}
-	if !isNil(o.Reason) {
+	if o.Reason != nil {
 		toSerialize["reason"] = o.Reason
 	}
-	if !isNil(o.Type) {
+	if o.Type != nil {
 		toSerialize["type"] = o.Type
 	}
-	if !isNil(o.Uuid) {
+	if o.Uuid != nil {
 		toSerialize["uuid"] = o.Uuid
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_bridge_error_type.go b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_bridge_error_type.go
index 909c8541..4386177f 100644
--- a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_bridge_error_type.go
+++ b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_bridge_error_type.go
@@ -1,11 +1,11 @@
 /*
-Red Hat Openshift SmartEvents Fleet Manager V2
-
-The API exposed by the fleet manager of the SmartEvents service.
-
-API version: 0.0.1
-Contact: openbridge-dev@redhat.com
-*/
+ * Red Hat Openshift SmartEvents Fleet Manager V2
+ *
+ * The API exposed by the fleet manager of the SmartEvents service.
+ *
+ * API version: 0.0.1
+ * Contact: openbridge-dev@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -25,8 +25,7 @@ const (
 	BRIDGEERRORTYPE_PLATFORM BridgeErrorType = "PLATFORM"
 )
 
-// All allowed values of BridgeErrorType enum
-var AllowedBridgeErrorTypeEnumValues = []BridgeErrorType{
+var allowedBridgeErrorTypeEnumValues = []BridgeErrorType{
 	"USER",
 	"PLATFORM",
 }
@@ -38,7 +37,7 @@ func (v *BridgeErrorType) UnmarshalJSON(src []byte) error {
 		return err
 	}
 	enumTypeValue := BridgeErrorType(value)
-	for _, existing := range AllowedBridgeErrorTypeEnumValues {
+	for _, existing := range allowedBridgeErrorTypeEnumValues {
 		if existing == enumTypeValue {
 			*v = enumTypeValue
 			return nil
@@ -55,13 +54,13 @@ func NewBridgeErrorTypeFromValue(v string) (*BridgeErrorType, error) {
 	if ev.IsValid() {
 		return &ev, nil
 	} else {
-		return nil, fmt.Errorf("invalid value '%v' for BridgeErrorType: valid values are %v", v, AllowedBridgeErrorTypeEnumValues)
+		return nil, fmt.Errorf("invalid value '%v' for BridgeErrorType: valid values are %v", v, allowedBridgeErrorTypeEnumValues)
 	}
 }
 
 // IsValid return true if the value is valid for the enum, false otherwise
 func (v BridgeErrorType) IsValid() bool {
-	for _, existing := range AllowedBridgeErrorTypeEnumValues {
+	for _, existing := range allowedBridgeErrorTypeEnumValues {
 		if existing == v {
 			return true
 		}
diff --git a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_bridge_list_response.go b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_bridge_list_response.go
index 6e3fb6c1..f7e27141 100644
--- a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_bridge_list_response.go
+++ b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_bridge_list_response.go
@@ -1,11 +1,11 @@
 /*
-Red Hat Openshift SmartEvents Fleet Manager V2
-
-The API exposed by the fleet manager of the SmartEvents service.
-
-API version: 0.0.1
-Contact: openbridge-dev@redhat.com
-*/
+ * Red Hat Openshift SmartEvents Fleet Manager V2
+ *
+ * The API exposed by the fleet manager of the SmartEvents service.
+ *
+ * API version: 0.0.1
+ * Contact: openbridge-dev@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -18,7 +18,7 @@ import (
 // BridgeListResponse struct for BridgeListResponse
 type BridgeListResponse struct {
 	Kind string `json:"kind"`
-	Items []BridgeResponse `json:"items,omitempty"`
+	Items *[]BridgeResponse `json:"items,omitempty"`
 	Page int64 `json:"page"`
 	Size int64 `json:"size"`
 	Total int64 `json:"total"`
@@ -58,8 +58,8 @@ func (o *BridgeListResponse) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *BridgeListResponse) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -71,25 +71,25 @@ func (o *BridgeListResponse) SetKind(v string) {
 
 // GetItems returns the Items field value if set, zero value otherwise.
 func (o *BridgeListResponse) GetItems() []BridgeResponse {
-	if o == nil || isNil(o.Items) {
+	if o == nil || o.Items == nil {
 		var ret []BridgeResponse
 		return ret
 	}
-	return o.Items
+	return *o.Items
 }
 
 // GetItemsOk returns a tuple with the Items field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *BridgeListResponse) GetItemsOk() ([]BridgeResponse, bool) {
-	if o == nil || isNil(o.Items) {
-    return nil, false
+func (o *BridgeListResponse) GetItemsOk() (*[]BridgeResponse, bool) {
+	if o == nil || o.Items == nil {
+		return nil, false
 	}
 	return o.Items, true
 }
 
 // HasItems returns a boolean if a field has been set.
 func (o *BridgeListResponse) HasItems() bool {
-	if o != nil && !isNil(o.Items) {
+	if o != nil && o.Items != nil {
 		return true
 	}
 
@@ -98,7 +98,7 @@ func (o *BridgeListResponse) HasItems() bool {
 
 // SetItems gets a reference to the given []BridgeResponse and assigns it to the Items field.
 func (o *BridgeListResponse) SetItems(v []BridgeResponse) {
-	o.Items = v
+	o.Items = &v
 }
 
 // GetPage returns the Page field value
@@ -114,8 +114,8 @@ func (o *BridgeListResponse) GetPage() int64 {
 // GetPageOk returns a tuple with the Page field value
 // and a boolean to check if the value has been set.
 func (o *BridgeListResponse) GetPageOk() (*int64, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Page, true
 }
@@ -138,8 +138,8 @@ func (o *BridgeListResponse) GetSize() int64 {
 // GetSizeOk returns a tuple with the Size field value
 // and a boolean to check if the value has been set.
 func (o *BridgeListResponse) GetSizeOk() (*int64, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Size, true
 }
@@ -162,8 +162,8 @@ func (o *BridgeListResponse) GetTotal() int64 {
 // GetTotalOk returns a tuple with the Total field value
 // and a boolean to check if the value has been set.
 func (o *BridgeListResponse) GetTotalOk() (*int64, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Total, true
 }
@@ -178,7 +178,7 @@ func (o BridgeListResponse) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["kind"] = o.Kind
 	}
-	if !isNil(o.Items) {
+	if o.Items != nil {
 		toSerialize["items"] = o.Items
 	}
 	if true {
diff --git a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_bridge_request.go b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_bridge_request.go
index 38346492..0725c99a 100644
--- a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_bridge_request.go
+++ b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_bridge_request.go
@@ -1,11 +1,11 @@
 /*
-Red Hat Openshift SmartEvents Fleet Manager V2
-
-The API exposed by the fleet manager of the SmartEvents service.
-
-API version: 0.0.1
-Contact: openbridge-dev@redhat.com
-*/
+ * Red Hat Openshift SmartEvents Fleet Manager V2
+ *
+ * The API exposed by the fleet manager of the SmartEvents service.
+ *
+ * API version: 0.0.1
+ * Contact: openbridge-dev@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -58,8 +58,8 @@ func (o *BridgeRequest) GetName() string {
 // GetNameOk returns a tuple with the Name field value
 // and a boolean to check if the value has been set.
 func (o *BridgeRequest) GetNameOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Name, true
 }
@@ -82,8 +82,8 @@ func (o *BridgeRequest) GetCloudProvider() string {
 // GetCloudProviderOk returns a tuple with the CloudProvider field value
 // and a boolean to check if the value has been set.
 func (o *BridgeRequest) GetCloudProviderOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.CloudProvider, true
 }
@@ -106,8 +106,8 @@ func (o *BridgeRequest) GetRegion() string {
 // GetRegionOk returns a tuple with the Region field value
 // and a boolean to check if the value has been set.
 func (o *BridgeRequest) GetRegionOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Region, true
 }
diff --git a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_bridge_response.go b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_bridge_response.go
index 1c5000d0..9dd5de4b 100644
--- a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_bridge_response.go
+++ b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_bridge_response.go
@@ -1,11 +1,11 @@
 /*
-Red Hat Openshift SmartEvents Fleet Manager V2
-
-The API exposed by the fleet manager of the SmartEvents service.
-
-API version: 0.0.1
-Contact: openbridge-dev@redhat.com
-*/
+ * Red Hat Openshift SmartEvents Fleet Manager V2
+ *
+ * The API exposed by the fleet manager of the SmartEvents service.
+ *
+ * API version: 0.0.1
+ * Contact: openbridge-dev@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -79,8 +79,8 @@ func (o *BridgeResponse) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *BridgeResponse) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -103,8 +103,8 @@ func (o *BridgeResponse) GetId() string {
 // GetIdOk returns a tuple with the Id field value
 // and a boolean to check if the value has been set.
 func (o *BridgeResponse) GetIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Id, true
 }
@@ -127,8 +127,8 @@ func (o *BridgeResponse) GetName() string {
 // GetNameOk returns a tuple with the Name field value
 // and a boolean to check if the value has been set.
 func (o *BridgeResponse) GetNameOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Name, true
 }
@@ -151,8 +151,8 @@ func (o *BridgeResponse) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value
 // and a boolean to check if the value has been set.
 func (o *BridgeResponse) GetHrefOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Href, true
 }
@@ -175,8 +175,8 @@ func (o *BridgeResponse) GetSubmittedAt() time.Time {
 // GetSubmittedAtOk returns a tuple with the SubmittedAt field value
 // and a boolean to check if the value has been set.
 func (o *BridgeResponse) GetSubmittedAtOk() (*time.Time, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.SubmittedAt, true
 }
@@ -188,7 +188,7 @@ func (o *BridgeResponse) SetSubmittedAt(v time.Time) {
 
 // GetPublishedAt returns the PublishedAt field value if set, zero value otherwise.
 func (o *BridgeResponse) GetPublishedAt() time.Time {
-	if o == nil || isNil(o.PublishedAt) {
+	if o == nil || o.PublishedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -198,15 +198,15 @@ func (o *BridgeResponse) GetPublishedAt() time.Time {
 // GetPublishedAtOk returns a tuple with the PublishedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *BridgeResponse) GetPublishedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.PublishedAt) {
-    return nil, false
+	if o == nil || o.PublishedAt == nil {
+		return nil, false
 	}
 	return o.PublishedAt, true
 }
 
 // HasPublishedAt returns a boolean if a field has been set.
 func (o *BridgeResponse) HasPublishedAt() bool {
-	if o != nil && !isNil(o.PublishedAt) {
+	if o != nil && o.PublishedAt != nil {
 		return true
 	}
 
@@ -220,7 +220,7 @@ func (o *BridgeResponse) SetPublishedAt(v time.Time) {
 
 // GetModifiedAt returns the ModifiedAt field value if set, zero value otherwise.
 func (o *BridgeResponse) GetModifiedAt() time.Time {
-	if o == nil || isNil(o.ModifiedAt) {
+	if o == nil || o.ModifiedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -230,15 +230,15 @@ func (o *BridgeResponse) GetModifiedAt() time.Time {
 // GetModifiedAtOk returns a tuple with the ModifiedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *BridgeResponse) GetModifiedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.ModifiedAt) {
-    return nil, false
+	if o == nil || o.ModifiedAt == nil {
+		return nil, false
 	}
 	return o.ModifiedAt, true
 }
 
 // HasModifiedAt returns a boolean if a field has been set.
 func (o *BridgeResponse) HasModifiedAt() bool {
-	if o != nil && !isNil(o.ModifiedAt) {
+	if o != nil && o.ModifiedAt != nil {
 		return true
 	}
 
@@ -263,8 +263,8 @@ func (o *BridgeResponse) GetStatus() ManagedResourceStatus {
 // GetStatusOk returns a tuple with the Status field value
 // and a boolean to check if the value has been set.
 func (o *BridgeResponse) GetStatusOk() (*ManagedResourceStatus, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Status, true
 }
@@ -287,8 +287,8 @@ func (o *BridgeResponse) GetOwner() string {
 // GetOwnerOk returns a tuple with the Owner field value
 // and a boolean to check if the value has been set.
 func (o *BridgeResponse) GetOwnerOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Owner, true
 }
@@ -300,7 +300,7 @@ func (o *BridgeResponse) SetOwner(v string) {
 
 // GetEndpoint returns the Endpoint field value if set, zero value otherwise.
 func (o *BridgeResponse) GetEndpoint() string {
-	if o == nil || isNil(o.Endpoint) {
+	if o == nil || o.Endpoint == nil {
 		var ret string
 		return ret
 	}
@@ -310,15 +310,15 @@ func (o *BridgeResponse) GetEndpoint() string {
 // GetEndpointOk returns a tuple with the Endpoint field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *BridgeResponse) GetEndpointOk() (*string, bool) {
-	if o == nil || isNil(o.Endpoint) {
-    return nil, false
+	if o == nil || o.Endpoint == nil {
+		return nil, false
 	}
 	return o.Endpoint, true
 }
 
 // HasEndpoint returns a boolean if a field has been set.
 func (o *BridgeResponse) HasEndpoint() bool {
-	if o != nil && !isNil(o.Endpoint) {
+	if o != nil && o.Endpoint != nil {
 		return true
 	}
 
@@ -332,7 +332,7 @@ func (o *BridgeResponse) SetEndpoint(v string) {
 
 // GetCloudProvider returns the CloudProvider field value if set, zero value otherwise.
 func (o *BridgeResponse) GetCloudProvider() string {
-	if o == nil || isNil(o.CloudProvider) {
+	if o == nil || o.CloudProvider == nil {
 		var ret string
 		return ret
 	}
@@ -342,15 +342,15 @@ func (o *BridgeResponse) GetCloudProvider() string {
 // GetCloudProviderOk returns a tuple with the CloudProvider field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *BridgeResponse) GetCloudProviderOk() (*string, bool) {
-	if o == nil || isNil(o.CloudProvider) {
-    return nil, false
+	if o == nil || o.CloudProvider == nil {
+		return nil, false
 	}
 	return o.CloudProvider, true
 }
 
 // HasCloudProvider returns a boolean if a field has been set.
 func (o *BridgeResponse) HasCloudProvider() bool {
-	if o != nil && !isNil(o.CloudProvider) {
+	if o != nil && o.CloudProvider != nil {
 		return true
 	}
 
@@ -364,7 +364,7 @@ func (o *BridgeResponse) SetCloudProvider(v string) {
 
 // GetRegion returns the Region field value if set, zero value otherwise.
 func (o *BridgeResponse) GetRegion() string {
-	if o == nil || isNil(o.Region) {
+	if o == nil || o.Region == nil {
 		var ret string
 		return ret
 	}
@@ -374,15 +374,15 @@ func (o *BridgeResponse) GetRegion() string {
 // GetRegionOk returns a tuple with the Region field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *BridgeResponse) GetRegionOk() (*string, bool) {
-	if o == nil || isNil(o.Region) {
-    return nil, false
+	if o == nil || o.Region == nil {
+		return nil, false
 	}
 	return o.Region, true
 }
 
 // HasRegion returns a boolean if a field has been set.
 func (o *BridgeResponse) HasRegion() bool {
-	if o != nil && !isNil(o.Region) {
+	if o != nil && o.Region != nil {
 		return true
 	}
 
@@ -396,7 +396,7 @@ func (o *BridgeResponse) SetRegion(v string) {
 
 // GetStatusMessage returns the StatusMessage field value if set, zero value otherwise.
 func (o *BridgeResponse) GetStatusMessage() string {
-	if o == nil || isNil(o.StatusMessage) {
+	if o == nil || o.StatusMessage == nil {
 		var ret string
 		return ret
 	}
@@ -406,15 +406,15 @@ func (o *BridgeResponse) GetStatusMessage() string {
 // GetStatusMessageOk returns a tuple with the StatusMessage field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *BridgeResponse) GetStatusMessageOk() (*string, bool) {
-	if o == nil || isNil(o.StatusMessage) {
-    return nil, false
+	if o == nil || o.StatusMessage == nil {
+		return nil, false
 	}
 	return o.StatusMessage, true
 }
 
 // HasStatusMessage returns a boolean if a field has been set.
 func (o *BridgeResponse) HasStatusMessage() bool {
-	if o != nil && !isNil(o.StatusMessage) {
+	if o != nil && o.StatusMessage != nil {
 		return true
 	}
 
@@ -443,10 +443,10 @@ func (o BridgeResponse) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["submitted_at"] = o.SubmittedAt
 	}
-	if !isNil(o.PublishedAt) {
+	if o.PublishedAt != nil {
 		toSerialize["published_at"] = o.PublishedAt
 	}
-	if !isNil(o.ModifiedAt) {
+	if o.ModifiedAt != nil {
 		toSerialize["modified_at"] = o.ModifiedAt
 	}
 	if true {
@@ -455,16 +455,16 @@ func (o BridgeResponse) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["owner"] = o.Owner
 	}
-	if !isNil(o.Endpoint) {
+	if o.Endpoint != nil {
 		toSerialize["endpoint"] = o.Endpoint
 	}
-	if !isNil(o.CloudProvider) {
+	if o.CloudProvider != nil {
 		toSerialize["cloud_provider"] = o.CloudProvider
 	}
-	if !isNil(o.Region) {
+	if o.Region != nil {
 		toSerialize["region"] = o.Region
 	}
-	if !isNil(o.StatusMessage) {
+	if o.StatusMessage != nil {
 		toSerialize["status_message"] = o.StatusMessage
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_cloud_provider_list_response.go b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_cloud_provider_list_response.go
index 2adcb9a1..0d4fcef1 100644
--- a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_cloud_provider_list_response.go
+++ b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_cloud_provider_list_response.go
@@ -1,11 +1,11 @@
 /*
-Red Hat Openshift SmartEvents Fleet Manager V2
-
-The API exposed by the fleet manager of the SmartEvents service.
-
-API version: 0.0.1
-Contact: openbridge-dev@redhat.com
-*/
+ * Red Hat Openshift SmartEvents Fleet Manager V2
+ *
+ * The API exposed by the fleet manager of the SmartEvents service.
+ *
+ * API version: 0.0.1
+ * Contact: openbridge-dev@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -18,7 +18,7 @@ import (
 // CloudProviderListResponse struct for CloudProviderListResponse
 type CloudProviderListResponse struct {
 	Kind string `json:"kind"`
-	Items []CloudProviderResponse `json:"items,omitempty"`
+	Items *[]CloudProviderResponse `json:"items,omitempty"`
 	Page int64 `json:"page"`
 	Size int64 `json:"size"`
 	Total int64 `json:"total"`
@@ -58,8 +58,8 @@ func (o *CloudProviderListResponse) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *CloudProviderListResponse) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -71,25 +71,25 @@ func (o *CloudProviderListResponse) SetKind(v string) {
 
 // GetItems returns the Items field value if set, zero value otherwise.
 func (o *CloudProviderListResponse) GetItems() []CloudProviderResponse {
-	if o == nil || isNil(o.Items) {
+	if o == nil || o.Items == nil {
 		var ret []CloudProviderResponse
 		return ret
 	}
-	return o.Items
+	return *o.Items
 }
 
 // GetItemsOk returns a tuple with the Items field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *CloudProviderListResponse) GetItemsOk() ([]CloudProviderResponse, bool) {
-	if o == nil || isNil(o.Items) {
-    return nil, false
+func (o *CloudProviderListResponse) GetItemsOk() (*[]CloudProviderResponse, bool) {
+	if o == nil || o.Items == nil {
+		return nil, false
 	}
 	return o.Items, true
 }
 
 // HasItems returns a boolean if a field has been set.
 func (o *CloudProviderListResponse) HasItems() bool {
-	if o != nil && !isNil(o.Items) {
+	if o != nil && o.Items != nil {
 		return true
 	}
 
@@ -98,7 +98,7 @@ func (o *CloudProviderListResponse) HasItems() bool {
 
 // SetItems gets a reference to the given []CloudProviderResponse and assigns it to the Items field.
 func (o *CloudProviderListResponse) SetItems(v []CloudProviderResponse) {
-	o.Items = v
+	o.Items = &v
 }
 
 // GetPage returns the Page field value
@@ -114,8 +114,8 @@ func (o *CloudProviderListResponse) GetPage() int64 {
 // GetPageOk returns a tuple with the Page field value
 // and a boolean to check if the value has been set.
 func (o *CloudProviderListResponse) GetPageOk() (*int64, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Page, true
 }
@@ -138,8 +138,8 @@ func (o *CloudProviderListResponse) GetSize() int64 {
 // GetSizeOk returns a tuple with the Size field value
 // and a boolean to check if the value has been set.
 func (o *CloudProviderListResponse) GetSizeOk() (*int64, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Size, true
 }
@@ -162,8 +162,8 @@ func (o *CloudProviderListResponse) GetTotal() int64 {
 // GetTotalOk returns a tuple with the Total field value
 // and a boolean to check if the value has been set.
 func (o *CloudProviderListResponse) GetTotalOk() (*int64, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Total, true
 }
@@ -178,7 +178,7 @@ func (o CloudProviderListResponse) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["kind"] = o.Kind
 	}
-	if !isNil(o.Items) {
+	if o.Items != nil {
 		toSerialize["items"] = o.Items
 	}
 	if true {
diff --git a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_cloud_provider_response.go b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_cloud_provider_response.go
index cecc544a..81e7cf59 100644
--- a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_cloud_provider_response.go
+++ b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_cloud_provider_response.go
@@ -1,11 +1,11 @@
 /*
-Red Hat Openshift SmartEvents Fleet Manager V2
-
-The API exposed by the fleet manager of the SmartEvents service.
-
-API version: 0.0.1
-Contact: openbridge-dev@redhat.com
-*/
+ * Red Hat Openshift SmartEvents Fleet Manager V2
+ *
+ * The API exposed by the fleet manager of the SmartEvents service.
+ *
+ * API version: 0.0.1
+ * Contact: openbridge-dev@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -65,8 +65,8 @@ func (o *CloudProviderResponse) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *CloudProviderResponse) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -89,8 +89,8 @@ func (o *CloudProviderResponse) GetId() string {
 // GetIdOk returns a tuple with the Id field value
 // and a boolean to check if the value has been set.
 func (o *CloudProviderResponse) GetIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Id, true
 }
@@ -113,8 +113,8 @@ func (o *CloudProviderResponse) GetName() string {
 // GetNameOk returns a tuple with the Name field value
 // and a boolean to check if the value has been set.
 func (o *CloudProviderResponse) GetNameOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Name, true
 }
@@ -137,8 +137,8 @@ func (o *CloudProviderResponse) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value
 // and a boolean to check if the value has been set.
 func (o *CloudProviderResponse) GetHrefOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Href, true
 }
@@ -161,8 +161,8 @@ func (o *CloudProviderResponse) GetDisplayName() string {
 // GetDisplayNameOk returns a tuple with the DisplayName field value
 // and a boolean to check if the value has been set.
 func (o *CloudProviderResponse) GetDisplayNameOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.DisplayName, true
 }
@@ -185,8 +185,8 @@ func (o *CloudProviderResponse) GetEnabled() bool {
 // GetEnabledOk returns a tuple with the Enabled field value
 // and a boolean to check if the value has been set.
 func (o *CloudProviderResponse) GetEnabledOk() (*bool, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Enabled, true
 }
diff --git a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_cloud_region_list_response.go b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_cloud_region_list_response.go
index eeacc0c3..a1018f84 100644
--- a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_cloud_region_list_response.go
+++ b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_cloud_region_list_response.go
@@ -1,11 +1,11 @@
 /*
-Red Hat Openshift SmartEvents Fleet Manager V2
-
-The API exposed by the fleet manager of the SmartEvents service.
-
-API version: 0.0.1
-Contact: openbridge-dev@redhat.com
-*/
+ * Red Hat Openshift SmartEvents Fleet Manager V2
+ *
+ * The API exposed by the fleet manager of the SmartEvents service.
+ *
+ * API version: 0.0.1
+ * Contact: openbridge-dev@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -18,7 +18,7 @@ import (
 // CloudRegionListResponse struct for CloudRegionListResponse
 type CloudRegionListResponse struct {
 	Kind string `json:"kind"`
-	Items []CloudRegionResponse `json:"items,omitempty"`
+	Items *[]CloudRegionResponse `json:"items,omitempty"`
 	Page int64 `json:"page"`
 	Size int64 `json:"size"`
 	Total int64 `json:"total"`
@@ -58,8 +58,8 @@ func (o *CloudRegionListResponse) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *CloudRegionListResponse) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -71,25 +71,25 @@ func (o *CloudRegionListResponse) SetKind(v string) {
 
 // GetItems returns the Items field value if set, zero value otherwise.
 func (o *CloudRegionListResponse) GetItems() []CloudRegionResponse {
-	if o == nil || isNil(o.Items) {
+	if o == nil || o.Items == nil {
 		var ret []CloudRegionResponse
 		return ret
 	}
-	return o.Items
+	return *o.Items
 }
 
 // GetItemsOk returns a tuple with the Items field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *CloudRegionListResponse) GetItemsOk() ([]CloudRegionResponse, bool) {
-	if o == nil || isNil(o.Items) {
-    return nil, false
+func (o *CloudRegionListResponse) GetItemsOk() (*[]CloudRegionResponse, bool) {
+	if o == nil || o.Items == nil {
+		return nil, false
 	}
 	return o.Items, true
 }
 
 // HasItems returns a boolean if a field has been set.
 func (o *CloudRegionListResponse) HasItems() bool {
-	if o != nil && !isNil(o.Items) {
+	if o != nil && o.Items != nil {
 		return true
 	}
 
@@ -98,7 +98,7 @@ func (o *CloudRegionListResponse) HasItems() bool {
 
 // SetItems gets a reference to the given []CloudRegionResponse and assigns it to the Items field.
 func (o *CloudRegionListResponse) SetItems(v []CloudRegionResponse) {
-	o.Items = v
+	o.Items = &v
 }
 
 // GetPage returns the Page field value
@@ -114,8 +114,8 @@ func (o *CloudRegionListResponse) GetPage() int64 {
 // GetPageOk returns a tuple with the Page field value
 // and a boolean to check if the value has been set.
 func (o *CloudRegionListResponse) GetPageOk() (*int64, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Page, true
 }
@@ -138,8 +138,8 @@ func (o *CloudRegionListResponse) GetSize() int64 {
 // GetSizeOk returns a tuple with the Size field value
 // and a boolean to check if the value has been set.
 func (o *CloudRegionListResponse) GetSizeOk() (*int64, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Size, true
 }
@@ -162,8 +162,8 @@ func (o *CloudRegionListResponse) GetTotal() int64 {
 // GetTotalOk returns a tuple with the Total field value
 // and a boolean to check if the value has been set.
 func (o *CloudRegionListResponse) GetTotalOk() (*int64, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Total, true
 }
@@ -178,7 +178,7 @@ func (o CloudRegionListResponse) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["kind"] = o.Kind
 	}
-	if !isNil(o.Items) {
+	if o.Items != nil {
 		toSerialize["items"] = o.Items
 	}
 	if true {
diff --git a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_cloud_region_response.go b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_cloud_region_response.go
index 0fbc9055..94192d44 100644
--- a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_cloud_region_response.go
+++ b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_cloud_region_response.go
@@ -1,11 +1,11 @@
 /*
-Red Hat Openshift SmartEvents Fleet Manager V2
-
-The API exposed by the fleet manager of the SmartEvents service.
-
-API version: 0.0.1
-Contact: openbridge-dev@redhat.com
-*/
+ * Red Hat Openshift SmartEvents Fleet Manager V2
+ *
+ * The API exposed by the fleet manager of the SmartEvents service.
+ *
+ * API version: 0.0.1
+ * Contact: openbridge-dev@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -57,8 +57,8 @@ func (o *CloudRegionResponse) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *CloudRegionResponse) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -81,8 +81,8 @@ func (o *CloudRegionResponse) GetName() string {
 // GetNameOk returns a tuple with the Name field value
 // and a boolean to check if the value has been set.
 func (o *CloudRegionResponse) GetNameOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Name, true
 }
@@ -105,8 +105,8 @@ func (o *CloudRegionResponse) GetDisplayName() string {
 // GetDisplayNameOk returns a tuple with the DisplayName field value
 // and a boolean to check if the value has been set.
 func (o *CloudRegionResponse) GetDisplayNameOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.DisplayName, true
 }
@@ -129,8 +129,8 @@ func (o *CloudRegionResponse) GetEnabled() bool {
 // GetEnabledOk returns a tuple with the Enabled field value
 // and a boolean to check if the value has been set.
 func (o *CloudRegionResponse) GetEnabledOk() (*bool, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Enabled, true
 }
diff --git a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_connector_request.go b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_connector_request.go
index 38af8890..a167da82 100644
--- a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_connector_request.go
+++ b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_connector_request.go
@@ -1,11 +1,11 @@
 /*
-Red Hat Openshift SmartEvents Fleet Manager V2
-
-The API exposed by the fleet manager of the SmartEvents service.
-
-API version: 0.0.1
-Contact: openbridge-dev@redhat.com
-*/
+ * Red Hat Openshift SmartEvents Fleet Manager V2
+ *
+ * The API exposed by the fleet manager of the SmartEvents service.
+ *
+ * API version: 0.0.1
+ * Contact: openbridge-dev@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -58,8 +58,8 @@ func (o *ConnectorRequest) GetName() string {
 // GetNameOk returns a tuple with the Name field value
 // and a boolean to check if the value has been set.
 func (o *ConnectorRequest) GetNameOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Name, true
 }
@@ -82,8 +82,8 @@ func (o *ConnectorRequest) GetConnectorTypeId() string {
 // GetConnectorTypeIdOk returns a tuple with the ConnectorTypeId field value
 // and a boolean to check if the value has been set.
 func (o *ConnectorRequest) GetConnectorTypeIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.ConnectorTypeId, true
 }
@@ -105,11 +105,11 @@ func (o *ConnectorRequest) GetConnector() map[string]interface{} {
 
 // GetConnectorOk returns a tuple with the Connector field value
 // and a boolean to check if the value has been set.
-func (o *ConnectorRequest) GetConnectorOk() (map[string]interface{}, bool) {
-	if o == nil {
-    return map[string]interface{}{}, false
+func (o *ConnectorRequest) GetConnectorOk() (*map[string]interface{}, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Connector, true
+	return &o.Connector, true
 }
 
 // SetConnector sets field value
diff --git a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_error.go b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_error.go
index b8e2acad..9efb4152 100644
--- a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_error.go
+++ b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_error.go
@@ -1,11 +1,11 @@
 /*
-Red Hat Openshift SmartEvents Fleet Manager V2
-
-The API exposed by the fleet manager of the SmartEvents service.
-
-API version: 0.0.1
-Contact: openbridge-dev@redhat.com
-*/
+ * Red Hat Openshift SmartEvents Fleet Manager V2
+ *
+ * The API exposed by the fleet manager of the SmartEvents service.
+ *
+ * API version: 0.0.1
+ * Contact: openbridge-dev@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -64,8 +64,8 @@ func (o *Error) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *Error) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -88,8 +88,8 @@ func (o *Error) GetId() string {
 // GetIdOk returns a tuple with the Id field value
 // and a boolean to check if the value has been set.
 func (o *Error) GetIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Id, true
 }
@@ -112,8 +112,8 @@ func (o *Error) GetName() string {
 // GetNameOk returns a tuple with the Name field value
 // and a boolean to check if the value has been set.
 func (o *Error) GetNameOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Name, true
 }
@@ -136,8 +136,8 @@ func (o *Error) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value
 // and a boolean to check if the value has been set.
 func (o *Error) GetHrefOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Href, true
 }
@@ -149,7 +149,7 @@ func (o *Error) SetHref(v string) {
 
 // GetCode returns the Code field value if set, zero value otherwise.
 func (o *Error) GetCode() string {
-	if o == nil || isNil(o.Code) {
+	if o == nil || o.Code == nil {
 		var ret string
 		return ret
 	}
@@ -159,15 +159,15 @@ func (o *Error) GetCode() string {
 // GetCodeOk returns a tuple with the Code field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *Error) GetCodeOk() (*string, bool) {
-	if o == nil || isNil(o.Code) {
-    return nil, false
+	if o == nil || o.Code == nil {
+		return nil, false
 	}
 	return o.Code, true
 }
 
 // HasCode returns a boolean if a field has been set.
 func (o *Error) HasCode() bool {
-	if o != nil && !isNil(o.Code) {
+	if o != nil && o.Code != nil {
 		return true
 	}
 
@@ -192,8 +192,8 @@ func (o *Error) GetReason() string {
 // GetReasonOk returns a tuple with the Reason field value
 // and a boolean to check if the value has been set.
 func (o *Error) GetReasonOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Reason, true
 }
@@ -217,7 +217,7 @@ func (o Error) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["href"] = o.Href
 	}
-	if !isNil(o.Code) {
+	if o.Code != nil {
 		toSerialize["code"] = o.Code
 	}
 	if true {
diff --git a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_error_list_response.go b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_error_list_response.go
index 7169a817..c0c5261e 100644
--- a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_error_list_response.go
+++ b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_error_list_response.go
@@ -1,11 +1,11 @@
 /*
-Red Hat Openshift SmartEvents Fleet Manager V2
-
-The API exposed by the fleet manager of the SmartEvents service.
-
-API version: 0.0.1
-Contact: openbridge-dev@redhat.com
-*/
+ * Red Hat Openshift SmartEvents Fleet Manager V2
+ *
+ * The API exposed by the fleet manager of the SmartEvents service.
+ *
+ * API version: 0.0.1
+ * Contact: openbridge-dev@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -18,7 +18,7 @@ import (
 // ErrorListResponse struct for ErrorListResponse
 type ErrorListResponse struct {
 	Kind string `json:"kind"`
-	Items []Error `json:"items,omitempty"`
+	Items *[]Error `json:"items,omitempty"`
 	Page int64 `json:"page"`
 	Size int64 `json:"size"`
 	Total int64 `json:"total"`
@@ -58,8 +58,8 @@ func (o *ErrorListResponse) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *ErrorListResponse) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -71,25 +71,25 @@ func (o *ErrorListResponse) SetKind(v string) {
 
 // GetItems returns the Items field value if set, zero value otherwise.
 func (o *ErrorListResponse) GetItems() []Error {
-	if o == nil || isNil(o.Items) {
+	if o == nil || o.Items == nil {
 		var ret []Error
 		return ret
 	}
-	return o.Items
+	return *o.Items
 }
 
 // GetItemsOk returns a tuple with the Items field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *ErrorListResponse) GetItemsOk() ([]Error, bool) {
-	if o == nil || isNil(o.Items) {
-    return nil, false
+func (o *ErrorListResponse) GetItemsOk() (*[]Error, bool) {
+	if o == nil || o.Items == nil {
+		return nil, false
 	}
 	return o.Items, true
 }
 
 // HasItems returns a boolean if a field has been set.
 func (o *ErrorListResponse) HasItems() bool {
-	if o != nil && !isNil(o.Items) {
+	if o != nil && o.Items != nil {
 		return true
 	}
 
@@ -98,7 +98,7 @@ func (o *ErrorListResponse) HasItems() bool {
 
 // SetItems gets a reference to the given []Error and assigns it to the Items field.
 func (o *ErrorListResponse) SetItems(v []Error) {
-	o.Items = v
+	o.Items = &v
 }
 
 // GetPage returns the Page field value
@@ -114,8 +114,8 @@ func (o *ErrorListResponse) GetPage() int64 {
 // GetPageOk returns a tuple with the Page field value
 // and a boolean to check if the value has been set.
 func (o *ErrorListResponse) GetPageOk() (*int64, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Page, true
 }
@@ -138,8 +138,8 @@ func (o *ErrorListResponse) GetSize() int64 {
 // GetSizeOk returns a tuple with the Size field value
 // and a boolean to check if the value has been set.
 func (o *ErrorListResponse) GetSizeOk() (*int64, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Size, true
 }
@@ -162,8 +162,8 @@ func (o *ErrorListResponse) GetTotal() int64 {
 // GetTotalOk returns a tuple with the Total field value
 // and a boolean to check if the value has been set.
 func (o *ErrorListResponse) GetTotalOk() (*int64, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Total, true
 }
@@ -178,7 +178,7 @@ func (o ErrorListResponse) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["kind"] = o.Kind
 	}
-	if !isNil(o.Items) {
+	if o.Items != nil {
 		toSerialize["items"] = o.Items
 	}
 	if true {
diff --git a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_errors_list.go b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_errors_list.go
index 07fb5b3c..975440eb 100644
--- a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_errors_list.go
+++ b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_errors_list.go
@@ -1,11 +1,11 @@
 /*
-Red Hat Openshift SmartEvents Fleet Manager V2
-
-The API exposed by the fleet manager of the SmartEvents service.
-
-API version: 0.0.1
-Contact: openbridge-dev@redhat.com
-*/
+ * Red Hat Openshift SmartEvents Fleet Manager V2
+ *
+ * The API exposed by the fleet manager of the SmartEvents service.
+ *
+ * API version: 0.0.1
+ * Contact: openbridge-dev@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -18,7 +18,7 @@ import (
 // ErrorsList struct for ErrorsList
 type ErrorsList struct {
 	Kind string `json:"kind"`
-	Items []Error `json:"items,omitempty"`
+	Items *[]Error `json:"items,omitempty"`
 }
 
 // NewErrorsList instantiates a new ErrorsList object
@@ -52,8 +52,8 @@ func (o *ErrorsList) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *ErrorsList) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -65,25 +65,25 @@ func (o *ErrorsList) SetKind(v string) {
 
 // GetItems returns the Items field value if set, zero value otherwise.
 func (o *ErrorsList) GetItems() []Error {
-	if o == nil || isNil(o.Items) {
+	if o == nil || o.Items == nil {
 		var ret []Error
 		return ret
 	}
-	return o.Items
+	return *o.Items
 }
 
 // GetItemsOk returns a tuple with the Items field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *ErrorsList) GetItemsOk() ([]Error, bool) {
-	if o == nil || isNil(o.Items) {
-    return nil, false
+func (o *ErrorsList) GetItemsOk() (*[]Error, bool) {
+	if o == nil || o.Items == nil {
+		return nil, false
 	}
 	return o.Items, true
 }
 
 // HasItems returns a boolean if a field has been set.
 func (o *ErrorsList) HasItems() bool {
-	if o != nil && !isNil(o.Items) {
+	if o != nil && o.Items != nil {
 		return true
 	}
 
@@ -92,7 +92,7 @@ func (o *ErrorsList) HasItems() bool {
 
 // SetItems gets a reference to the given []Error and assigns it to the Items field.
 func (o *ErrorsList) SetItems(v []Error) {
-	o.Items = v
+	o.Items = &v
 }
 
 func (o ErrorsList) MarshalJSON() ([]byte, error) {
@@ -100,7 +100,7 @@ func (o ErrorsList) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["kind"] = o.Kind
 	}
-	if !isNil(o.Items) {
+	if o.Items != nil {
 		toSerialize["items"] = o.Items
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_list.go b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_list.go
index 9d84bc9b..a85de189 100644
--- a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_list.go
+++ b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_list.go
@@ -1,11 +1,11 @@
 /*
-Red Hat Openshift SmartEvents Fleet Manager V2
-
-The API exposed by the fleet manager of the SmartEvents service.
-
-API version: 0.0.1
-Contact: openbridge-dev@redhat.com
-*/
+ * Red Hat Openshift SmartEvents Fleet Manager V2
+ *
+ * The API exposed by the fleet manager of the SmartEvents service.
+ *
+ * API version: 0.0.1
+ * Contact: openbridge-dev@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -18,7 +18,7 @@ import (
 // List struct for List
 type List struct {
 	Kind string `json:"kind"`
-	Items []map[string]interface{} `json:"items,omitempty"`
+	Items *[]map[string]interface{} `json:"items,omitempty"`
 	Page int64 `json:"page"`
 	Size int64 `json:"size"`
 	Total int64 `json:"total"`
@@ -58,8 +58,8 @@ func (o *List) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *List) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -71,25 +71,25 @@ func (o *List) SetKind(v string) {
 
 // GetItems returns the Items field value if set, zero value otherwise.
 func (o *List) GetItems() []map[string]interface{} {
-	if o == nil || isNil(o.Items) {
+	if o == nil || o.Items == nil {
 		var ret []map[string]interface{}
 		return ret
 	}
-	return o.Items
+	return *o.Items
 }
 
 // GetItemsOk returns a tuple with the Items field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *List) GetItemsOk() ([]map[string]interface{}, bool) {
-	if o == nil || isNil(o.Items) {
-    return nil, false
+func (o *List) GetItemsOk() (*[]map[string]interface{}, bool) {
+	if o == nil || o.Items == nil {
+		return nil, false
 	}
 	return o.Items, true
 }
 
 // HasItems returns a boolean if a field has been set.
 func (o *List) HasItems() bool {
-	if o != nil && !isNil(o.Items) {
+	if o != nil && o.Items != nil {
 		return true
 	}
 
@@ -98,7 +98,7 @@ func (o *List) HasItems() bool {
 
 // SetItems gets a reference to the given []map[string]interface{} and assigns it to the Items field.
 func (o *List) SetItems(v []map[string]interface{}) {
-	o.Items = v
+	o.Items = &v
 }
 
 // GetPage returns the Page field value
@@ -114,8 +114,8 @@ func (o *List) GetPage() int64 {
 // GetPageOk returns a tuple with the Page field value
 // and a boolean to check if the value has been set.
 func (o *List) GetPageOk() (*int64, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Page, true
 }
@@ -138,8 +138,8 @@ func (o *List) GetSize() int64 {
 // GetSizeOk returns a tuple with the Size field value
 // and a boolean to check if the value has been set.
 func (o *List) GetSizeOk() (*int64, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Size, true
 }
@@ -162,8 +162,8 @@ func (o *List) GetTotal() int64 {
 // GetTotalOk returns a tuple with the Total field value
 // and a boolean to check if the value has been set.
 func (o *List) GetTotalOk() (*int64, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Total, true
 }
@@ -178,7 +178,7 @@ func (o List) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["kind"] = o.Kind
 	}
-	if !isNil(o.Items) {
+	if o.Items != nil {
 		toSerialize["items"] = o.Items
 	}
 	if true {
diff --git a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_list_all_of.go b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_list_all_of.go
index 91607872..b7b75590 100644
--- a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_list_all_of.go
+++ b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_list_all_of.go
@@ -1,11 +1,11 @@
 /*
-Red Hat Openshift SmartEvents Fleet Manager V2
-
-The API exposed by the fleet manager of the SmartEvents service.
-
-API version: 0.0.1
-Contact: openbridge-dev@redhat.com
-*/
+ * Red Hat Openshift SmartEvents Fleet Manager V2
+ *
+ * The API exposed by the fleet manager of the SmartEvents service.
+ *
+ * API version: 0.0.1
+ * Contact: openbridge-dev@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -55,8 +55,8 @@ func (o *ListAllOf) GetPage() int64 {
 // GetPageOk returns a tuple with the Page field value
 // and a boolean to check if the value has been set.
 func (o *ListAllOf) GetPageOk() (*int64, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Page, true
 }
@@ -79,8 +79,8 @@ func (o *ListAllOf) GetSize() int64 {
 // GetSizeOk returns a tuple with the Size field value
 // and a boolean to check if the value has been set.
 func (o *ListAllOf) GetSizeOk() (*int64, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Size, true
 }
@@ -103,8 +103,8 @@ func (o *ListAllOf) GetTotal() int64 {
 // GetTotalOk returns a tuple with the Total field value
 // and a boolean to check if the value has been set.
 func (o *ListAllOf) GetTotalOk() (*int64, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Total, true
 }
diff --git a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_list_response.go b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_list_response.go
index fdab7a17..1dd7ae1e 100644
--- a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_list_response.go
+++ b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_list_response.go
@@ -1,11 +1,11 @@
 /*
-Red Hat Openshift SmartEvents Fleet Manager V2
-
-The API exposed by the fleet manager of the SmartEvents service.
-
-API version: 0.0.1
-Contact: openbridge-dev@redhat.com
-*/
+ * Red Hat Openshift SmartEvents Fleet Manager V2
+ *
+ * The API exposed by the fleet manager of the SmartEvents service.
+ *
+ * API version: 0.0.1
+ * Contact: openbridge-dev@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -18,7 +18,7 @@ import (
 // ListResponse struct for ListResponse
 type ListResponse struct {
 	Kind string `json:"kind"`
-	Items []map[string]interface{} `json:"items,omitempty"`
+	Items *[]map[string]interface{} `json:"items,omitempty"`
 }
 
 // NewListResponse instantiates a new ListResponse object
@@ -52,8 +52,8 @@ func (o *ListResponse) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *ListResponse) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -65,25 +65,25 @@ func (o *ListResponse) SetKind(v string) {
 
 // GetItems returns the Items field value if set, zero value otherwise.
 func (o *ListResponse) GetItems() []map[string]interface{} {
-	if o == nil || isNil(o.Items) {
+	if o == nil || o.Items == nil {
 		var ret []map[string]interface{}
 		return ret
 	}
-	return o.Items
+	return *o.Items
 }
 
 // GetItemsOk returns a tuple with the Items field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *ListResponse) GetItemsOk() ([]map[string]interface{}, bool) {
-	if o == nil || isNil(o.Items) {
-    return nil, false
+func (o *ListResponse) GetItemsOk() (*[]map[string]interface{}, bool) {
+	if o == nil || o.Items == nil {
+		return nil, false
 	}
 	return o.Items, true
 }
 
 // HasItems returns a boolean if a field has been set.
 func (o *ListResponse) HasItems() bool {
-	if o != nil && !isNil(o.Items) {
+	if o != nil && o.Items != nil {
 		return true
 	}
 
@@ -92,7 +92,7 @@ func (o *ListResponse) HasItems() bool {
 
 // SetItems gets a reference to the given []map[string]interface{} and assigns it to the Items field.
 func (o *ListResponse) SetItems(v []map[string]interface{}) {
-	o.Items = v
+	o.Items = &v
 }
 
 func (o ListResponse) MarshalJSON() ([]byte, error) {
@@ -100,7 +100,7 @@ func (o ListResponse) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["kind"] = o.Kind
 	}
-	if !isNil(o.Items) {
+	if o.Items != nil {
 		toSerialize["items"] = o.Items
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_managed_resource_status.go b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_managed_resource_status.go
index cdca4c5f..c6bd6798 100644
--- a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_managed_resource_status.go
+++ b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_managed_resource_status.go
@@ -1,11 +1,11 @@
 /*
-Red Hat Openshift SmartEvents Fleet Manager V2
-
-The API exposed by the fleet manager of the SmartEvents service.
-
-API version: 0.0.1
-Contact: openbridge-dev@redhat.com
-*/
+ * Red Hat Openshift SmartEvents Fleet Manager V2
+ *
+ * The API exposed by the fleet manager of the SmartEvents service.
+ *
+ * API version: 0.0.1
+ * Contact: openbridge-dev@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -34,8 +34,7 @@ const (
 	MANAGEDRESOURCESTATUS_FAILED ManagedResourceStatus = "failed"
 )
 
-// All allowed values of ManagedResourceStatus enum
-var AllowedManagedResourceStatusEnumValues = []ManagedResourceStatus{
+var allowedManagedResourceStatusEnumValues = []ManagedResourceStatus{
 	"accepted",
 	"preparing",
 	"provisioning",
@@ -56,7 +55,7 @@ func (v *ManagedResourceStatus) UnmarshalJSON(src []byte) error {
 		return err
 	}
 	enumTypeValue := ManagedResourceStatus(value)
-	for _, existing := range AllowedManagedResourceStatusEnumValues {
+	for _, existing := range allowedManagedResourceStatusEnumValues {
 		if existing == enumTypeValue {
 			*v = enumTypeValue
 			return nil
@@ -73,13 +72,13 @@ func NewManagedResourceStatusFromValue(v string) (*ManagedResourceStatus, error)
 	if ev.IsValid() {
 		return &ev, nil
 	} else {
-		return nil, fmt.Errorf("invalid value '%v' for ManagedResourceStatus: valid values are %v", v, AllowedManagedResourceStatusEnumValues)
+		return nil, fmt.Errorf("invalid value '%v' for ManagedResourceStatus: valid values are %v", v, allowedManagedResourceStatusEnumValues)
 	}
 }
 
 // IsValid return true if the value is valid for the enum, false otherwise
 func (v ManagedResourceStatus) IsValid() bool {
-	for _, existing := range AllowedManagedResourceStatusEnumValues {
+	for _, existing := range allowedManagedResourceStatusEnumValues {
 		if existing == v {
 			return true
 		}
diff --git a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_object_reference.go b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_object_reference.go
index 2a038ae3..d8b97d27 100644
--- a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_object_reference.go
+++ b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_object_reference.go
@@ -1,11 +1,11 @@
 /*
-Red Hat Openshift SmartEvents Fleet Manager V2
-
-The API exposed by the fleet manager of the SmartEvents service.
-
-API version: 0.0.1
-Contact: openbridge-dev@redhat.com
-*/
+ * Red Hat Openshift SmartEvents Fleet Manager V2
+ *
+ * The API exposed by the fleet manager of the SmartEvents service.
+ *
+ * API version: 0.0.1
+ * Contact: openbridge-dev@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -61,8 +61,8 @@ func (o *ObjectReference) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *ObjectReference) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -85,8 +85,8 @@ func (o *ObjectReference) GetId() string {
 // GetIdOk returns a tuple with the Id field value
 // and a boolean to check if the value has been set.
 func (o *ObjectReference) GetIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Id, true
 }
@@ -109,8 +109,8 @@ func (o *ObjectReference) GetName() string {
 // GetNameOk returns a tuple with the Name field value
 // and a boolean to check if the value has been set.
 func (o *ObjectReference) GetNameOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Name, true
 }
@@ -133,8 +133,8 @@ func (o *ObjectReference) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value
 // and a boolean to check if the value has been set.
 func (o *ObjectReference) GetHrefOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Href, true
 }
diff --git a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_processing_error_list_response.go b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_processing_error_list_response.go
index 99f65b9a..07616c56 100644
--- a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_processing_error_list_response.go
+++ b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_processing_error_list_response.go
@@ -1,11 +1,11 @@
 /*
-Red Hat Openshift SmartEvents Fleet Manager V2
-
-The API exposed by the fleet manager of the SmartEvents service.
-
-API version: 0.0.1
-Contact: openbridge-dev@redhat.com
-*/
+ * Red Hat Openshift SmartEvents Fleet Manager V2
+ *
+ * The API exposed by the fleet manager of the SmartEvents service.
+ *
+ * API version: 0.0.1
+ * Contact: openbridge-dev@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -18,7 +18,7 @@ import (
 // ProcessingErrorListResponse struct for ProcessingErrorListResponse
 type ProcessingErrorListResponse struct {
 	Kind string `json:"kind"`
-	Items []ProcessingErrorResponse `json:"items,omitempty"`
+	Items *[]ProcessingErrorResponse `json:"items,omitempty"`
 	Page int64 `json:"page"`
 	Size int64 `json:"size"`
 	Total int64 `json:"total"`
@@ -58,8 +58,8 @@ func (o *ProcessingErrorListResponse) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *ProcessingErrorListResponse) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -71,25 +71,25 @@ func (o *ProcessingErrorListResponse) SetKind(v string) {
 
 // GetItems returns the Items field value if set, zero value otherwise.
 func (o *ProcessingErrorListResponse) GetItems() []ProcessingErrorResponse {
-	if o == nil || isNil(o.Items) {
+	if o == nil || o.Items == nil {
 		var ret []ProcessingErrorResponse
 		return ret
 	}
-	return o.Items
+	return *o.Items
 }
 
 // GetItemsOk returns a tuple with the Items field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *ProcessingErrorListResponse) GetItemsOk() ([]ProcessingErrorResponse, bool) {
-	if o == nil || isNil(o.Items) {
-    return nil, false
+func (o *ProcessingErrorListResponse) GetItemsOk() (*[]ProcessingErrorResponse, bool) {
+	if o == nil || o.Items == nil {
+		return nil, false
 	}
 	return o.Items, true
 }
 
 // HasItems returns a boolean if a field has been set.
 func (o *ProcessingErrorListResponse) HasItems() bool {
-	if o != nil && !isNil(o.Items) {
+	if o != nil && o.Items != nil {
 		return true
 	}
 
@@ -98,7 +98,7 @@ func (o *ProcessingErrorListResponse) HasItems() bool {
 
 // SetItems gets a reference to the given []ProcessingErrorResponse and assigns it to the Items field.
 func (o *ProcessingErrorListResponse) SetItems(v []ProcessingErrorResponse) {
-	o.Items = v
+	o.Items = &v
 }
 
 // GetPage returns the Page field value
@@ -114,8 +114,8 @@ func (o *ProcessingErrorListResponse) GetPage() int64 {
 // GetPageOk returns a tuple with the Page field value
 // and a boolean to check if the value has been set.
 func (o *ProcessingErrorListResponse) GetPageOk() (*int64, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Page, true
 }
@@ -138,8 +138,8 @@ func (o *ProcessingErrorListResponse) GetSize() int64 {
 // GetSizeOk returns a tuple with the Size field value
 // and a boolean to check if the value has been set.
 func (o *ProcessingErrorListResponse) GetSizeOk() (*int64, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Size, true
 }
@@ -162,8 +162,8 @@ func (o *ProcessingErrorListResponse) GetTotal() int64 {
 // GetTotalOk returns a tuple with the Total field value
 // and a boolean to check if the value has been set.
 func (o *ProcessingErrorListResponse) GetTotalOk() (*int64, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Total, true
 }
@@ -178,7 +178,7 @@ func (o ProcessingErrorListResponse) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["kind"] = o.Kind
 	}
-	if !isNil(o.Items) {
+	if o.Items != nil {
 		toSerialize["items"] = o.Items
 	}
 	if true {
diff --git a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_processing_error_response.go b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_processing_error_response.go
index cb0681d2..6cc57181 100644
--- a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_processing_error_response.go
+++ b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_processing_error_response.go
@@ -1,11 +1,11 @@
 /*
-Red Hat Openshift SmartEvents Fleet Manager V2
-
-The API exposed by the fleet manager of the SmartEvents service.
-
-API version: 0.0.1
-Contact: openbridge-dev@redhat.com
-*/
+ * Red Hat Openshift SmartEvents Fleet Manager V2
+ *
+ * The API exposed by the fleet manager of the SmartEvents service.
+ *
+ * API version: 0.0.1
+ * Contact: openbridge-dev@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -20,7 +20,7 @@ import (
 type ProcessingErrorResponse struct {
 	RecordedAt *time.Time `json:"recorded_at,omitempty"`
 	Headers *map[string]string `json:"headers,omitempty"`
-	Payload map[string]interface{} `json:"payload,omitempty"`
+	Payload *map[string]interface{} `json:"payload,omitempty"`
 }
 
 // NewProcessingErrorResponse instantiates a new ProcessingErrorResponse object
@@ -42,7 +42,7 @@ func NewProcessingErrorResponseWithDefaults() *ProcessingErrorResponse {
 
 // GetRecordedAt returns the RecordedAt field value if set, zero value otherwise.
 func (o *ProcessingErrorResponse) GetRecordedAt() time.Time {
-	if o == nil || isNil(o.RecordedAt) {
+	if o == nil || o.RecordedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -52,15 +52,15 @@ func (o *ProcessingErrorResponse) GetRecordedAt() time.Time {
 // GetRecordedAtOk returns a tuple with the RecordedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ProcessingErrorResponse) GetRecordedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.RecordedAt) {
-    return nil, false
+	if o == nil || o.RecordedAt == nil {
+		return nil, false
 	}
 	return o.RecordedAt, true
 }
 
 // HasRecordedAt returns a boolean if a field has been set.
 func (o *ProcessingErrorResponse) HasRecordedAt() bool {
-	if o != nil && !isNil(o.RecordedAt) {
+	if o != nil && o.RecordedAt != nil {
 		return true
 	}
 
@@ -74,7 +74,7 @@ func (o *ProcessingErrorResponse) SetRecordedAt(v time.Time) {
 
 // GetHeaders returns the Headers field value if set, zero value otherwise.
 func (o *ProcessingErrorResponse) GetHeaders() map[string]string {
-	if o == nil || isNil(o.Headers) {
+	if o == nil || o.Headers == nil {
 		var ret map[string]string
 		return ret
 	}
@@ -84,15 +84,15 @@ func (o *ProcessingErrorResponse) GetHeaders() map[string]string {
 // GetHeadersOk returns a tuple with the Headers field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ProcessingErrorResponse) GetHeadersOk() (*map[string]string, bool) {
-	if o == nil || isNil(o.Headers) {
-    return nil, false
+	if o == nil || o.Headers == nil {
+		return nil, false
 	}
 	return o.Headers, true
 }
 
 // HasHeaders returns a boolean if a field has been set.
 func (o *ProcessingErrorResponse) HasHeaders() bool {
-	if o != nil && !isNil(o.Headers) {
+	if o != nil && o.Headers != nil {
 		return true
 	}
 
@@ -106,25 +106,25 @@ func (o *ProcessingErrorResponse) SetHeaders(v map[string]string) {
 
 // GetPayload returns the Payload field value if set, zero value otherwise.
 func (o *ProcessingErrorResponse) GetPayload() map[string]interface{} {
-	if o == nil || isNil(o.Payload) {
+	if o == nil || o.Payload == nil {
 		var ret map[string]interface{}
 		return ret
 	}
-	return o.Payload
+	return *o.Payload
 }
 
 // GetPayloadOk returns a tuple with the Payload field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *ProcessingErrorResponse) GetPayloadOk() (map[string]interface{}, bool) {
-	if o == nil || isNil(o.Payload) {
-    return map[string]interface{}{}, false
+func (o *ProcessingErrorResponse) GetPayloadOk() (*map[string]interface{}, bool) {
+	if o == nil || o.Payload == nil {
+		return nil, false
 	}
 	return o.Payload, true
 }
 
 // HasPayload returns a boolean if a field has been set.
 func (o *ProcessingErrorResponse) HasPayload() bool {
-	if o != nil && !isNil(o.Payload) {
+	if o != nil && o.Payload != nil {
 		return true
 	}
 
@@ -133,18 +133,18 @@ func (o *ProcessingErrorResponse) HasPayload() bool {
 
 // SetPayload gets a reference to the given map[string]interface{} and assigns it to the Payload field.
 func (o *ProcessingErrorResponse) SetPayload(v map[string]interface{}) {
-	o.Payload = v
+	o.Payload = &v
 }
 
 func (o ProcessingErrorResponse) MarshalJSON() ([]byte, error) {
 	toSerialize := map[string]interface{}{}
-	if !isNil(o.RecordedAt) {
+	if o.RecordedAt != nil {
 		toSerialize["recorded_at"] = o.RecordedAt
 	}
-	if !isNil(o.Headers) {
+	if o.Headers != nil {
 		toSerialize["headers"] = o.Headers
 	}
-	if !isNil(o.Payload) {
+	if o.Payload != nil {
 		toSerialize["payload"] = o.Payload
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_processor_list_response.go b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_processor_list_response.go
index ced0f450..29706a5e 100644
--- a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_processor_list_response.go
+++ b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_processor_list_response.go
@@ -1,11 +1,11 @@
 /*
-Red Hat Openshift SmartEvents Fleet Manager V2
-
-The API exposed by the fleet manager of the SmartEvents service.
-
-API version: 0.0.1
-Contact: openbridge-dev@redhat.com
-*/
+ * Red Hat Openshift SmartEvents Fleet Manager V2
+ *
+ * The API exposed by the fleet manager of the SmartEvents service.
+ *
+ * API version: 0.0.1
+ * Contact: openbridge-dev@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -18,7 +18,7 @@ import (
 // ProcessorListResponse struct for ProcessorListResponse
 type ProcessorListResponse struct {
 	Kind string `json:"kind"`
-	Items []ProcessorResponse `json:"items,omitempty"`
+	Items *[]ProcessorResponse `json:"items,omitempty"`
 	Page int64 `json:"page"`
 	Size int64 `json:"size"`
 	Total int64 `json:"total"`
@@ -58,8 +58,8 @@ func (o *ProcessorListResponse) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *ProcessorListResponse) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -71,25 +71,25 @@ func (o *ProcessorListResponse) SetKind(v string) {
 
 // GetItems returns the Items field value if set, zero value otherwise.
 func (o *ProcessorListResponse) GetItems() []ProcessorResponse {
-	if o == nil || isNil(o.Items) {
+	if o == nil || o.Items == nil {
 		var ret []ProcessorResponse
 		return ret
 	}
-	return o.Items
+	return *o.Items
 }
 
 // GetItemsOk returns a tuple with the Items field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *ProcessorListResponse) GetItemsOk() ([]ProcessorResponse, bool) {
-	if o == nil || isNil(o.Items) {
-    return nil, false
+func (o *ProcessorListResponse) GetItemsOk() (*[]ProcessorResponse, bool) {
+	if o == nil || o.Items == nil {
+		return nil, false
 	}
 	return o.Items, true
 }
 
 // HasItems returns a boolean if a field has been set.
 func (o *ProcessorListResponse) HasItems() bool {
-	if o != nil && !isNil(o.Items) {
+	if o != nil && o.Items != nil {
 		return true
 	}
 
@@ -98,7 +98,7 @@ func (o *ProcessorListResponse) HasItems() bool {
 
 // SetItems gets a reference to the given []ProcessorResponse and assigns it to the Items field.
 func (o *ProcessorListResponse) SetItems(v []ProcessorResponse) {
-	o.Items = v
+	o.Items = &v
 }
 
 // GetPage returns the Page field value
@@ -114,8 +114,8 @@ func (o *ProcessorListResponse) GetPage() int64 {
 // GetPageOk returns a tuple with the Page field value
 // and a boolean to check if the value has been set.
 func (o *ProcessorListResponse) GetPageOk() (*int64, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Page, true
 }
@@ -138,8 +138,8 @@ func (o *ProcessorListResponse) GetSize() int64 {
 // GetSizeOk returns a tuple with the Size field value
 // and a boolean to check if the value has been set.
 func (o *ProcessorListResponse) GetSizeOk() (*int64, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Size, true
 }
@@ -162,8 +162,8 @@ func (o *ProcessorListResponse) GetTotal() int64 {
 // GetTotalOk returns a tuple with the Total field value
 // and a boolean to check if the value has been set.
 func (o *ProcessorListResponse) GetTotalOk() (*int64, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Total, true
 }
@@ -178,7 +178,7 @@ func (o ProcessorListResponse) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["kind"] = o.Kind
 	}
-	if !isNil(o.Items) {
+	if o.Items != nil {
 		toSerialize["items"] = o.Items
 	}
 	if true {
diff --git a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_processor_request.go b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_processor_request.go
index a714ca80..a06c6a09 100644
--- a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_processor_request.go
+++ b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_processor_request.go
@@ -1,11 +1,11 @@
 /*
-Red Hat Openshift SmartEvents Fleet Manager V2
-
-The API exposed by the fleet manager of the SmartEvents service.
-
-API version: 0.0.1
-Contact: openbridge-dev@redhat.com
-*/
+ * Red Hat Openshift SmartEvents Fleet Manager V2
+ *
+ * The API exposed by the fleet manager of the SmartEvents service.
+ *
+ * API version: 0.0.1
+ * Contact: openbridge-dev@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -55,8 +55,8 @@ func (o *ProcessorRequest) GetName() string {
 // GetNameOk returns a tuple with the Name field value
 // and a boolean to check if the value has been set.
 func (o *ProcessorRequest) GetNameOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Name, true
 }
@@ -78,11 +78,11 @@ func (o *ProcessorRequest) GetFlows() map[string]interface{} {
 
 // GetFlowsOk returns a tuple with the Flows field value
 // and a boolean to check if the value has been set.
-func (o *ProcessorRequest) GetFlowsOk() (map[string]interface{}, bool) {
-	if o == nil {
-    return map[string]interface{}{}, false
+func (o *ProcessorRequest) GetFlowsOk() (*map[string]interface{}, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Flows, true
+	return &o.Flows, true
 }
 
 // SetFlows sets field value
diff --git a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_processor_response.go b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_processor_response.go
index 2aa1febb..89afcc1b 100644
--- a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_processor_response.go
+++ b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_processor_response.go
@@ -1,11 +1,11 @@
 /*
-Red Hat Openshift SmartEvents Fleet Manager V2
-
-The API exposed by the fleet manager of the SmartEvents service.
-
-API version: 0.0.1
-Contact: openbridge-dev@redhat.com
-*/
+ * Red Hat Openshift SmartEvents Fleet Manager V2
+ *
+ * The API exposed by the fleet manager of the SmartEvents service.
+ *
+ * API version: 0.0.1
+ * Contact: openbridge-dev@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -75,8 +75,8 @@ func (o *ProcessorResponse) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *ProcessorResponse) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -99,8 +99,8 @@ func (o *ProcessorResponse) GetId() string {
 // GetIdOk returns a tuple with the Id field value
 // and a boolean to check if the value has been set.
 func (o *ProcessorResponse) GetIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Id, true
 }
@@ -123,8 +123,8 @@ func (o *ProcessorResponse) GetName() string {
 // GetNameOk returns a tuple with the Name field value
 // and a boolean to check if the value has been set.
 func (o *ProcessorResponse) GetNameOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Name, true
 }
@@ -147,8 +147,8 @@ func (o *ProcessorResponse) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value
 // and a boolean to check if the value has been set.
 func (o *ProcessorResponse) GetHrefOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Href, true
 }
@@ -171,8 +171,8 @@ func (o *ProcessorResponse) GetSubmittedAt() time.Time {
 // GetSubmittedAtOk returns a tuple with the SubmittedAt field value
 // and a boolean to check if the value has been set.
 func (o *ProcessorResponse) GetSubmittedAtOk() (*time.Time, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.SubmittedAt, true
 }
@@ -184,7 +184,7 @@ func (o *ProcessorResponse) SetSubmittedAt(v time.Time) {
 
 // GetPublishedAt returns the PublishedAt field value if set, zero value otherwise.
 func (o *ProcessorResponse) GetPublishedAt() time.Time {
-	if o == nil || isNil(o.PublishedAt) {
+	if o == nil || o.PublishedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -194,15 +194,15 @@ func (o *ProcessorResponse) GetPublishedAt() time.Time {
 // GetPublishedAtOk returns a tuple with the PublishedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ProcessorResponse) GetPublishedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.PublishedAt) {
-    return nil, false
+	if o == nil || o.PublishedAt == nil {
+		return nil, false
 	}
 	return o.PublishedAt, true
 }
 
 // HasPublishedAt returns a boolean if a field has been set.
 func (o *ProcessorResponse) HasPublishedAt() bool {
-	if o != nil && !isNil(o.PublishedAt) {
+	if o != nil && o.PublishedAt != nil {
 		return true
 	}
 
@@ -216,7 +216,7 @@ func (o *ProcessorResponse) SetPublishedAt(v time.Time) {
 
 // GetModifiedAt returns the ModifiedAt field value if set, zero value otherwise.
 func (o *ProcessorResponse) GetModifiedAt() time.Time {
-	if o == nil || isNil(o.ModifiedAt) {
+	if o == nil || o.ModifiedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -226,15 +226,15 @@ func (o *ProcessorResponse) GetModifiedAt() time.Time {
 // GetModifiedAtOk returns a tuple with the ModifiedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ProcessorResponse) GetModifiedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.ModifiedAt) {
-    return nil, false
+	if o == nil || o.ModifiedAt == nil {
+		return nil, false
 	}
 	return o.ModifiedAt, true
 }
 
 // HasModifiedAt returns a boolean if a field has been set.
 func (o *ProcessorResponse) HasModifiedAt() bool {
-	if o != nil && !isNil(o.ModifiedAt) {
+	if o != nil && o.ModifiedAt != nil {
 		return true
 	}
 
@@ -259,8 +259,8 @@ func (o *ProcessorResponse) GetStatus() ManagedResourceStatus {
 // GetStatusOk returns a tuple with the Status field value
 // and a boolean to check if the value has been set.
 func (o *ProcessorResponse) GetStatusOk() (*ManagedResourceStatus, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Status, true
 }
@@ -283,8 +283,8 @@ func (o *ProcessorResponse) GetOwner() string {
 // GetOwnerOk returns a tuple with the Owner field value
 // and a boolean to check if the value has been set.
 func (o *ProcessorResponse) GetOwnerOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Owner, true
 }
@@ -306,11 +306,11 @@ func (o *ProcessorResponse) GetFlows() map[string]interface{} {
 
 // GetFlowsOk returns a tuple with the Flows field value
 // and a boolean to check if the value has been set.
-func (o *ProcessorResponse) GetFlowsOk() (map[string]interface{}, bool) {
-	if o == nil {
-    return map[string]interface{}{}, false
+func (o *ProcessorResponse) GetFlowsOk() (*map[string]interface{}, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Flows, true
+	return &o.Flows, true
 }
 
 // SetFlows sets field value
@@ -320,7 +320,7 @@ func (o *ProcessorResponse) SetFlows(v map[string]interface{}) {
 
 // GetStatusMessage returns the StatusMessage field value if set, zero value otherwise.
 func (o *ProcessorResponse) GetStatusMessage() string {
-	if o == nil || isNil(o.StatusMessage) {
+	if o == nil || o.StatusMessage == nil {
 		var ret string
 		return ret
 	}
@@ -330,15 +330,15 @@ func (o *ProcessorResponse) GetStatusMessage() string {
 // GetStatusMessageOk returns a tuple with the StatusMessage field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *ProcessorResponse) GetStatusMessageOk() (*string, bool) {
-	if o == nil || isNil(o.StatusMessage) {
-    return nil, false
+	if o == nil || o.StatusMessage == nil {
+		return nil, false
 	}
 	return o.StatusMessage, true
 }
 
 // HasStatusMessage returns a boolean if a field has been set.
 func (o *ProcessorResponse) HasStatusMessage() bool {
-	if o != nil && !isNil(o.StatusMessage) {
+	if o != nil && o.StatusMessage != nil {
 		return true
 	}
 
@@ -367,10 +367,10 @@ func (o ProcessorResponse) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["submitted_at"] = o.SubmittedAt
 	}
-	if !isNil(o.PublishedAt) {
+	if o.PublishedAt != nil {
 		toSerialize["published_at"] = o.PublishedAt
 	}
-	if !isNil(o.ModifiedAt) {
+	if o.ModifiedAt != nil {
 		toSerialize["modified_at"] = o.ModifiedAt
 	}
 	if true {
@@ -382,7 +382,7 @@ func (o ProcessorResponse) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["flows"] = o.Flows
 	}
-	if !isNil(o.StatusMessage) {
+	if o.StatusMessage != nil {
 		toSerialize["status_message"] = o.StatusMessage
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_sink_connector_list_response.go b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_sink_connector_list_response.go
index 0eb9aa7a..53a72fcd 100644
--- a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_sink_connector_list_response.go
+++ b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_sink_connector_list_response.go
@@ -1,11 +1,11 @@
 /*
-Red Hat Openshift SmartEvents Fleet Manager V2
-
-The API exposed by the fleet manager of the SmartEvents service.
-
-API version: 0.0.1
-Contact: openbridge-dev@redhat.com
-*/
+ * Red Hat Openshift SmartEvents Fleet Manager V2
+ *
+ * The API exposed by the fleet manager of the SmartEvents service.
+ *
+ * API version: 0.0.1
+ * Contact: openbridge-dev@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -18,7 +18,7 @@ import (
 // SinkConnectorListResponse struct for SinkConnectorListResponse
 type SinkConnectorListResponse struct {
 	Kind string `json:"kind"`
-	Items []SinkConnectorResponse `json:"items,omitempty"`
+	Items *[]SinkConnectorResponse `json:"items,omitempty"`
 	Page int64 `json:"page"`
 	Size int64 `json:"size"`
 	Total int64 `json:"total"`
@@ -58,8 +58,8 @@ func (o *SinkConnectorListResponse) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *SinkConnectorListResponse) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -71,25 +71,25 @@ func (o *SinkConnectorListResponse) SetKind(v string) {
 
 // GetItems returns the Items field value if set, zero value otherwise.
 func (o *SinkConnectorListResponse) GetItems() []SinkConnectorResponse {
-	if o == nil || isNil(o.Items) {
+	if o == nil || o.Items == nil {
 		var ret []SinkConnectorResponse
 		return ret
 	}
-	return o.Items
+	return *o.Items
 }
 
 // GetItemsOk returns a tuple with the Items field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *SinkConnectorListResponse) GetItemsOk() ([]SinkConnectorResponse, bool) {
-	if o == nil || isNil(o.Items) {
-    return nil, false
+func (o *SinkConnectorListResponse) GetItemsOk() (*[]SinkConnectorResponse, bool) {
+	if o == nil || o.Items == nil {
+		return nil, false
 	}
 	return o.Items, true
 }
 
 // HasItems returns a boolean if a field has been set.
 func (o *SinkConnectorListResponse) HasItems() bool {
-	if o != nil && !isNil(o.Items) {
+	if o != nil && o.Items != nil {
 		return true
 	}
 
@@ -98,7 +98,7 @@ func (o *SinkConnectorListResponse) HasItems() bool {
 
 // SetItems gets a reference to the given []SinkConnectorResponse and assigns it to the Items field.
 func (o *SinkConnectorListResponse) SetItems(v []SinkConnectorResponse) {
-	o.Items = v
+	o.Items = &v
 }
 
 // GetPage returns the Page field value
@@ -114,8 +114,8 @@ func (o *SinkConnectorListResponse) GetPage() int64 {
 // GetPageOk returns a tuple with the Page field value
 // and a boolean to check if the value has been set.
 func (o *SinkConnectorListResponse) GetPageOk() (*int64, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Page, true
 }
@@ -138,8 +138,8 @@ func (o *SinkConnectorListResponse) GetSize() int64 {
 // GetSizeOk returns a tuple with the Size field value
 // and a boolean to check if the value has been set.
 func (o *SinkConnectorListResponse) GetSizeOk() (*int64, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Size, true
 }
@@ -162,8 +162,8 @@ func (o *SinkConnectorListResponse) GetTotal() int64 {
 // GetTotalOk returns a tuple with the Total field value
 // and a boolean to check if the value has been set.
 func (o *SinkConnectorListResponse) GetTotalOk() (*int64, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Total, true
 }
@@ -178,7 +178,7 @@ func (o SinkConnectorListResponse) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["kind"] = o.Kind
 	}
-	if !isNil(o.Items) {
+	if o.Items != nil {
 		toSerialize["items"] = o.Items
 	}
 	if true {
diff --git a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_sink_connector_response.go b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_sink_connector_response.go
index a3e156d1..e65a094e 100644
--- a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_sink_connector_response.go
+++ b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_sink_connector_response.go
@@ -1,11 +1,11 @@
 /*
-Red Hat Openshift SmartEvents Fleet Manager V2
-
-The API exposed by the fleet manager of the SmartEvents service.
-
-API version: 0.0.1
-Contact: openbridge-dev@redhat.com
-*/
+ * Red Hat Openshift SmartEvents Fleet Manager V2
+ *
+ * The API exposed by the fleet manager of the SmartEvents service.
+ *
+ * API version: 0.0.1
+ * Contact: openbridge-dev@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -82,8 +82,8 @@ func (o *SinkConnectorResponse) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *SinkConnectorResponse) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -106,8 +106,8 @@ func (o *SinkConnectorResponse) GetId() string {
 // GetIdOk returns a tuple with the Id field value
 // and a boolean to check if the value has been set.
 func (o *SinkConnectorResponse) GetIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Id, true
 }
@@ -130,8 +130,8 @@ func (o *SinkConnectorResponse) GetName() string {
 // GetNameOk returns a tuple with the Name field value
 // and a boolean to check if the value has been set.
 func (o *SinkConnectorResponse) GetNameOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Name, true
 }
@@ -154,8 +154,8 @@ func (o *SinkConnectorResponse) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value
 // and a boolean to check if the value has been set.
 func (o *SinkConnectorResponse) GetHrefOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Href, true
 }
@@ -178,8 +178,8 @@ func (o *SinkConnectorResponse) GetSubmittedAt() time.Time {
 // GetSubmittedAtOk returns a tuple with the SubmittedAt field value
 // and a boolean to check if the value has been set.
 func (o *SinkConnectorResponse) GetSubmittedAtOk() (*time.Time, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.SubmittedAt, true
 }
@@ -191,7 +191,7 @@ func (o *SinkConnectorResponse) SetSubmittedAt(v time.Time) {
 
 // GetPublishedAt returns the PublishedAt field value if set, zero value otherwise.
 func (o *SinkConnectorResponse) GetPublishedAt() time.Time {
-	if o == nil || isNil(o.PublishedAt) {
+	if o == nil || o.PublishedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -201,15 +201,15 @@ func (o *SinkConnectorResponse) GetPublishedAt() time.Time {
 // GetPublishedAtOk returns a tuple with the PublishedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SinkConnectorResponse) GetPublishedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.PublishedAt) {
-    return nil, false
+	if o == nil || o.PublishedAt == nil {
+		return nil, false
 	}
 	return o.PublishedAt, true
 }
 
 // HasPublishedAt returns a boolean if a field has been set.
 func (o *SinkConnectorResponse) HasPublishedAt() bool {
-	if o != nil && !isNil(o.PublishedAt) {
+	if o != nil && o.PublishedAt != nil {
 		return true
 	}
 
@@ -223,7 +223,7 @@ func (o *SinkConnectorResponse) SetPublishedAt(v time.Time) {
 
 // GetModifiedAt returns the ModifiedAt field value if set, zero value otherwise.
 func (o *SinkConnectorResponse) GetModifiedAt() time.Time {
-	if o == nil || isNil(o.ModifiedAt) {
+	if o == nil || o.ModifiedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -233,15 +233,15 @@ func (o *SinkConnectorResponse) GetModifiedAt() time.Time {
 // GetModifiedAtOk returns a tuple with the ModifiedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SinkConnectorResponse) GetModifiedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.ModifiedAt) {
-    return nil, false
+	if o == nil || o.ModifiedAt == nil {
+		return nil, false
 	}
 	return o.ModifiedAt, true
 }
 
 // HasModifiedAt returns a boolean if a field has been set.
 func (o *SinkConnectorResponse) HasModifiedAt() bool {
-	if o != nil && !isNil(o.ModifiedAt) {
+	if o != nil && o.ModifiedAt != nil {
 		return true
 	}
 
@@ -266,8 +266,8 @@ func (o *SinkConnectorResponse) GetStatus() ManagedResourceStatus {
 // GetStatusOk returns a tuple with the Status field value
 // and a boolean to check if the value has been set.
 func (o *SinkConnectorResponse) GetStatusOk() (*ManagedResourceStatus, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Status, true
 }
@@ -290,8 +290,8 @@ func (o *SinkConnectorResponse) GetOwner() string {
 // GetOwnerOk returns a tuple with the Owner field value
 // and a boolean to check if the value has been set.
 func (o *SinkConnectorResponse) GetOwnerOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Owner, true
 }
@@ -314,8 +314,8 @@ func (o *SinkConnectorResponse) GetConnectorTypeId() string {
 // GetConnectorTypeIdOk returns a tuple with the ConnectorTypeId field value
 // and a boolean to check if the value has been set.
 func (o *SinkConnectorResponse) GetConnectorTypeIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.ConnectorTypeId, true
 }
@@ -337,11 +337,11 @@ func (o *SinkConnectorResponse) GetConnector() map[string]interface{} {
 
 // GetConnectorOk returns a tuple with the Connector field value
 // and a boolean to check if the value has been set.
-func (o *SinkConnectorResponse) GetConnectorOk() (map[string]interface{}, bool) {
-	if o == nil {
-    return map[string]interface{}{}, false
+func (o *SinkConnectorResponse) GetConnectorOk() (*map[string]interface{}, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Connector, true
+	return &o.Connector, true
 }
 
 // SetConnector sets field value
@@ -351,7 +351,7 @@ func (o *SinkConnectorResponse) SetConnector(v map[string]interface{}) {
 
 // GetStatusMessage returns the StatusMessage field value if set, zero value otherwise.
 func (o *SinkConnectorResponse) GetStatusMessage() string {
-	if o == nil || isNil(o.StatusMessage) {
+	if o == nil || o.StatusMessage == nil {
 		var ret string
 		return ret
 	}
@@ -361,15 +361,15 @@ func (o *SinkConnectorResponse) GetStatusMessage() string {
 // GetStatusMessageOk returns a tuple with the StatusMessage field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SinkConnectorResponse) GetStatusMessageOk() (*string, bool) {
-	if o == nil || isNil(o.StatusMessage) {
-    return nil, false
+	if o == nil || o.StatusMessage == nil {
+		return nil, false
 	}
 	return o.StatusMessage, true
 }
 
 // HasStatusMessage returns a boolean if a field has been set.
 func (o *SinkConnectorResponse) HasStatusMessage() bool {
-	if o != nil && !isNil(o.StatusMessage) {
+	if o != nil && o.StatusMessage != nil {
 		return true
 	}
 
@@ -394,8 +394,8 @@ func (o *SinkConnectorResponse) GetUriDsl() string {
 // GetUriDslOk returns a tuple with the UriDsl field value
 // and a boolean to check if the value has been set.
 func (o *SinkConnectorResponse) GetUriDslOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.UriDsl, true
 }
@@ -422,10 +422,10 @@ func (o SinkConnectorResponse) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["submitted_at"] = o.SubmittedAt
 	}
-	if !isNil(o.PublishedAt) {
+	if o.PublishedAt != nil {
 		toSerialize["published_at"] = o.PublishedAt
 	}
-	if !isNil(o.ModifiedAt) {
+	if o.ModifiedAt != nil {
 		toSerialize["modified_at"] = o.ModifiedAt
 	}
 	if true {
@@ -440,7 +440,7 @@ func (o SinkConnectorResponse) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["connector"] = o.Connector
 	}
-	if !isNil(o.StatusMessage) {
+	if o.StatusMessage != nil {
 		toSerialize["status_message"] = o.StatusMessage
 	}
 	if true {
diff --git a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_source_connector_list_response.go b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_source_connector_list_response.go
index d4f9fde8..b47922a5 100644
--- a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_source_connector_list_response.go
+++ b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_source_connector_list_response.go
@@ -1,11 +1,11 @@
 /*
-Red Hat Openshift SmartEvents Fleet Manager V2
-
-The API exposed by the fleet manager of the SmartEvents service.
-
-API version: 0.0.1
-Contact: openbridge-dev@redhat.com
-*/
+ * Red Hat Openshift SmartEvents Fleet Manager V2
+ *
+ * The API exposed by the fleet manager of the SmartEvents service.
+ *
+ * API version: 0.0.1
+ * Contact: openbridge-dev@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -18,7 +18,7 @@ import (
 // SourceConnectorListResponse struct for SourceConnectorListResponse
 type SourceConnectorListResponse struct {
 	Kind string `json:"kind"`
-	Items []SourceConnectorResponse `json:"items,omitempty"`
+	Items *[]SourceConnectorResponse `json:"items,omitempty"`
 	Page int64 `json:"page"`
 	Size int64 `json:"size"`
 	Total int64 `json:"total"`
@@ -58,8 +58,8 @@ func (o *SourceConnectorListResponse) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *SourceConnectorListResponse) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -71,25 +71,25 @@ func (o *SourceConnectorListResponse) SetKind(v string) {
 
 // GetItems returns the Items field value if set, zero value otherwise.
 func (o *SourceConnectorListResponse) GetItems() []SourceConnectorResponse {
-	if o == nil || isNil(o.Items) {
+	if o == nil || o.Items == nil {
 		var ret []SourceConnectorResponse
 		return ret
 	}
-	return o.Items
+	return *o.Items
 }
 
 // GetItemsOk returns a tuple with the Items field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *SourceConnectorListResponse) GetItemsOk() ([]SourceConnectorResponse, bool) {
-	if o == nil || isNil(o.Items) {
-    return nil, false
+func (o *SourceConnectorListResponse) GetItemsOk() (*[]SourceConnectorResponse, bool) {
+	if o == nil || o.Items == nil {
+		return nil, false
 	}
 	return o.Items, true
 }
 
 // HasItems returns a boolean if a field has been set.
 func (o *SourceConnectorListResponse) HasItems() bool {
-	if o != nil && !isNil(o.Items) {
+	if o != nil && o.Items != nil {
 		return true
 	}
 
@@ -98,7 +98,7 @@ func (o *SourceConnectorListResponse) HasItems() bool {
 
 // SetItems gets a reference to the given []SourceConnectorResponse and assigns it to the Items field.
 func (o *SourceConnectorListResponse) SetItems(v []SourceConnectorResponse) {
-	o.Items = v
+	o.Items = &v
 }
 
 // GetPage returns the Page field value
@@ -114,8 +114,8 @@ func (o *SourceConnectorListResponse) GetPage() int64 {
 // GetPageOk returns a tuple with the Page field value
 // and a boolean to check if the value has been set.
 func (o *SourceConnectorListResponse) GetPageOk() (*int64, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Page, true
 }
@@ -138,8 +138,8 @@ func (o *SourceConnectorListResponse) GetSize() int64 {
 // GetSizeOk returns a tuple with the Size field value
 // and a boolean to check if the value has been set.
 func (o *SourceConnectorListResponse) GetSizeOk() (*int64, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Size, true
 }
@@ -162,8 +162,8 @@ func (o *SourceConnectorListResponse) GetTotal() int64 {
 // GetTotalOk returns a tuple with the Total field value
 // and a boolean to check if the value has been set.
 func (o *SourceConnectorListResponse) GetTotalOk() (*int64, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Total, true
 }
@@ -178,7 +178,7 @@ func (o SourceConnectorListResponse) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["kind"] = o.Kind
 	}
-	if !isNil(o.Items) {
+	if o.Items != nil {
 		toSerialize["items"] = o.Items
 	}
 	if true {
diff --git a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_source_connector_response.go b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_source_connector_response.go
index 99854834..63ba5db2 100644
--- a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_source_connector_response.go
+++ b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/model_source_connector_response.go
@@ -1,11 +1,11 @@
 /*
-Red Hat Openshift SmartEvents Fleet Manager V2
-
-The API exposed by the fleet manager of the SmartEvents service.
-
-API version: 0.0.1
-Contact: openbridge-dev@redhat.com
-*/
+ * Red Hat Openshift SmartEvents Fleet Manager V2
+ *
+ * The API exposed by the fleet manager of the SmartEvents service.
+ *
+ * API version: 0.0.1
+ * Contact: openbridge-dev@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -79,8 +79,8 @@ func (o *SourceConnectorResponse) GetKind() string {
 // GetKindOk returns a tuple with the Kind field value
 // and a boolean to check if the value has been set.
 func (o *SourceConnectorResponse) GetKindOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Kind, true
 }
@@ -103,8 +103,8 @@ func (o *SourceConnectorResponse) GetId() string {
 // GetIdOk returns a tuple with the Id field value
 // and a boolean to check if the value has been set.
 func (o *SourceConnectorResponse) GetIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Id, true
 }
@@ -127,8 +127,8 @@ func (o *SourceConnectorResponse) GetName() string {
 // GetNameOk returns a tuple with the Name field value
 // and a boolean to check if the value has been set.
 func (o *SourceConnectorResponse) GetNameOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Name, true
 }
@@ -151,8 +151,8 @@ func (o *SourceConnectorResponse) GetHref() string {
 // GetHrefOk returns a tuple with the Href field value
 // and a boolean to check if the value has been set.
 func (o *SourceConnectorResponse) GetHrefOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Href, true
 }
@@ -175,8 +175,8 @@ func (o *SourceConnectorResponse) GetSubmittedAt() time.Time {
 // GetSubmittedAtOk returns a tuple with the SubmittedAt field value
 // and a boolean to check if the value has been set.
 func (o *SourceConnectorResponse) GetSubmittedAtOk() (*time.Time, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.SubmittedAt, true
 }
@@ -188,7 +188,7 @@ func (o *SourceConnectorResponse) SetSubmittedAt(v time.Time) {
 
 // GetPublishedAt returns the PublishedAt field value if set, zero value otherwise.
 func (o *SourceConnectorResponse) GetPublishedAt() time.Time {
-	if o == nil || isNil(o.PublishedAt) {
+	if o == nil || o.PublishedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -198,15 +198,15 @@ func (o *SourceConnectorResponse) GetPublishedAt() time.Time {
 // GetPublishedAtOk returns a tuple with the PublishedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SourceConnectorResponse) GetPublishedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.PublishedAt) {
-    return nil, false
+	if o == nil || o.PublishedAt == nil {
+		return nil, false
 	}
 	return o.PublishedAt, true
 }
 
 // HasPublishedAt returns a boolean if a field has been set.
 func (o *SourceConnectorResponse) HasPublishedAt() bool {
-	if o != nil && !isNil(o.PublishedAt) {
+	if o != nil && o.PublishedAt != nil {
 		return true
 	}
 
@@ -220,7 +220,7 @@ func (o *SourceConnectorResponse) SetPublishedAt(v time.Time) {
 
 // GetModifiedAt returns the ModifiedAt field value if set, zero value otherwise.
 func (o *SourceConnectorResponse) GetModifiedAt() time.Time {
-	if o == nil || isNil(o.ModifiedAt) {
+	if o == nil || o.ModifiedAt == nil {
 		var ret time.Time
 		return ret
 	}
@@ -230,15 +230,15 @@ func (o *SourceConnectorResponse) GetModifiedAt() time.Time {
 // GetModifiedAtOk returns a tuple with the ModifiedAt field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SourceConnectorResponse) GetModifiedAtOk() (*time.Time, bool) {
-	if o == nil || isNil(o.ModifiedAt) {
-    return nil, false
+	if o == nil || o.ModifiedAt == nil {
+		return nil, false
 	}
 	return o.ModifiedAt, true
 }
 
 // HasModifiedAt returns a boolean if a field has been set.
 func (o *SourceConnectorResponse) HasModifiedAt() bool {
-	if o != nil && !isNil(o.ModifiedAt) {
+	if o != nil && o.ModifiedAt != nil {
 		return true
 	}
 
@@ -263,8 +263,8 @@ func (o *SourceConnectorResponse) GetStatus() ManagedResourceStatus {
 // GetStatusOk returns a tuple with the Status field value
 // and a boolean to check if the value has been set.
 func (o *SourceConnectorResponse) GetStatusOk() (*ManagedResourceStatus, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Status, true
 }
@@ -287,8 +287,8 @@ func (o *SourceConnectorResponse) GetOwner() string {
 // GetOwnerOk returns a tuple with the Owner field value
 // and a boolean to check if the value has been set.
 func (o *SourceConnectorResponse) GetOwnerOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.Owner, true
 }
@@ -311,8 +311,8 @@ func (o *SourceConnectorResponse) GetConnectorTypeId() string {
 // GetConnectorTypeIdOk returns a tuple with the ConnectorTypeId field value
 // and a boolean to check if the value has been set.
 func (o *SourceConnectorResponse) GetConnectorTypeIdOk() (*string, bool) {
-	if o == nil {
-    return nil, false
+	if o == nil  {
+		return nil, false
 	}
 	return &o.ConnectorTypeId, true
 }
@@ -334,11 +334,11 @@ func (o *SourceConnectorResponse) GetConnector() map[string]interface{} {
 
 // GetConnectorOk returns a tuple with the Connector field value
 // and a boolean to check if the value has been set.
-func (o *SourceConnectorResponse) GetConnectorOk() (map[string]interface{}, bool) {
-	if o == nil {
-    return map[string]interface{}{}, false
+func (o *SourceConnectorResponse) GetConnectorOk() (*map[string]interface{}, bool) {
+	if o == nil  {
+		return nil, false
 	}
-	return o.Connector, true
+	return &o.Connector, true
 }
 
 // SetConnector sets field value
@@ -348,7 +348,7 @@ func (o *SourceConnectorResponse) SetConnector(v map[string]interface{}) {
 
 // GetStatusMessage returns the StatusMessage field value if set, zero value otherwise.
 func (o *SourceConnectorResponse) GetStatusMessage() string {
-	if o == nil || isNil(o.StatusMessage) {
+	if o == nil || o.StatusMessage == nil {
 		var ret string
 		return ret
 	}
@@ -358,15 +358,15 @@ func (o *SourceConnectorResponse) GetStatusMessage() string {
 // GetStatusMessageOk returns a tuple with the StatusMessage field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 func (o *SourceConnectorResponse) GetStatusMessageOk() (*string, bool) {
-	if o == nil || isNil(o.StatusMessage) {
-    return nil, false
+	if o == nil || o.StatusMessage == nil {
+		return nil, false
 	}
 	return o.StatusMessage, true
 }
 
 // HasStatusMessage returns a boolean if a field has been set.
 func (o *SourceConnectorResponse) HasStatusMessage() bool {
-	if o != nil && !isNil(o.StatusMessage) {
+	if o != nil && o.StatusMessage != nil {
 		return true
 	}
 
@@ -395,10 +395,10 @@ func (o SourceConnectorResponse) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["submitted_at"] = o.SubmittedAt
 	}
-	if !isNil(o.PublishedAt) {
+	if o.PublishedAt != nil {
 		toSerialize["published_at"] = o.PublishedAt
 	}
-	if !isNil(o.ModifiedAt) {
+	if o.ModifiedAt != nil {
 		toSerialize["modified_at"] = o.ModifiedAt
 	}
 	if true {
@@ -413,7 +413,7 @@ func (o SourceConnectorResponse) MarshalJSON() ([]byte, error) {
 	if true {
 		toSerialize["connector"] = o.Connector
 	}
-	if !isNil(o.StatusMessage) {
+	if o.StatusMessage != nil {
 		toSerialize["status_message"] = o.StatusMessage
 	}
 	return json.Marshal(toSerialize)
diff --git a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/response.go b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/response.go
index 46fb76c1..ebce09bd 100644
--- a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/response.go
+++ b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/response.go
@@ -1,11 +1,11 @@
 /*
-Red Hat Openshift SmartEvents Fleet Manager V2
-
-The API exposed by the fleet manager of the SmartEvents service.
-
-API version: 0.0.1
-Contact: openbridge-dev@redhat.com
-*/
+ * Red Hat Openshift SmartEvents Fleet Manager V2
+ *
+ * The API exposed by the fleet manager of the SmartEvents service.
+ *
+ * API version: 0.0.1
+ * Contact: openbridge-dev@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
diff --git a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/test/api_bridges_test.go b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/test/api_bridges_test.go
deleted file mode 100644
index e6625e64..00000000
--- a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/test/api_bridges_test.go
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
-Red Hat Openshift SmartEvents Fleet Manager V2
-
-Testing BridgesApiService
-
-*/
-
-// Code generated by OpenAPI Generator (https://openapi-generator.tech);
-
-package smarteventsmgmtclient
-
-import (
-    "context"
-    "github.com/stretchr/testify/assert"
-    "github.com/stretchr/testify/require"
-    "testing"
-    openapiclient "./openapi"
-)
-
-func Test_smarteventsmgmtclient_BridgesApiService(t *testing.T) {
-
-    configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-
-    t.Run("Test BridgesApiService BridgesAPICreateBridge", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.BridgesApi.BridgesAPICreateBridge(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test BridgesApiService BridgesAPIDeleteBridge", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var bridgeId string
-
-        resp, httpRes, err := apiClient.BridgesApi.BridgesAPIDeleteBridge(context.Background(), bridgeId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test BridgesApiService BridgesAPIGetBridge", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var bridgeId string
-
-        resp, httpRes, err := apiClient.BridgesApi.BridgesAPIGetBridge(context.Background(), bridgeId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test BridgesApiService BridgesAPIGetBridges", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.BridgesApi.BridgesAPIGetBridges(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-}
diff --git a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/test/api_cloud_providers_test.go b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/test/api_cloud_providers_test.go
deleted file mode 100644
index e903eb95..00000000
--- a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/test/api_cloud_providers_test.go
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
-Red Hat Openshift SmartEvents Fleet Manager V2
-
-Testing CloudProvidersApiService
-
-*/
-
-// Code generated by OpenAPI Generator (https://openapi-generator.tech);
-
-package smarteventsmgmtclient
-
-import (
-    "context"
-    "github.com/stretchr/testify/assert"
-    "github.com/stretchr/testify/require"
-    "testing"
-    openapiclient "./openapi"
-)
-
-func Test_smarteventsmgmtclient_CloudProvidersApiService(t *testing.T) {
-
-    configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-
-    t.Run("Test CloudProvidersApiService CloudProviderAPIGetCloudProvider", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.CloudProvidersApi.CloudProviderAPIGetCloudProvider(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test CloudProvidersApiService CloudProviderAPIListCloudProviderRegions", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id string
-
-        resp, httpRes, err := apiClient.CloudProvidersApi.CloudProviderAPIListCloudProviderRegions(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test CloudProvidersApiService CloudProviderAPIListCloudProviders", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.CloudProvidersApi.CloudProviderAPIListCloudProviders(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-}
diff --git a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/test/api_error_catalog_test.go b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/test/api_error_catalog_test.go
deleted file mode 100644
index 6fd18117..00000000
--- a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/test/api_error_catalog_test.go
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-Red Hat Openshift SmartEvents Fleet Manager V2
-
-Testing ErrorCatalogApiService
-
-*/
-
-// Code generated by OpenAPI Generator (https://openapi-generator.tech);
-
-package smarteventsmgmtclient
-
-import (
-    "context"
-    "github.com/stretchr/testify/assert"
-    "github.com/stretchr/testify/require"
-    "testing"
-    openapiclient "./openapi"
-)
-
-func Test_smarteventsmgmtclient_ErrorCatalogApiService(t *testing.T) {
-
-    configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-
-    t.Run("Test ErrorCatalogApiService ErrorsAPIGetError", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var id int32
-
-        resp, httpRes, err := apiClient.ErrorCatalogApi.ErrorsAPIGetError(context.Background(), id).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test ErrorCatalogApiService ErrorsAPIGetErrors", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        resp, httpRes, err := apiClient.ErrorCatalogApi.ErrorsAPIGetErrors(context.Background()).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-}
diff --git a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/test/api_processors_test.go b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/test/api_processors_test.go
deleted file mode 100644
index 5043d45d..00000000
--- a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/test/api_processors_test.go
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
-Red Hat Openshift SmartEvents Fleet Manager V2
-
-Testing ProcessorsApiService
-
-*/
-
-// Code generated by OpenAPI Generator (https://openapi-generator.tech);
-
-package smarteventsmgmtclient
-
-import (
-    "context"
-    "github.com/stretchr/testify/assert"
-    "github.com/stretchr/testify/require"
-    "testing"
-    openapiclient "./openapi"
-)
-
-func Test_smarteventsmgmtclient_ProcessorsApiService(t *testing.T) {
-
-    configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-
-    t.Run("Test ProcessorsApiService ProcessorsAPICreateProcessor", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var bridgeId string
-
-        resp, httpRes, err := apiClient.ProcessorsApi.ProcessorsAPICreateProcessor(context.Background(), bridgeId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test ProcessorsApiService ProcessorsAPIDeleteProcessor", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var bridgeId string
-        var processorId string
-
-        resp, httpRes, err := apiClient.ProcessorsApi.ProcessorsAPIDeleteProcessor(context.Background(), bridgeId, processorId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test ProcessorsApiService ProcessorsAPIGetProcessor", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var bridgeId string
-        var processorId string
-
-        resp, httpRes, err := apiClient.ProcessorsApi.ProcessorsAPIGetProcessor(context.Background(), bridgeId, processorId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test ProcessorsApiService ProcessorsAPIGetProcessors", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var bridgeId string
-
-        resp, httpRes, err := apiClient.ProcessorsApi.ProcessorsAPIGetProcessors(context.Background(), bridgeId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test ProcessorsApiService ProcessorsAPIUpdateProcessor", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var bridgeId string
-        var processorId string
-
-        resp, httpRes, err := apiClient.ProcessorsApi.ProcessorsAPIUpdateProcessor(context.Background(), bridgeId, processorId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-}
diff --git a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/test/api_sink_connectors_test.go b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/test/api_sink_connectors_test.go
deleted file mode 100644
index 43b4057b..00000000
--- a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/test/api_sink_connectors_test.go
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
-Red Hat Openshift SmartEvents Fleet Manager V2
-
-Testing SinkConnectorsApiService
-
-*/
-
-// Code generated by OpenAPI Generator (https://openapi-generator.tech);
-
-package smarteventsmgmtclient
-
-import (
-    "context"
-    "github.com/stretchr/testify/assert"
-    "github.com/stretchr/testify/require"
-    "testing"
-    openapiclient "./openapi"
-)
-
-func Test_smarteventsmgmtclient_SinkConnectorsApiService(t *testing.T) {
-
-    configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-
-    t.Run("Test SinkConnectorsApiService SinkConnectorsAPICreateSinkConnector", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var bridgeId string
-
-        resp, httpRes, err := apiClient.SinkConnectorsApi.SinkConnectorsAPICreateSinkConnector(context.Background(), bridgeId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test SinkConnectorsApiService SinkConnectorsAPIDeleteSinkConnector", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var bridgeId string
-        var sinkId string
-
-        resp, httpRes, err := apiClient.SinkConnectorsApi.SinkConnectorsAPIDeleteSinkConnector(context.Background(), bridgeId, sinkId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test SinkConnectorsApiService SinkConnectorsAPIGetSinkConnector", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var bridgeId string
-        var sinkId string
-
-        resp, httpRes, err := apiClient.SinkConnectorsApi.SinkConnectorsAPIGetSinkConnector(context.Background(), bridgeId, sinkId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test SinkConnectorsApiService SinkConnectorsAPIGetSinkConnectors", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var bridgeId string
-
-        resp, httpRes, err := apiClient.SinkConnectorsApi.SinkConnectorsAPIGetSinkConnectors(context.Background(), bridgeId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test SinkConnectorsApiService SinkConnectorsAPIUpdateSinkConnector", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var bridgeId string
-        var sinkId string
-
-        resp, httpRes, err := apiClient.SinkConnectorsApi.SinkConnectorsAPIUpdateSinkConnector(context.Background(), bridgeId, sinkId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-}
diff --git a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/test/api_source_connectors_test.go b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/test/api_source_connectors_test.go
deleted file mode 100644
index 83c55798..00000000
--- a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/test/api_source_connectors_test.go
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
-Red Hat Openshift SmartEvents Fleet Manager V2
-
-Testing SourceConnectorsApiService
-
-*/
-
-// Code generated by OpenAPI Generator (https://openapi-generator.tech);
-
-package smarteventsmgmtclient
-
-import (
-    "context"
-    "github.com/stretchr/testify/assert"
-    "github.com/stretchr/testify/require"
-    "testing"
-    openapiclient "./openapi"
-)
-
-func Test_smarteventsmgmtclient_SourceConnectorsApiService(t *testing.T) {
-
-    configuration := openapiclient.NewConfiguration()
-    apiClient := openapiclient.NewAPIClient(configuration)
-
-    t.Run("Test SourceConnectorsApiService SourceConnectorsAPICreateSourceConnector", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var bridgeId string
-
-        resp, httpRes, err := apiClient.SourceConnectorsApi.SourceConnectorsAPICreateSourceConnector(context.Background(), bridgeId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test SourceConnectorsApiService SourceConnectorsAPIDeleteSourceConnector", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var bridgeId string
-        var sourceId string
-
-        resp, httpRes, err := apiClient.SourceConnectorsApi.SourceConnectorsAPIDeleteSourceConnector(context.Background(), bridgeId, sourceId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test SourceConnectorsApiService SourceConnectorsAPIGetSourceConnector", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var bridgeId string
-        var sourceId string
-
-        resp, httpRes, err := apiClient.SourceConnectorsApi.SourceConnectorsAPIGetSourceConnector(context.Background(), bridgeId, sourceId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test SourceConnectorsApiService SourceConnectorsAPIGetSourceConnectors", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var bridgeId string
-
-        resp, httpRes, err := apiClient.SourceConnectorsApi.SourceConnectorsAPIGetSourceConnectors(context.Background(), bridgeId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-    t.Run("Test SourceConnectorsApiService SourceConnectorsAPIUpdateSourceConnector", func(t *testing.T) {
-
-        t.Skip("skip test")  // remove to run test
-
-        var bridgeId string
-        var sourceId string
-
-        resp, httpRes, err := apiClient.SourceConnectorsApi.SourceConnectorsAPIUpdateSourceConnector(context.Background(), bridgeId, sourceId).Execute()
-
-        require.Nil(t, err)
-        require.NotNil(t, resp)
-        assert.Equal(t, 200, httpRes.StatusCode)
-
-    })
-
-}
diff --git a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/utils.go b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/utils.go
index 9da72787..df18c196 100644
--- a/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/utils.go
+++ b/app-services-sdk-go/smarteventsmgmt/apiv1alpha/client/utils.go
@@ -1,11 +1,11 @@
 /*
-Red Hat Openshift SmartEvents Fleet Manager V2
-
-The API exposed by the fleet manager of the SmartEvents service.
-
-API version: 0.0.1
-Contact: openbridge-dev@redhat.com
-*/
+ * Red Hat Openshift SmartEvents Fleet Manager V2
+ *
+ * The API exposed by the fleet manager of the SmartEvents service.
+ *
+ * API version: 0.0.1
+ * Contact: openbridge-dev@redhat.com
+ */
 
 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
 
@@ -13,7 +13,6 @@ package smarteventsmgmtclient
 
 import (
 	"encoding/json"
-    "reflect"
 	"time"
 )
 
@@ -328,17 +327,3 @@ func (v *NullableTime) UnmarshalJSON(src []byte) error {
 	v.isSet = true
 	return json.Unmarshal(src, &v.value)
 }
-
-// isNil checks if an input is nil
-func isNil(i interface{}) bool {
-    if i == nil {
-        return true
-    }
-    switch reflect.TypeOf(i).Kind() {
-    case reflect.Chan, reflect.Func, reflect.Map, reflect.Ptr, reflect.UnsafePointer, reflect.Interface, reflect.Slice:
-        return reflect.ValueOf(i).IsNil()
-    case reflect.Array:
-        return reflect.ValueOf(i).IsZero()
-    }
-    return false
-}
\ No newline at end of file
diff --git a/app-services-sdk-go/smarteventsmgmt/go.mod b/app-services-sdk-go/smarteventsmgmt/go.mod
index 7ed7189a..2f680806 100644
--- a/app-services-sdk-go/smarteventsmgmt/go.mod
+++ b/app-services-sdk-go/smarteventsmgmt/go.mod
@@ -1,8 +1,8 @@
-module github.com/redhat-developer/app-services-sdk-go/smarteventsmgmt
+module github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go/smarteventsmgmt
 
 go 1.15
 
 require (
-	github.com/redhat-developer/app-services-sdk-go v0.10.0
+	github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go v0.1.0
 	golang.org/x/oauth2 v0.0.0-20220630143837-2104d58473e0
 )
diff --git a/scripts/generate-go.sh b/scripts/generate-go.sh
index cb00e4f7..c3a18f24 100644
--- a/scripts/generate-go.sh
+++ b/scripts/generate-go.sh
@@ -38,7 +38,7 @@ generate_sdk() {
     --ignore-file-override=.openapi-generator-ignore
 }
 
-npx @openapitools/openapi-generator-cli version-manager set 6.2.1
+npx @openapitools/openapi-generator-cli version-manager set 5.2.0
 echo "Generating Go SDKs"
 additional_properties="generateInterfaces=true,enumClassPrefix=true"
 
@@ -143,3 +143,9 @@ then
     OUTPUT_PATH="app-services-sdk-go/smarteventsmgmt/apiv1alpha/client"
     generate_sdk $OPENAPI_FILENAME $OUTPUT_PATH $PACKAGE_NAME
 fi
+
+# this hack is due to the api generator not ignoring the correct files
+# so we need to revert the changes it does on these files. It ignores
+# the other mod files but for some reason it decides to change this
+git restore app-services-sdk-go/accountmgmt/apiv1/client/go.mod
+git restore app-services-sdk-go/accountmgmt/apiv1/client/go.sum
\ No newline at end of file