diff --git a/apim/README.md b/apim/README.md
index de1b858..9979102 100644
--- a/apim/README.md
+++ b/apim/README.md
@@ -73,15 +73,15 @@ ctx = context.WithValue(context.Background(), apim.ContextOperationServerVariabl
 
 ## Documentation for API Endpoints
 
-All URIs are relative to *https://anypoint.mulesoft.com/apimanager/api/v1*
+All URIs are relative to *https://anypoint.mulesoft.com/apimanager*
 
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
-*DefaultApi* | [**DeleteApimInstance**](docs/DefaultApi.md#deleteapiminstance) | **Delete** /organizations/{orgId}/environments/{envId}/apis/{envApiId} | Delete a specific API Manager Instance
-*DefaultApi* | [**GetApimInstanceDetails**](docs/DefaultApi.md#getapiminstancedetails) | **Get** /organizations/{orgId}/environments/{envId}/apis/{envApiId} | Retrieves a specific API Manager Instance
-*DefaultApi* | [**GetEnvApimInstances**](docs/DefaultApi.md#getenvapiminstances) | **Get** /organizations/{orgId}/environments/{envId}/apis | Retrieves a collection of API Manager Instances
-*DefaultApi* | [**PatchApimInstance**](docs/DefaultApi.md#patchapiminstance) | **Patch** /organizations/{orgId}/environments/{envId}/apis/{envApiId} | Patches a specific API Manager Instance
-*DefaultApi* | [**PostApimInstance**](docs/DefaultApi.md#postapiminstance) | **Post** /organizations/{orgId}/environments/{envId}/apis | Creates an API Manager Instance
+*DefaultApi* | [**DeleteApimInstance**](docs/DefaultApi.md#deleteapiminstance) | **Delete** /api/v1/organizations/{orgId}/environments/{envId}/apis/{envApiId} | Delete a specific API Manager Instance
+*DefaultApi* | [**GetApimInstanceDetails**](docs/DefaultApi.md#getapiminstancedetails) | **Get** /api/v1/organizations/{orgId}/environments/{envId}/apis/{envApiId} | Retrieves a specific API Manager Instance
+*DefaultApi* | [**GetEnvApimInstances**](docs/DefaultApi.md#getenvapiminstances) | **Get** /api/v1/organizations/{orgId}/environments/{envId}/apis | Retrieves a collection of API Manager Instances
+*DefaultApi* | [**PatchApimInstance**](docs/DefaultApi.md#patchapiminstance) | **Patch** /xapi/v1/organizations/{orgId}/environments/{envId}/apis/{envApiId} | Patches a specific API Manager Instance
+*DefaultApi* | [**PostApimInstance**](docs/DefaultApi.md#postapiminstance) | **Post** /xapi/v1/organizations/{orgId}/environments/{envId}/apis | Creates an API Manager Instance
 
 
 ## Documentation For Models
diff --git a/apim/api/openapi.yaml b/apim/api/openapi.yaml
index 550886f..09a7562 100644
--- a/apim/api/openapi.yaml
+++ b/apim/api/openapi.yaml
@@ -5,15 +5,15 @@ info:
   version: 1.0.0
 servers:
 - description: Anypoint Cloudhub
-  url: https://anypoint.mulesoft.com/apimanager/api/v1/
+  url: https://anypoint.mulesoft.com/apimanager
 - description: Anypoint Cloudhub EU
-  url: https://eu1.anypoint.mulesoft.com/apimanager/api/v1/
+  url: https://eu1.anypoint.mulesoft.com/apimanager
 - description: Anypoint Cloudhub GOV
-  url: https://gov.anypoint.mulesoft.com/apimanager/api/v1/
+  url: https://gov.anypoint.mulesoft.com/apimanager
 security:
 - bearerAuth: []
 paths:
-  /organizations/{orgId}/environments/{envId}/apis:
+  /api/v1/organizations/{orgId}/environments/{envId}/apis:
     get:
       description: Retrieves collection of API Manager Instances that meets the given
         criteria. Connected Apps require the scope "View APIs Configuration"
@@ -156,50 +156,7 @@ paths:
                 $ref: '#/components/schemas/ApimInstanceCollection'
           description: Collection of APIM Instances
       summary: Retrieves a collection of API Manager Instances
-    post:
-      description: Creates an API Manager Instance in a given environment. Connected
-        Apps require the scope "Manage APIs Configuration".
-      operationId: PostApimInstance
-      parameters:
-      - description: The organization Id
-        explode: false
-        in: path
-        name: orgId
-        required: true
-        schema:
-          type: string
-        style: simple
-      - description: The environment id
-        explode: false
-        in: path
-        name: envId
-        required: true
-        schema:
-          type: string
-        style: simple
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/ApimInstancePostBody'
-        description: Post API Manager Instance Body
-      responses:
-        "401":
-          description: Access token is missing or invalid
-        "400":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/errorsResponse'
-          description: Bad request response
-        "201":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/ApimInstancePostResponse'
-          description: Create APIM Instance
-      summary: Creates an API Manager Instance
-  /organizations/{orgId}/environments/{envId}/apis/{envApiId}:
+  /api/v1/organizations/{orgId}/environments/{envId}/apis/{envApiId}:
     delete:
       description: Delete a specific API Manager Instance in a specific environment
         and organization. Connected Apps require the scope "Manage APIs Configuration".
@@ -316,6 +273,51 @@ paths:
                 $ref: '#/components/schemas/ApimInstanceDetails'
           description: API Instance
       summary: Retrieves a specific API Manager Instance
+  /xapi/v1/organizations/{orgId}/environments/{envId}/apis:
+    post:
+      description: Creates an API Manager Instance in a given environment. Connected
+        Apps require the scope "Manage APIs Configuration".
+      operationId: PostApimInstance
+      parameters:
+      - description: The organization Id
+        explode: false
+        in: path
+        name: orgId
+        required: true
+        schema:
+          type: string
+        style: simple
+      - description: The environment id
+        explode: false
+        in: path
+        name: envId
+        required: true
+        schema:
+          type: string
+        style: simple
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/ApimInstancePostBody'
+        description: Post API Manager Instance Body
+      responses:
+        "401":
+          description: Access token is missing or invalid
+        "400":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/errorsResponse'
+          description: Bad request response
+        "201":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ApimInstancePostResponse'
+          description: Create APIM Instance
+      summary: Creates an API Manager Instance
+  /xapi/v1/organizations/{orgId}/environments/{envId}/apis/{envApiId}:
     patch:
       description: Patches a specific API Manager Instance in a specific environment
         and organization. Connected Apps require the scope "Manage APIs Configuration".
@@ -494,9 +496,9 @@ components:
             environmentId: environmentId
             audit:
               created:
-                date: 2000-01-23T04:56:07.000+00:00
+                date: date
               updated:
-                date: 2000-01-23T04:56:07.000+00:00
+                date: date
             assetId: assetId
             providerId: providerId
             isPublic: true
@@ -508,14 +510,14 @@ components:
               targetName: targetName
               targetId: targetId
               expectedStatus: expectedStatus
-              updatedDate: 2000-01-23T04:56:07.000+00:00
+              updatedDate: updatedDate
               type: type
               environmentId: environmentId
               audit:
                 created:
-                  date: 2000-01-23T04:56:07.000+00:00
+                  date: date
                 updated:
-                  date: 2000-01-23T04:56:07.000+00:00
+                  date: date
               environmentName: environmentName
               deploymentId: deploymentId
               id: 5
@@ -574,9 +576,9 @@ components:
             environmentId: environmentId
             audit:
               created:
-                date: 2000-01-23T04:56:07.000+00:00
+                date: date
               updated:
-                date: 2000-01-23T04:56:07.000+00:00
+                date: date
             assetId: assetId
             providerId: providerId
             isPublic: true
@@ -588,14 +590,14 @@ components:
               targetName: targetName
               targetId: targetId
               expectedStatus: expectedStatus
-              updatedDate: 2000-01-23T04:56:07.000+00:00
+              updatedDate: updatedDate
               type: type
               environmentId: environmentId
               audit:
                 created:
-                  date: 2000-01-23T04:56:07.000+00:00
+                  date: date
                 updated:
-                  date: 2000-01-23T04:56:07.000+00:00
+                  date: date
               environmentName: environmentName
               deploymentId: deploymentId
               id: 5
@@ -612,9 +614,9 @@ components:
             status: status
           audit:
             created:
-              date: 2000-01-23T04:56:07.000+00:00
+              date: date
             updated:
-              date: 2000-01-23T04:56:07.000+00:00
+              date: date
           assetId: assetId
           groupId: groupId
           name: name
@@ -669,9 +671,9 @@ components:
             environmentId: environmentId
             audit:
               created:
-                date: 2000-01-23T04:56:07.000+00:00
+                date: date
               updated:
-                date: 2000-01-23T04:56:07.000+00:00
+                date: date
             assetId: assetId
             providerId: providerId
             isPublic: true
@@ -683,14 +685,14 @@ components:
               targetName: targetName
               targetId: targetId
               expectedStatus: expectedStatus
-              updatedDate: 2000-01-23T04:56:07.000+00:00
+              updatedDate: updatedDate
               type: type
               environmentId: environmentId
               audit:
                 created:
-                  date: 2000-01-23T04:56:07.000+00:00
+                  date: date
                 updated:
-                  date: 2000-01-23T04:56:07.000+00:00
+                  date: date
               environmentName: environmentName
               deploymentId: deploymentId
               id: 5
@@ -749,9 +751,9 @@ components:
             environmentId: environmentId
             audit:
               created:
-                date: 2000-01-23T04:56:07.000+00:00
+                date: date
               updated:
-                date: 2000-01-23T04:56:07.000+00:00
+                date: date
             assetId: assetId
             providerId: providerId
             isPublic: true
@@ -763,14 +765,14 @@ components:
               targetName: targetName
               targetId: targetId
               expectedStatus: expectedStatus
-              updatedDate: 2000-01-23T04:56:07.000+00:00
+              updatedDate: updatedDate
               type: type
               environmentId: environmentId
               audit:
                 created:
-                  date: 2000-01-23T04:56:07.000+00:00
+                  date: date
                 updated:
-                  date: 2000-01-23T04:56:07.000+00:00
+                  date: date
               environmentName: environmentName
               deploymentId: deploymentId
               id: 5
@@ -787,9 +789,9 @@ components:
             status: status
           audit:
             created:
-              date: 2000-01-23T04:56:07.000+00:00
+              date: date
             updated:
-              date: 2000-01-23T04:56:07.000+00:00
+              date: date
           assetId: assetId
           groupId: groupId
           name: name
@@ -896,7 +898,7 @@ components:
         endpoint:
           console: console
           referencesUserDomain: referencesUserDomain
-          lastActiveDate: 2000-01-23T04:56:07.000+00:00
+          lastActiveDate: lastActiveDate
           apiVersionId: 5
           type: type
           uri: uri
@@ -904,9 +906,9 @@ components:
           deploymentType: deploymentType
           audit:
             created:
-              date: 2000-01-23T04:56:07.000+00:00
+              date: date
             updated:
-              date: 2000-01-23T04:56:07.000+00:00
+              date: date
           muleVersion4OrAbove: true
           proxyUri: proxyUri
           policiesVersion: policiesVersion
@@ -920,9 +922,9 @@ components:
               secretGroupId: secretGroupId
             audit:
               created:
-                date: 2000-01-23T04:56:07.000+00:00
+                date: date
               updated:
-                date: 2000-01-23T04:56:07.000+00:00
+                date: date
             outbound: "{}"
           isCloudHub: isCloudHub
           proxyRegistrationUri: proxyRegistrationUri
@@ -933,9 +935,9 @@ components:
         providerId: providerId
         audit:
           created:
-            date: 2000-01-23T04:56:07.000+00:00
+            date: date
           updated:
-            date: 2000-01-23T04:56:07.000+00:00
+            date: date
         assetId: assetId
         assetVersion: assetVersion
         instanceLabel: instanceLabel
@@ -987,7 +989,7 @@ components:
         groupId: groupId
         deprecated: true
         description: description
-        lastActiveDate: 2000-01-23T04:56:07.000+00:00
+        lastActiveDate: lastActiveDate
         masterOrganizationId: masterOrganizationId
         organizationId: organizationId
         routing:
@@ -1025,7 +1027,7 @@ components:
         endpoint:
           console: console
           referencesUserDomain: referencesUserDomain
-          lastActiveDate: 2000-01-23T04:56:07.000+00:00
+          lastActiveDate: lastActiveDate
           apiVersionId: 5
           type: type
           uri: uri
@@ -1033,9 +1035,9 @@ components:
           deploymentType: deploymentType
           audit:
             created:
-              date: 2000-01-23T04:56:07.000+00:00
+              date: date
             updated:
-              date: 2000-01-23T04:56:07.000+00:00
+              date: date
           muleVersion4OrAbove: true
           proxyUri: proxyUri
           policiesVersion: policiesVersion
@@ -1049,9 +1051,9 @@ components:
               secretGroupId: secretGroupId
             audit:
               created:
-                date: 2000-01-23T04:56:07.000+00:00
+                date: date
               updated:
-                date: 2000-01-23T04:56:07.000+00:00
+                date: date
             outbound: "{}"
           isCloudHub: isCloudHub
           proxyRegistrationUri: proxyRegistrationUri
@@ -1060,9 +1062,9 @@ components:
         environmentId: environmentId
         audit:
           created:
-            date: 2000-01-23T04:56:07.000+00:00
+            date: date
           updated:
-            date: 2000-01-23T04:56:07.000+00:00
+            date: date
         assetId: assetId
         providerId: providerId
         isPublic: true
@@ -1074,14 +1076,14 @@ components:
           targetName: targetName
           targetId: targetId
           expectedStatus: expectedStatus
-          updatedDate: 2000-01-23T04:56:07.000+00:00
+          updatedDate: updatedDate
           type: type
           environmentId: environmentId
           audit:
             created:
-              date: 2000-01-23T04:56:07.000+00:00
+              date: date
             updated:
-              date: 2000-01-23T04:56:07.000+00:00
+              date: date
           environmentName: environmentName
           deploymentId: deploymentId
           id: 5
@@ -1130,7 +1132,6 @@ components:
         deprecated:
           type: boolean
         lastActiveDate:
-          format: date-time
           nullable: true
           type: string
         endpointUri:
@@ -1195,7 +1196,7 @@ components:
         endpoint:
           console: console
           referencesUserDomain: referencesUserDomain
-          lastActiveDate: 2000-01-23T04:56:07.000+00:00
+          lastActiveDate: lastActiveDate
           apiVersionId: 5
           type: type
           uri: uri
@@ -1203,9 +1204,9 @@ components:
           deploymentType: deploymentType
           audit:
             created:
-              date: 2000-01-23T04:56:07.000+00:00
+              date: date
             updated:
-              date: 2000-01-23T04:56:07.000+00:00
+              date: date
           muleVersion4OrAbove: true
           proxyUri: proxyUri
           policiesVersion: policiesVersion
@@ -1219,9 +1220,9 @@ components:
               secretGroupId: secretGroupId
             audit:
               created:
-                date: 2000-01-23T04:56:07.000+00:00
+                date: date
               updated:
-                date: 2000-01-23T04:56:07.000+00:00
+                date: date
             outbound: "{}"
           isCloudHub: isCloudHub
           proxyRegistrationUri: proxyRegistrationUri
@@ -1230,9 +1231,9 @@ components:
         environmentId: environmentId
         audit:
           created:
-            date: 2000-01-23T04:56:07.000+00:00
+            date: date
           updated:
-            date: 2000-01-23T04:56:07.000+00:00
+            date: date
         providerId: providerId
         id: 0
         instanceLabel: instanceLabel
@@ -1243,14 +1244,14 @@ components:
           targetName: targetName
           targetId: targetId
           expectedStatus: expectedStatus
-          updatedDate: 2000-01-23T04:56:07.000+00:00
+          updatedDate: updatedDate
           type: type
           environmentId: environmentId
           audit:
             created:
-              date: 2000-01-23T04:56:07.000+00:00
+              date: date
             updated:
-              date: 2000-01-23T04:56:07.000+00:00
+              date: date
           environmentName: environmentName
           deploymentId: deploymentId
           id: 5
@@ -1345,7 +1346,7 @@ components:
       example:
         console: console
         referencesUserDomain: referencesUserDomain
-        lastActiveDate: 2000-01-23T04:56:07.000+00:00
+        lastActiveDate: lastActiveDate
         apiVersionId: 5
         type: type
         uri: uri
@@ -1353,9 +1354,9 @@ components:
         deploymentType: deploymentType
         audit:
           created:
-            date: 2000-01-23T04:56:07.000+00:00
+            date: date
           updated:
-            date: 2000-01-23T04:56:07.000+00:00
+            date: date
         muleVersion4OrAbove: true
         proxyUri: proxyUri
         policiesVersion: policiesVersion
@@ -1369,9 +1370,9 @@ components:
             secretGroupId: secretGroupId
           audit:
             created:
-              date: 2000-01-23T04:56:07.000+00:00
+              date: date
             updated:
-              date: 2000-01-23T04:56:07.000+00:00
+              date: date
           outbound: "{}"
         isCloudHub: isCloudHub
         proxyRegistrationUri: proxyRegistrationUri
@@ -1398,7 +1399,6 @@ components:
           nullable: true
           type: string
         lastActiveDate:
-          format: date-time
           nullable: true
           type: string
         isCloudHub:
@@ -1495,9 +1495,9 @@ components:
     Audit:
       example:
         created:
-          date: 2000-01-23T04:56:07.000+00:00
+          date: date
         updated:
-          date: 2000-01-23T04:56:07.000+00:00
+          date: date
       properties:
         created:
           $ref: '#/components/schemas/Audit_created'
@@ -1510,14 +1510,14 @@ components:
         targetName: targetName
         targetId: targetId
         expectedStatus: expectedStatus
-        updatedDate: 2000-01-23T04:56:07.000+00:00
+        updatedDate: updatedDate
         type: type
         environmentId: environmentId
         audit:
           created:
-            date: 2000-01-23T04:56:07.000+00:00
+            date: date
           updated:
-            date: 2000-01-23T04:56:07.000+00:00
+            date: date
         environmentName: environmentName
         deploymentId: deploymentId
         id: 5
@@ -1553,7 +1553,6 @@ components:
           nullable: true
           type: string
         updatedDate:
-          format: date-time
           type: string
         type:
           type: string
@@ -1704,9 +1703,9 @@ components:
         environmentId: environmentId
         audit:
           created:
-            date: 2000-01-23T04:56:07.000+00:00
+            date: date
           updated:
-            date: 2000-01-23T04:56:07.000+00:00
+            date: date
         assetId: assetId
         providerId: providerId
         isPublic: true
@@ -1718,14 +1717,14 @@ components:
           targetName: targetName
           targetId: targetId
           expectedStatus: expectedStatus
-          updatedDate: 2000-01-23T04:56:07.000+00:00
+          updatedDate: updatedDate
           type: type
           environmentId: environmentId
           audit:
             created:
-              date: 2000-01-23T04:56:07.000+00:00
+              date: date
             updated:
-              date: 2000-01-23T04:56:07.000+00:00
+              date: date
           environmentName: environmentName
           deploymentId: deploymentId
           id: 5
@@ -1848,9 +1847,9 @@ components:
           environmentId: environmentId
           audit:
             created:
-              date: 2000-01-23T04:56:07.000+00:00
+              date: date
             updated:
-              date: 2000-01-23T04:56:07.000+00:00
+              date: date
           assetId: assetId
           providerId: providerId
           isPublic: true
@@ -1862,14 +1861,14 @@ components:
             targetName: targetName
             targetId: targetId
             expectedStatus: expectedStatus
-            updatedDate: 2000-01-23T04:56:07.000+00:00
+            updatedDate: updatedDate
             type: type
             environmentId: environmentId
             audit:
               created:
-                date: 2000-01-23T04:56:07.000+00:00
+                date: date
               updated:
-                date: 2000-01-23T04:56:07.000+00:00
+                date: date
             environmentName: environmentName
             deploymentId: deploymentId
             id: 5
@@ -1928,9 +1927,9 @@ components:
           environmentId: environmentId
           audit:
             created:
-              date: 2000-01-23T04:56:07.000+00:00
+              date: date
             updated:
-              date: 2000-01-23T04:56:07.000+00:00
+              date: date
           assetId: assetId
           providerId: providerId
           isPublic: true
@@ -1942,14 +1941,14 @@ components:
             targetName: targetName
             targetId: targetId
             expectedStatus: expectedStatus
-            updatedDate: 2000-01-23T04:56:07.000+00:00
+            updatedDate: updatedDate
             type: type
             environmentId: environmentId
             audit:
               created:
-                date: 2000-01-23T04:56:07.000+00:00
+                date: date
               updated:
-                date: 2000-01-23T04:56:07.000+00:00
+                date: date
             environmentName: environmentName
             deploymentId: deploymentId
             id: 5
@@ -1966,9 +1965,9 @@ components:
           status: status
         audit:
           created:
-            date: 2000-01-23T04:56:07.000+00:00
+            date: date
           updated:
-            date: 2000-01-23T04:56:07.000+00:00
+            date: date
         assetId: assetId
         groupId: groupId
         name: name
@@ -2028,9 +2027,9 @@ components:
           secretGroupId: secretGroupId
         audit:
           created:
-            date: 2000-01-23T04:56:07.000+00:00
+            date: date
           updated:
-            date: 2000-01-23T04:56:07.000+00:00
+            date: date
         outbound: "{}"
       properties:
         audit:
@@ -2068,10 +2067,9 @@ components:
       type: object
     Audit_created:
       example:
-        date: 2000-01-23T04:56:07.000+00:00
+        date: date
       properties:
         date:
-          format: date-time
           type: string
       type: object
     Routing_rules:
diff --git a/apim/api_default.go b/apim/api_default.go
index 4399c43..37bbac0 100644
--- a/apim/api_default.go
+++ b/apim/api_default.go
@@ -70,7 +70,7 @@ func (a *DefaultApiService) DeleteApimInstanceExecute(r DefaultApiDeleteApimInst
 		return nil, &GenericOpenAPIError{error: err.Error()}
 	}
 
-	localVarPath := localBasePath + "/organizations/{orgId}/environments/{envId}/apis/{envApiId}"
+	localVarPath := localBasePath + "/api/v1/organizations/{orgId}/environments/{envId}/apis/{envApiId}"
 	localVarPath = strings.Replace(localVarPath, "{"+"orgId"+"}", url.PathEscape(parameterValueToString(r.orgId, "orgId")), -1)
 	localVarPath = strings.Replace(localVarPath, "{"+"envId"+"}", url.PathEscape(parameterValueToString(r.envId, "envId")), -1)
 	localVarPath = strings.Replace(localVarPath, "{"+"envApiId"+"}", url.PathEscape(parameterValueToString(r.envApiId, "envApiId")), -1)
@@ -204,7 +204,7 @@ func (a *DefaultApiService) GetApimInstanceDetailsExecute(r DefaultApiGetApimIns
 		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
 	}
 
-	localVarPath := localBasePath + "/organizations/{orgId}/environments/{envId}/apis/{envApiId}"
+	localVarPath := localBasePath + "/api/v1/organizations/{orgId}/environments/{envId}/apis/{envApiId}"
 	localVarPath = strings.Replace(localVarPath, "{"+"orgId"+"}", url.PathEscape(parameterValueToString(r.orgId, "orgId")), -1)
 	localVarPath = strings.Replace(localVarPath, "{"+"envId"+"}", url.PathEscape(parameterValueToString(r.envId, "envId")), -1)
 	localVarPath = strings.Replace(localVarPath, "{"+"envApiId"+"}", url.PathEscape(parameterValueToString(r.envApiId, "envApiId")), -1)
@@ -427,7 +427,7 @@ func (a *DefaultApiService) GetEnvApimInstancesExecute(r DefaultApiGetEnvApimIns
 		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
 	}
 
-	localVarPath := localBasePath + "/organizations/{orgId}/environments/{envId}/apis"
+	localVarPath := localBasePath + "/api/v1/organizations/{orgId}/environments/{envId}/apis"
 	localVarPath = strings.Replace(localVarPath, "{"+"orgId"+"}", url.PathEscape(parameterValueToString(r.orgId, "orgId")), -1)
 	localVarPath = strings.Replace(localVarPath, "{"+"envId"+"}", url.PathEscape(parameterValueToString(r.envId, "envId")), -1)
 
@@ -613,7 +613,7 @@ func (a *DefaultApiService) PatchApimInstanceExecute(r DefaultApiPatchApimInstan
 		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
 	}
 
-	localVarPath := localBasePath + "/organizations/{orgId}/environments/{envId}/apis/{envApiId}"
+	localVarPath := localBasePath + "/xapi/v1/organizations/{orgId}/environments/{envId}/apis/{envApiId}"
 	localVarPath = strings.Replace(localVarPath, "{"+"orgId"+"}", url.PathEscape(parameterValueToString(r.orgId, "orgId")), -1)
 	localVarPath = strings.Replace(localVarPath, "{"+"envId"+"}", url.PathEscape(parameterValueToString(r.envId, "envId")), -1)
 	localVarPath = strings.Replace(localVarPath, "{"+"envApiId"+"}", url.PathEscape(parameterValueToString(r.envApiId, "envApiId")), -1)
@@ -758,7 +758,7 @@ func (a *DefaultApiService) PostApimInstanceExecute(r DefaultApiPostApimInstance
 		return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()}
 	}
 
-	localVarPath := localBasePath + "/organizations/{orgId}/environments/{envId}/apis"
+	localVarPath := localBasePath + "/xapi/v1/organizations/{orgId}/environments/{envId}/apis"
 	localVarPath = strings.Replace(localVarPath, "{"+"orgId"+"}", url.PathEscape(parameterValueToString(r.orgId, "orgId")), -1)
 	localVarPath = strings.Replace(localVarPath, "{"+"envId"+"}", url.PathEscape(parameterValueToString(r.envId, "envId")), -1)
 
diff --git a/apim/configuration.go b/apim/configuration.go
index 5dd28a9..0458a50 100644
--- a/apim/configuration.go
+++ b/apim/configuration.go
@@ -93,15 +93,15 @@ func NewConfiguration() *Configuration {
 		Debug:            false,
 		Servers:          ServerConfigurations{
 			{
-				URL: "https://anypoint.mulesoft.com/apimanager/api/v1",
+				URL: "https://anypoint.mulesoft.com/apimanager",
 				Description: "Anypoint Cloudhub",
 			},
 			{
-				URL: "https://eu1.anypoint.mulesoft.com/apimanager/api/v1",
+				URL: "https://eu1.anypoint.mulesoft.com/apimanager",
 				Description: "Anypoint Cloudhub EU",
 			},
 			{
-				URL: "https://gov.anypoint.mulesoft.com/apimanager/api/v1",
+				URL: "https://gov.anypoint.mulesoft.com/apimanager",
 				Description: "Anypoint Cloudhub GOV",
 			},
 		},
diff --git a/apim/docs/ApimInstanceDetails.md b/apim/docs/ApimInstanceDetails.md
index 38a8289..96268ba 100644
--- a/apim/docs/ApimInstanceDetails.md
+++ b/apim/docs/ApimInstanceDetails.md
@@ -18,7 +18,7 @@ Name | Type | Description | Notes
 **Order** | Pointer to **int32** |  | [optional] 
 **ProviderId** | Pointer to **NullableString** |  | [optional] 
 **Deprecated** | Pointer to **bool** |  | [optional] 
-**LastActiveDate** | Pointer to **NullableTime** |  | [optional] 
+**LastActiveDate** | Pointer to **NullableString** |  | [optional] 
 **EndpointUri** | Pointer to **string** |  | [optional] 
 **EnvironmentId** | Pointer to **string** |  | [optional] 
 **IsPublic** | Pointer to **bool** |  | [optional] 
@@ -421,20 +421,20 @@ HasDeprecated returns a boolean if a field has been set.
 
 ### GetLastActiveDate
 
-`func (o *ApimInstanceDetails) GetLastActiveDate() time.Time`
+`func (o *ApimInstanceDetails) GetLastActiveDate() string`
 
 GetLastActiveDate returns the LastActiveDate field if non-nil, zero value otherwise.
 
 ### GetLastActiveDateOk
 
-`func (o *ApimInstanceDetails) GetLastActiveDateOk() (*time.Time, bool)`
+`func (o *ApimInstanceDetails) GetLastActiveDateOk() (*string, bool)`
 
 GetLastActiveDateOk returns a tuple with the LastActiveDate field if it's non-nil, zero value otherwise
 and a boolean to check if the value has been set.
 
 ### SetLastActiveDate
 
-`func (o *ApimInstanceDetails) SetLastActiveDate(v time.Time)`
+`func (o *ApimInstanceDetails) SetLastActiveDate(v string)`
 
 SetLastActiveDate sets LastActiveDate field to given value.
 
diff --git a/apim/docs/AuditCreated.md b/apim/docs/AuditCreated.md
index 9af0dec..8c0f6bd 100644
--- a/apim/docs/AuditCreated.md
+++ b/apim/docs/AuditCreated.md
@@ -4,7 +4,7 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Date** | Pointer to **time.Time** |  | [optional] 
+**Date** | Pointer to **string** |  | [optional] 
 
 ## Methods
 
@@ -27,20 +27,20 @@ but it doesn't guarantee that properties required by API are set
 
 ### GetDate
 
-`func (o *AuditCreated) GetDate() time.Time`
+`func (o *AuditCreated) GetDate() string`
 
 GetDate returns the Date field if non-nil, zero value otherwise.
 
 ### GetDateOk
 
-`func (o *AuditCreated) GetDateOk() (*time.Time, bool)`
+`func (o *AuditCreated) GetDateOk() (*string, bool)`
 
 GetDateOk returns a tuple with the Date field if it's non-nil, zero value otherwise
 and a boolean to check if the value has been set.
 
 ### SetDate
 
-`func (o *AuditCreated) SetDate(v time.Time)`
+`func (o *AuditCreated) SetDate(v string)`
 
 SetDate sets Date field to given value.
 
diff --git a/apim/docs/DefaultApi.md b/apim/docs/DefaultApi.md
index 3c018ae..7ff0707 100644
--- a/apim/docs/DefaultApi.md
+++ b/apim/docs/DefaultApi.md
@@ -1,14 +1,14 @@
 # \DefaultApi
 
-All URIs are relative to *https://anypoint.mulesoft.com/apimanager/api/v1*
+All URIs are relative to *https://anypoint.mulesoft.com/apimanager*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**DeleteApimInstance**](DefaultApi.md#DeleteApimInstance) | **Delete** /organizations/{orgId}/environments/{envId}/apis/{envApiId} | Delete a specific API Manager Instance
-[**GetApimInstanceDetails**](DefaultApi.md#GetApimInstanceDetails) | **Get** /organizations/{orgId}/environments/{envId}/apis/{envApiId} | Retrieves a specific API Manager Instance
-[**GetEnvApimInstances**](DefaultApi.md#GetEnvApimInstances) | **Get** /organizations/{orgId}/environments/{envId}/apis | Retrieves a collection of API Manager Instances
-[**PatchApimInstance**](DefaultApi.md#PatchApimInstance) | **Patch** /organizations/{orgId}/environments/{envId}/apis/{envApiId} | Patches a specific API Manager Instance
-[**PostApimInstance**](DefaultApi.md#PostApimInstance) | **Post** /organizations/{orgId}/environments/{envId}/apis | Creates an API Manager Instance
+[**DeleteApimInstance**](DefaultApi.md#DeleteApimInstance) | **Delete** /api/v1/organizations/{orgId}/environments/{envId}/apis/{envApiId} | Delete a specific API Manager Instance
+[**GetApimInstanceDetails**](DefaultApi.md#GetApimInstanceDetails) | **Get** /api/v1/organizations/{orgId}/environments/{envId}/apis/{envApiId} | Retrieves a specific API Manager Instance
+[**GetEnvApimInstances**](DefaultApi.md#GetEnvApimInstances) | **Get** /api/v1/organizations/{orgId}/environments/{envId}/apis | Retrieves a collection of API Manager Instances
+[**PatchApimInstance**](DefaultApi.md#PatchApimInstance) | **Patch** /xapi/v1/organizations/{orgId}/environments/{envId}/apis/{envApiId} | Patches a specific API Manager Instance
+[**PostApimInstance**](DefaultApi.md#PostApimInstance) | **Post** /xapi/v1/organizations/{orgId}/environments/{envId}/apis | Creates an API Manager Instance
 
 
 
diff --git a/apim/docs/Deployment.md b/apim/docs/Deployment.md
index a84c764..9d704fa 100644
--- a/apim/docs/Deployment.md
+++ b/apim/docs/Deployment.md
@@ -14,7 +14,7 @@ Name | Type | Description | Notes
 **TargetId** | Pointer to **string** |  | [optional] 
 **TargetName** | Pointer to **string** |  | [optional] 
 **DeploymentId** | Pointer to **NullableString** |  | [optional] 
-**UpdatedDate** | Pointer to **time.Time** |  | [optional] 
+**UpdatedDate** | Pointer to **string** |  | [optional] 
 **Type** | Pointer to **string** |  | [optional] 
 **ExpectedStatus** | Pointer to **string** |  | [optional] 
 **ApiId** | Pointer to **int32** |  | [optional] 
@@ -340,20 +340,20 @@ HasDeploymentId returns a boolean if a field has been set.
 UnsetDeploymentId ensures that no value is present for DeploymentId, not even an explicit nil
 ### GetUpdatedDate
 
-`func (o *Deployment) GetUpdatedDate() time.Time`
+`func (o *Deployment) GetUpdatedDate() string`
 
 GetUpdatedDate returns the UpdatedDate field if non-nil, zero value otherwise.
 
 ### GetUpdatedDateOk
 
-`func (o *Deployment) GetUpdatedDateOk() (*time.Time, bool)`
+`func (o *Deployment) GetUpdatedDateOk() (*string, bool)`
 
 GetUpdatedDateOk returns a tuple with the UpdatedDate field if it's non-nil, zero value otherwise
 and a boolean to check if the value has been set.
 
 ### SetUpdatedDate
 
-`func (o *Deployment) SetUpdatedDate(v time.Time)`
+`func (o *Deployment) SetUpdatedDate(v string)`
 
 SetUpdatedDate sets UpdatedDate field to given value.
 
diff --git a/apim/docs/Endpoint.md b/apim/docs/Endpoint.md
index 559ff18..d75f2aa 100644
--- a/apim/docs/Endpoint.md
+++ b/apim/docs/Endpoint.md
@@ -11,7 +11,7 @@ Name | Type | Description | Notes
 **ApiGatewayVersion** | Pointer to **NullableString** |  | [optional] 
 **ProxyUri** | Pointer to **NullableString** |  | [optional] 
 **ProxyRegistrationUri** | Pointer to **NullableString** |  | [optional] 
-**LastActiveDate** | Pointer to **NullableTime** |  | [optional] 
+**LastActiveDate** | Pointer to **NullableString** |  | [optional] 
 **IsCloudHub** | Pointer to **NullableString** |  | [optional] 
 **DeploymentType** | Pointer to **string** |  | [optional] 
 **PoliciesVersion** | Pointer to **NullableString** |  | [optional] 
@@ -270,20 +270,20 @@ HasProxyRegistrationUri returns a boolean if a field has been set.
 UnsetProxyRegistrationUri ensures that no value is present for ProxyRegistrationUri, not even an explicit nil
 ### GetLastActiveDate
 
-`func (o *Endpoint) GetLastActiveDate() time.Time`
+`func (o *Endpoint) GetLastActiveDate() string`
 
 GetLastActiveDate returns the LastActiveDate field if non-nil, zero value otherwise.
 
 ### GetLastActiveDateOk
 
-`func (o *Endpoint) GetLastActiveDateOk() (*time.Time, bool)`
+`func (o *Endpoint) GetLastActiveDateOk() (*string, bool)`
 
 GetLastActiveDateOk returns a tuple with the LastActiveDate field if it's non-nil, zero value otherwise
 and a boolean to check if the value has been set.
 
 ### SetLastActiveDate
 
-`func (o *Endpoint) SetLastActiveDate(v time.Time)`
+`func (o *Endpoint) SetLastActiveDate(v string)`
 
 SetLastActiveDate sets LastActiveDate field to given value.
 
diff --git a/apim/model_apim_instance_details.go b/apim/model_apim_instance_details.go
index 414d7a7..e03c90b 100644
--- a/apim/model_apim_instance_details.go
+++ b/apim/model_apim_instance_details.go
@@ -12,7 +12,6 @@ package apim
 
 import (
 	"encoding/json"
-	"time"
 )
 
 // checks if the ApimInstanceDetails type satisfies the MappedNullable interface at compile time
@@ -34,7 +33,7 @@ type ApimInstanceDetails struct {
 	Order *int32 `json:"order,omitempty"`
 	ProviderId NullableString `json:"providerId,omitempty"`
 	Deprecated *bool `json:"deprecated,omitempty"`
-	LastActiveDate NullableTime `json:"lastActiveDate,omitempty"`
+	LastActiveDate NullableString `json:"lastActiveDate,omitempty"`
 	EndpointUri *string `json:"endpointUri,omitempty"`
 	EnvironmentId *string `json:"environmentId,omitempty"`
 	IsPublic *bool `json:"isPublic,omitempty"`
@@ -533,9 +532,9 @@ func (o *ApimInstanceDetails) SetDeprecated(v bool) {
 }
 
 // GetLastActiveDate returns the LastActiveDate field value if set, zero value otherwise (both if not set or set to explicit null).
-func (o *ApimInstanceDetails) GetLastActiveDate() time.Time {
+func (o *ApimInstanceDetails) GetLastActiveDate() string {
 	if o == nil || IsNil(o.LastActiveDate.Get()) {
-		var ret time.Time
+		var ret string
 		return ret
 	}
 	return *o.LastActiveDate.Get()
@@ -544,7 +543,7 @@ func (o *ApimInstanceDetails) GetLastActiveDate() time.Time {
 // GetLastActiveDateOk returns a tuple with the LastActiveDate 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 *ApimInstanceDetails) GetLastActiveDateOk() (*time.Time, bool) {
+func (o *ApimInstanceDetails) GetLastActiveDateOk() (*string, bool) {
 	if o == nil {
 		return nil, false
 	}
@@ -560,8 +559,8 @@ func (o *ApimInstanceDetails) HasLastActiveDate() bool {
 	return false
 }
 
-// SetLastActiveDate gets a reference to the given NullableTime and assigns it to the LastActiveDate field.
-func (o *ApimInstanceDetails) SetLastActiveDate(v time.Time) {
+// SetLastActiveDate gets a reference to the given NullableString and assigns it to the LastActiveDate field.
+func (o *ApimInstanceDetails) SetLastActiveDate(v string) {
 	o.LastActiveDate.Set(&v)
 }
 // SetLastActiveDateNil sets the value for LastActiveDate to be an explicit nil
diff --git a/apim/model_audit_created.go b/apim/model_audit_created.go
index e46192e..9ea11d7 100644
--- a/apim/model_audit_created.go
+++ b/apim/model_audit_created.go
@@ -12,7 +12,6 @@ package apim
 
 import (
 	"encoding/json"
-	"time"
 )
 
 // checks if the AuditCreated type satisfies the MappedNullable interface at compile time
@@ -20,7 +19,7 @@ var _ MappedNullable = &AuditCreated{}
 
 // AuditCreated struct for AuditCreated
 type AuditCreated struct {
-	Date *time.Time `json:"date,omitempty"`
+	Date *string `json:"date,omitempty"`
 }
 
 // NewAuditCreated instantiates a new AuditCreated object
@@ -41,9 +40,9 @@ func NewAuditCreatedWithDefaults() *AuditCreated {
 }
 
 // GetDate returns the Date field value if set, zero value otherwise.
-func (o *AuditCreated) GetDate() time.Time {
+func (o *AuditCreated) GetDate() string {
 	if o == nil || IsNil(o.Date) {
-		var ret time.Time
+		var ret string
 		return ret
 	}
 	return *o.Date
@@ -51,7 +50,7 @@ func (o *AuditCreated) GetDate() time.Time {
 
 // GetDateOk returns a tuple with the Date field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *AuditCreated) GetDateOk() (*time.Time, bool) {
+func (o *AuditCreated) GetDateOk() (*string, bool) {
 	if o == nil || IsNil(o.Date) {
 		return nil, false
 	}
@@ -67,8 +66,8 @@ func (o *AuditCreated) HasDate() bool {
 	return false
 }
 
-// SetDate gets a reference to the given time.Time and assigns it to the Date field.
-func (o *AuditCreated) SetDate(v time.Time) {
+// SetDate gets a reference to the given string and assigns it to the Date field.
+func (o *AuditCreated) SetDate(v string) {
 	o.Date = &v
 }
 
diff --git a/apim/model_deployment.go b/apim/model_deployment.go
index 75f9562..c4538fc 100644
--- a/apim/model_deployment.go
+++ b/apim/model_deployment.go
@@ -12,7 +12,6 @@ package apim
 
 import (
 	"encoding/json"
-	"time"
 )
 
 // checks if the Deployment type satisfies the MappedNullable interface at compile time
@@ -30,7 +29,7 @@ type Deployment struct {
 	TargetId *string `json:"targetId,omitempty"`
 	TargetName *string `json:"targetName,omitempty"`
 	DeploymentId NullableString `json:"deploymentId,omitempty"`
-	UpdatedDate *time.Time `json:"updatedDate,omitempty"`
+	UpdatedDate *string `json:"updatedDate,omitempty"`
 	Type *string `json:"type,omitempty"`
 	ExpectedStatus *string `json:"expectedStatus,omitempty"`
 	ApiId *int32 `json:"apiId,omitempty"`
@@ -424,9 +423,9 @@ func (o *Deployment) UnsetDeploymentId() {
 }
 
 // GetUpdatedDate returns the UpdatedDate field value if set, zero value otherwise.
-func (o *Deployment) GetUpdatedDate() time.Time {
+func (o *Deployment) GetUpdatedDate() string {
 	if o == nil || IsNil(o.UpdatedDate) {
-		var ret time.Time
+		var ret string
 		return ret
 	}
 	return *o.UpdatedDate
@@ -434,7 +433,7 @@ func (o *Deployment) GetUpdatedDate() time.Time {
 
 // GetUpdatedDateOk returns a tuple with the UpdatedDate field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *Deployment) GetUpdatedDateOk() (*time.Time, bool) {
+func (o *Deployment) GetUpdatedDateOk() (*string, bool) {
 	if o == nil || IsNil(o.UpdatedDate) {
 		return nil, false
 	}
@@ -450,8 +449,8 @@ func (o *Deployment) HasUpdatedDate() bool {
 	return false
 }
 
-// SetUpdatedDate gets a reference to the given time.Time and assigns it to the UpdatedDate field.
-func (o *Deployment) SetUpdatedDate(v time.Time) {
+// SetUpdatedDate gets a reference to the given string and assigns it to the UpdatedDate field.
+func (o *Deployment) SetUpdatedDate(v string) {
 	o.UpdatedDate = &v
 }
 
diff --git a/apim/model_endpoint.go b/apim/model_endpoint.go
index 3e0ea22..e09a74b 100644
--- a/apim/model_endpoint.go
+++ b/apim/model_endpoint.go
@@ -12,7 +12,6 @@ package apim
 
 import (
 	"encoding/json"
-	"time"
 )
 
 // checks if the Endpoint type satisfies the MappedNullable interface at compile time
@@ -27,7 +26,7 @@ type Endpoint struct {
 	ApiGatewayVersion NullableString `json:"apiGatewayVersion,omitempty"`
 	ProxyUri NullableString `json:"proxyUri,omitempty"`
 	ProxyRegistrationUri NullableString `json:"proxyRegistrationUri,omitempty"`
-	LastActiveDate NullableTime `json:"lastActiveDate,omitempty"`
+	LastActiveDate NullableString `json:"lastActiveDate,omitempty"`
 	IsCloudHub NullableString `json:"isCloudHub,omitempty"`
 	DeploymentType *string `json:"deploymentType,omitempty"`
 	PoliciesVersion NullableString `json:"policiesVersion,omitempty"`
@@ -333,9 +332,9 @@ func (o *Endpoint) UnsetProxyRegistrationUri() {
 }
 
 // GetLastActiveDate returns the LastActiveDate field value if set, zero value otherwise (both if not set or set to explicit null).
-func (o *Endpoint) GetLastActiveDate() time.Time {
+func (o *Endpoint) GetLastActiveDate() string {
 	if o == nil || IsNil(o.LastActiveDate.Get()) {
-		var ret time.Time
+		var ret string
 		return ret
 	}
 	return *o.LastActiveDate.Get()
@@ -344,7 +343,7 @@ func (o *Endpoint) GetLastActiveDate() time.Time {
 // GetLastActiveDateOk returns a tuple with the LastActiveDate 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 *Endpoint) GetLastActiveDateOk() (*time.Time, bool) {
+func (o *Endpoint) GetLastActiveDateOk() (*string, bool) {
 	if o == nil {
 		return nil, false
 	}
@@ -360,8 +359,8 @@ func (o *Endpoint) HasLastActiveDate() bool {
 	return false
 }
 
-// SetLastActiveDate gets a reference to the given NullableTime and assigns it to the LastActiveDate field.
-func (o *Endpoint) SetLastActiveDate(v time.Time) {
+// SetLastActiveDate gets a reference to the given NullableString and assigns it to the LastActiveDate field.
+func (o *Endpoint) SetLastActiveDate(v string) {
 	o.LastActiveDate.Set(&v)
 }
 // SetLastActiveDateNil sets the value for LastActiveDate to be an explicit nil
diff --git a/apim_policy/.openapi-generator/FILES b/apim_policy/.openapi-generator/FILES
index 2578fa1..127502f 100644
--- a/apim_policy/.openapi-generator/FILES
+++ b/apim_policy/.openapi-generator/FILES
@@ -1,5 +1,4 @@
 .gitignore
-.openapi-generator-ignore
 .travis.yml
 README.md
 api/openapi.yaml
@@ -53,5 +52,4 @@ model_pointcut_data_item.go
 model_policy_configuration.go
 model_policy_configuration_configuration_inner.go
 response.go
-test/api_default_test.go
 utils.go